diff options
Diffstat (limited to 'gerrit-httpd')
8 files changed, 239 insertions, 4 deletions
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java index 9e6246513b..312f9e6685 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java @@ -104,8 +104,9 @@ public class ChangeDetailFactory extends Handler<ChangeDetail> { detail.setChange(change); detail.setAllowsAnonymous(control.forAnonymousUser().isVisible()); - detail.setCanAbandon(change.getStatus().isOpen() && control.canAbandon()); - detail.setCanRestore(change.getStatus() == Change.Status.ABANDONED && control.canRestore()); + detail.setCanAbandon((change.getStatus() == Change.Status.DEFERRED || change.getStatus().isOpen()) && control.canAbandon()); + detail.setCanDefer((change.getStatus() == Change.Status.ABANDONED || change.getStatus().isOpen()) && control.canDefer()); + detail.setCanRestore((change.getStatus() == Change.Status.ABANDONED || change.getStatus() == Change.Status.DEFERRED) && control.canRestore()); detail.setCanSubmit(canSubmitResult == CanSubmitResult.OK); detail.setStarred(control.getCurrentUser().getStarredChanges().contains( changeId)); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeManageServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeManageServiceImpl.java index a8be03d888..121d478b82 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeManageServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeManageServiceImpl.java @@ -24,6 +24,7 @@ import com.google.inject.Inject; class ChangeManageServiceImpl implements ChangeManageService { private final SubmitAction.Factory submitAction; private final AbandonChange.Factory abandonChangeFactory; + private final DeferChange.Factory deferChangeFactory; private final RestoreChange.Factory restoreChangeFactory; private final RevertChange.Factory revertChangeFactory; private final StagingAction.Factory stagingActionFactory; @@ -32,12 +33,14 @@ class ChangeManageServiceImpl implements ChangeManageService { @Inject ChangeManageServiceImpl(final SubmitAction.Factory patchSetAction, final AbandonChange.Factory abandonChangeFactory, + final DeferChange.Factory deferChangeFactory, final RestoreChange.Factory restoreChangeFactory, final RevertChange.Factory revertChangeFactory, final StagingAction.Factory stagingActionFactory, final UnstageChange.Factory unstageChangeFactory) { this.submitAction = patchSetAction; this.abandonChangeFactory = abandonChangeFactory; + this.deferChangeFactory = deferChangeFactory; this.restoreChangeFactory = restoreChangeFactory; this.revertChangeFactory = revertChangeFactory; this.stagingActionFactory = stagingActionFactory; @@ -54,6 +57,11 @@ class ChangeManageServiceImpl implements ChangeManageService { abandonChangeFactory.create(patchSetId, message).to(callback); } + public void deferChange(final PatchSet.Id patchSetId, final String message, + final AsyncCallback<ChangeDetail> callback) { + deferChangeFactory.create(patchSetId, message).to(callback); + } + public void revertChange(final PatchSet.Id patchSetId, final String message, final AsyncCallback<ChangeDetail> callback) { revertChangeFactory.create(patchSetId, message).to(callback); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeModule.java index 8797ed88f4..7aae7a8d74 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeModule.java @@ -30,6 +30,7 @@ public class ChangeModule extends RpcServletModule { @Override protected void configure() { factory(AbandonChange.Factory.class); + factory(DeferChange.Factory.class); factory(RestoreChange.Factory.class); factory(RevertChange.Factory.class); factory(ChangeDetailFactory.Factory.class); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/DeferChange.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/DeferChange.java new file mode 100644 index 0000000000..9aadf05f00 --- /dev/null +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/DeferChange.java @@ -0,0 +1,125 @@ +// Copyright (C) 2009 The Android Open Source Project, +// Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.httpd.rpc.changedetail; + +import com.google.gerrit.common.ChangeHookRunner; +import com.google.gerrit.common.data.ChangeDetail; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.server.ChangeUtil; +import com.google.gerrit.server.IdentifiedUser; +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.mail.DeferredSender; +import com.google.gerrit.server.mail.EmailException; +import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; +import com.google.gerrit.server.project.ChangeControl; +import com.google.gerrit.server.project.InvalidChangeOperationException; +import com.google.gerrit.server.project.NoSuchChangeException; +import com.google.gerrit.server.project.NoSuchRefException; +import com.google.gwtorm.client.OrmException; +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; + +import org.eclipse.jgit.lib.Repository; + +import java.io.IOException; +import javax.annotation.Nullable; + +class DeferChange extends Handler<ChangeDetail> { + interface Factory { + DeferChange create(PatchSet.Id patchSetId, String message); + } + + private final ChangeControl.Factory changeControlFactory; + private final ReviewDb db; + private final IdentifiedUser currentUser; + private final DeferredSender.Factory deferredSenderFactory; + private final ChangeDetailFactory.Factory changeDetailFactory; + + private final PatchSet.Id patchSetId; + @Nullable + private final String message; + + private final ChangeHookRunner hooks; + private final MergeQueue merger; + private final MergeOp.Factory opFactory; + private final GitRepositoryManager gitManager; + + @Inject + DeferChange(final ChangeControl.Factory changeControlFactory, + final ReviewDb db, final IdentifiedUser currentUser, + final DeferredSender.Factory deferredSenderFactory, + final ChangeDetailFactory.Factory changeDetailFactory, + @Assisted final PatchSet.Id patchSetId, + @Assisted @Nullable final String message, final ChangeHookRunner hooks, + MergeQueue merger, MergeOp.Factory opFactory, + GitRepositoryManager gitManager) { + this.changeControlFactory = changeControlFactory; + this.db = db; + this.currentUser = currentUser; + this.deferredSenderFactory = deferredSenderFactory; + this.changeDetailFactory = changeDetailFactory; + + this.patchSetId = patchSetId; + this.message = message; + this.hooks = hooks; + this.merger = merger; + this.opFactory = opFactory; + this.gitManager = gitManager; + } + + @Override + public ChangeDetail call() throws NoSuchChangeException, OrmException, + EmailException, NoSuchEntityException, InvalidChangeOperationException, + PatchSetInfoNotAvailableException { + final Change.Id changeId = patchSetId.getParentKey(); + final ChangeControl control = changeControlFactory.validateFor(changeId); + if (!control.canDefer()) { + throw new NoSuchChangeException(changeId); + } + + ChangeUtil.defer(patchSetId, currentUser, message, db, + deferredSenderFactory, hooks); + + final Change change = db.changes().get(changeId); + final boolean staged = change.getStatus() == Change.Status.STAGED; + + // If the change was staged, the staging branch needs to be updated. + if (staged) { + Repository git = null; + try { + git = gitManager.openRepository(change.getProject()); + ChangeUtil.rebuildStaging(change.getDest(), currentUser, db, git, + opFactory, merger, hooks); + } catch (IOException e) { + // Failed to open git repository. + } catch (NoSuchRefException e) { + // Invalid change destination branch. + } finally { + if (git != null) { + git.close(); + } + } + } + + return changeDetailFactory.create(changeId).call(); + } +} diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/DeferTopic.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/DeferTopic.java new file mode 100644 index 0000000000..33e0f69c27 --- /dev/null +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/DeferTopic.java @@ -0,0 +1,90 @@ +// Copyright (C) 2011 The Android Open Source Project, +// Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.httpd.rpc.topic; + +import com.google.gerrit.common.ChangeHookRunner; +import com.google.gerrit.common.data.TopicDetail; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.ChangeSet; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Topic; +import com.google.gerrit.server.IdentifiedUser; +import com.google.gerrit.server.TopicUtil; +import com.google.gerrit.server.mail.DeferredSender; +import com.google.gerrit.server.mail.EmailException; +import com.google.gerrit.server.project.InvalidChangeOperationException; +import com.google.gerrit.server.project.NoSuchChangeException; +import com.google.gerrit.server.project.NoSuchTopicException; +import com.google.gerrit.server.project.TopicControl; +import com.google.gwtorm.client.OrmException; +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; + +import javax.annotation.Nullable; + +class DeferTopic extends Handler<TopicDetail> { + interface Factory { + DeferTopic create(ChangeSet.Id changeSetId, String message); + } + + private final TopicControl.Factory topicControlFactory; + private final ReviewDb db; + private final IdentifiedUser currentUser; + private final DeferredSender.Factory deferredSenderFactory; + private final TopicDetailFactory.Factory topicDetailFactory; + + private final ChangeSet.Id changeSetId; + @Nullable + private final String message; + + private final ChangeHookRunner hooks; + + @Inject + DeferTopic(final TopicControl.Factory topicControlFactory, + final ReviewDb db, final IdentifiedUser currentUser, + final DeferredSender.Factory deferredSenderFactory, + final TopicDetailFactory.Factory topicDetailFactory, + @Assisted final ChangeSet.Id changeSetId, + @Assisted @Nullable final String message, final ChangeHookRunner hooks) { + this.db = db; + this.currentUser = currentUser; + this.deferredSenderFactory = deferredSenderFactory; + this.topicControlFactory = topicControlFactory; + this.topicDetailFactory = topicDetailFactory; + + this.changeSetId = changeSetId; + this.message = message; + this.hooks = hooks; + } + + @Override + public TopicDetail call() throws NoSuchTopicException, NoSuchChangeException, + OrmException, EmailException, NoSuchEntityException, + ChangeSetInfoNotAvailableException, InvalidChangeOperationException { + + final Topic.Id topicId = changeSetId.getParentKey(); + final TopicControl topicControl = topicControlFactory.validateFor(topicId); + if (!topicControl.canDefer()) { + throw new NoSuchTopicException(topicId); + } + + TopicUtil.defer(changeSetId, currentUser, message, db, + deferredSenderFactory, hooks); + + return topicDetailFactory.create(topicId).call(); + } +} diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicDetailFactory.java index 931905cf71..35f85f48c1 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicDetailFactory.java @@ -113,8 +113,9 @@ public class TopicDetailFactory extends Handler<TopicDetail> { detail.setTopic(topic); detail.setAllowsAnonymous(control.forUser(anonymousUser).isVisible()); - detail.setCanAbandon(topic.getStatus().isOpen() && control.canAbandon()); - detail.setCanRestore(topic.getStatus() == AbstractEntity.Status.ABANDONED && control.canRestore()); + detail.setCanAbandon((topic.getStatus() == AbstractEntity.Status.DEFERRED || topic.getStatus().isOpen()) && control.canAbandon()); + detail.setCanDefer((topic.getStatus() == AbstractEntity.Status.ABANDONED || topic.getStatus().isOpen()) && control.canDefer()); + detail.setCanRestore((topic.getStatus() == AbstractEntity.Status.ABANDONED || topic.getStatus() == AbstractEntity.Status.DEFERRED) && control.canRestore()); detail.setStarred(control.getCurrentUser().getStarredChanges().contains( topicId)); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicManageServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicManageServiceImpl.java index d628def421..7dd40ceaf9 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicManageServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicManageServiceImpl.java @@ -24,6 +24,7 @@ import com.google.inject.Inject; class TopicManageServiceImpl implements TopicManageService { private final SubmitAction.Factory submitAction; private final AbandonTopic.Factory abandonTopicFactory; + private final DeferTopic.Factory deferTopicFactory; private final RestoreTopic.Factory restoreTopicFactory; private final RevertTopic.Factory revertTopicFactory; private final StagingAction.Factory stagingActionFactory; @@ -32,12 +33,14 @@ class TopicManageServiceImpl implements TopicManageService { @Inject TopicManageServiceImpl(final SubmitAction.Factory changeSetAction, final AbandonTopic.Factory abandonTopicFactory, + final DeferTopic.Factory deferTopicFactory, final RestoreTopic.Factory restoreTopicFactory, final RevertTopic.Factory revertTopicFactory, final StagingAction.Factory stagingActionFactory, final UnstageAction.Factory unstageActionFactory) { this.submitAction = changeSetAction; this.abandonTopicFactory = abandonTopicFactory; + this.deferTopicFactory = deferTopicFactory; this.restoreTopicFactory = restoreTopicFactory; this.revertTopicFactory = revertTopicFactory; this.stagingActionFactory = stagingActionFactory; @@ -54,6 +57,11 @@ class TopicManageServiceImpl implements TopicManageService { abandonTopicFactory.create(csid, message).to(cb); } + public void deferTopic(final ChangeSet.Id csid, final String message, + final AsyncCallback<TopicDetail> cb) { + deferTopicFactory.create(csid, message).to(cb); + } + public void revertTopic(final ChangeSet.Id csid, final String message, final AsyncCallback<TopicDetail> cb) { revertTopicFactory.create(csid, message).to(cb); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicModule.java index 28e495ea09..361a622f91 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicModule.java @@ -30,6 +30,7 @@ public class TopicModule extends RpcServletModule { @Override protected void configure() { factory(AbandonTopic.Factory.class); + factory(DeferTopic.Factory.class); factory(RestoreTopic.Factory.class); factory(RevertTopic.Factory.class); factory(AddTopicReviewer.Factory.class); |