Refactor ChangeInserter's setDraft to match PatchSetInserter's
The `setDraft` method in ChangeInserter can only set the status to
draft; it cannot toggle it.
Change it to be able to toggle the status between draft and new,
making it consistent with the way the method of the same name works
in PatchSetInserter.
Change-Id: Iead2e62701c6b5c90a33efcda35b2e144fd67ccf
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
index 2f3e66a..b992ff2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -107,9 +107,9 @@
return this;
}
- public ChangeInserter setDraft() {
- change.setStatus(Change.Status.DRAFT);
- patchSet.setDraft(true);
+ public ChangeInserter setDraft(boolean draft) {
+ change.setStatus(draft ? Change.Status.DRAFT : Change.Status.NEW);
+ patchSet.setDraft(draft);
return this;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index 2c8663e..aed72ee 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -1479,10 +1479,8 @@
currentUser.getAccountId(),
magicBranch.dest);
change.setTopic(magicBranch.topic);
- ins = changeInserterFactory.create(ctl, change, c);
- if (magicBranch.isDraft()) {
- ins.setDraft();
- }
+ ins = changeInserterFactory.create(ctl, change, c)
+ .setDraft(magicBranch.isDraft());
cmd = new ReceiveCommand(ObjectId.zeroId(), c,
ins.getPatchSet().getRefName());
}
