No OneTemporary
Actions

Size

61 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
	index a57b9a4e84..121d6e557f 100644
	--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
	+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
	@@ -1,1213 +1,1253 @@
	<?php

	final class DifferentialTransactionEditor
	extends PhabricatorApplicationTransactionEditor {

	private $heraldEmailPHIDs;
	+ private $changedPriorToCommitURI;
	+ private $isCloseByCommit;
	+
	+ public function setIsCloseByCommit($is_close_by_commit) {
	+ $this->isCloseByCommit = $is_close_by_commit;
	+ return $this;
	+ }
	+
	+ public function getIsCloseByCommit() {
	+ return $this->isCloseByCommit;
	+ }
	+
	+ public function setChangedPriorToCommitURI($uri) {
	+ $this->changedPriorToCommitURI = $uri;
	+ return $this;
	+ }
	+
	+ public function getChangedPriorToCommitURI() {
	+ return $this->changedPriorToCommitURI;
	+ }

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhabricatorTransactions::TYPE_COMMENT;
	$types[] = PhabricatorTransactions::TYPE_EDGE;
	$types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
	$types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;

	$types[] = DifferentialTransaction::TYPE_ACTION;
	$types[] = DifferentialTransaction::TYPE_INLINE;
	$types[] = DifferentialTransaction::TYPE_STATUS;
	$types[] = DifferentialTransaction::TYPE_UPDATE;

	return $types;
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	return $object->getViewPolicy();
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	return $object->getEditPolicy();
	case DifferentialTransaction::TYPE_ACTION:
	return null;
	case DifferentialTransaction::TYPE_INLINE:
	return null;
	case DifferentialTransaction::TYPE_UPDATE:
	if ($this->getIsNewObject()) {
	return null;
	} else {
	return $object->getActiveDiff()->getPHID();
	}
	}

	return parent::getCustomTransactionOldValue($object, $xaction);
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case DifferentialTransaction::TYPE_ACTION:
	case DifferentialTransaction::TYPE_UPDATE:
	return $xaction->getNewValue();
	case DifferentialTransaction::TYPE_INLINE:
	return null;
	}

	return parent::getCustomTransactionNewValue($object, $xaction);
	}

	protected function transactionHasEffect(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_INLINE:
	return $xaction->hasComment();
	case DifferentialTransaction::TYPE_ACTION:
	$status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
	$status_abandoned = ArcanistDifferentialRevisionStatus::ABANDONED;
	$status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
	$status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
	$status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;

	$action_type = $xaction->getNewValue();
	switch ($action_type) {
	case DifferentialAction::ACTION_ACCEPT:
	case DifferentialAction::ACTION_REJECT:
	if ($action_type == DifferentialAction::ACTION_ACCEPT) {
	$new_status = DifferentialReviewerStatus::STATUS_ACCEPTED;
	} else {
	$new_status = DifferentialReviewerStatus::STATUS_REJECTED;
	}

	$actor = $this->getActor();
	$actor_phid = $actor->getPHID();

	// These transactions can cause effects in two ways: by altering the
	// status of an existing reviewer; or by adding the actor as a new
	// reviewer.

	$will_add_reviewer = true;
	foreach ($object->getReviewerStatus() as $reviewer) {
	if ($reviewer->hasAuthority($actor)) {
	if ($reviewer->getStatus() != $new_status) {
	return true;
	}
	}
	if ($reviewer->getReviewerPHID() == $actor_phid) {
	$will_add_reviwer = false;
	}
	}

	return $will_add_reviewer;
	case DifferentialAction::ACTION_CLOSE:
	return ($object->getStatus() != $status_closed);
	case DifferentialAction::ACTION_ABANDON:
	return ($object->getStatus() != $status_abandoned);
	case DifferentialAction::ACTION_RECLAIM:
	return ($object->getStatus() == $status_abandoned);
	case DifferentialAction::ACTION_REOPEN:
	return ($object->getStatus() == $status_closed);
	case DifferentialAction::ACTION_RETHINK:
	return ($object->getStatus() != $status_plan);
	case DifferentialAction::ACTION_REQUEST:
	return ($object->getStatus() != $status_review);
	case DifferentialAction::ACTION_RESIGN:
	$actor_phid = $this->getActor()->getPHID();
	foreach ($object->getReviewerStatus() as $reviewer) {
	if ($reviewer->getReviewerPHID() == $actor_phid) {
	return true;
	}
	}
	return false;
	case DifferentialAction::ACTION_CLAIM:
	$actor_phid = $this->getActor()->getPHID();
	return ($actor_phid != $object->getAuthorPHID());
	}
	}

	return parent::transactionHasEffect($object, $xaction);
	}


	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
	$status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
	$status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	$object->setViewPolicy($xaction->getNewValue());
	return;
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	$object->setEditPolicy($xaction->getNewValue());
	return;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	case PhabricatorTransactions::TYPE_COMMENT:
	case DifferentialTransaction::TYPE_INLINE:
	return;
	case PhabricatorTransactions::TYPE_EDGE:
	return;
	case DifferentialTransaction::TYPE_UPDATE:
	- $object->setStatus($status_review);
	+ if (!$this->getIsCloseByCommit()) {
	+ $object->setStatus($status_review);
	+ }
	// TODO: Update the `diffPHID` once we add that.
	return;
	case DifferentialTransaction::TYPE_ACTION:
	switch ($xaction->getNewValue()) {
	case DifferentialAction::ACTION_RESIGN:
	case DifferentialAction::ACTION_ACCEPT:
	case DifferentialAction::ACTION_REJECT:
	// These have no direct effects, and affect review status only
	// indirectly by altering reviewers with TYPE_EDGE transactions.
	return;
	case DifferentialAction::ACTION_ABANDON:
	$object->setStatus(ArcanistDifferentialRevisionStatus::ABANDONED);
	return;
	case DifferentialAction::ACTION_RETHINK:
	$object->setStatus($status_plan);
	return;
	case DifferentialAction::ACTION_RECLAIM:
	$object->setStatus($status_review);
	return;
	case DifferentialAction::ACTION_REOPEN:
	$object->setStatus($status_review);
	return;
	case DifferentialAction::ACTION_REQUEST:
	$object->setStatus($status_review);
	return;
	case DifferentialAction::ACTION_CLOSE:
	$object->setStatus(ArcanistDifferentialRevisionStatus::CLOSED);
	return;
	case DifferentialAction::ACTION_CLAIM:
	$object->setAuthorPHID($this->getActor()->getPHID());
	return;
	}
	break;
	}

	return parent::applyCustomInternalTransaction($object, $xaction);
	}

	protected function expandTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$actor = $this->getActor();
	$actor_phid = $actor->getPHID();
	$type_edge = PhabricatorTransactions::TYPE_EDGE;
	$edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER;

	$results = parent::expandTransaction($object, $xaction);
	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_UPDATE:
	+ if ($this->getIsCloseByCommit()) {
	+ // Don't bother with any of this if this update is a side effect of
	+ // commit detection.
	+ break;
	+ }
	+
	$new_accept = DifferentialReviewerStatus::STATUS_ACCEPTED;
	$new_reject = DifferentialReviewerStatus::STATUS_REJECTED;
	$old_accept = DifferentialReviewerStatus::STATUS_ACCEPTED_OLDER;
	$old_reject = DifferentialReviewerStatus::STATUS_REJECTED_OLDER;

	// When a revision is updated, change all "reject" to "rejected older
	// revision". This means we won't immediately push the update back into
	// "needs review", but outstanding rejects will still block it from
	// moving to "accepted".
	$edits = array();
	foreach ($object->getReviewerStatus() as $reviewer) {
	if ($reviewer->getStatus() == $new_reject) {
	$edits[$reviewer->getReviewerPHID()] = array(
	'data' => array(
	'status' => $old_reject,
	),
	);
	}

	// TODO: If sticky accept is off, do a similar update for accepts.
	}

	if ($edits) {
	$results[] = id(new DifferentialTransaction())
	->setTransactionType($type_edge)
	->setMetadataValue('edge:type', $edge_reviewer)
	->setIgnoreOnNoEffect(true)
	->setNewValue(array('+' => $edits));
	}
	break;

	case PhabricatorTransactions::TYPE_COMMENT:
	// When a user leaves a comment, upgrade their reviewer status from
	// "added" to "commented" if they're also a reviewer. We may further
	// upgrade this based on other actions in the transaction group.

	$status_added = DifferentialReviewerStatus::STATUS_ADDED;
	$status_commented = DifferentialReviewerStatus::STATUS_COMMENTED;

	$data = array(
	'status' => $status_commented,
	);

	$edits = array();
	foreach ($object->getReviewerStatus() as $reviewer) {
	if ($reviewer->getReviewerPHID() == $actor_phid) {
	if ($reviewer->getStatus() == $status_added) {
	$edits[$actor_phid] = array(
	'data' => $data,
	);
	}
	}
	}

	if ($edits) {
	$results[] = id(new DifferentialTransaction())
	->setTransactionType($type_edge)
	->setMetadataValue('edge:type', $edge_reviewer)
	->setIgnoreOnNoEffect(true)
	->setNewValue(array('+' => $edits));
	}
	break;

	case DifferentialTransaction::TYPE_ACTION:
	$action_type = $xaction->getNewValue();

	switch ($action_type) {
	case DifferentialAction::ACTION_ACCEPT:
	case DifferentialAction::ACTION_REJECT:
	if ($action_type == DifferentialAction::ACTION_ACCEPT) {
	$data = array(
	'status' => DifferentialReviewerStatus::STATUS_ACCEPTED,
	);
	} else {
	$data = array(
	'status' => DifferentialReviewerStatus::STATUS_REJECTED,
	);
	}

	$edits = array();

	foreach ($object->getReviewerStatus() as $reviewer) {
	if ($reviewer->hasAuthority($actor)) {
	$edits[$reviewer->getReviewerPHID()] = array(
	'data' => $data,
	);
	}
	}

	// Also either update or add the actor themselves as a reviewer.
	$edits[$actor_phid] = array(
	'data' => $data,
	);

	$results[] = id(new DifferentialTransaction())
	->setTransactionType($type_edge)
	->setMetadataValue('edge:type', $edge_reviewer)
	->setIgnoreOnNoEffect(true)
	->setNewValue(array('+' => $edits));
	break;

	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.

	$results[] = id(new DifferentialTransaction())
	->setTransactionType($type_edge)
	->setMetadataValue('edge:type', $edge_reviewer)
	->setIgnoreOnNoEffect(true)
	->setNewValue(
	array(
	'-' => array(
	$actor_phid => $actor_phid,
	),
	));

	break;
	}
	break;
	}

	return $results;
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	return;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	case PhabricatorTransactions::TYPE_EDGE:
	case PhabricatorTransactions::TYPE_COMMENT:
	case DifferentialTransaction::TYPE_ACTION:
	case DifferentialTransaction::TYPE_INLINE:
	return;
	case DifferentialTransaction::TYPE_UPDATE:
	// Now that we're inside the transaction, do a final check.
	$diff = $this->loadDiff($xaction->getNewValue());

	// TODO: It would be slightly cleaner to just revalidate this
	// transaction somehow using the same validation code, but that's
	// not easy to do at the moment.

	if (!$diff) {
	throw new Exception(pht('Diff does not exist!'));
	} else {
	$revision_id = $diff->getRevisionID();
	if ($revision_id && ($revision_id != $object->getID())) {
	throw new Exception(
	pht(
	'Diff is already attached to another revision. You lost '.
	'a race?'));
	}
	}

	$diff->setRevisionID($object->getID());
	$diff->save();

	$object->setLineCount($diff->getLineCount());
	$object->setRepositoryPHID($diff->getRepositoryPHID());

	return;
	}

	return parent::applyCustomExternalTransaction($object, $xaction);
	}

	protected function mergeEdgeData($type, array $u, array $v) {
	$result = parent::mergeEdgeData($type, $u, $v);

	switch ($type) {
	case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER:
	// When the same reviewer has their status updated by multiple
	// transactions, we want the strongest status to win. An example of
	// this is when a user adds a comment and also accepts a revision which
	// they are a reviewer on. The comment creates a "commented" status,
	// while the accept creates an "accepted" status. Since accept is
	// stronger, it should win and persist.

	$u_status = idx($u, 'status');
	$v_status = idx($v, 'status');
	$u_str = DifferentialReviewerStatus::getStatusStrength($u_status);
	$v_str = DifferentialReviewerStatus::getStatusStrength($v_status);
	if ($u_str > $v_str) {
	$result['status'] = $u_status;
	} else {
	$result['status'] = $v_status;
	}
	break;
	}

	return $result;
	}



	protected function applyFinalEffects(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;
	$status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
	$status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;

	$old_status = $object->getStatus();
	switch ($old_status) {
	case $status_accepted:
	case $status_revision:
	case $status_review:
	// Load the most up-to-date version of the revision and its reviewers,
	// so we don't need to try to deduce the state of reviewers by examining
	// all the changes made by the transactions.
	$new_revision = id(new DifferentialRevisionQuery())
	->setViewer($this->getActor())
	->needReviewerStatus(true)
	->withIDs(array($object->getID()))
	->executeOne();
	if (!$new_revision) {
	throw new Exception(
	pht('Failed to load revision from transaction finalization.'));
	}

	// Try to move a revision to "accepted". We look for:
	//
	// - at least one accepting reviewer who is a user; and
	// - no rejects; and
	// - no rejects of older diffs; and
	// - no blocking reviewers.

	$has_accepting_user = false;
	$has_rejecting_reviewer = false;
	$has_rejecting_older_reviewer = false;
	$has_blocking_reviewer = false;
	foreach ($new_revision->getReviewerStatus() as $reviewer) {
	$reviewer_status = $reviewer->getStatus();
	switch ($reviewer_status) {
	case DifferentialReviewerStatus::STATUS_REJECTED:
	$has_rejecting_reviewer = true;
	break;
	case DifferentialReviewerStatus::STATUS_REJECTED_OLDER:
	$has_rejecting_older_reviewer = true;
	break;
	case DifferentialReviewerStatus::STATUS_BLOCKING:
	$has_blocking_reviewer = true;
	break;
	case DifferentialReviewerStatus::STATUS_ACCEPTED:
	if ($reviewer->isUser()) {
	$has_accepting_user = true;
	}
	break;
	}
	}

	$new_status = null;
	if ($has_accepting_user &&
	!$has_rejecting_reviewer &&
	!$has_rejecting_older_reviewer &&
	!$has_blocking_reviewer) {
	$new_status = $status_accepted;
	} else if ($has_rejecting_reviewer) {
	// This isn't accepted, and there's at least one rejecting reviewer,
	// so the revision needs changes. This usually happens after a
	// "reject".
	$new_status = $status_revision;
	} else if ($old_status == $status_accepted) {
	// This revision was accepted, but it no longer satisfies the
	// conditions for acceptance. This usually happens after an accepting
	// reviewer resigns or is removed.
	$new_status = $status_review;
	}

	if ($new_status !== null && $new_status != $old_status) {
	$xaction = id(new DifferentialTransaction())
	->setTransactionType(DifferentialTransaction::TYPE_STATUS)
	->setOldValue($old_status)
	->setNewValue($new_status);

	$xaction = $this->populateTransaction($object, $xaction)->save();

	$xactions[] = $xaction;

	$object->setStatus($new_status)->save();
	}
	break;
	default:
	// Revisions can't transition out of other statuses (like closed or
	// abandoned) as a side effect of reviewer status changes.
	break;
	}

	return $xactions;
	}


	protected function validateTransaction(
	PhabricatorLiskDAO $object,
	$type,
	array $xactions) {

	$errors = parent::validateTransaction($object, $type, $xactions);

	foreach ($xactions as $xaction) {
	switch ($type) {
	case DifferentialTransaction::TYPE_UPDATE:
	$diff = $this->loadDiff($xaction->getNewValue());
	if (!$diff) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	pht('The specified diff does not exist.'),
	$xaction);
	} else if (($diff->getRevisionID()) &&
	($diff->getRevisionID() != $object->getID())) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	pht(
	'You can not update this revision to the specified diff, '.
	'because the diff is already attached to another revision.'),
	$xaction);
	}
	break;
	case DifferentialTransaction::TYPE_ACTION:
	$error = $this->validateDifferentialAction(
	$object,
	$type,
	$xaction,
	$xaction->getNewValue());
	if ($error) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	$error,
	$xaction);
	}
	break;
	}
	}

	return $errors;
	}

	private function validateDifferentialAction(
	DifferentialRevision $revision,
	$type,
	DifferentialTransaction $xaction,
	$action) {

	$author_phid = $revision->getAuthorPHID();
	$actor_phid = $this->getActor()->getPHID();
	$actor_is_author = ($author_phid == $actor_phid);

	$config_close_key = 'differential.always-allow-close';
	$always_allow_close = PhabricatorEnv::getEnvConfig($config_close_key);

	$config_reopen_key = 'differential.allow-reopen';
	$allow_reopen = PhabricatorEnv::getEnvConfig($config_reopen_key);

	$config_self_accept_key = 'differential.allow-self-accept';
	$allow_self_accept = PhabricatorEnv::getEnvConfig($config_self_accept_key);

	$revision_status = $revision->getStatus();

	$status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;
	$status_abandoned = ArcanistDifferentialRevisionStatus::ABANDONED;
	$status_closed = ArcanistDifferentialRevisionStatus::CLOSED;

	switch ($action) {
	case DifferentialAction::ACTION_ACCEPT:
	if ($actor_is_author && !$allow_self_accept) {
	return pht(
	'You can not accept this revision because you are the owner.');
	}

	if ($revision_status == $status_abandoned) {
	return pht(
	'You can not accept this revision because it has been '.
	'abandoned.');
	}

	if ($revision_status == $status_closed) {
	return pht(
	'You can not accept this revision because it has already been '.
	'closed.');
	}
	break;

	case DifferentialAction::ACTION_REJECT:
	if ($actor_is_author) {
	return pht(
	'You can not request changes to your own revision.');
	}

	if ($revision_status == $status_abandoned) {
	return pht(
	'You can not request changes to this revision because it has been '.
	'abandoned.');
	}

	if ($revision_status == $status_closed) {
	return pht(
	'You can not request changes to this revision because it has '.
	'already been closed.');
	}
	break;

	case DifferentialAction::ACTION_RESIGN:
	// You can always resign from a revision if you're a reviewer. If you
	// 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(
	"You can not abandon this revision because you do not own it. ".
	"You can only abandon revisions you own.");
	}

	if ($revision_status == $status_closed) {
	return pht(
	"You can not abandon this revision because it has already been ".
	"closed.");
	}

	// NOTE: Abandons of already-abandoned revisions are treated as no-op
	// instead of invalid. Other abandons are OK.

	break;

	case DifferentialAction::ACTION_RECLAIM:
	if (!$actor_is_author) {
	return pht(
	"You can not reclaim this revision because you do not own ".
	"it. You can only reclaim revisions you own.");
	}

	if ($revision_status == $status_closed) {
	return pht(
	"You can not reclaim this revision because it has already been ".
	"closed.");
	}

	// NOTE: Reclaims of other non-abandoned revisions are treated as no-op
	// instead of invalid.

	break;

	case DifferentialAction::ACTION_REOPEN:
	if (!$allow_reopen) {
	return pht(
	'The reopen action is not enabled on this Phabricator install. '.
	'Adjust your configuration to enable it.');
	}

	// NOTE: If the revision is not closed, this is caught as a no-op
	// instead of an invalid transaction.

	break;

	case DifferentialAction::ACTION_RETHINK:
	if (!$actor_is_author) {
	return pht(
	"You can not plan changes to this revision because you do not ".
	"own it. To plan changes to a revision, you must be its owner.");
	}

	switch ($revision_status) {
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	// These are OK.
	break;
	case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
	// Let this through, it's a no-op.
	break;
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	return pht(
	"You can not plan changes to this revision because it has ".
	"been abandoned.");
	case ArcanistDifferentialRevisionStatus::CLOSED:
	return pht(
	"You can not plan changes to this revision because it has ".
	"already been closed.");
	default:
	throw new Exception(
	pht(
	'Encountered unexpected revision status ("%s") when '.
	'validating "%s" action.',
	$revision_status,
	$action));
	}
	break;

	case DifferentialAction::ACTION_REQUEST:
	if (!$actor_is_author) {
	return pht(
	"You can not request review of this revision because you do ".
	"not own it. To request review of a revision, you must be its ".
	"owner.");
	}

	switch ($revision_status) {
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
	// These are OK.
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	// This will be caught as "no effect" later on.
	break;
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	return pht(
	"You can not request review of this revision because it has ".
	"been abandoned. Instead, reclaim it.");
	case ArcanistDifferentialRevisionStatus::CLOSED:
	return pht(
	"You can not request review of this revision because it has ".
	"already been closed.");
	default:
	throw new Exception(
	pht(
	'Encountered unexpected revision status ("%s") when '.
	'validating "%s" action.',
	$revision_status,
	$action));
	}
	break;

	case DifferentialAction::ACTION_CLOSE:
	+ // We force revisions closed when we discover a corresponding commit.
	+ // In this case, revisions are allowed to transition to closed from
	+ // any state. This is an automated action taken by the daemons.

	- // TODO: Permit the daemons to take this action in all cases.
	-
	- if (!$actor_is_author && !$always_allow_close) {
	- return pht(
	- "You can not close this revision because you do not own it. To ".
	- "close a revision, you must be its owner.");
	- }
	+ if (!$this->getIsCloseByCommit()) {
	+ if (!$actor_is_author && !$always_allow_close) {
	+ return pht(
	+ "You can not close this revision because you do not own it. To ".
	+ "close a revision, you must be its owner.");
	+ }

	- if ($revision_status != $status_accepted) {
	- return pht(
	- "You can not close this revision because it has not been ".
	- "accepted. You can only close accepted revisions.");
	+ if ($revision_status != $status_accepted) {
	+ return pht(
	+ "You can not close this revision because it has not been ".
	+ "accepted. You can only close accepted revisions.");
	+ }
	}
	break;
	}

	return null;
	}

	protected function sortTransactions(array $xactions) {
	$xactions = parent::sortTransactions($xactions);

	$head = array();
	$tail = array();

	foreach ($xactions as $xaction) {
	$type = $xaction->getTransactionType();
	if ($type == DifferentialTransaction::TYPE_INLINE) {
	$tail[] = $xaction;
	} else {
	$head[] = $xaction;
	}
	}

	return array_values(array_merge($head, $tail));
	}

	protected function requireCapabilities(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	}

	return parent::requireCapabilities($object, $xaction);
	}

	protected function shouldPublishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function getMailTo(PhabricatorLiskDAO $object) {
	$phids = array();
	$phids[] = $object->getAuthorPHID();
	foreach ($object->getReviewerStatus() as $reviewer) {
	$phids[] = $reviewer->getReviewerPHID();
	}
	return $phids;
	}

	protected function getMailCC(PhabricatorLiskDAO $object) {
	$phids = parent::getMailCC($object);

	if ($this->heraldEmailPHIDs) {
	foreach ($this->heraldEmailPHIDs as $phid) {
	$phids[] = $phid;
	}
	}

	return $phids;
	}

	protected function getMailSubjectPrefix() {
	return PhabricatorEnv::getEnvConfig('metamta.differential.subject-prefix');
	}

	protected function getMailThreadID(PhabricatorLiskDAO $object) {
	// This is nonstandard, but retains threading with older messages.
	$phid = $object->getPHID();
	return "differential-rev-{$phid}-req";
	}

	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	return id(new DifferentialReplyHandler())
	->setMailReceiver($object);
	}

	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	$id = $object->getID();
	$title = $object->getTitle();

	$original_title = $object->getOriginalTitle();

	$subject = "D{$id}: {$title}";
	$thread_topic = "D{$id}: {$original_title}";

	return id(new PhabricatorMetaMTAMail())
	->setSubject($subject)
	->addHeader('Thread-Topic', $thread_topic);
	}

	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$body = parent::buildMailBody($object, $xactions);

	$type_inline = DifferentialTransaction::TYPE_INLINE;

	$inlines = array();
	foreach ($xactions as $xaction) {
	if ($xaction->getTransactionType() == $type_inline) {
	$inlines[] = $xaction;
	}
	}

	+ $changed_uri = $this->getChangedPriorToCommitURI();
	+ if ($changed_uri) {
	+ $body->addTextSection(
	+ pht('CHANGED PRIOR TO COMMIT'),
	+ $changed_uri);
	+ }
	+
	if ($inlines) {
	$body->addTextSection(
	pht('INLINE COMMENTS'),
	$this->renderInlineCommentsForMail($object, $inlines));
	}

	$body->addTextSection(
	pht('REVISION DETAIL'),
	PhabricatorEnv::getProductionURI('/D'.$object->getID()));


	return $body;
	}

	protected function supportsSearch() {
	return true;
	}

	protected function extractFilePHIDsFromCustomTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	}

	return parent::extractFilePHIDsFromCustomTransaction($object, $xaction);
	}

	protected function expandCustomRemarkupBlockTransactions(
	PhabricatorLiskDAO $object,
	array $xactions,
	$blocks,
	PhutilMarkupEngine $engine) {


	$flat_blocks = array_mergev($blocks);
	$huge_block = implode("\n\n", $flat_blocks);

	$task_map = array();
	$task_refs = id(new ManiphestCustomFieldStatusParser())
	->parseCorpus($huge_block);
	foreach ($task_refs as $match) {
	foreach ($match['monograms'] as $monogram) {
	$task_id = (int)trim($monogram, 'tT');
	$task_map[$task_id] = true;
	}
	}

	$rev_map = array();
	$rev_refs = id(new DifferentialCustomFieldDependsOnParser())
	->parseCorpus($huge_block);
	foreach ($rev_refs as $match) {
	foreach ($match['monograms'] as $monogram) {
	$rev_id = (int)trim($monogram, 'dD');
	$rev_map[$rev_id] = true;
	}
	}

	$edges = array();

	if ($task_map) {
	$tasks = id(new ManiphestTaskQuery())
	->setViewer($this->getActor())
	->withIDs(array_keys($task_map))
	->execute();

	if ($tasks) {
	$edge_related = PhabricatorEdgeConfig::TYPE_DREV_HAS_RELATED_TASK;
	$edges[$edge_related] = mpull($tasks, 'getPHID', 'getPHID');
	}
	}

	if ($rev_map) {
	$revs = id(new DifferentialRevisionQuery())
	->setViewer($this->getActor())
	->withIDs(array_keys($rev_map))
	->execute();
	$rev_phids = mpull($revs, 'getPHID', 'getPHID');

	// NOTE: Skip any write attempts if a user cleverly implies a revision
	// depends upon itself.
	unset($rev_phids[$object->getPHID()]);

	if ($revs) {
	$edge_depends = PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV;
	$edges[$edge_depends] = $rev_phids;
	}
	}

	$result = array();
	foreach ($edges as $type => $specs) {
	$result[] = id(new DifferentialTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $type)
	->setNewValue(array('+' => $specs));
	}

	return $result;
	}

	private function renderInlineCommentsForMail(
	PhabricatorLiskDAO $object,
	array $inlines) {

	$context_key = 'metamta.differential.unified-comment-context';
	$show_context = PhabricatorEnv::getEnvConfig($context_key);

	$changeset_ids = array();
	foreach ($inlines as $inline) {
	$id = $inline->getComment()->getChangesetID();
	$changeset_ids[$id] = $id;
	}

	// TODO: We should write a proper Query class for this eventually.
	$changesets = id(new DifferentialChangeset())->loadAllWhere(
	'id IN (%Ld)',
	$changeset_ids);
	if ($show_context) {
	$hunk_parser = new DifferentialHunkParser();
	foreach ($changesets as $changeset) {
	$changeset->attachHunks($changeset->loadHunks());
	}
	}

	$inline_groups = DifferentialTransactionComment::sortAndGroupInlines(
	$inlines,
	$changesets);

	$result = array();
	foreach ($inline_groups as $changeset_id => $group) {
	$changeset = idx($changesets, $changeset_id);
	if (!$changeset) {
	continue;
	}

	foreach ($group as $inline) {
	$comment = $inline->getComment();
	$file = $changeset->getFilename();
	$start = $comment->getLineNumber();
	$len = $comment->getLineLength();
	if ($len) {
	$range = $start.'-'.($start + $len);
	} else {
	$range = $start;
	}

	$inline_content = $comment->getContent();

	if (!$show_context) {
	$result[] = "{$file}:{$range} {$inline_content}";
	} else {
	$result[] = "================";
	$result[] = "Comment at: " . $file . ":" . $range;
	$result[] = $hunk_parser->makeContextDiff(
	$changeset->getHunks(),
	$comment->getIsNewFile(),
	$comment->getLineNumber(),
	$comment->getLineLength(),
	1);
	$result[] = "----------------";

	$result[] = $inline_content;
	$result[] = null;
	}
	}
	}

	return implode("\n", $result);
	}

	private function loadDiff($phid) {
	return id(new DifferentialDiffQuery())
	->withPHIDs(array($phid))
	->setViewer($this->getActor())
	->executeOne();
	}

	/* -( Herald Integration )------------------------------------------------- */

	protected function shouldApplyHeraldRules(
	PhabricatorLiskDAO $object,
	array $xactions) {

	if ($this->getIsNewObject()) {
	return true;
	}

	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_UPDATE:
	- return true;
	+ if (!$this->getIsCloseByCommit()) {
	+ return true;
	+ }
	}
	}

	return parent::shouldApplyHeraldRules($object, $xactions);
	}

	protected function buildHeraldAdapter(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$unsubscribed_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$object->getPHID(),
	PhabricatorEdgeConfig::TYPE_OBJECT_HAS_UNSUBSCRIBER);

	$subscribed_phids = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$object->getPHID());

	$revision = id(new DifferentialRevisionQuery())
	->setViewer($this->getActor())
	->withPHIDs(array($object->getPHID()))
	->needActiveDiffs(true)
	->needReviewerStatus(true)
	->executeOne();
	if (!$revision) {
	throw new Exception(
	pht(
	'Failed to load revision for Herald adapter construction!'));
	}

	$adapter = HeraldDifferentialRevisionAdapter::newLegacyAdapter(
	$object,
	$object->getActiveDiff());

	$reviewers = $revision->getReviewerStatus();
	$reviewer_phids = mpull($reviewers, 'getReviewerPHID');

	$adapter->setExplicitCCs($subscribed_phids);
	$adapter->setExplicitReviewers($reviewer_phids);
	$adapter->setForbiddenCCs($unsubscribed_phids);

	$adapter->setIsNewObject($this->getIsNewObject());

	return $adapter;
	}

	protected function didApplyHeraldRules(
	PhabricatorLiskDAO $object,
	HeraldAdapter $adapter,
	HeraldTranscript $transcript) {

	$xactions = array();

	// Build a transaction to adjust CCs.
	$ccs = array(
	'+' => array_keys($adapter->getCCsAddedByHerald()),
	'-' => array_keys($adapter->getCCsRemovedByHerald()),
	);
	$value = array();
	foreach ($ccs as $type => $phids) {
	foreach ($phids as $phid) {
	$value[$type][$phid] = $phid;
	}
	}

	if ($value) {
	$xactions[] = id(new DifferentialTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
	->setNewValue($value);
	}

	// Build a transaction to adjust reviewers.
	$reviewers = array(
	DifferentialReviewerStatus::STATUS_ADDED =>
	array_keys($adapter->getReviewersAddedByHerald()),
	DifferentialReviewerStatus::STATUS_BLOCKING =>
	array_keys($adapter->getBlockingReviewersAddedByHerald()),
	);

	$value = array();
	foreach ($reviewers as $status => $phids) {
	foreach ($phids as $phid) {
	$value['+'][$phid] = array(
	'data' => array(
	'status' => $status,
	),
	);
	}
	}

	if ($value) {
	$edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER;

	$xactions[] = id(new DifferentialTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $edge_reviewer)
	->setNewValue($value);
	}

	// Save extra email PHIDs for later.
	$this->heraldEmailPHIDs = $adapter->getEmailPHIDsAddedByHerald();

	// Apply build plans.
	HarbormasterBuildable::applyBuildPlans(
	$adapter->getDiff(),
	$adapter->getPHID(),
	$adapter->getBuildPlans());

	return $xactions;
	}

	}
	diff --git a/src/applications/metamta/contentsource/PhabricatorContentSource.php b/src/applications/metamta/contentsource/PhabricatorContentSource.php
	index 57ebb1b75d..64653a573d 100644
	--- a/src/applications/metamta/contentsource/PhabricatorContentSource.php
	+++ b/src/applications/metamta/contentsource/PhabricatorContentSource.php
	@@ -1,98 +1,100 @@
	<?php

	final class PhabricatorContentSource {

	const SOURCE_UNKNOWN = 'unknown';
	const SOURCE_WEB = 'web';
	const SOURCE_EMAIL = 'email';
	const SOURCE_CONDUIT = 'conduit';
	const SOURCE_MOBILE = 'mobile';
	const SOURCE_TABLET = 'tablet';
	const SOURCE_FAX = 'fax';
	const SOURCE_CONSOLE = 'console';
	const SOURCE_HERALD = 'herald';
	const SOURCE_LEGACY = 'legacy';
	+ const SOURCE_DAEMON = 'daemon';

	private $source;
	private $params = array();

	private function __construct() {
	// <empty>
	}

	public static function newForSource($source, array $params) {
	$obj = new PhabricatorContentSource();
	$obj->source = $source;
	$obj->params = $params;

	return $obj;
	}

	public static function newFromSerialized($serialized) {
	$dict = json_decode($serialized, true);
	if (!is_array($dict)) {
	$dict = array();
	}

	$obj = new PhabricatorContentSource();
	$obj->source = idx($dict, 'source', self::SOURCE_UNKNOWN);
	$obj->params = idx($dict, 'params', array());

	return $obj;
	}

	public static function newConsoleSource() {
	return self::newForSource(
	PhabricatorContentSource::SOURCE_CONSOLE,
	array());
	}

	public static function newFromRequest(AphrontRequest $request) {
	return self::newForSource(
	PhabricatorContentSource::SOURCE_WEB,
	array(
	'ip' => $request->getRemoteAddr(),
	));
	}

	public static function newFromConduitRequest(ConduitAPIRequest $request) {
	return self::newForSource(
	PhabricatorContentSource::SOURCE_CONDUIT,
	array());
	}

	public static function getSourceNameMap() {
	return array(
	self::SOURCE_WEB => pht('Web'),
	self::SOURCE_EMAIL => pht('Email'),
	self::SOURCE_CONDUIT => pht('Conduit'),
	self::SOURCE_MOBILE => pht('Mobile'),
	self::SOURCE_TABLET => pht('Tablet'),
	self::SOURCE_FAX => pht('Fax'),
	self::SOURCE_CONSOLE => pht('Console'),
	self::SOURCE_LEGACY => pht('Legacy'),
	self::SOURCE_HERALD => pht('Herald'),
	+ self::SOURCE_DAEMON => pht('Daemons'),
	self::SOURCE_UNKNOWN => pht('Old World'),
	);
	}

	public function serialize() {
	return json_encode(array(
	'source' => $this->getSource(),
	'params' => $this->getParams(),
	));
	}

	public function getSource() {
	return $this->source;
	}

	public function getParams() {
	return $this->params;
	}

	public function getParam($key, $default = null) {
	return idx($this->params, $key, $default);
	}

	}
	diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
	index b9941be50d..fa7bb122e7 100644
	--- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
	+++ b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
	@@ -1,384 +1,421 @@
	<?php

	abstract class PhabricatorRepositoryCommitMessageParserWorker
	extends PhabricatorRepositoryCommitParserWorker {

	final protected function updateCommitData(DiffusionCommitRef $ref) {
	$commit = $this->commit;
	$author = $ref->getAuthor();
	$message = $ref->getMessage();
	$committer = $ref->getCommitter();
	$hashes = $ref->getHashes();

	$data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
	'commitID = %d',
	$commit->getID());
	if (!$data) {
	$data = new PhabricatorRepositoryCommitData();
	}
	$data->setCommitID($commit->getID());
	$data->setAuthorName($author);
	$data->setCommitDetail(
	'authorPHID',
	$this->resolveUserPHID($commit, $author));

	$data->setCommitMessage($message);

	if (strlen($committer)) {
	$data->setCommitDetail('committer', $committer);
	$data->setCommitDetail(
	'committerPHID',
	$this->resolveUserPHID($commit, $committer));
	}

	$repository = $this->repository;

	$author_phid = $data->getCommitDetail('authorPHID');
	$committer_phid = $data->getCommitDetail('committerPHID');

	$user = new PhabricatorUser();
	if ($author_phid) {
	$user = $user->loadOneWhere(
	'phid = %s',
	$author_phid);
	}

	$field_values = id(new DiffusionLowLevelCommitFieldsQuery())
	->setRepository($repository)
	->withCommitRef($ref)
	->execute();
	$revision_id = idx($field_values, 'revisionID');

	if (!empty($field_values['reviewedByPHIDs'])) {
	$data->setCommitDetail(
	'reviewerPHID',
	reset($field_values['reviewedByPHIDs']));
	}

	$data->setCommitDetail('differential.revisionID', $revision_id);

	if ($author_phid != $commit->getAuthorPHID()) {
	$commit->setAuthorPHID($author_phid);
	}

	$commit->setSummary($data->getSummary());
	$commit->save();

	$conn_w = id(new DifferentialRevision())->establishConnection('w');

	// NOTE: The `differential_commit` table has a unique ID on `commitPHID`,
	// preventing more than one revision from being associated with a commit.
	// Generally this is good and desirable, but with the advent of hash
	// tracking we may end up in a situation where we match several different
	// revisions. We just kind of ignore this and pick one, we might want to
	// revisit this and do something differently. (If we match several revisions
	// someone probably did something very silly, though.)

	$revision = null;
	$should_autoclose = $repository->shouldAutocloseCommit($commit, $data);

	if ($revision_id) {
	- $lock = PhabricatorGlobalLock::newLock(get_class($this).':'.$revision_id);
	- $lock->lock(5 * 60);
	-
	// TODO: Check if a more restrictive viewer could be set here
	- $revision = id(new DifferentialRevisionQuery())
	+ $revision_query = id(new DifferentialRevisionQuery())
	->withIDs(array($revision_id))
	->setViewer(PhabricatorUser::getOmnipotentUser())
	- ->needRelationships(true)
	->needReviewerStatus(true)
	- ->executeOne();
	+ ->needActiveDiffs(true);
	+
	+ // TODO: Remove this once we swap to new CustomFields. This is only
	+ // required by the old FieldSpecifications, lower on in this worker.
	+ $revision_query->needRelationships(true);
	+
	+ $revision = $revision_query->executeOne();

	if ($revision) {
	$commit_drev = PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV;
	id(new PhabricatorEdgeEditor())
	->setActor($user)
	->addEdge($commit->getPHID(), $commit_drev, $revision->getPHID())
	->save();

	queryfx(
	$conn_w,
	'INSERT IGNORE INTO %T (revisionID, commitPHID) VALUES (%d, %s)',
	DifferentialRevision::TABLE_COMMIT,
	$revision->getID(),
	$commit->getPHID());

	$status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
	$should_close = ($revision->getStatus() != $status_closed) &&
	$should_autoclose;

	if ($should_close) {
	$actor_phid = nonempty(
	$committer_phid,
	$author_phid,
	$revision->getAuthorPHID());
	+
	$actor = id(new PhabricatorUser())
	->loadOneWhere('phid = %s', $actor_phid);

	- $diff = $this->attachToRevision($revision, $actor_phid);
	-
	- $editor = new DifferentialCommentEditor(
	- $revision,
	- DifferentialAction::ACTION_CLOSE);
	- $editor->setActor($actor);
	- $editor->setIsDaemonWorkflow(true);
	-
	- $vs_diff = $this->loadChangedByCommit($diff);
	- if ($vs_diff) {
	- $data->setCommitDetail('vsDiff', $vs_diff->getID());
	-
	- $changed_by_commit = PhabricatorEnv::getProductionURI(
	- '/D'.$revision->getID().
	- '?vs='.$vs_diff->getID().
	- '&id='.$diff->getID().
	- '#toc');
	- $editor->setChangedByCommit($changed_by_commit);
	- }
	-
	$commit_name = $repository->formatCommitName(
	$commit->getCommitIdentifier());

	$committer_name = $this->loadUserName(
	$committer_phid,
	$data->getCommitDetail('committer'),
	$actor);

	$author_name = $this->loadUserName(
	$author_phid,
	$data->getAuthorName(),
	$actor);

	- $info = array();
	- $info[] = "authored by {$author_name}";
	if ($committer_name && ($committer_name != $author_name)) {
	- $info[] = "committed by {$committer_name}";
	+ $message = pht(
	+ 'Closed by commit %s (authored by %s, committed by %s).',
	+ $commit_name,
	+ $author_name,
	+ $committer_name);
	+ } else {
	+ $message = pht(
	+ 'Closed by commit %s (authored by %s).',
	+ $commit_name,
	+ $author_name);
	}
	- $info = implode(', ', $info);

	- $editor
	- ->setMessage("Closed by commit {$commit_name} ({$info}).")
	- ->save();
	- }
	+ $diff = $this->generateFinalDiff($revision, $actor_phid);

	- }
	+ $vs_diff = $this->loadChangedByCommit($revision, $diff);
	+ $changed_uri = null;
	+ if ($vs_diff) {
	+ $data->setCommitDetail('vsDiff', $vs_diff->getID());

	- $lock->unlock();
	+ $changed_uri = PhabricatorEnv::getProductionURI(
	+ '/D'.$revision->getID().
	+ '?vs='.$vs_diff->getID().
	+ '&id='.$diff->getID().
	+ '#toc');
	+ }
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new DifferentialTransaction())
	+ ->setTransactionType(DifferentialTransaction::TYPE_ACTION)
	+ ->setNewValue(DifferentialAction::ACTION_CLOSE);
	+
	+ $xactions[] = id(new DifferentialTransaction())
	+ ->setTransactionType(DifferentialTransaction::TYPE_UPDATE)
	+ ->setIgnoreOnNoEffect(true)
	+ ->setNewValue($diff->getPHID());
	+
	+ $xactions[] = id(new DifferentialTransaction())
	+ ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	+ ->setIgnoreOnNoEffect(true)
	+ ->attachComment(
	+ id(new DifferentialTransactionComment())
	+ ->setContent($message));
	+
	+ $content_source = PhabricatorContentSource::newForSource(
	+ PhabricatorContentSource::SOURCE_DAEMON,
	+ array());
	+
	+ $editor = id(new DifferentialTransactionEditor())
	+ ->setActor($actor)
	+ ->setContinueOnMissingFields(true)
	+ ->setContentSource($content_source)
	+ ->setChangedPriorToCommitURI($changed_uri)
	+ ->setIsCloseByCommit(true);
	+
	+ try {
	+ $editor->applyTransactions($revision, $xactions);
	+ } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
	+ // NOTE: We've marked transactions other than the CLOSE transaction
	+ // as ignored when they don't have an effect, so this means that we
	+ // lost a race to close the revision. That's perfectly fine, we can
	+ // just continue normally.
	+ }
	+ }
	+ }
	}

	if ($should_autoclose) {
	+ // TODO: When this is moved to CustomFields, remove the additional
	+ // call above in query construction.
	$fields = DifferentialFieldSelector::newSelector()
	->getFieldSpecifications();
	foreach ($fields as $key => $field) {
	if (!$field->shouldAppearOnCommitMessage()) {
	continue;
	}
	$field->setUser($user);
	$value = idx($field_values, $field->getCommitMessageKey());
	$field->setValueFromParsedCommitMessage($value);
	if ($revision) {
	$field->setRevision($revision);
	}
	$field->didParseCommit($repository, $commit, $data);
	}
	}

	$data->save();

	$commit->writeImportStatusFlag(
	PhabricatorRepositoryCommit::IMPORTED_MESSAGE);
	}

	private function loadUserName($user_phid, $default, PhabricatorUser $actor) {
	if (!$user_phid) {
	return $default;
	}
	$handle = id(new PhabricatorHandleQuery())
	->setViewer($actor)
	->withPHIDs(array($user_phid))
	->executeOne();

	return '@'.$handle->getName();
	}

	- private function attachToRevision(
	+ private function generateFinalDiff(
	DifferentialRevision $revision,
	$actor_phid) {

	$viewer = PhabricatorUser::getOmnipotentUser();

	$drequest = DiffusionRequest::newFromDictionary(array(
	'user' => $viewer,
	'repository' => $this->repository,
	));

	$raw_diff = DiffusionQuery::callConduitWithDiffusionRequest(
	$viewer,
	$drequest,
	'diffusion.rawdiffquery',
	array(
	'commit' => $this->commit->getCommitIdentifier(),
	));

	// TODO: Support adds, deletes and moves under SVN.
	if (strlen($raw_diff)) {
	$changes = id(new ArcanistDiffParser())->parseDiff($raw_diff);
	} else {
	// This is an empty diff, maybe made with `git commit --allow-empty`.
	// NOTE: These diffs have the same tree hash as their ancestors, so
	// they may attach to revisions in an unexpected way. Just let this
	// happen for now, although it might make sense to special case it
	// eventually.
	$changes = array();
	}

	$diff = DifferentialDiff::newFromRawChanges($changes)
	- ->setRevisionID($revision->getID())
	+ ->setRepositoryPHID($this->repository->getPHID())
	->setAuthorPHID($actor_phid)
	->setCreationMethod('commit')
	->setSourceControlSystem($this->repository->getVersionControlSystem())
	->setLintStatus(DifferentialLintStatus::LINT_SKIP)
	->setUnitStatus(DifferentialUnitStatus::UNIT_SKIP)
	->setDateCreated($this->commit->getEpoch())
	->setDescription(
	'Commit r'.
	$this->repository->getCallsign().
	$this->commit->getCommitIdentifier());

	// TODO: This is not correct in SVN where one repository can have multiple
	// Arcanist projects.
	$arcanist_project = id(new PhabricatorRepositoryArcanistProject())
	->loadOneWhere('repositoryID = %d LIMIT 1', $this->repository->getID());
	if ($arcanist_project) {
	$diff->setArcanistProjectPHID($arcanist_project->getPHID());
	}

	$parents = DiffusionQuery::callConduitWithDiffusionRequest(
	$viewer,
	$drequest,
	'diffusion.commitparentsquery',
	array(
	'commit' => $this->commit->getCommitIdentifier(),
	));
	if ($parents) {
	$diff->setSourceControlBaseRevision(head($parents));
	}

	// TODO: Attach binary files.

	- $revision->setLineCount($diff->getLineCount());
	-
	return $diff->save();
	}

	- private function loadChangedByCommit(DifferentialDiff $diff) {
	+ private function loadChangedByCommit(
	+ DifferentialRevision $revision,
	+ DifferentialDiff $diff) {
	+
	$repository = $this->repository;

	$vs_changesets = array();
	$vs_diff = id(new DifferentialDiff())->loadOneWhere(
	'revisionID = %d AND creationMethod != %s ORDER BY id DESC LIMIT 1',
	- $diff->getRevisionID(),
	+ $revision->getID(),
	'commit');
	foreach ($vs_diff->loadChangesets() as $changeset) {
	$path = $changeset->getAbsoluteRepositoryPath($repository, $vs_diff);
	$path = ltrim($path, '/');
	$vs_changesets[$path] = $changeset;
	}

	$changesets = array();
	foreach ($diff->getChangesets() as $changeset) {
	$path = $changeset->getAbsoluteRepositoryPath($repository, $diff);
	$path = ltrim($path, '/');
	$changesets[$path] = $changeset;
	}

	if (array_fill_keys(array_keys($changesets), true) !=
	array_fill_keys(array_keys($vs_changesets), true)) {
	return $vs_diff;
	}

	$hunks = id(new DifferentialHunk())->loadAllWhere(
	'changesetID IN (%Ld)',
	mpull($vs_changesets, 'getID'));
	$hunks = mgroup($hunks, 'getChangesetID');
	foreach ($vs_changesets as $changeset) {
	$changeset->attachHunks(idx($hunks, $changeset->getID(), array()));
	}

	$file_phids = array();
	foreach ($vs_changesets as $changeset) {
	$metadata = $changeset->getMetadata();
	$file_phid = idx($metadata, 'new:binary-phid');
	if ($file_phid) {
	$file_phids[$file_phid] = $file_phid;
	}
	}

	$files = array();
	if ($file_phids) {
	$files = id(new PhabricatorFileQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs($file_phids)
	->execute();
	$files = mpull($files, null, 'getPHID');
	}

	foreach ($changesets as $path => $changeset) {
	$vs_changeset = $vs_changesets[$path];

	$file_phid = idx($vs_changeset->getMetadata(), 'new:binary-phid');
	if ($file_phid) {
	if (!isset($files[$file_phid])) {
	return $vs_diff;
	}
	$drequest = DiffusionRequest::newFromDictionary(array(
	'user' => PhabricatorUser::getOmnipotentUser(),
	'initFromConduit' => false,
	'repository' => $this->repository,
	'commit' => $this->commit->getCommitIdentifier(),
	'path' => $path,
	));
	$corpus = DiffusionFileContentQuery::newFromDiffusionRequest($drequest)
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->loadFileContent()
	->getCorpus();
	if ($files[$file_phid]->loadFileData() != $corpus) {
	return $vs_diff;
	}
	} else {
	$context = implode("\n", $changeset->makeChangesWithContext());
	$vs_context = implode("\n", $vs_changeset->makeChangesWithContext());

	// We couldn't just compare $context and $vs_context because following
	// diffs will be considered different:
	//
	// -(empty line)
	// -echo 'test';
	// (empty line)
	//
	// (empty line)
	// -echo "test";
	// -(empty line)

	$hunk = id(new DifferentialHunk())->setChanges($context);
	$vs_hunk = id(new DifferentialHunk())->setChanges($vs_context);
	if ($hunk->makeOldFile() != $vs_hunk->makeOldFile() \|\|
	$hunk->makeNewFile() != $vs_hunk->makeNewFile()) {
	return $vs_diff;
	}
	}
	}

	return null;
	}

	private function resolveUserPHID(
	PhabricatorRepositoryCommit $commit,
	$user_name) {

	return id(new DiffusionResolveUserQuery())
	->withCommit($commit)
	->withName($user_name)
	->execute();
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Sep 7, 7:59 AM (2 h, 26 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 222649
Default Alt Text: (61 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions