opendev/gerrit
Code Issues Proposed changes

Fix push to refs/drafts creates a change in NEW state

Browse Source 
Commit 50a618ab15 does not set the draft status
of a change/patch set correctly.
Fix removes 'draft' field from ChangeInserter and sets the status directly on
a change and a patch set. Adds a call to setDraft() if pushed to refs/drafts.

Change-Id: I84d0dfccdcb33940e8b3af24d5ad5d35eb68b55e
This commit is contained in:
Jan Opacki
2013-06-02 19:31:34 +02:00
parent 32259c663c
commit e3106b3d05
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
View File

@@ -65,7 +65,6 @@ public class ChangeInserter {
private RequestScopePropagator requestScopePropagator;
private ChangeMessage changeMessage;
private Set<Account.Id> reviewers;
private boolean draft;
@Inject
ChangeInserter(Provider<ReviewDb> dbProvider,
@@ -95,10 +94,6 @@ public class ChangeInserter {
patchSet.setCreatedOn(change.getCreatedOn());
patchSet.setUploader(change.getOwner());
patchSet.setRevision(new RevId(commit.name()));
if (draft) {
change.setStatus(Change.Status.DRAFT);
patchSet.setDraft(true);
}
patchSetInfo = patchSetInfoFactory.get(commit, patchSet.getId());
change.setCurrentPatchSet(patchSetInfo);
ChangeUtil.computeSortKey(change);
@@ -119,8 +114,9 @@ public class ChangeInserter {
return this;
}
public ChangeInserter setDraft(boolean draft) {
this.draft = draft;
public ChangeInserter setDraft() {
change.setStatus(Change.Status.DRAFT);
patchSet.setDraft(true);
return this;
}