From 69263d352009138d1e27d20909d855eb23fdffac Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Tue, 13 May 2014 16:08:59 +0200 Subject: [PATCH] Highlight merge commit on change screen For a reviewer it is important to notice that he is reviewing a merge commit. Normally this should be obvious by the commit message, but there may be merge commits with bad commit messages. Highlight merge commits by displaying an icon for them. The icon is taken from the Tango Icon Library [1]. [1] http://tango.freedesktop.org/Tango_Icon_Library Change-Id: I510909a3b146f448492ee11da3c8b80160dec715 --- ...change-screen-commit-info-merge-commit.png | Bin 15940 -> 16210 bytes Documentation/user-review-ui.txt | 3 ++- .../google/gerrit/client/GerritResources.java | 3 +++ .../gerrit/client/change/CommitBox.java | 3 +++ .../gerrit/client/change/CommitBox.ui.xml | 19 +++++++++++++++++- .../com/google/gerrit/client/important.png | Bin 0 -> 717 bytes 6 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 gerrit-gwtui/src/main/java/com/google/gerrit/client/important.png 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 2708b7e0f31f2c6e7cf0981fe3e3f844281c95ef..75cd60ca8e91fe575b53033ee694f778bb967e91 100644 GIT binary patch literal 16210 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 literal 15940 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 MsU%S*_9^iH0Z5)aHvj+t diff --git a/Documentation/user-review-ui.txt b/Documentation/user-review-ui.txt index ddf8de1f11..5f4c2b7a3e 100644 --- a/Documentation/user-review-ui.txt +++ b/Documentation/user-review-ui.txt @@ -107,7 +107,8 @@ 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"] -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 3319457450..19d50ff5e3 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 @@ public interface GerritResources extends ClientBundle { @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 938b23b1f4..4ba579336e 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.Composite; 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 @@ class CommitBox extends Composite { } @UiField Style style; + @UiField Image mergeCommit; @UiField CopyableLabel commitName; @UiField AnchorElement browserLink; @UiField Element parents; @@ -120,6 +122,7 @@ class CommitBox extends Composite { } 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 195ad5dfaf..34454f02c3 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 @@ limitations under the License. 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'> + @eval trimColor com.google.gerrit.client.Gerrit.getTheme().trimColor; @@ -83,6 +84,11 @@ limitations under the License. .parentWebLink { margin-left:16px; } + + .mergeCommit { + margin-right: 3px; + float: left; + } @@ -116,7 +122,18 @@ limitations under the License. - Commit + +
+ Commit +
+ + + + 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 0000000000000000000000000000000000000000..81e9ed29a560c6e478283f003da23194a31a443b GIT binary patch literal 717 zcmV;;0y6!HP)v(sQ968-{g5V4d9iG&ql zB_XjB39*n!l!ZhkMCnD-nwd_`OsDhR&TB!d)krKnt9SFeSKHT?_Q?{SkqPz%HJWA2Gu!d&yZ+uU4F9=A1xavUU#@oV#xN2bEr z(Wyyg?V-NAyj^DSY|t5OGx~O6_hyyOWs#W>LirtI6spysTCLgf7jNg4(7#}!uO1-L zo^o#$c5hN?w*{FFAQa5r^CVBb#0;E)NRUcIHj&ZYyS5k$cNV<$&h@EBx$X`(?PZZ_ z#7gwyB=eSB)^oFk)xB?ya2!A7(iP; zXmwjs5XrJsseXlE4qN#GehuuefEbeLR8oZP07l~2QChPoml&x{5Py3Q#)a?W*y1oK zh05enEnR5sI!e(7V9+YE&AL%R6PYU^jWUQuh93|OKUmUTkoq)IpC(9dssq8#u8va- z$|Y>&BQjS6u|GGr?;`2Tf*Cls{7sD^4C4?O0?A~Igu0`he<8>h{OWkA0^DEx zNJE2abi=j{>obkAl4|Ym>b4HbtGtQQ>ye4RyX;zAvKBcw_UcQcn(7Snnl3PAW$m@S zVbORK#i0=wIJx2$uJ2)>FVFS%p4B~>F3-uNOu}f?TtG97tUohWDm5l6^`znGid$I9 zjlEpz_1N#ZY&4pd$Woj2`S59$C#RosmjBHUh1~=Bl!W4-00000NkvXXu0mjf8+l9k literal 0 HcmV?d00001