opendev/gerrit
Code Issues Proposed changes

ChangeEditUtil: Fix inconsistent change message

Browse Source 
Change messages created when editing patch sets were being created
with the prefix "Patch set 1:" with a lower case 's'. This is not
consistent with other change messages that use "Patch Set 1:" with
an upper case 'S'.

Change-Id: I7b7476d0f2138d908e5dc5a391ce1bef3a847897
This commit is contained in:
David Pursehouse
2016-01-19 13:16:28 +09:00
parent 0300e1344e
commit 094e811bb5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java
View File

@@ -173,7 +173,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
assertChangeMessages(change, assertChangeMessages(change,
ImmutableList.of("Uploaded patch set 1.", ImmutableList.of("Uploaded patch set 1.",
"Uploaded patch set 2.", "Uploaded patch set 2.",
"Patch set 3: Published edit on patch set 2.")); "Patch Set 3: Published edit on patch set 2."));
} }
@Test @Test
@@ -194,7 +194,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
assertChangeMessages(change, assertChangeMessages(change,
ImmutableList.of("Uploaded patch set 1.", ImmutableList.of("Uploaded patch set 1.",
"Uploaded patch set 2.", "Uploaded patch set 2.",
"Patch set 3: Published edit on patch set 2.")); "Patch Set 3: Published edit on patch set 2."));
} }
@Test @Test
@@ -365,7 +365,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
assertChangeMessages(change, assertChangeMessages(change,
ImmutableList.of("Uploaded patch set 1.", ImmutableList.of("Uploaded patch set 1.",
"Uploaded patch set 2.", "Uploaded patch set 2.",
"Patch set 3: Commit message was updated.")); "Patch Set 3: Commit message was updated."));
} }
@Test @Test
@@ -395,7 +395,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
assertChangeMessages(change, assertChangeMessages(change,
ImmutableList.of("Uploaded patch set 1.", ImmutableList.of("Uploaded patch set 1.",
"Uploaded patch set 2.", "Uploaded patch set 2.",
"Patch set 3: Commit message was updated.")); "Patch Set 3: Commit message was updated."));
} }
@Test @Test

2
gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java
View File

@@ -228,7 +228,7 @@ public class ChangeEditUtil {
PatchSetInserter inserter = PatchSetInserter inserter =
patchSetInserterFactory.create(ctl, psId, squashed); patchSetInserterFactory.create(ctl, psId, squashed);
StringBuilder message = new StringBuilder("Patch set ") StringBuilder message = new StringBuilder("Patch Set ")
.append(inserter.getPatchSetId().get()) .append(inserter.getPatchSetId().get())
.append(": "); .append(": ");