opendev/gerrit
Code Issues Proposed changes

Display parents for all changes, not only merge commits

Browse Source 
Bug: issue 2279
Change-Id: Iab4930b53e7968f2d6ae1e874b4b474004b4557b
This commit is contained in:
Orgad Shaneh 2014-07-20 08:58:28 +03:00 committed by David Pursehouse
parent 90bef32620
commit 306ed3cb52
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/user-review-ui.txt
View File

@ -98,7 +98,7 @@ It displays the author and the committer as links to a list of this
person's changes that have the same status as the currently viewed person's changes that have the same status as the currently viewed
change. change.
The commit ID and the link:user-changeid.html[Change-Id] are both The commit ID, the parent commit(s) and the link:user-changeid.html[Change-Id] are
displayed with a copy-to-clipboard icon that allows the ID to be copied displayed with a copy-to-clipboard icon that allows the ID to be copied
into the clipboard. into the clipboard.
@ -107,8 +107,7 @@ is also a link to the commit in the Git web browser.
image::images/user-review-ui-change-screen-commit-info.png[width=800, link="images/user-review-ui-change-screen-commit-info.png"] image::images/user-review-ui-change-screen-commit-info.png[width=800, link="images/user-review-ui-change-screen-commit-info.png"]
If a merge commit is viewed this is highlighted by an icon. In this If a merge commit is viewed this is highlighted by an icon.
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"] 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"]

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.java
View File

@ -122,8 +122,8 @@ class CommitBox extends Composite {
if (revInfo.commit().parents().length() > 1) { if (revInfo.commit().parents().length() > 1) {
mergeCommit.setVisible(true); mergeCommit.setVisible(true);
setParents(change.project(), revInfo.commit().parents());
} }
setParents(change.project(), revInfo.commit().parents());
} }
private void setParents(String project, JsArray<CommitInfo> commits) { private void setParents(String project, JsArray<CommitInfo> commits) {

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml
View File

@ -139,7 +139,7 @@ limitations under the License.
<td><a style="margin-left:16px;" ui:field='browserLink' href=""/></td> <td><a style="margin-left:16px;" ui:field='browserLink' href=""/></td>
</tr> </tr>
<tr ui:field='parents' style='display: none'> <tr ui:field='parents' style='display: none'>
<th><ui:msg>Parents</ui:msg></th> <th><ui:msg>Parent(s)</ui:msg></th>
<td> <td>
<g:FlowPanel ui:field='parentCommits'/> <g:FlowPanel ui:field='parentCommits'/>
</td> </td>