Make rebase CommitMergeStatus sound like a submit
This status message is used when changes land via the
REBASE_ALWAYS and REBASE_IF_NECESSARY strategies.
However, it sounds like the change has just been rebased,
not like it has also been submitted to the target branch.
This change updates the message so that it is clearer that
the change has landed, instead of looking like someone
clicked the Rebase button.
Change-Id: If6a963ecef741d9d0c2e0e6421663a5e0061199f
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
index 3736710..d1750fa 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
@@ -777,7 +777,7 @@
if (getSubmitType() == SubmitType.CHERRY_PICK) {
assertThat(last).startsWith("Change has been successfully cherry-picked as ");
} else if (getSubmitType() == SubmitType.REBASE_ALWAYS) {
- assertThat(last).startsWith("Change has been successfully rebased as");
+ assertThat(last).startsWith("Change has been successfully rebased and submitted as");
} else {
assertThat(last).isEqualTo("Change has been successfully merged by Administrator");
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java
index 64dd46c..32c81ad 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java
@@ -295,7 +295,10 @@
assertThat(ps2).isNotNull();
assertThat(ps2.getRevision().get()).isEqualTo(rev2.name());
assertThat(Iterables.getLast(info.messages).message)
- .isEqualTo("Change has been successfully rebased as " + rev2.name() + " by Administrator");
+ .isEqualTo(
+ "Change has been successfully rebased and submitted as "
+ + rev2.name()
+ + " by Administrator");
try (Repository repo = repoManager.openRepository(project)) {
assertThat(repo.exactRef("refs/heads/master").getObjectId()).isEqualTo(rev2);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CommitMergeStatus.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CommitMergeStatus.java
index 7fbf4cd..9262e63 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CommitMergeStatus.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CommitMergeStatus.java
@@ -23,7 +23,7 @@
CLEAN_PICK("Change has been successfully cherry-picked"),
- CLEAN_REBASE("Change has been successfully rebased"),
+ CLEAN_REBASE("Change has been successfully rebased and submitted"),
ALREADY_MERGED(""),
