opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.11' into stable-2.12

Browse Source 
* stable-2.11:
  Fix subject for "Updated Changes" lines on push

Change-Id: I0b903209f82dfaf02cc2d4f82778a3420378a3e5
This commit is contained in:
David Pursehouse
2016-04-14 16:37:28 +09:00
parent e8b75cbaee a778c50997
commit eb1dcc089f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -695,7 +695,8 @@ public class ReceiveCommits {
addMessage(""); addMessage("");
addMessage("New Changes:"); addMessage("New Changes:");
for (CreateRequest c : created) { for (CreateRequest c : created) {
addMessage(formatChangeUrl(canonicalWebUrl, c.change, false)); addMessage(formatChangeUrl(canonicalWebUrl, c.change,
c.change.getSubject(), false));
} }
addMessage(""); addMessage("");
} }
@@ -720,20 +721,21 @@ public class ReceiveCommits {
addMessage("Updated Changes:"); addMessage("Updated Changes:");
boolean edit = magicBranch != null && magicBranch.edit; boolean edit = magicBranch != null && magicBranch.edit;
for (ReplaceRequest u : updated) { for (ReplaceRequest u : updated) {
addMessage(formatChangeUrl(canonicalWebUrl, u.change, edit)); addMessage(formatChangeUrl(canonicalWebUrl, u.change,
u.info.getSubject(), edit));
} }
addMessage(""); addMessage("");
} }
} }
private static String formatChangeUrl(String url, Change change, private static String formatChangeUrl(String url, Change change,
boolean edit) { String subject, boolean edit) {
StringBuilder m = new StringBuilder() StringBuilder m = new StringBuilder()
.append(" ") .append(" ")
.append(url) .append(url)
.append(change.getChangeId()) .append(change.getChangeId())
.append(" ") .append(" ")
.append(ChangeUtil.cropSubject(change.getSubject())); .append(ChangeUtil.cropSubject(subject));
if (change.getStatus() == Change.Status.DRAFT) { if (change.getStatus() == Change.Status.DRAFT) {
m.append(" [DRAFT]"); m.append(" [DRAFT]");
} }