opendev/gerrit
Code Issues Proposed changes

Merge "Handle error when publishing non draft patch set"

Browse Source
This commit is contained in:
Edwin Kempin
2012-02-08 23:28:59 -08:00
committed by gerrit code review
parent 29b412d37e 20b27e7c5a
commit 0856f6d625
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-common/src/main/java/com/google/gerrit/common/data/ReviewResult.java
View File

@@ -67,7 +67,10 @@ public class ReviewResult {
PUBLISH_NOT_PERMITTED,
/** Review operation not permitted by rule. */
RULE_ERROR
RULE_ERROR,
/** Review operation invalid because patch set is not a draft. */
NOT_A_DRAFT,
}
protected Type type;

7
gerrit-server/src/main/java/com/google/gerrit/server/changedetail/PublishDraft.java
View File

@@ -57,9 +57,14 @@ public class PublishDraft implements Callable<ReviewResult> {
result.setChangeId(changeId);
final ChangeControl control = changeControlFactory.validateFor(changeId);
final PatchSet patch = db.patchSets().get(patchSetId);
if (patch == null || !patch.isDraft()) {
if (patch == null) {
throw new NoSuchChangeException(changeId);
}
if (!patch.isDraft()) {
result.addError(new ReviewResult.Error(
ReviewResult.Error.Type.NOT_A_DRAFT));
return result;
}
if (!control.canPublish(db)) {
result.addError(new ReviewResult.Error(

3
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
View File

@@ -294,6 +294,9 @@ public class ReviewCommand extends BaseCommand {
case RULE_ERROR:
errMsg += "rule error";
break;
case NOT_A_DRAFT:
errMsg += "change is not a draft";
break;
default:
errMsg += "failure in review";
}