opendev/gerrit
Code Issues Proposed changes

Merge "Add "Uploaded patch set 1" message for the UI changes" into stable-2.11

Browse Source
This commit is contained in:
David Pursehouse
2015-08-03 01:59:01 +00:00
committed by Gerrit Code Review
parent d1a1699dd1 dc45ac1047
commit 89caa4212a
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@@ -229,6 +229,8 @@ public class ChangeIT extends AbstractDaemonTest {
assertThat(info.project).isEqualTo(in.project); assertThat(info.project).isEqualTo(in.project);
assertThat(info.branch).isEqualTo(in.branch); assertThat(info.branch).isEqualTo(in.branch);
assertThat(info.subject).isEqualTo(in.subject); assertThat(info.subject).isEqualTo(in.subject);
assertThat(Iterables.getOnlyElement(info.messages).message)
.isEqualTo("Uploaded patch set 1.");
} }
@Test @Test

10
gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java
View File

@@ -31,6 +31,7 @@ import com.google.gerrit.extensions.restapi.TopLevelResource;
import com.google.gerrit.extensions.restapi.UnprocessableEntityException; import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.ChangeMessage;
import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -207,6 +208,15 @@ public class CreateChange implements
changeInserterFactory.create(refControl.getProjectControl(), changeInserterFactory.create(refControl.getProjectControl(),
change, c); change, c);
ChangeMessage msg = new ChangeMessage(new ChangeMessage.Key(change.getId(),
ChangeUtil.messageUUID(db.get())),
me.getAccountId(),
ins.getPatchSet().getCreatedOn(),
ins.getPatchSet().getId());
msg.setMessage(String.format("Uploaded patch set %s.",
ins.getPatchSet().getPatchSetId()));
ins.setMessage(msg);
validateCommit(git, refControl, c, me, ins); validateCommit(git, refControl, c, me, ins);
updateRef(git, rw, c, change, ins.getPatchSet()); updateRef(git, rw, c, change, ins.getPatchSet());