Merge "Fix testBlockRule_ParentBlocksChild() from RefControlTest" into stable-2.9
diff --git a/Documentation/images/user-review-ui-change-screen-commit-info-merge-commit.png b/Documentation/images/user-review-ui-change-screen-commit-info-merge-commit.png
index 2708b7e..75cd60c 100644
--- a/Documentation/images/user-review-ui-change-screen-commit-info-merge-commit.png
+++ b/Documentation/images/user-review-ui-change-screen-commit-info-merge-commit.png
Binary files differ
diff --git a/Documentation/user-review-ui.txt b/Documentation/user-review-ui.txt
index ddf8de1..5f4c2b7a 100644
--- a/Documentation/user-review-ui.txt
+++ b/Documentation/user-review-ui.txt
@@ -107,7 +107,8 @@
image::images/user-review-ui-change-screen-commit-info.png[width=800, link="images/user-review-ui-change-screen-commit-info.png"]
-For merge commits the parent commits are also shown.
+If a merge commit is viewed this is highlighted by an icon. In this
+case the parent commits are also shown.
image::images/user-review-ui-change-screen-commit-info-merge-commit.png[width=800, link="images/user-review-ui-change-screen-commit-info-merge-commit.png"]
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
index 3319457..19d50ff 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
@@ -69,4 +69,7 @@
@Source("warning.png")
public ImageResource warning();
+
+ @Source("important.png")
+ public ImageResource important();
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.java
index 938b23b..4ba5793 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.java
@@ -41,6 +41,7 @@
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HTMLPanel;
+import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.UIObject;
import com.google.gwt.user.client.ui.VerticalPanel;
@@ -59,6 +60,7 @@
}
@UiField Style style;
+ @UiField Image mergeCommit;
@UiField CopyableLabel commitName;
@UiField AnchorElement browserLink;
@UiField Element parents;
@@ -120,6 +122,7 @@
}
if (revInfo.commit().parents().length() > 1) {
+ mergeCommit.setVisible(true);
setParents(change.project(), revInfo.commit().parents());
}
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml
index 195ad5d..34454f0 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml
@@ -19,6 +19,7 @@
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:x='urn:import:com.google.gerrit.client.ui'
xmlns:clippy='urn:import:com.google.gwtexpui.clippy.client'>
+ <ui:with field='ico' type='com.google.gerrit.client.GerritResources'/>
<ui:image field="toggle" src="more_less.png"/>
<ui:style type='com.google.gerrit.client.change.CommitBox.Style'>
@eval trimColor com.google.gerrit.client.Gerrit.getTheme().trimColor;
@@ -83,6 +84,11 @@
.parentWebLink {
margin-left:16px;
}
+
+ .mergeCommit {
+ margin-right: 3px;
+ float: left;
+ }
</ui:style>
<g:HTMLPanel>
<g:ScrollPanel styleName='{style.scroll}' ui:field='scroll'>
@@ -116,7 +122,18 @@
<td ui:field='committerDate' class='{style.date}' colspan="2"/>
</tr>
<tr>
- <th><ui:msg>Commit</ui:msg></th>
+ <th>
+ <div class='{style.mergeCommit}'>
+ <ui:msg>Commit</ui:msg>
+ </div>
+ <g:Image
+ ui:field='mergeCommit'
+ resource='{ico.important}'
+ visible='false'
+ title='Merge Commit'>
+ <ui:attribute name='title'/>
+ </g:Image>
+ </th>
<td><clippy:CopyableLabel styleName='{style.clippy}' ui:field='commitName'/></td>
<td><a style="margin-left:16px;" ui:field='browserLink' href=""/></td>
</tr>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/important.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/important.png
new file mode 100644
index 0000000..81e9ed2
--- /dev/null
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/important.png
Binary files differ
