opendev/gerrit
Code Issues Proposed changes

Button to allow Cherry Picking of a change to another branch.

Browse Source 
Built on the cherry pick REST Api.

Change-Id: I1b0211896eada7de12170ac73de60828bcf19d47
This commit is contained in:
Gustaf Lundh
2012-11-28 14:22:36 +01:00
committed by Gerrit Code Review
parent 524dc79abd
commit 849fec9440
8 changed files with 108 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeDetail.java
View File

@@ -27,6 +27,7 @@ public class ChangeDetail {
protected boolean allowsAnonymous;
protected boolean canAbandon;
protected boolean canEditCommitMessage;
protected boolean canCherryPick;
protected boolean canPublish;
protected boolean canRebase;
protected boolean canRestore;
@@ -82,6 +83,14 @@ public class ChangeDetail {
canEditCommitMessage = a;
}
public boolean canCherryPick() {
return canCherryPick;
}
public void setCanCherryPick(final boolean a) {
canCherryPick = a;
}
public boolean canPublish() {
return canPublish;
}

19
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeApi.java
View File

@@ -81,6 +81,14 @@ public class ChangeApi {
return change(id).view("reviewers").id(reviewer);
}
/** Submit a specific revision of a change. */
public static void cherrypick(int id, String commit, String destination, String message, AsyncCallback<ChangeInfo> cb) {
CherryPickInput cherryPickInput = CherryPickInput.create();
cherryPickInput.setMessage(message);
cherryPickInput.setDestination(destination);
call(id, commit, "cherrypick").post(cherryPickInput, cb);
}
/** Submit a specific revision of a change. */
public static void submit(int id, String commit, AsyncCallback<SubmitInfo> cb) {
SubmitInput in = SubmitInput.create();
@@ -100,6 +108,17 @@ public class ChangeApi {
}
}
private static class CherryPickInput extends JavaScriptObject {
static CherryPickInput create() {
return (CherryPickInput) createObject();
}
final native void setDestination(String d) /*-{ this.destination = d; }-*/;
final native void setMessage(String m) /*-{ this.message = m; }-*/;
protected CherryPickInput() {
}
};
private static class SubmitInput extends JavaScriptObject {
final native void wait_for_merge(boolean b) /*-{ this.wait_for_merge=b; }-*/;

6
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
View File

@@ -136,6 +136,12 @@ public interface ChangeConstants extends Constants {
String editCommitMessageToolTip();
String titleEditCommitMessage();
String buttonCherryPickChangeBegin();
String buttonCherryPickChangeSend();
String headingCherryPickBranch();
String cherryPickCommitMessage();
String cherryPickTitle();
String buttonAbandonChangeBegin();
String buttonAbandonChangeSend();
String headingAbandonMessage();

6
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties
View File

@@ -121,6 +121,12 @@ headingEditCommitMessage = Commit Message
editCommitMessageToolTip = Edit Commit Message
titleEditCommitMessage = Create New Patch Set
buttonCherryPickChangeBegin = Cherry Pick To
buttonCherryPickChangeSend = Cherry Pick Change
headingCherryPickBranch = Cherry Pick to Branch:
cherryPickCommitMessage = Cherry Pick Commit Message:
cherryPickTitle = Code Review - Cherry Pick Change to Another Branch
buttonRestoreChangeBegin = Restore Change
restoreChangeTitle = Code Review - Restore Change
headingRestoreMessage = Restore Message:

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java
View File

@@ -24,6 +24,7 @@ public interface ChangeMessages extends Messages {
String revertChangeDefaultMessage(String commitMsg, String commitId);
String cherryPickedChangeDefaultMessage(String commitMsg, String commitId);
String changeScreenTitleId(String changeId);
String outdatedHeader(int outdated);
String patchSetHeader(int id);

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties
View File

@@ -6,6 +6,7 @@ changesMergedInProject = Merged Changes In {0}
changesAbandonedInProject = Abandoned Changes In {0}
revertChangeDefaultMessage = Revert \"{0}\"\n\nThis reverts commit {1}
cherryPickedChangeDefaultMessage = {0}\n(cherry picked from commit {1})
changeScreenTitleId = Change {0}
outdatedHeader = Change depends on {0} outdated change(s) and should be rebased on the latest patch sets.

63
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java
View File

@@ -25,6 +25,7 @@ import com.google.gerrit.client.ui.AccountLinkPanel;
import com.google.gerrit.client.ui.CommentedActionDialog;
import com.google.gerrit.client.ui.ComplexDisclosurePanel;
import com.google.gerrit.client.ui.ListenableAccountDiffPreference;
import com.google.gerrit.client.ui.SmallHeading;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.common.data.ChangeDetail;
import com.google.gerrit.common.data.PatchSetDetail;
@@ -48,6 +49,7 @@ import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
import com.google.gwt.user.client.ui.InlineLabel;
import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwtjsonrpc.common.VoidResult;
import java.util.HashSet;
@@ -379,6 +381,48 @@ class PatchSetComplexDisclosurePanel extends ComplexDisclosurePanel
actionsPanel.add(b);
}
if (changeDetail.canCherryPick()) {
final Button b = new Button(Util.C.buttonCherryPickChangeBegin());
b.addClickHandler(new ClickHandler() {
@Override
public void onClick(final ClickEvent event) {
b.setEnabled(false);
new CherryPickDialog(b) {
{
sendButton.setText(Util.C.buttonCherryPickChangeSend());
message.setText(Util.M.cherryPickedChangeDefaultMessage(
detail.getInfo().getMessage().trim(),
detail.getPatchSet().getRevision().get()));
}
@Override
public void onSend() {
ChangeApi.cherrypick(changeDetail.getChange().getChangeId(),
patchSet.getRevision().get(),
getDestinationBranch(),
getMessageText(),
new GerritCallback<ChangeInfo>() {
@Override
public void onSuccess(ChangeInfo result) {
sent = true;
Gerrit.display(PageLinks.toChange(new Change.Id(result
._number())));
hide();
}
@Override
public void onFailure(Throwable caught) {
enableButtons(true);
super.onFailure(caught);
}
});
}
}.center();
}
});
actionsPanel.add(b);
}
if (changeDetail.canAbandon()) {
final Button b = new Button(Util.C.buttonAbandonChangeBegin());
b.addClickHandler(new ClickHandler() {
@@ -650,4 +694,23 @@ class PatchSetComplexDisclosurePanel extends ComplexDisclosurePanel
});
}
}
private abstract class CherryPickDialog extends ActionDialog {
private TextBox newBranch;
CherryPickDialog(final FocusWidget enableOnFailure) {
super(enableOnFailure, true, Util.C.cherryPickTitle(), Util.C.cherryPickCommitMessage());
newBranch = new TextBox();
newBranch.setVisibleLength(65);
setFocusOn(newBranch);
message.setCharacterWidth(70);
panel.insert(newBranch, 0);
panel.insert(new SmallHeading(Util.C.headingCherryPickBranch()), 0);
}
public String getDestinationBranch() {
return newBranch.getText();
}
}
}

3
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.httpd.rpc.changedetail;
import com.google.gerrit.common.data.Capable;
import com.google.gerrit.common.data.ChangeDetail;
import com.google.gerrit.common.data.ChangeInfo;
import com.google.gerrit.common.data.SubmitRecord;
@@ -136,6 +137,8 @@ public class ChangeDetailFactory extends Handler<ChangeDetail> {
detail.setCanRevert(change.getStatus() == Change.Status.MERGED && control.canAddPatchSet());
detail.setCanCherryPick(control.getProjectControl().canPushToAtLeastOneRef() == Capable.OK);
detail.setCanEdit(control.getRefControl().canWrite());
detail.setCanEditCommitMessage(change.getStatus().isOpen() && control.canAddPatchSet());
detail.setCanEditTopicName(control.canEditTopicName());