Fix change message when change is created as WiP revert
When publishing a WiP revert we would wrongly prepend I
to the change message which creates messages like IIdeadbeef.
Release-Notes: skip
Change-Id: Ie6c5ccb9637fef4ac8f671a3a7cd45e16345fd17
diff --git a/java/com/google/gerrit/server/restapi/change/SetReadyForReview.java b/java/com/google/gerrit/server/restapi/change/SetReadyForReview.java
index 7d3fe98..97b08f0 100644
--- a/java/com/google/gerrit/server/restapi/change/SetReadyForReview.java
+++ b/java/com/google/gerrit/server/restapi/change/SetReadyForReview.java
@@ -77,7 +77,7 @@
bu.addOp(rsrc.getChange().getId(), opFactory.create(false, input));
if (change.getRevertOf() != null) {
commitUtil.addChangeRevertedNotificationOps(
- bu, change.getRevertOf(), change.getId(), change.getKey().get());
+ bu, change.getRevertOf(), change.getId(), change.getKey().get().substring(1));
}
bu.execute();
return Response.ok();
diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
index 97ec978..3b0d240 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -448,7 +448,7 @@
List<ChangeMessageInfo> sourceMessages =
new ArrayList<>(gApi.changes().id(r.getChangeId()).get().messages);
assertThat(sourceMessages).hasSize(4);
- String expectedMessage = String.format("Created a revert of this change as I%s", changeId);
+ String expectedMessage = String.format("Created a revert of this change as %s", changeId);
assertThat(sourceMessages.get(3).message).isEqualTo(expectedMessage);
}
diff --git a/javatests/com/google/gerrit/acceptance/api/change/RevertIT.java b/javatests/com/google/gerrit/acceptance/api/change/RevertIT.java
index 4855ba4..7c50e93 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/RevertIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/RevertIT.java
@@ -225,6 +225,12 @@
List<ChangeMessageInfo> sourceMessages =
new ArrayList<>(gApi.changes().id(r.getChangeId()).get().messages);
assertThat(sourceMessages).hasSize(3);
+ // Publishing creates a revert message
+ gApi.changes().id(revertChange.changeId).setReadyForReview();
+ sourceMessages = new ArrayList<>(gApi.changes().id(r.getChangeId()).get().messages);
+ assertThat(sourceMessages).hasSize(4);
+ assertThat(sourceMessages.get(3).message)
+ .isEqualTo("Created a revert of this change as " + revertChange.changeId);
}
@Test
