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

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.setStyleName(Gerrit.RESOURCES.css().selectPatchSetOldVersion());
@@ -312,6 +311,11 @@ public class ChangeScreen extends Screen {
neededBy.display(detail.getNeededBy());
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()) {
if (patchesList != null) {
patchesList.addItem(Util.M.patchSetHeader(pId.getPatchSetId()), pId