Fix ChangeControl when adding patch-set to Change

lucamilanesio · lucamilanesio · commit 963b5effc7ee · 2016-06-24T00:49:22.000+01:00
In current Gerrit master we need a ChangeControl in order
to add a new patch-set to an existing change.

Change-Id: If0bc2b59fd3ca1a193c291c913bb42aec6182e2d
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java
@@ -28,13 +28,13 @@
 import com.google.gerrit.server.ChangeUtil;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.IdentifiedUser.GenericFactory;
-import com.google.gerrit.server.Sequences;
 import com.google.gerrit.server.change.ChangeInserter;
 import com.google.gerrit.server.change.PatchSetInserter;
 import com.google.gerrit.server.git.BatchUpdate;
 import com.google.gerrit.server.git.IntegrationException;
 import com.google.gerrit.server.git.UpdateException;
 import com.google.gerrit.server.git.validators.CommitValidators.Policy;
+import com.google.gerrit.server.project.ChangeControl;
 import com.google.gerrit.server.project.InvalidChangeOperationException;
 import com.google.gerrit.server.project.NoSuchChangeException;
 import com.google.gerrit.server.project.NoSuchProjectException;
@@ -64,7 +64,6 @@
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 public class PullRequestCreateChange {
@@ -180,8 +179,11 @@ public Change.Id internalAddCommitToChange(ReviewDb db, BatchUpdate bu,
       // The change key exists on the destination branch: adding a new
       // patch-set
       Change destChange = destChanges.get(0).change();
-      insertPatchSet(bu, repo, destChange, pullRequestCommit,
-          refControl, pullRequestMesage);
+      ChangeControl changeControl =
+          projectControlFactory.controlFor(project.getNameKey())
+              .controlForIndexedChange(destChange);
+      insertPatchSet(bu, repo, destChange, pullRequestCommit, changeControl,
+          pullRequestMesage);
       return destChange.getId();
     }
 
@@ -205,15 +207,15 @@ private List<ChangeData> queryChangesForSha1(String pullRequestSha1) {
   }
 
   private void insertPatchSet(BatchUpdate bu, Repository git, Change change,
-      RevCommit cherryPickCommit, RefControl refControl,
+      RevCommit cherryPickCommit, ChangeControl changeControl,
       String pullRequestMessage) throws IOException, UpdateException,
       RestApiException {
     try (RevWalk revWalk = new RevWalk(git)) {
       PatchSet.Id psId =
           ChangeUtil.nextPatchSetId(git, change.currentPatchSetId());
 
       PatchSetInserter patchSetInserter =
-          patchSetInserterFactory.create(refControl, psId, cherryPickCommit);
+          patchSetInserterFactory.create(changeControl, psId, cherryPickCommit);
       patchSetInserter.setMessage(pullRequestMessage);
       patchSetInserter.setValidatePolicy(Policy.NONE);
 
