Merge "Cut down to below 73 characters when reverting changes"

Documentation/rest-api-changes.txt

@@ -1457,6 +1457,10 @@ response body.
 
 Reverts a change.
 
+The subject of the newly created change will be
+'Revert "<subject-of-reverted-change>"'. If the subject of the change reverted is
+above 63 characters, it will be cut down to 59 characters with "..." in the end.
+
 The request body does not need to include a link:#revert-input[
 RevertInput] entity if no review comment is added.
 
@@ -1515,7 +1519,9 @@ the error message is contained in the response body.
 
 Creates open revert changes for all of the changes of a certain submission.
 
-The subject of each revert change will be "Revert <subject-of-reverted-change".
+The subject of each revert change will be 'Revert "<subject-of-reverted-change"'.
+If the subject is above 63 characters, the subject will be cut to 59 characters
+with "..." in the end.
 
 Details for the revert can be specified in the request body inside a link:#revert-input[
 RevertInput] The topic of all created revert changes will be

java/com/google/gerrit/server/git/CommitUtil.java

@@ -146,12 +146,14 @@ public class CommitUtil {
     revertCommitBuilder.setCommitter(authorIdent);
 
     Change changeToRevert = notes.getChange();
+    String subject = changeToRevert.getSubject();
+    if (subject.length() > 63) {
+      subject = subject.substring(0, 59) + "...";
+    }
     if (message == null) {
       message =
           MessageFormat.format(
-              ChangeMessages.get().revertChangeDefaultMessage,
+              ChangeMessages.get().revertChangeDefaultMessage, subject, patch.commitId().name());
-              changeToRevert.getSubject(),
-              patch.commitId().name());
     }
     if (generatedChangeId != null) {
       revertCommitBuilder.setMessage(ChangeIdUtil.insertId(message, generatedChangeId, true));

java/com/google/gerrit/server/restapi/change/RevertSubmission.java

@@ -313,6 +313,9 @@ public class RevertSubmission
 
   private String getMessage(RevertInput revertInput, ChangeNotes changeNotes) {
     String subject = changeNotes.getChange().getSubject();
+    if (subject.length() > 63) {
+      subject = subject.substring(0, 59) + "...";
+    }
     if (revertInput.message == null) {
       return MessageFormat.format(
           ChangeMessages.get().revertChangeDefaultMessage,

javatests/com/google/gerrit/acceptance/api/change/RevertIT.java

@@ -283,6 +283,27 @@ public class RevertIT extends AbstractDaemonTest {
         .isEqualTo(revertInput.message);
   }
 
+  @Test
+  public void revertChangeWithLongSubject() throws Exception {
+    String changeTitle =
+        "This change has a very long title and therefore it will be cut to 50 characters when the"
+            + " revert change will revert this change";
+    String result = createChange(changeTitle, "a.txt", "message").getChangeId();
+    gApi.changes().id(result).current().review(ReviewInput.approve());
+    gApi.changes().id(result).current().submit();
+    RevertInput revertInput = new RevertInput();
+    ChangeInfo revertChange = gApi.changes().id(result).revert(revertInput).get();
+    assertThat(revertChange.subject)
+        .isEqualTo(String.format("Revert \"%s...\"", changeTitle.substring(0, 59)));
+    assertThat(gApi.changes().id(revertChange.id).current().commit(false).message)
+        .isEqualTo(
+            String.format(
+                "Revert \"%s...\"\n\nThis reverts commit %s.\n\nChange-Id: %s\n",
+                changeTitle.substring(0, 59),
+                gApi.changes().id(result).get().currentRevision,
+                revertChange.changeId));
+  }
+
   @Test
   public void revertNotifications() throws Exception {
     PushOneCommit.Result r = createChange();
@@ -704,6 +725,28 @@ public class RevertIT extends AbstractDaemonTest {
                 gApi.changes().id(result).get().currentRevision, revertChange.changeId));
   }
 
+  @Test
+  public void revertSubmissionRevertsChangeWithLongSubject() throws Exception {
+    String changeTitle =
+        "This change has a very long title and therefore it will be cut to 50 characters when the"
+            + " revert change will revert this change";
+    String result = createChange(changeTitle, "a.txt", "message").getChangeId();
+    gApi.changes().id(result).current().review(ReviewInput.approve());
+    gApi.changes().id(result).current().submit();
+    RevertInput revertInput = new RevertInput();
+    ChangeInfo revertChange =
+        gApi.changes().id(result).revertSubmission(revertInput).revertChanges.get(0);
+    assertThat(revertChange.subject)
+        .isEqualTo(String.format("Revert \"%s...\"", changeTitle.substring(0, 59)));
+    assertThat(gApi.changes().id(revertChange.id).current().commit(false).message)
+        .isEqualTo(
+            String.format(
+                "Revert \"%s...\"\n\nThis reverts commit %s.\n\nChange-Id: %s\n",
+                changeTitle.substring(0, 59),
+                gApi.changes().id(result).get().currentRevision,
+                revertChange.changeId));
+  }
+
   @Test
   @GerritConfig(name = "change.submitWholeTopic", value = "true")
   public void revertSubmissionDifferentRepositoriesWithDependantChange() throws Exception {