opendev/gerrit
Code Issues Proposed changes

Merge changes from topic 'addUpdateChange'

Browse Source 
* changes:
  Add new REST api for creating a merge patch set for change
  Refactor ReplaceOp for updating change rest api
This commit is contained in:
Dave Borowitz
2016-10-17 19:40:35 +00:00
committed by Gerrit Code Review
parent 917f26bf93 b1e07e52b2
commit a6d76a70fd
9 changed files with 453 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -2433,10 +2433,12 @@ public class ReceiveCommits {
rw.parseBody(newCommit);
RevCommit priorCommit = revisions.inverse().get(priorPatchSet);
replaceOp = replaceOpFactory.create(requestScopePropagator,
projectControl, notes.getChange().getDest(), checkMergedInto,
priorPatchSet, priorCommit, psId, newCommit, info, groups,
magicBranch, rp.getPushCertificate());
replaceOp = replaceOpFactory
.create(projectControl, notes.getChange().getDest(), checkMergedInto,
priorPatchSet, priorCommit, psId, newCommit, info, groups,
magicBranch, rp.getPushCertificate())
.setRequestScopePropagator(requestScopePropagator)
.setUpdateRef(false);
bu.addOp(notes.getChangeId(), replaceOp);
if (progress != null) {
bu.addOp(notes.getChangeId(), new ChangeProgressOp(progress));