opendev/gerrit
Code Issues Proposed changes

Use 'Auto Merge' for merge commit's base comparison

Browse Source 
When reviewing a merge commit, the old wording in the version history dropdown
of 'Base' doesn't really match Gerrit's behavior.  Updating this to use
'Auto Merge' as suggested by SOP on IRC.

Signed-off-by: Brad Larson <bklarson@gmail.com>
Change-Id: Ia71eeb063c1b0d71789dbb584825f4220195ec40
This commit is contained in:
Brad Larson
2012-03-05 13:50:56 -06:00
parent c36914973c
commit 0f716e62c5
6 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,6 +124,7 @@ public interface ChangeConstants extends Constants {
String abandonChangeTitle(); String abandonChangeTitle();
String oldVersionHistory(); String oldVersionHistory();
String baseDiffItem(); String baseDiffItem();
String autoMerge();
String buttonReview(); String buttonReview();
String buttonPublishCommentsSend(); String buttonPublishCommentsSend();

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

@@ -95,6 +95,7 @@ headingAbandonMessage = Abandon Message:
abandonChangeTitle = Code Review - Abandon Change abandonChangeTitle = Code Review - Abandon Change
oldVersionHistory = Old Version History: oldVersionHistory = Old Version History:
baseDiffItem = Base baseDiffItem = Base
autoMerge = Auto Merge
buttonRevertChangeBegin = Revert Change buttonRevertChangeBegin = Revert Change
buttonRevertChangeSend = Revert Change buttonRevertChangeSend = Revert Change

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

@@ -250,7 +250,6 @@ public class ChangeScreen extends Screen {
} }
} }
}); });
patchesList.addItem(Util.C.baseDiffItem());
patchesGrid = new Grid(1, 2); patchesGrid = new Grid(1, 2);
patchesGrid.setStyleName(Gerrit.RESOURCES.css().selectPatchSetOldVersion()); patchesGrid.setStyleName(Gerrit.RESOURCES.css().selectPatchSetOldVersion());
@@ -312,6 +311,11 @@ public class ChangeScreen extends Screen {
neededBy.display(detail.getNeededBy()); neededBy.display(detail.getNeededBy());
approvals.display(detail); approvals.display(detail);
if (detail.getCurrentPatchSetDetail().getInfo().getParents().size() > 1) {
patchesList.addItem(Util.C.autoMerge());
} else {
patchesList.addItem(Util.C.baseDiffItem());
}
for (PatchSet pId : detail.getPatchSets()) { for (PatchSet pId : detail.getPatchSets()) {
if (patchesList != null) { if (patchesList != null) {
patchesList.addItem(Util.M.patchSetHeader(pId.getPatchSetId()), pId patchesList.addItem(Util.M.patchSetHeader(pId.getPatchSetId()), pId

6
gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/HistoryTable.java
View File

@@ -76,7 +76,11 @@ class HistoryTable extends FancyFlexTable<Patch> {
table.setText(3, 0, Util.C.patchTableColumnComments()); table.setText(3, 0, Util.C.patchTableColumnComments());
fmt.setStyleName(3, 0, Gerrit.RESOURCES.css().dataHeader()); fmt.setStyleName(3, 0, Gerrit.RESOURCES.css().dataHeader());
table.setText(0, 1, PatchUtil.C.patchBase()); if (screen.getPatchSetDetail().getInfo().getParents().size() > 1) {
table.setText(0, 1, PatchUtil.C.patchBaseAutoMerge());
} else {
table.setText(0, 1, PatchUtil.C.patchBase());
}
fmt.setStyleName(0, 1, Gerrit.RESOURCES.css().dataCell()); fmt.setStyleName(0, 1, Gerrit.RESOURCES.css().dataCell());
fmt.addStyleName(0, 1, Gerrit.RESOURCES.css().topMostCell()); fmt.addStyleName(0, 1, Gerrit.RESOURCES.css().topMostCell());
fmt.setStyleName(1, 1, Gerrit.RESOURCES.css().dataCell()); fmt.setStyleName(1, 1, Gerrit.RESOURCES.css().dataCell());

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
View File

@@ -27,6 +27,7 @@ public interface PatchConstants extends Constants {
String noDifference(); String noDifference();
String patchBase(); String patchBase();
String patchBaseAutoMerge();
String patchHeaderPatchSet(); String patchHeaderPatchSet();
String patchHeaderOld(); String patchHeaderOld();
String patchHeaderNew(); String patchHeaderNew();

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties
View File

@@ -10,6 +10,7 @@ buttonDiscard = Discard
noDifference = No Differences noDifference = No Differences
patchBase = Base patchBase = Base
patchBaseAutoMerge = Auto Merge
patchHeaderPatchSet = Patch Set patchHeaderPatchSet = Patch Set
patchHeaderOld = Old Version patchHeaderOld = Old Version
patchHeaderNew = New Version patchHeaderNew = New Version