From 315005ddb0a5b34a817a18f48dfe00b5eb342654 Mon Sep 17 00:00:00 2001
From: Edwin Kempin <ekempin@google.com>
Date: Wed, 20 Jan 2016 10:04:46 +0100
Subject: [PATCH] Set subject for commits on note branch when change/ps is
 created

Instead of using the default subject for commits on the note branch
which is

  Update patch set XX

be more specific when a change / patch set is created:

  Create change / Create patch set XX

These messages are consistent with the ones that are set by
ChangeRebuilder.

Change-Id: I26a0154f92d55fe594d46be031047de27e37366c
Signed-off-by: Edwin Kempin <ekempin@google.com>
---
 .../com/google/gerrit/acceptance/api/change/ChangeIT.java     | 4 ++++
 .../google/gerrit/acceptance/rest/change/CreateChangeIT.java  | 2 ++
 .../java/com/google/gerrit/server/change/ChangeInserter.java  | 1 +
 .../com/google/gerrit/server/change/PatchSetInserter.java     | 1 +
 .../java/com/google/gerrit/server/git/ReceiveCommits.java     | 1 +
 5 files changed, 9 insertions(+)

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
index c156a46083..1bd791f746 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -897,6 +897,8 @@ public class ChangeIT extends AbstractDaemonTest {
           repo.exactRef(ChangeNoteUtil.changeRefName(new Change.Id(c._number)))
               .getObjectId());
 
+      assertThat(commitPatchSetCreation.getShortMessage())
+          .isEqualTo("Create patch set 2");
       PersonIdent expectedAuthor = ChangeNoteUtil.newIdent(
           accountCache.get(admin.id).getAccount(), c.updated,
           serverIdent.get(), AnonymousCowardNameProvider.DEFAULT);
@@ -908,6 +910,8 @@ public class ChangeIT extends AbstractDaemonTest {
 
       RevCommit commitChangeCreation =
           rw.parseCommit(commitPatchSetCreation.getParent(0));
+      assertThat(commitChangeCreation.getShortMessage())
+          .isEqualTo("Create change");
       expectedAuthor = ChangeNoteUtil.newIdent(
           accountCache.get(admin.id).getAccount(), c.created, serverIdent.get(),
           AnonymousCowardNameProvider.DEFAULT);
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
index 5e6e2d37cc..5847831ed3 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
@@ -113,6 +113,8 @@ public class CreateChangeIT extends AbstractDaemonTest {
           repo.exactRef(ChangeNoteUtil.changeRefName(new Change.Id(c._number)))
               .getObjectId());
 
+      assertThat(commit.getShortMessage()).isEqualTo("Create change");
+
       PersonIdent expectedAuthor = ChangeNoteUtil.newIdent(
           accountCache.get(admin.id).getAccount(), c.created, serverIdent.get(),
           AnonymousCowardNameProvider.DEFAULT);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
index 975874e5a6..625e548d4f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -292,6 +292,7 @@ public class ChangeInserter extends BatchUpdate.InsertChangeOp {
     ctx.getChange().setCurrentPatchSet(patchSetInfo);
 
     ChangeUpdate update = ctx.getUpdate(patchSet.getId());
+    update.setSubject("Create change");
     update.setTopic(change.getTopic());
 
     if (patchSet.getGroups() == null) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
index be26915461..0f8eb71204 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
@@ -216,6 +216,7 @@ public class PatchSetInserter extends BatchUpdate.Op {
 
     change = ctx.getChange();
     ChangeUpdate update = ctx.getUpdate(psId);
+    update.setSubject("Create patch set " + psId.get());
 
     if (!change.getStatus().isOpen() && !allowClosed) {
       throw new InvalidChangeOperationException(String.format(
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index 86c78bb03d..6d1a2dae57 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -2245,6 +2245,7 @@ public class ReceiveCommits {
       Map<String, Short> approvals = new HashMap<>();
       ChangeUpdate update = updateFactory.create(
           changeCtl, newPatchSet.getCreatedOn());
+      update.setSubject("Create patch set " + newPatchSet.getId().get());
       update.setPatchSetId(newPatchSet.getId());
 
       if (magicBranch != null) {