diff options
author | Edwin Kempin <edwin.kempin@gmail.com> | 2014-04-10 13:33:23 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-10 13:33:23 +0000 |
commit | db59610367dad47d9406a2005b8a33a0683a62af (patch) | |
tree | 33a6ed63d5d3d403264acab29cd9abbbcc860a5a | |
parent | 69fd3a468d330d3178927c5db1fe011af48a7550 (diff) | |
parent | 980c5bf9ef4f27cc8d25cb0c4aebf8d54b9cc47f (diff) |
Merge "Set uploader to current user in "patchset-created" event upon cherry-picking" into stable-2.8
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java index bf848a6767..a5c7c69c4d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java @@ -175,7 +175,7 @@ public class CherryPickChange { // The change key exists on the destination branch. The cherry pick // will be added as a new patch set. return insertPatchSet(git, revWalk, destChanges.get(0), patchSetId, - cherryPickCommit, refControl); + cherryPickCommit, refControl, currentUser); } else { // Change key not found on destination branch. We can create a new // change. @@ -192,8 +192,9 @@ public class CherryPickChange { private Change.Id insertPatchSet(Repository git, RevWalk revWalk, Change change, PatchSet.Id patchSetId, RevCommit cherryPickCommit, - RefControl refControl) throws InvalidChangeOperationException, - IOException, OrmException, NoSuchChangeException { + RefControl refControl, IdentifiedUser uploader) + throws InvalidChangeOperationException, IOException, OrmException, + NoSuchChangeException { final PatchSetInserter inserter = patchSetInserterFactory .create(git, revWalk, refControl, currentUser, change, cherryPickCommit); final PatchSet.Id newPatchSetId = inserter.getPatchSetId(); @@ -201,6 +202,7 @@ public class CherryPickChange { inserter .setMessage("Uploaded patch set " + newPatchSetId.get() + ".") .setDraft(current.isDraft()) + .setUploader(uploader.getAccountId()) .insert(); return change.getId(); } |