opendev/gerrit
Code Issues Proposed changes

Merge "Refactor RestoreChange code into gerrit-server"

Browse Source
This commit is contained in:
Edwin Kempin
2012-01-27 10:55:11 -08:00
committed by gerrit code review
parent 9d21da77df ece4c9824f
commit e0f8b573ae
8 changed files with 155 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@
package com.google.gerrit.sshd.commands;
import com.google.gerrit.common.ChangeHooks;
import com.google.gerrit.common.data.ApprovalType;
import com.google.gerrit.common.data.ApprovalTypes;
import com.google.gerrit.common.data.ReviewResult;
@@ -30,13 +29,12 @@ import com.google.gerrit.reviewdb.ReviewDb;
import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.changedetail.AbandonChange;
import com.google.gerrit.server.changedetail.RestoreChange;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.MergeOp;
import com.google.gerrit.server.git.MergeQueue;
import com.google.gerrit.server.git.ReplicationQueue;
import com.google.gerrit.server.mail.AbandonedSender;
import com.google.gerrit.server.mail.EmailException;
import com.google.gerrit.server.mail.RestoredSender;
import com.google.gerrit.server.patch.PatchSetInfoFactory;
import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException;
import com.google.gerrit.server.patch.PublishComments;
@@ -137,9 +135,6 @@ public class ReviewCommand extends BaseCommand {
@Inject
private AbandonChange.Factory abandonChangeFactory;
@Inject
private AbandonedSender.Factory abandonedSenderFactory;
@Inject
private FunctionState.Factory functionStateFactory;
@@ -147,10 +142,7 @@ public class ReviewCommand extends BaseCommand {
private PublishComments.Factory publishCommentsFactory;
@Inject
private RestoredSender.Factory restoredSenderFactory;
@Inject
private ChangeHooks hooks;
private RestoreChange.Factory restoreChangeFactory;
@Inject
private GitRepositoryManager gitManager;
@@ -278,15 +270,8 @@ public class ReviewCommand extends BaseCommand {
if (abandonChange) {
result = abandonChangeFactory.create(patchSetId, changeComment).call();
}
if (restoreChange) {
if (changeControl.canRestore()) {
ChangeUtil.restore(patchSetId, currentUser, changeComment, db,
restoredSenderFactory, hooks);
} else {
throw error("Not permitted to restore change");
}
} else if (restoreChange) {
result = restoreChangeFactory.create(patchSetId, changeComment).call();
if (submitChange) {
changeControl = changeControlFactory.validateFor(changeId);
}
@@ -379,6 +364,10 @@ public class ReviewCommand extends BaseCommand {
switch (resultError.getType()) {
case ABANDON_NOT_PERMITTED:
writeError("error: not permitted to abandon change");
break;
case RESTORE_NOT_PERMITTED:
writeError("error: not permitted to restore change");
break;
default:
writeError("error: failure in review");
}