opendev/gerrit
Code Issues Proposed changes

NoteDb: Fix publish draft change by pushing non-draft patch set

Browse Source 
When a non-draft patch set is pushed to a draft change, the change
should get published. For this the change status must be changed from
DRAFT to NEW. This was not done when NoteDb was enabled.

Change-Id: I025b89873082777ecbab6936d05064f8cacaeef2
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-08-17 12:52:54 +02:00
parent d3c33d2146
commit 5fce2c535d
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java
View File

@@ -269,6 +269,19 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
r.assertChange(Change.Status.DRAFT, null); r.assertChange(Change.Status.DRAFT, null);
} }
@Test
public void publishDraftChangeByPushingNonDraftPatchSet() throws Exception {
// create draft change
PushOneCommit.Result r = pushTo("refs/drafts/master");
r.assertOkStatus();
r.assertChange(Change.Status.DRAFT, null);
// publish draft change by pushing non-draft patch set
r = amendChange(r.getChangeId(), "refs/for/master");
r.assertOkStatus();
r.assertChange(Change.Status.NEW, null);
}
@Test @Test
public void pushForMasterAsEdit() throws Exception { public void pushForMasterAsEdit() throws Exception {
PushOneCommit.Result r = pushTo("refs/for/master"); PushOneCommit.Result r = pushTo("refs/for/master");

3
gerrit-server/src/main/java/com/google/gerrit/server/git/ReplaceOp.java
View File

@@ -240,6 +240,9 @@ public class ReplaceOp extends BatchUpdate.Op {
} }
boolean draft = magicBranch != null && magicBranch.draft; boolean draft = magicBranch != null && magicBranch.draft;
if (change.getStatus() == Change.Status.DRAFT && !draft) {
update.setStatus(Change.Status.NEW);
}
newPatchSet = psUtil.insert( newPatchSet = psUtil.insert(
ctx.getDb(), ctx.getRevWalk(), update, patchSetId, commit, draft, groups, ctx.getDb(), ctx.getRevWalk(), update, patchSetId, commit, draft, groups,
pushCertificate != null pushCertificate != null