From d07292df7fe00103c6daec877da3c30018654471 Mon Sep 17 00:00:00 2001 From: epriestley Date: Tue, 25 Feb 2014 12:36:24 -0800 Subject: [PATCH] Implement Commandeer action in ApplicationTransactions Summary: Ref T2222. Implements Commandeer on the new stuff. Test Plan: {F117768} {F117769} Reviewers: btrahan Reviewed By: btrahan CC: aran Maniphest Tasks: T2222 Differential Revision: https://secure.phabricator.com/D8331 --- .../editor/DifferentialTransactionEditor.php | 58 +++++++++++++++++-- .../storage/DifferentialTransaction.php | 4 ++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php index c2ee36ae4b..e3202e4e50 100644 --- a/src/applications/differential/editor/DifferentialTransactionEditor.php +++ b/src/applications/differential/editor/DifferentialTransactionEditor.php @@ -90,6 +90,9 @@ final class DifferentialTransactionEditor } } return false; + case DifferentialAction::ACTION_CLAIM: + $actor_phid = $this->getActor()->getPHID(); + return ($actor_phid != $object->getAuthorPHID()); } } @@ -145,6 +148,9 @@ final class DifferentialTransactionEditor case DifferentialAction::ACTION_CLOSE: $object->setStatus(ArcanistDifferentialRevisionStatus::CLOSED); break; + case DifferentialAction::ACTION_CLAIM: + $object->setAuthorPHID($this->getActor()->getPHID()); + break; default: // TODO: For now, we're just shipping the rest of these through // without acting on them. @@ -163,15 +169,48 @@ final class DifferentialTransactionEditor $results = parent::expandTransaction($object, $xaction); switch ($xaction->getTransactionType()) { case DifferentialTransaction::TYPE_ACTION: + + $actor_phid = $this->getActor()->getPHID(); + $type_edge = PhabricatorTransactions::TYPE_EDGE; + $edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; + switch ($xaction->getNewValue()) { + case DifferentialAction::ACTION_CLAIM: + // If the user is commandeering, add the previous owner as a + // reviewer and remove the actor. + + $edits = array( + '-' => array( + $actor_phid => $actor_phid, + ), + ); + + $owner_phid = $object->getAuthorPHID(); + if ($owner_phid) { + $reviewer = new DifferentialReviewer( + $owner_phid, + array( + 'status' => DifferentialReviewerStatus::STATUS_ADDED, + )); + + $edits['+'] = array( + $owner_phid => array( + 'data' => $reviewer->getEdgeData(), + ), + ); + } + + $results[] = id(new DifferentialTransaction()) + ->setTransactionType($type_edge) + ->setMetadataValue('edge:type', $edge_reviewer) + ->setIgnoreOnNoEffect(true) + ->setNewValue($edits); + + break; case DifferentialAction::ACTION_RESIGN: // If the user is resigning, add a separate reviewer edit // transaction which removes them as a reviewer. - $actor_phid = $this->getActor()->getPHID(); - $type_edge = PhabricatorTransactions::TYPE_EDGE; - $edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; - $results[] = id(new DifferentialTransaction()) ->setTransactionType($type_edge) ->setMetadataValue('edge:type', $edge_reviewer) @@ -267,6 +306,17 @@ final class DifferentialTransactionEditor // aren't, this is a no-op rather than invalid. break; + case DifferentialAction::ACTION_CLAIM: + // You can claim a revision if you're not the owner. If you are, this + // is a no-op rather than invalid. + + if ($revision_status == $status_closed) { + return pht( + "You can not commandeer this revision because it has already been ". + "closed."); + } + break; + case DifferentialAction::ACTION_ABANDON: if (!$actor_is_author) { return pht( diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php index 34a9dc6268..7e1d0a5ada 100644 --- a/src/applications/differential/storage/DifferentialTransaction.php +++ b/src/applications/differential/storage/DifferentialTransaction.php @@ -147,6 +147,10 @@ final class DifferentialTransaction extends PhabricatorApplicationTransaction { return pht( 'You can not resign from this revision because you are not '. 'a reviewer.'); + case DifferentialAction::ACTION_CLAIM: + return pht( + 'You can not commandeer this revision because you already own '. + 'it.'); } break; }