No OneTemporary
Actions

Size

39 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php
	index b7b0e7f123..6232594aae 100644
	--- a/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php
	+++ b/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php
	@@ -1,88 +1,89 @@
	<?php

	final class DifferentialRevisionAbandonTransaction
	extends DifferentialRevisionActionTransaction {

	const TRANSACTIONTYPE = 'differential.revision.abandon';
	const ACTIONKEY = 'abandon';

	protected function getRevisionActionLabel() {
	return pht('Abandon Revision');
	}

	- protected function getRevisionActionDescription() {
	+ protected function getRevisionActionDescription(
	+ DifferentialRevision $revision) {
	return pht('This revision will be abandoned and closed.');
	}

	public function getIcon() {
	return 'fa-plane';
	}

	public function getColor() {
	return 'indigo';
	}

	protected function getRevisionActionOrder() {
	return 500;
	}

	public function getActionName() {
	return pht('Abandoned');
	}

	public function getCommandKeyword() {
	return 'abandon';
	}

	public function getCommandAliases() {
	return array();
	}

	public function getCommandSummary() {
	return pht('Abandon a revision.');
	}

	public function generateOldValue($object) {
	return $object->isAbandoned();
	}

	public function applyInternalEffects($object, $value) {
	$status_abandoned = DifferentialRevisionStatus::ABANDONED;
	$object->setModernRevisionStatus($status_abandoned);
	}

	protected function validateAction($object, PhabricatorUser $viewer) {
	if ($object->isClosed()) {
	throw new Exception(
	pht(
	'You can not abandon this revision because it has already been '.
	'closed. Only open revisions can be abandoned.'));
	}

	$config_key = 'differential.always-allow-abandon';
	if (!PhabricatorEnv::getEnvConfig($config_key)) {
	if (!$this->isViewerRevisionAuthor($object, $viewer)) {
	throw new Exception(
	pht(
	'You can not abandon this revision because you are not the '.
	'author. You can only abandon revisions you own. You can change '.
	'this behavior by adjusting the "%s" setting in Config.',
	$config_key));
	}
	}
	}

	public function getTitle() {
	return pht(
	'%s abandoned this revision.',
	$this->renderAuthor());
	}

	public function getTitleForFeed() {
	return pht(
	'%s abandoned %s.',
	$this->renderAuthor(),
	$this->renderObject());
	}

	}
	diff --git a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
	index f01ce4b487..d52e2dbeb7 100644
	--- a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
	+++ b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
	@@ -1,231 +1,232 @@
	<?php

	final class DifferentialRevisionAcceptTransaction
	extends DifferentialRevisionReviewTransaction {

	const TRANSACTIONTYPE = 'differential.revision.accept';
	const ACTIONKEY = 'accept';

	protected function getRevisionActionLabel() {
	return pht("Accept Revision \xE2\x9C\x94");
	}

	- protected function getRevisionActionDescription() {
	+ protected function getRevisionActionDescription(
	+ DifferentialRevision $revision) {
	return pht('These changes will be approved.');
	}

	public function getIcon() {
	return 'fa-check-circle-o';
	}

	public function getColor() {
	return 'green';
	}

	protected function getRevisionActionOrder() {
	return 500;
	}

	public function getActionName() {
	return pht('Accepted');
	}

	public function getCommandKeyword() {
	$accept_key = 'differential.enable-email-accept';
	$allow_email_accept = PhabricatorEnv::getEnvConfig($accept_key);
	if (!$allow_email_accept) {
	return null;
	}

	return 'accept';
	}

	public function getCommandAliases() {
	return array();
	}

	public function getCommandSummary() {
	return pht('Accept a revision.');
	}

	protected function getActionOptions(
	PhabricatorUser $viewer,
	DifferentialRevision $revision,
	$include_accepted = false) {

	$reviewers = $revision->getReviewers();

	$options = array();
	$value = array();

	// Put the viewer's user reviewer first, if it exists, so that "Accept as
	// yourself" is always at the top.
	$head = array();
	$tail = array();
	foreach ($reviewers as $key => $reviewer) {
	if ($reviewer->isUser()) {
	$head[$key] = $reviewer;
	} else {
	$tail[$key] = $reviewer;
	}
	}
	$reviewers = $head + $tail;

	$diff_phid = $this->getActiveDiffPHID($revision);
	$reviewer_phids = array();

	// If the viewer isn't a reviewer, add them to the list of options first.
	// This happens when you navigate to some revision you aren't involved in:
	// you can accept and become a reviewer.

	$viewer_phid = $viewer->getPHID();
	if ($viewer_phid) {
	if (!isset($reviewers[$viewer_phid])) {
	$reviewer_phids[$viewer_phid] = $viewer_phid;
	}
	}

	$default_unchecked = array();
	foreach ($reviewers as $reviewer) {
	$reviewer_phid = $reviewer->getReviewerPHID();

	if (!$reviewer->hasAuthority($viewer)) {
	// If the viewer doesn't have authority to act on behalf of a reviewer,
	// we check if they can accept by force.
	if ($revision->canReviewerForceAccept($viewer, $reviewer)) {
	$default_unchecked[$reviewer_phid] = true;
	} else {
	continue;
	}
	}

	if (!$include_accepted) {
	if ($reviewer->isAccepted($diff_phid)) {
	// If a reviewer is already in a full "accepted" state, don't
	// include that reviewer as an option unless we're listing all
	// reviewers, including reviewers who have already accepted.
	continue;
	}
	}

	$reviewer_phids[$reviewer_phid] = $reviewer_phid;
	}

	$handles = $viewer->loadHandles($reviewer_phids);

	$head = array();
	$tail = array();
	foreach ($reviewer_phids as $reviewer_phid) {
	$is_force = isset($default_unchecked[$reviewer_phid]);

	if ($is_force) {
	$tail[] = $reviewer_phid;

	$options[$reviewer_phid] = pht(
	'Force accept as %s',
	$viewer->renderHandle($reviewer_phid));
	} else {
	$head[] = $reviewer_phid;
	$value[] = $reviewer_phid;

	$options[$reviewer_phid] = pht(
	'Accept as %s',
	$viewer->renderHandle($reviewer_phid));
	}
	}

	// Reorder reviewers so "force accept" reviewers come at the end.
	$options =
	array_select_keys($options, $head) +
	array_select_keys($options, $tail);

	return array($options, $value);
	}

	public function generateOldValue($object) {
	$actor = $this->getActor();
	return $this->isViewerFullyAccepted($object, $actor);
	}

	public function applyExternalEffects($object, $value) {
	$status = DifferentialReviewerStatus::STATUS_ACCEPTED;
	$actor = $this->getActor();
	$this->applyReviewerEffect($object, $actor, $value, $status);
	}

	protected function validateAction($object, PhabricatorUser $viewer) {
	if ($object->isClosed()) {
	throw new Exception(
	pht(
	'You can not accept this revision because it has already been '.
	'closed. Only open revisions can be accepted.'));
	}

	$config_key = 'differential.allow-self-accept';
	if (!PhabricatorEnv::getEnvConfig($config_key)) {
	if ($this->isViewerRevisionAuthor($object, $viewer)) {
	throw new Exception(
	pht(
	'You can not accept this revision because you are the revision '.
	'author. You can only accept revisions you do not own. You can '.
	'change this behavior by adjusting the "%s" setting in Config.',
	$config_key));
	}
	}

	if ($this->isViewerFullyAccepted($object, $viewer)) {
	throw new Exception(
	pht(
	'You can not accept this revision because you have already '.
	'accepted it.'));
	}
	}

	protected function validateOptionValue($object, $actor, array $value) {
	if (!$value) {
	throw new Exception(
	pht(
	'When accepting a revision, you must accept on behalf of at '.
	'least one reviewer.'));
	}

	// NOTE: We're including reviewers who have already been accepted in this
	// check. Legitimate users may race one another to accept on behalf of
	// packages. If we get a form submission which includes a reviewer which
	// someone has already accepted, that's fine. See T12757.

	list($options) = $this->getActionOptions($actor, $object, true);
	foreach ($value as $phid) {
	if (!isset($options[$phid])) {
	throw new Exception(
	pht(
	'Reviewer "%s" is not a valid reviewer which you have authority '.
	'to accept on behalf of.',
	$phid));
	}
	}
	}

	public function getTitle() {
	$new = $this->getNewValue();
	if (is_array($new) && $new) {
	return pht(
	'%s accepted this revision as %s reviewer(s): %s.',
	$this->renderAuthor(),
	phutil_count($new),
	$this->renderHandleList($new));
	} else {
	return pht(
	'%s accepted this revision.',
	$this->renderAuthor());
	}
	}

	public function getTitleForFeed() {
	return pht(
	'%s accepted %s.',
	$this->renderAuthor(),
	$this->renderObject());
	}

	}
	diff --git a/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php b/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
	index ba769c2be5..a1e66379f7 100644
	--- a/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
	+++ b/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
	@@ -1,180 +1,181 @@
	<?php

	abstract class DifferentialRevisionActionTransaction
	extends DifferentialRevisionTransactionType {

	final public function getRevisionActionKey() {
	return $this->getPhobjectClassConstant('ACTIONKEY', 32);
	}

	public function isActionAvailable($object, PhabricatorUser $viewer) {
	try {
	$this->validateAction($object, $viewer);
	return true;
	} catch (Exception $ex) {
	return false;
	}
	}

	abstract protected function validateAction($object, PhabricatorUser $viewer);
	abstract protected function getRevisionActionLabel();

	protected function validateOptionValue($object, $actor, array $value) {
	return null;
	}

	public function getCommandKeyword() {
	return null;
	}

	public function getCommandAliases() {
	return array();
	}

	public function getCommandSummary() {
	return null;
	}

	protected function getRevisionActionOrder() {
	return 1000;
	}

	public function getActionStrength() {
	return 3;
	}

	public function getRevisionActionOrderVector() {
	return id(new PhutilSortVector())
	->addInt($this->getRevisionActionOrder());
	}

	protected function getRevisionActionGroupKey() {
	return DifferentialRevisionEditEngine::ACTIONGROUP_REVISION;
	}

	- protected function getRevisionActionDescription() {
	+ protected function getRevisionActionDescription(
	+ DifferentialRevision $revision) {
	return null;
	}

	public static function loadAllActions() {
	return id(new PhutilClassMapQuery())
	->setAncestorClass(__CLASS__)
	->setUniqueMethod('getRevisionActionKey')
	->execute();
	}

	protected function isViewerRevisionAuthor(
	DifferentialRevision $revision,
	PhabricatorUser $viewer) {

	if (!$viewer->getPHID()) {
	return false;
	}

	return ($viewer->getPHID() === $revision->getAuthorPHID());
	}

	protected function getActionOptions(
	PhabricatorUser $viewer,
	DifferentialRevision $revision) {
	return array(
	array(),
	null,
	);
	}

	public function newEditField(
	DifferentialRevision $revision,
	PhabricatorUser $viewer) {

	// Actions in the "review" group, like "Accept Revision", do not require
	// that the actor be able to edit the revision.
	$group_review = DifferentialRevisionEditEngine::ACTIONGROUP_REVIEW;
	$is_review = ($this->getRevisionActionGroupKey() == $group_review);

	$field = id(new PhabricatorApplyEditField())
	->setKey($this->getRevisionActionKey())
	->setTransactionType($this->getTransactionTypeConstant())
	->setCanApplyWithoutEditCapability($is_review)
	->setValue(true);

	if ($this->isActionAvailable($revision, $viewer)) {
	$label = $this->getRevisionActionLabel();
	if ($label !== null) {
	$field->setCommentActionLabel($label);

	- $description = $this->getRevisionActionDescription();
	+ $description = $this->getRevisionActionDescription($revision);
	$field->setActionDescription($description);

	$group_key = $this->getRevisionActionGroupKey();
	$field->setCommentActionGroupKey($group_key);

	// Currently, every revision action conflicts with every other
	// revision action: for example, you can not simultaneously Accept and
	// Reject a revision.

	// Under some configurations, some combinations of actions are sort of
	// technically permissible. For example, you could reasonably Reject
	// and Abandon a revision if "anyone can abandon anything" is enabled.

	// It's not clear that these combinations are actually useful, so just
	// keep things simple for now.
	$field->setActionConflictKey('revision.action');

	list($options, $value) = $this->getActionOptions($viewer, $revision);

	// Show the options if the user can select on behalf of two or more
	// reviewers, or can force-accept on behalf of one or more reviewers,
	// or can accept on behalf of a reviewer other than themselves (see
	// T12533).
	$can_multi = (count($options) > 1);
	$can_force = (count($value) < count($options));
	$not_self = (head_key($options) != $viewer->getPHID());

	if ($can_multi \|\| $can_force \|\| $not_self) {
	$field->setOptions($options);
	$field->setValue($value);
	}
	}
	}

	return $field;
	}

	public function validateTransactions($object, array $xactions) {
	$errors = array();
	$actor = $this->getActor();

	$action_exception = null;
	try {
	$this->validateAction($object, $actor);
	} catch (Exception $ex) {
	$action_exception = $ex;
	}

	foreach ($xactions as $xaction) {
	if ($action_exception) {
	$errors[] = $this->newInvalidError(
	$action_exception->getMessage(),
	$xaction);
	continue;
	}

	$new = $xaction->getNewValue();
	if (!is_array($new)) {
	continue;
	}

	try {
	$this->validateOptionValue($object, $actor, $new);
	} catch (Exception $ex) {
	$errors[] = $this->newInvalidError(
	$ex->getMessage(),
	$xaction);
	}
	}

	return $errors;
	}

	}
	diff --git a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
	index d71b30950a..b1c796dca4 100644
	--- a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
	+++ b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
	@@ -1,138 +1,139 @@
	<?php

	final class DifferentialRevisionCloseTransaction
	extends DifferentialRevisionActionTransaction {

	const TRANSACTIONTYPE = 'differential.revision.close';
	const ACTIONKEY = 'close';

	protected function getRevisionActionLabel() {
	return pht('Close Revision');
	}

	- protected function getRevisionActionDescription() {
	+ protected function getRevisionActionDescription(
	+ DifferentialRevision $revision) {
	return pht('This revision will be closed.');
	}

	public function getIcon() {
	return 'fa-check';
	}

	public function getColor() {
	return 'indigo';
	}

	protected function getRevisionActionOrder() {
	return 300;
	}

	public function getActionName() {
	return pht('Closed');
	}

	public function generateOldValue($object) {
	return $object->isClosed();
	}

	public function applyInternalEffects($object, $value) {
	$was_accepted = $object->isAccepted();

	$status_published = DifferentialRevisionStatus::PUBLISHED;
	$object->setModernRevisionStatus($status_published);

	$object->setProperty(
	DifferentialRevision::PROPERTY_CLOSED_FROM_ACCEPTED,
	$was_accepted);
	}

	protected function validateAction($object, PhabricatorUser $viewer) {
	if ($this->hasEditor()) {
	if ($this->getEditor()->getIsCloseByCommit()) {
	// If we're closing a revision because we discovered a commit, we don't
	// care what state it was in.
	return;
	}
	}

	if ($object->isClosed()) {
	throw new Exception(
	pht(
	'You can not close this revision because it has already been '.
	'closed. Only open revisions can be closed.'));
	}

	if (!$object->isAccepted()) {
	throw new Exception(
	pht(
	'You can not close this revision because it has not been accepted. '.
	'Revisions must be accepted before they can be closed.'));
	}

	$config_key = 'differential.always-allow-close';
	if (!PhabricatorEnv::getEnvConfig($config_key)) {
	if (!$this->isViewerRevisionAuthor($object, $viewer)) {
	throw new Exception(
	pht(
	'You can not close this revision because you are not the '.
	'author. You can only close revisions you own. You can change '.
	'this behavior by adjusting the "%s" setting in Config.',
	$config_key));
	}
	}
	}

	public function getTitle() {
	if (!$this->getMetadataValue('isCommitClose')) {
	return pht(
	'%s closed this revision.',
	$this->renderAuthor());
	}

	$commit_phid = $this->getMetadataValue('commitPHID');
	$committer_phid = $this->getMetadataValue('committerPHID');
	$author_phid = $this->getMetadataValue('authorPHID');

	if ($committer_phid) {
	$committer_name = $this->renderHandle($committer_phid);
	} else {
	$committer_name = $this->getMetadataValue('committerName');
	}

	if ($author_phid) {
	$author_name = $this->renderHandle($author_phid);
	} else {
	$author_name = $this->getMetadatavalue('authorName');
	}

	$same_phid =
	strlen($committer_phid) &&
	strlen($author_phid) &&
	($committer_phid == $author_phid);

	$same_name =
	!strlen($committer_phid) &&
	!strlen($author_phid) &&
	($committer_name == $author_name);

	if ($same_name \|\| $same_phid) {
	return pht(
	'Closed by commit %s (authored by %s).',
	$this->renderHandle($commit_phid),
	$author_name);
	} else {
	return pht(
	'Closed by commit %s (authored by %s, committed by %s).',
	$this->renderHandle($commit_phid),
	$author_name,
	$committer_name);
	}
	}

	public function getTitleForFeed() {
	return pht(
	'%s closed %s.',
	$this->renderAuthor(),
	$this->renderObject());
	}

	}
	diff --git a/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php
	index 34cedcbb73..4169c3e4dc 100644
	--- a/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php
	+++ b/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php
	@@ -1,89 +1,95 @@
	<?php

	final class DifferentialRevisionCommandeerTransaction
	extends DifferentialRevisionActionTransaction {

	const TRANSACTIONTYPE = 'differential.revision.commandeer';
	const ACTIONKEY = 'commandeer';

	protected function getRevisionActionLabel() {
	return pht('Commandeer Revision');
	}

	- protected function getRevisionActionDescription() {
	+ protected function getRevisionActionDescription(
	+ DifferentialRevision $revision) {
	return pht('You will take control of this revision and become its author.');
	}

	public function getIcon() {
	return 'fa-flag';
	}

	public function getColor() {
	return 'sky';
	}

	protected function getRevisionActionOrder() {
	return 700;
	}

	public function getActionName() {
	return pht('Commandeered');
	}

	public function getCommandKeyword() {
	return 'commandeer';
	}

	public function getCommandAliases() {
	return array(
	'claim',
	);
	}

	public function getCommandSummary() {
	return pht('Commandeer a revision.');
	}

	public function generateOldValue($object) {
	return $object->getAuthorPHID();
	}

	public function generateNewValue($object, $value) {
	$actor = $this->getActor();
	return $actor->getPHID();
	}

	public function applyInternalEffects($object, $value) {
	$object->setAuthorPHID($value);
	}

	protected function validateAction($object, PhabricatorUser $viewer) {
	if ($object->isClosed()) {
	throw new Exception(
	pht(
	'You can not commandeer this revision because it has already '.
	'been closed. You can only commandeer open revisions.'));
	}

	+ if ($object->isDraft()) {
	+ throw new Exception(
	+ pht('You can not commandeer a draft revision.'));
	+ }
	+
	if ($this->isViewerRevisionAuthor($object, $viewer)) {
	throw new Exception(
	pht(
	'You can not commandeer this revision because you are already '.
	'the author.'));
	}
	}

	public function getTitle() {
	return pht(
	'%s commandeered this revision.',
	$this->renderAuthor());
	}

	public function getTitleForFeed() {
	return pht(
	'%s commandeered %s.',
	$this->renderAuthor(),
	$this->renderObject());
	}

	}
	diff --git a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
	index 6e584ceb36..231adc5bf8 100644
	--- a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
	+++ b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
	@@ -1,94 +1,100 @@
	<?php

	final class DifferentialRevisionPlanChangesTransaction
	extends DifferentialRevisionActionTransaction {

	const TRANSACTIONTYPE = 'differential.revision.plan';
	const ACTIONKEY = 'plan-changes';

	protected function getRevisionActionLabel() {
	return pht('Plan Changes');
	}

	- protected function getRevisionActionDescription() {
	+ protected function getRevisionActionDescription(
	+ DifferentialRevision $revision) {
	return pht(
	'This revision will be removed from review queues until it is revised.');
	}

	public function getIcon() {
	return 'fa-headphones';
	}

	public function getColor() {
	return 'red';
	}

	protected function getRevisionActionOrder() {
	return 200;
	}

	public function getActionName() {
	return pht('Planned Changes');
	}

	public function getCommandKeyword() {
	return 'planchanges';
	}

	public function getCommandAliases() {
	return array(
	'rethink',
	);
	}

	public function getCommandSummary() {
	return pht('Plan changes to a revision.');
	}

	public function generateOldValue($object) {
	return $object->isChangePlanned();
	}

	public function applyInternalEffects($object, $value) {
	$status_planned = DifferentialRevisionStatus::CHANGES_PLANNED;
	$object->setModernRevisionStatus($status_planned);
	}

	protected function validateAction($object, PhabricatorUser $viewer) {
	+ if ($object->isDraft()) {
	+ throw new Exception(
	+ pht('You can not plan changes to a draft revision.'));
	+ }
	+
	if ($object->isChangePlanned()) {
	throw new Exception(
	pht(
	'You can not request review of this revision because this '.
	'revision is already under review and the action would have '.
	'no effect.'));
	}

	if ($object->isClosed()) {
	throw new Exception(
	pht(
	'You can not plan changes to this this revision because it has '.
	'already been closed.'));
	}

	if (!$this->isViewerRevisionAuthor($object, $viewer)) {
	throw new Exception(
	pht(
	'You can not plan changes to this revision because you do not '.
	'own it. Only the author of a revision can plan changes to it.'));
	}
	}

	public function getTitle() {
	return pht(
	'%s planned changes to this revision.',
	$this->renderAuthor());
	}

	public function getTitleForFeed() {
	return pht(
	'%s planned changes to %s.',
	$this->renderAuthor(),
	$this->renderObject());
	}

	}
	diff --git a/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
	index 4767924445..4a4744e2e0 100644
	--- a/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
	+++ b/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
	@@ -1,83 +1,84 @@
	<?php

	final class DifferentialRevisionReclaimTransaction
	extends DifferentialRevisionActionTransaction {

	const TRANSACTIONTYPE = 'differential.revision.reclaim';
	const ACTIONKEY = 'reclaim';

	protected function getRevisionActionLabel() {
	return pht('Reclaim Revision');
	}

	- protected function getRevisionActionDescription() {
	+ protected function getRevisionActionDescription(
	+ DifferentialRevision $revision) {
	return pht('This revision will be reclaimed and reopened.');
	}

	public function getIcon() {
	return 'fa-bullhorn';
	}

	public function getColor() {
	return 'sky';
	}

	protected function getRevisionActionOrder() {
	return 600;
	}

	public function getActionName() {
	return pht('Reclaimed');
	}

	public function getCommandKeyword() {
	return 'reclaim';
	}

	public function getCommandAliases() {
	return array();
	}

	public function getCommandSummary() {
	return pht('Reclaim a revision.');
	}

	public function generateOldValue($object) {
	return !$object->isAbandoned();
	}

	public function applyInternalEffects($object, $value) {
	$status_review = DifferentialRevisionStatus::NEEDS_REVIEW;
	$object->setModernRevisionStatus($status_review);
	}

	protected function validateAction($object, PhabricatorUser $viewer) {
	if (!$object->isAbandoned()) {
	throw new Exception(
	pht(
	'You can not reclaim this revision because it has not been '.
	'abandoned. Only abandoned revisions can be reclaimed.'));
	}

	if (!$this->isViewerRevisionAuthor($object, $viewer)) {
	throw new Exception(
	pht(
	'You can not reclaim this revision because you are not the '.
	'revision author. You can only reclaim revisions you own.'));
	}
	}

	public function getTitle() {
	return pht(
	'%s reclaimed this revision.',
	$this->renderAuthor());
	}

	public function getTitleForFeed() {
	return pht(
	'%s reclaimed %s.',
	$this->renderAuthor(),
	$this->renderObject());
	}

	}
	diff --git a/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
	index b4c71209aa..a15ca0641b 100644
	--- a/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
	+++ b/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
	@@ -1,96 +1,102 @@
	<?php

	final class DifferentialRevisionRejectTransaction
	extends DifferentialRevisionReviewTransaction {

	const TRANSACTIONTYPE = 'differential.revision.reject';
	const ACTIONKEY = 'reject';

	protected function getRevisionActionLabel() {
	return pht("Request Changes \xE2\x9C\x98");
	}

	- protected function getRevisionActionDescription() {
	+ protected function getRevisionActionDescription(
	+ DifferentialRevision $revision) {
	return pht('This revision will be returned to the author for updates.');
	}

	public function getIcon() {
	return 'fa-times-circle-o';
	}

	public function getColor() {
	return 'red';
	}

	protected function getRevisionActionOrder() {
	return 600;
	}

	public function getActionName() {
	return pht('Requested Changes');
	}

	public function getCommandKeyword() {
	return 'request';
	}

	public function getCommandAliases() {
	return array(
	'reject',
	);
	}

	public function getCommandSummary() {
	return pht('Request changes to a revision.');
	}

	public function generateOldValue($object) {
	$actor = $this->getActor();
	return $this->isViewerFullyRejected($object, $actor);
	}

	public function applyExternalEffects($object, $value) {
	$status = DifferentialReviewerStatus::STATUS_REJECTED;
	$actor = $this->getActor();
	$this->applyReviewerEffect($object, $actor, $value, $status);
	}

	protected function validateAction($object, PhabricatorUser $viewer) {
	if ($object->isClosed()) {
	throw new Exception(
	pht(
	'You can not request changes to this revision because it has '.
	'already been closed. You can only request changes to open '.
	'revisions.'));
	}

	if ($this->isViewerRevisionAuthor($object, $viewer)) {
	throw new Exception(
	pht(
	'You can not request changes to this revision because you are the '.
	'revision author. You can only request changes to revisions you do '.
	'not own.'));
	}

	+ if ($object->isDraft()) {
	+ throw new Exception(
	+ pht('You can not request changes to a draft revision.'));
	+ }
	+
	if ($this->isViewerFullyRejected($object, $viewer)) {
	throw new Exception(
	pht(
	'You can not request changes to this revision because you have '.
	'already requested changes.'));
	}
	}

	public function getTitle() {
	return pht(
	'%s requested changes to this revision.',
	$this->renderAuthor());
	}

	public function getTitleForFeed() {
	return pht(
	'%s requested changes to %s.',
	$this->renderAuthor(),
	$this->renderObject());
	}

	}
	diff --git a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
	index 1d28433429..4fc9f3a6f1 100644
	--- a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
	+++ b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
	@@ -1,74 +1,75 @@
	<?php

	final class DifferentialRevisionReopenTransaction
	extends DifferentialRevisionActionTransaction {

	const TRANSACTIONTYPE = 'differential.revision.reopen';
	const ACTIONKEY = 'reopen';

	protected function getRevisionActionLabel() {
	return pht('Reopen Revision');
	}

	- protected function getRevisionActionDescription() {
	+ protected function getRevisionActionDescription(
	+ DifferentialRevision $revision) {
	return pht('This revision will be reopened for review.');
	}

	public function getIcon() {
	return 'fa-bullhorn';
	}

	public function getColor() {
	return 'sky';
	}

	protected function getRevisionActionOrder() {
	return 400;
	}

	public function getActionName() {
	return pht('Reopened');
	}

	public function generateOldValue($object) {
	return !$object->isClosed();
	}

	public function applyInternalEffects($object, $value) {
	$status_review = DifferentialRevisionStatus::NEEDS_REVIEW;
	$object->setModernRevisionStatus($status_review);
	}

	protected function validateAction($object, PhabricatorUser $viewer) {
	if (!$object->isPublished()) {
	throw new Exception(
	pht(
	'You can not reopen this revision because it is not closed. '.
	'Only closed revisions can be reopened.'));
	}

	$config_key = 'differential.allow-reopen';
	if (!PhabricatorEnv::getEnvConfig($config_key)) {
	throw new Exception(
	pht(
	'You can not reopen this revision because configuration prevents '.
	'any revision from being reopened. You can change this behavior '.
	'by adjusting the "%s" setting in Config.',
	$config_key));
	}
	}

	public function getTitle() {
	return pht(
	'%s reopened this revision.',
	$this->renderAuthor());
	}

	public function getTitleForFeed() {
	return pht(
	'%s reopened %s.',
	$this->renderAuthor(),
	$this->renderObject());
	}

	}
	diff --git a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
	index d102b0c0c2..465b5234d5 100644
	--- a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
	+++ b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
	@@ -1,76 +1,81 @@
	<?php

	final class DifferentialRevisionRequestReviewTransaction
	extends DifferentialRevisionActionTransaction {

	const TRANSACTIONTYPE = 'differential.revision.request';
	const ACTIONKEY = 'request-review';

	protected function getRevisionActionLabel() {
	return pht('Request Review');
	}

	- protected function getRevisionActionDescription() {
	- return pht('This revision will be returned to reviewers for feedback.');
	+ protected function getRevisionActionDescription(
	+ DifferentialRevision $revision) {
	+ if ($revision->isDraft()) {
	+ return pht('This revision will be submitted to reviewers for feedback.');
	+ } else {
	+ return pht('This revision will be returned to reviewers for feedback.');
	+ }
	}

	public function getColor() {
	return 'sky';
	}

	protected function getRevisionActionOrder() {
	return 200;
	}

	public function getActionName() {
	return pht('Requested Review');
	}

	public function generateOldValue($object) {
	return $object->isNeedsReview();
	}

	public function applyInternalEffects($object, $value) {
	$status_review = DifferentialRevisionStatus::NEEDS_REVIEW;
	$object->setModernRevisionStatus($status_review);
	}

	protected function validateAction($object, PhabricatorUser $viewer) {
	if ($object->isNeedsReview()) {
	throw new Exception(
	pht(
	'You can not request review of this revision because this '.
	'revision is already under review and the action would have '.
	'no effect.'));
	}

	if ($object->isClosed()) {
	throw new Exception(
	pht(
	'You can not request review of this revision because it has '.
	'already been closed. You can only request review of open '.
	'revisions.'));
	}

	if (!$this->isViewerRevisionAuthor($object, $viewer)) {
	throw new Exception(
	pht(
	'You can not request review of this revision because you are not '.
	'the author of the revision.'));
	}
	}

	public function getTitle() {
	return pht(
	'%s requested review of this revision.',
	$this->renderAuthor());
	}

	public function getTitleForFeed() {
	return pht(
	'%s requested review of %s.',
	$this->renderAuthor(),
	$this->renderObject());
	}

	}
	diff --git a/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php b/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php
	index c7805ad35f..40a512202d 100644
	--- a/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php
	+++ b/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php
	@@ -1,95 +1,101 @@
	<?php

	final class DifferentialRevisionResignTransaction
	extends DifferentialRevisionReviewTransaction {

	const TRANSACTIONTYPE = 'differential.revision.resign';
	const ACTIONKEY = 'resign';

	protected function getRevisionActionLabel() {
	return pht('Resign as Reviewer');
	}

	- protected function getRevisionActionDescription() {
	+ protected function getRevisionActionDescription(
	+ DifferentialRevision $revision) {
	return pht('You will resign as a reviewer for this change.');
	}

	public function getIcon() {
	return 'fa-flag';
	}

	public function getColor() {
	return 'orange';
	}

	protected function getRevisionActionOrder() {
	return 700;
	}

	public function getCommandKeyword() {
	return 'resign';
	}

	public function getActionName() {
	return pht('Resigned');
	}

	public function getCommandAliases() {
	return array();
	}

	public function getCommandSummary() {
	return pht('Resign from a revision.');
	}

	public function generateOldValue($object) {
	$actor = $this->getActor();
	$resigned = DifferentialReviewerStatus::STATUS_RESIGNED;

	return ($this->getViewerReviewerStatus($object, $actor) == $resigned);
	}

	public function applyExternalEffects($object, $value) {
	$status = DifferentialReviewerStatus::STATUS_RESIGNED;
	$actor = $this->getActor();
	$this->applyReviewerEffect($object, $actor, $value, $status);
	}

	protected function validateAction($object, PhabricatorUser $viewer) {
	if ($object->isClosed()) {
	throw new Exception(
	pht(
	'You can not resign from this revision because it has already '.
	'been closed. You can only resign from open revisions.'));
	}

	+ if ($object->isDraft()) {
	+ throw new Exception(
	+ pht('You can not resign from a draft revision.'));
	+ }
	+
	$resigned = DifferentialReviewerStatus::STATUS_RESIGNED;
	if ($this->getViewerReviewerStatus($object, $viewer) == $resigned) {
	throw new Exception(
	pht(
	'You can not resign from this revision because you have already '.
	'resigned.'));
	}

	if (!$this->isViewerAnyAuthority($object, $viewer)) {
	throw new Exception(
	pht(
	'You can not resign from this revision because you are not a '.
	'reviewer, and do not have authority over any reviewer.'));
	}
	}

	public function getTitle() {
	return pht(
	'%s resigned from this revision.',
	$this->renderAuthor());
	}

	public function getTitleForFeed() {
	return pht(
	'%s resigned from %s.',
	$this->renderAuthor(),
	$this->renderObject());
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Wed, Apr 30, 10:07 PM (1 d, 11 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 108802
Default Alt Text: (39 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions