Page MenuHomePhabricator
Files F17920462

D8443.id20038.diff
No OneTemporary
Actions

D8443.id20038.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -317,7 +317,6 @@
'DatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DatabaseConfigurationProvider.php',
'DefaultDatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php',
'DifferentialAction' => 'applications/differential/constants/DifferentialAction.php',
- 'DifferentialActionHasNoEffectException' => 'applications/differential/exception/DifferentialActionHasNoEffectException.php',
'DifferentialActionMenuEventListener' => 'applications/differential/event/DifferentialActionMenuEventListener.php',
'DifferentialAddCommentView' => 'applications/differential/view/DifferentialAddCommentView.php',
'DifferentialAffectedPath' => 'applications/differential/storage/DifferentialAffectedPath.php',
@@ -354,8 +353,6 @@
'DifferentialChangesetTwoUpTestRenderer' => 'applications/differential/render/DifferentialChangesetTwoUpTestRenderer.php',
'DifferentialChangesetViewController' => 'applications/differential/controller/DifferentialChangesetViewController.php',
'DifferentialComment' => 'applications/differential/storage/DifferentialComment.php',
- 'DifferentialCommentEditor' => 'applications/differential/editor/DifferentialCommentEditor.php',
- 'DifferentialCommentMail' => 'applications/differential/mail/DifferentialCommentMail.php',
'DifferentialCommentPreviewController' => 'applications/differential/controller/DifferentialCommentPreviewController.php',
'DifferentialCommentQuery' => 'applications/differential/query/DifferentialCommentQuery.php',
'DifferentialCommentSaveController' => 'applications/differential/controller/DifferentialCommentSaveController.php',
@@ -2707,7 +2704,7 @@
'ConduitAPI_conpherence_querytransaction_Method' => 'ConduitAPI_conpherence_Method',
'ConduitAPI_conpherence_updatethread_Method' => 'ConduitAPI_conpherence_Method',
'ConduitAPI_differential_Method' => 'ConduitAPIMethod',
- 'ConduitAPI_differential_close_Method' => 'ConduitAPIMethod',
+ 'ConduitAPI_differential_close_Method' => 'ConduitAPI_differential_Method',
'ConduitAPI_differential_createcomment_Method' => 'ConduitAPIMethod',
'ConduitAPI_differential_creatediff_Method' => 'ConduitAPIMethod',
'ConduitAPI_differential_createinline_Method' => 'ConduitAPI_differential_Method',
@@ -2887,7 +2884,6 @@
'DarkConsoleServicesPlugin' => 'DarkConsolePlugin',
'DarkConsoleXHProfPlugin' => 'DarkConsolePlugin',
'DefaultDatabaseConfigurationProvider' => 'DatabaseConfigurationProvider',
- 'DifferentialActionHasNoEffectException' => 'DifferentialException',
'DifferentialActionMenuEventListener' => 'PhabricatorEventListener',
'DifferentialAddCommentView' => 'AphrontView',
'DifferentialAffectedPath' => 'DifferentialDAO',
@@ -2919,8 +2915,6 @@
'DifferentialChangesetTwoUpTestRenderer' => 'DifferentialChangesetTestRenderer',
'DifferentialChangesetViewController' => 'DifferentialController',
'DifferentialComment' => 'PhabricatorMarkupInterface',
- 'DifferentialCommentEditor' => 'PhabricatorEditor',
- 'DifferentialCommentMail' => 'DifferentialMail',
'DifferentialCommentPreviewController' => 'DifferentialController',
'DifferentialCommentQuery' => 'PhabricatorOffsetPagedQuery',
'DifferentialCommentSaveController' => 'DifferentialController',
diff --git a/src/applications/differential/editor/DifferentialCommentEditor.php b/src/applications/differential/editor/DifferentialCommentEditor.php
deleted file mode 100644
--- a/src/applications/differential/editor/DifferentialCommentEditor.php
+++ /dev/null
@@ -1,800 +0,0 @@
-<?php
-
-final class DifferentialCommentEditor extends PhabricatorEditor {
-
- protected $revision;
- protected $action;
-
- protected $attachInlineComments;
- protected $message;
- protected $changedByCommit;
- protected $addedReviewers = array();
- protected $removedReviewers = array();
- private $addedCCs = array();
-
- private $parentMessageID;
- private $contentSource;
- private $noEmail;
-
- private $isDaemonWorkflow;
-
- public function __construct(
- DifferentialRevision $revision,
- $action) {
-
- $this->revision = $revision;
- $this->action = $action;
- }
-
- public function setParentMessageID($parent_message_id) {
- $this->parentMessageID = $parent_message_id;
- return $this;
- }
-
- public function setMessage($message) {
- $this->message = $message;
- return $this;
- }
-
- public function setAttachInlineComments($attach) {
- $this->attachInlineComments = $attach;
- return $this;
- }
-
- public function setChangedByCommit($changed_by_commit) {
- $this->changedByCommit = $changed_by_commit;
- return $this;
- }
-
- public function getChangedByCommit() {
- return $this->changedByCommit;
- }
-
- public function setAddedReviewers(array $added_reviewers) {
- $this->addedReviewers = $added_reviewers;
- return $this;
- }
-
- public function getAddedReviewers() {
- return $this->addedReviewers;
- }
-
- public function setRemovedReviewers(array $removeded_reviewers) {
- $this->removedReviewers = $removeded_reviewers;
- return $this;
- }
-
- public function getRemovedReviewers() {
- return $this->removedReviewers;
- }
-
- public function setAddedCCs($added_ccs) {
- $this->addedCCs = $added_ccs;
- return $this;
- }
-
- public function getAddedCCs() {
- return $this->addedCCs;
- }
-
- public function setContentSource(PhabricatorContentSource $content_source) {
- $this->contentSource = $content_source;
- return $this;
- }
-
- public function setIsDaemonWorkflow($is_daemon) {
- $this->isDaemonWorkflow = $is_daemon;
- return $this;
- }
-
- public function setNoEmail($no_email) {
- $this->noEmail = $no_email;
- return $this;
- }
-
- public function save() {
- $actor = $this->requireActor();
-
- // Reload the revision to pick up reviewer status, until we can lift this
- // out of here.
- $this->revision = id(new DifferentialRevisionQuery())
- ->setViewer($actor)
- ->withIDs(array($this->revision->getID()))
- ->needRelationships(true)
- ->needReviewerStatus(true)
- ->needReviewerAuthority(true)
- ->executeOne();
-
- $revision = $this->revision;
- $action = $this->action;
- $actor_phid = $actor->getPHID();
- $actor_is_author = ($actor_phid == $revision->getAuthorPHID());
- $allow_self_accept = PhabricatorEnv::getEnvConfig(
- 'differential.allow-self-accept');
- $always_allow_close = PhabricatorEnv::getEnvConfig(
- 'differential.always-allow-close');
- $allow_reopen = PhabricatorEnv::getEnvConfig(
- 'differential.allow-reopen');
- $revision_status = $revision->getStatus();
- $update_accepted_status = false;
-
- $reviewer_phids = $revision->getReviewers();
- if ($reviewer_phids) {
- $reviewer_phids = array_fuse($reviewer_phids);
- }
-
- $metadata = array();
-
- $inline_comments = array();
- if ($this->attachInlineComments) {
- $inline_comments = id(new DifferentialInlineCommentQuery())
- ->withDraftComments($actor_phid, $revision->getID())
- ->execute();
- }
-
- switch ($action) {
- case DifferentialAction::ACTION_COMMENT:
- if (!$this->message && !$inline_comments) {
- throw new DifferentialActionHasNoEffectException(
- "You are submitting an empty comment with no action: ".
- "you must act on the revision or post a comment.");
- }
-
- // If the actor is a reviewer, and their status is "added" (that is,
- // they haven't accepted or requested changes to the revision),
- // upgrade their status to "commented". If they have a stronger status
- // already, don't overwrite it.
- if (isset($reviewer_phids[$actor_phid])) {
- $status_added = DifferentialReviewerStatus::STATUS_ADDED;
- $reviewer_status = $revision->getReviewerStatus();
- foreach ($reviewer_status as $reviewer) {
- if ($reviewer->getReviewerPHID() == $actor_phid) {
- if ($reviewer->getStatus() == $status_added) {
- DifferentialRevisionEditor::updateReviewerStatus(
- $revision,
- $actor,
- $actor_phid,
- DifferentialReviewerStatus::STATUS_COMMENTED);
- }
- }
- }
- }
-
- break;
-
- case DifferentialAction::ACTION_RESIGN:
- if ($actor_is_author) {
- throw new Exception('You can not resign from your own revision!');
- }
- if (empty($reviewer_phids[$actor_phid])) {
- throw new DifferentialActionHasNoEffectException(
- "You can not resign from this revision because you are not ".
- "a reviewer.");
- }
-
- list($added_reviewers, $ignored) = $this->alterReviewers();
- if ($added_reviewers) {
- $key = DifferentialComment::METADATA_ADDED_REVIEWERS;
- $metadata[$key] = $added_reviewers;
- }
-
- DifferentialRevisionEditor::updateReviewers(
- $revision,
- $actor,
- array(),
- array($actor_phid));
-
- // If you are a blocking reviewer, your presence as a reviewer may be
- // the only thing keeping a revision from transitioning to "accepted".
- // Recalculate state after removing the resigning reviewer.
- switch ($revision_status) {
- case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
- case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
- $update_accepted_status = true;
- break;
- }
-
- break;
-
- case DifferentialAction::ACTION_ABANDON:
- if (!$actor_is_author) {
- throw new Exception('You can only abandon your own revisions.');
- }
-
- if ($revision_status == ArcanistDifferentialRevisionStatus::CLOSED) {
- throw new DifferentialActionHasNoEffectException(
- "You can not abandon this revision because it has already ".
- "been closed.");
- }
-
- if ($revision_status == ArcanistDifferentialRevisionStatus::ABANDONED) {
- throw new DifferentialActionHasNoEffectException(
- "You can not abandon this revision because it has already ".
- "been abandoned.");
- }
-
- $revision->setStatus(ArcanistDifferentialRevisionStatus::ABANDONED);
- break;
-
- case DifferentialAction::ACTION_ACCEPT:
- if ($actor_is_author && !$allow_self_accept) {
- throw new Exception('You can not accept your own revision.');
- }
-
- switch ($revision_status) {
- case ArcanistDifferentialRevisionStatus::ABANDONED:
- throw new DifferentialActionHasNoEffectException(
- "You can not accept this revision because it has been ".
- "abandoned.");
- case ArcanistDifferentialRevisionStatus::CLOSED:
- throw new DifferentialActionHasNoEffectException(
- "You can not accept this revision because it has already ".
- "been closed.");
- case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
- case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
- case ArcanistDifferentialRevisionStatus::ACCEPTED:
- // We expect "Accept" from these states.
- break;
- default:
- throw new Exception(
- "Unexpected revision state '{$revision_status}'!");
- }
-
- $was_reviewer_already = false;
- foreach ($revision->getReviewerStatus() as $reviewer) {
- if ($reviewer->hasAuthority($actor)) {
- DifferentialRevisionEditor::updateReviewerStatus(
- $revision,
- $actor,
- $reviewer->getReviewerPHID(),
- DifferentialReviewerStatus::STATUS_ACCEPTED);
- if ($reviewer->getReviewerPHID() == $actor_phid) {
- $was_reviewer_already = true;
- }
- }
- }
-
- if (!$was_reviewer_already) {
- DifferentialRevisionEditor::updateReviewerStatus(
- $revision,
- $actor,
- $actor_phid,
- DifferentialReviewerStatus::STATUS_ACCEPTED);
- }
-
- $update_accepted_status = true;
- break;
-
- case DifferentialAction::ACTION_REQUEST:
- if (!$actor_is_author) {
- throw new Exception('You must own a revision to request review.');
- }
-
- switch ($revision_status) {
- case ArcanistDifferentialRevisionStatus::ACCEPTED:
- case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
- $revision->setStatus(
- ArcanistDifferentialRevisionStatus::NEEDS_REVIEW);
- break;
- case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
- throw new DifferentialActionHasNoEffectException(
- "You can not request review of this revision because it has ".
- "been abandoned.");
- case ArcanistDifferentialRevisionStatus::ABANDONED:
- throw new DifferentialActionHasNoEffectException(
- "You can not request review of this revision because it has ".
- "been abandoned.");
- case ArcanistDifferentialRevisionStatus::CLOSED:
- throw new DifferentialActionHasNoEffectException(
- "You can not request review of this revision because it has ".
- "already been closed.");
- default:
- throw new Exception(
- "Unexpected revision state '{$revision_status}'!");
- }
-
- list($added_reviewers, $ignored) = $this->alterReviewers();
- if ($added_reviewers) {
- $key = DifferentialComment::METADATA_ADDED_REVIEWERS;
- $metadata[$key] = $added_reviewers;
- }
-
- break;
-
- case DifferentialAction::ACTION_REJECT:
- if ($actor_is_author) {
- throw new Exception(
- 'You can not request changes to your own revision.');
- }
-
- switch ($revision_status) {
- case ArcanistDifferentialRevisionStatus::ACCEPTED:
- case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
- case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
- // We expect rejects from these states.
- break;
- case ArcanistDifferentialRevisionStatus::ABANDONED:
- throw new DifferentialActionHasNoEffectException(
- "You can not request changes to this revision because it has ".
- "been abandoned.");
- case ArcanistDifferentialRevisionStatus::CLOSED:
- throw new DifferentialActionHasNoEffectException(
- "You can not request changes to this revision because it has ".
- "already been closed.");
- default:
- throw new Exception(
- "Unexpected revision state '{$revision_status}'!");
- }
-
- DifferentialRevisionEditor::updateReviewerStatus(
- $revision,
- $actor,
- $actor_phid,
- DifferentialReviewerStatus::STATUS_REJECTED);
-
- $revision
- ->setStatus(ArcanistDifferentialRevisionStatus::NEEDS_REVISION);
- break;
-
- case DifferentialAction::ACTION_RETHINK:
- if (!$actor_is_author) {
- throw new Exception(
- "You can not plan changes to somebody else's revision");
- }
-
- switch ($revision_status) {
- case ArcanistDifferentialRevisionStatus::ACCEPTED:
- case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
- case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
- // We expect accepts from these states.
- break;
- case ArcanistDifferentialRevisionStatus::ABANDONED:
- throw new DifferentialActionHasNoEffectException(
- "You can not plan changes to this revision because it has ".
- "been abandoned.");
- case ArcanistDifferentialRevisionStatus::CLOSED:
- throw new DifferentialActionHasNoEffectException(
- "You can not plan changes to this revision because it has ".
- "already been closed.");
- default:
- throw new Exception(
- "Unexpected revision state '{$revision_status}'!");
- }
-
- $revision
- ->setStatus(ArcanistDifferentialRevisionStatus::NEEDS_REVISION);
- break;
-
- case DifferentialAction::ACTION_RECLAIM:
- if (!$actor_is_author) {
- throw new Exception('You can not reclaim a revision you do not own.');
- }
-
-
- if ($revision_status != ArcanistDifferentialRevisionStatus::ABANDONED) {
- throw new DifferentialActionHasNoEffectException(
- "You can not reclaim this revision because it is not abandoned.");
- }
-
- $revision
- ->setStatus(ArcanistDifferentialRevisionStatus::NEEDS_REVIEW);
-
- $update_accepted_status = true;
- break;
-
- case DifferentialAction::ACTION_CLOSE:
-
- // NOTE: The daemons can mark things closed from any state. We treat
- // them as completely authoritative.
-
- if (!$this->isDaemonWorkflow) {
- if (!$actor_is_author && !$always_allow_close) {
- throw new Exception(
- "You can not mark a revision you don't own as closed.");
- }
-
- $status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
- $status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;
-
- if ($revision_status == $status_closed) {
- throw new DifferentialActionHasNoEffectException(
- "You can not mark this revision as closed because it has ".
- "already been marked as closed.");
- }
-
- if ($revision_status != $status_accepted) {
- throw new DifferentialActionHasNoEffectException(
- "You can not mark this revision as closed because it is ".
- "has not been accepted.");
- }
- }
-
- $revision->setStatus(ArcanistDifferentialRevisionStatus::CLOSED);
- break;
-
- case DifferentialAction::ACTION_REOPEN:
- if (!$allow_reopen) {
- throw new Exception(
- "You cannot reopen a revision when this action is disabled.");
- }
-
- if ($revision_status != ArcanistDifferentialRevisionStatus::CLOSED) {
- throw new Exception(
- "You cannot reopen a revision that is not currently closed.");
- }
-
- $revision->setStatus(ArcanistDifferentialRevisionStatus::NEEDS_REVIEW);
-
- break;
-
- case DifferentialAction::ACTION_ADDREVIEWERS:
- list($added_reviewers, $ignored) = $this->alterReviewers();
-
- if ($added_reviewers) {
- $key = DifferentialComment::METADATA_ADDED_REVIEWERS;
- $metadata[$key] = $added_reviewers;
- } else {
- $user_tried_to_add = count($this->getAddedReviewers());
- if ($user_tried_to_add == 0) {
- throw new DifferentialActionHasNoEffectException(
- "You can not add reviewers, because you did not specify any ".
- "reviewers.");
- } else if ($user_tried_to_add == 1) {
- throw new DifferentialActionHasNoEffectException(
- "You can not add that reviewer, because they are already an ".
- "author or reviewer.");
- } else {
- throw new DifferentialActionHasNoEffectException(
- "You can not add those reviewers, because they are all already ".
- "authors or reviewers.");
- }
- }
-
- break;
- case DifferentialAction::ACTION_ADDCCS:
- $added_ccs = $this->getAddedCCs();
- $user_tried_to_add = count($added_ccs);
-
- $added_ccs = $this->filterAddedCCs($added_ccs);
-
- if ($added_ccs) {
- $key = DifferentialComment::METADATA_ADDED_CCS;
- $metadata[$key] = $added_ccs;
- } else {
- if ($user_tried_to_add == 0) {
- throw new DifferentialActionHasNoEffectException(
- "You can not add CCs, because you did not specify any ".
- "CCs.");
- } else if ($user_tried_to_add == 1) {
- throw new DifferentialActionHasNoEffectException(
- "You can not add that CC, because they are already an ".
- "author, reviewer or CC.");
- } else {
- throw new DifferentialActionHasNoEffectException(
- "You can not add those CCs, because they are all already ".
- "authors, reviewers or CCs.");
- }
- }
- break;
- case DifferentialAction::ACTION_CLAIM:
- if ($actor_is_author) {
- throw new Exception("You can not commandeer your own revision.");
- }
-
- switch ($revision_status) {
- case ArcanistDifferentialRevisionStatus::CLOSED:
- throw new DifferentialActionHasNoEffectException(
- "You can not commandeer this revision because it has ".
- "already been closed.");
- break;
- }
-
- $this->setAddedReviewers(array($revision->getAuthorPHID()));
- $this->setRemovedReviewers(array($actor_phid));
-
- // NOTE: Set the new author PHID before calling addReviewers(), since it
- // doesn't permit the author to become a reviewer.
- $revision->setAuthorPHID($actor_phid);
-
- list($added_reviewers, $removed_reviewers) = $this->alterReviewers();
- if ($added_reviewers) {
- $key = DifferentialComment::METADATA_ADDED_REVIEWERS;
- $metadata[$key] = $added_reviewers;
- }
-
- if ($removed_reviewers) {
- $key = DifferentialComment::METADATA_REMOVED_REVIEWERS;
- $metadata[$key] = $removed_reviewers;
- }
-
- break;
- default:
- throw new Exception('Unsupported action.');
- }
-
- // Update information about reviewer in charge.
- if ($action == DifferentialAction::ACTION_ACCEPT ||
- $action == DifferentialAction::ACTION_REJECT) {
- $revision->setLastReviewerPHID($actor_phid);
- }
-
- // TODO: Call beginReadLocking() prior to loading the revision.
- $revision->openTransaction();
-
- // Always save the revision (even if we didn't actually change any of its
- // properties) so that it jumps to the top of the revision list when sorted
- // by "updated". Notably, this allows "ping" comments to push it to the
- // top of the action list.
- $revision->save();
-
- if ($update_accepted_status) {
- $revision = DifferentialRevisionEditor::updateAcceptedStatus(
- $actor,
- $revision);
- }
-
- if ($action != DifferentialAction::ACTION_RESIGN) {
- DifferentialRevisionEditor::addCC(
- $revision,
- $actor_phid,
- $actor_phid);
- }
-
- $is_new = !$revision->getID();
-
- $event = new PhabricatorEvent(
- PhabricatorEventType::TYPE_DIFFERENTIAL_WILLEDITREVISION,
- array(
- 'revision' => $revision,
- 'new' => $is_new,
- ));
-
- $event->setUser($actor);
- PhutilEventEngine::dispatchEvent($event);
-
- $template = id(new DifferentialComment())
- ->setAuthorPHID($actor_phid)
- ->setRevision($revision);
-
- if ($this->contentSource) {
- $content_source = $this->contentSource;
- } else {
- $content_source = PhabricatorContentSource::newForSource(
- PhabricatorContentSource::SOURCE_LEGACY,
- array());
- }
-
- $template->setContentSource($content_source);
-
- $comments = array();
-
- // If this edit performs a meaningful action, save a transaction for the
- // action. Do this first, since the mail currently assumes the first
- // transaction is the strongest.
- if ($action != DifferentialAction::ACTION_COMMENT &&
- $action != DifferentialAction::ACTION_ADDREVIEWERS &&
- $action != DifferentialAction::ACTION_ADDCCS) {
- $comments[] = id(clone $template)
- ->setAction($action);
- }
-
- // If this edit adds reviewers, save a transaction for those changes.
- $rev_add = DifferentialComment::METADATA_ADDED_REVIEWERS;
- $rev_rem = DifferentialComment::METADATA_REMOVED_REVIEWERS;
- if (idx($metadata, $rev_add) || idx($metadata, $rev_rem)) {
- $reviewer_meta = array_select_keys($metadata, array($rev_add, $rev_rem));
-
- $comments[] = id(clone $template)
- ->setAction(DifferentialAction::ACTION_ADDREVIEWERS)
- ->setMetadata($reviewer_meta);
- }
-
- // If this edit adds CCs, save a transaction for the new CCs. We build this
- // for either explicit CCs, or for @mentions. First, find any "@mentions" in
- // the comment blocks.
- $content_blocks = array($this->message);
- foreach ($inline_comments as $inline) {
- $content_blocks[] = $inline->getContent();
- }
- $mention_ccs = PhabricatorMarkupEngine::extractPHIDsFromMentions(
- $content_blocks);
-
- // Now, build a comment if we have explicit action CCs or mention CCs.
- $cc_add = DifferentialComment::METADATA_ADDED_CCS;
- if (idx($metadata, $cc_add) || $mention_ccs) {
- $all_adds = array_merge(
- idx($metadata, $cc_add, array()),
- $mention_ccs);
- $all_adds = $this->filterAddedCCs($all_adds);
- if ($all_adds) {
- $cc_meta = array(
- DifferentialComment::METADATA_ADDED_CCS => $all_adds,
- );
-
- foreach ($all_adds as $cc_phid) {
- DifferentialRevisionEditor::addCC(
- $revision,
- $cc_phid,
- $actor_phid);
- }
-
- $comments[] = id(clone $template)
- ->setAction(DifferentialAction::ACTION_ADDCCS)
- ->setMetadata($cc_meta);
- }
- }
-
- // If this edit has comments or inline comments, save a transaction for
- // the comment content.
- if (strlen($this->message)) {
- $comments[] = id(clone $template)
- ->setAction(DifferentialAction::ACTION_COMMENT)
- ->setContent((string)$this->message);
- }
-
- foreach ($comments as $comment) {
- $comment->save();
- }
-
- $changesets = array();
- $mail_inlines = array();
- if ($inline_comments) {
- $load_ids = mpull($inline_comments, 'getChangesetID');
- if ($load_ids) {
- $load_ids = array_unique($load_ids);
- $changesets = id(new DifferentialChangeset())->loadAllWhere(
- 'id in (%Ld)',
- $load_ids);
- }
- foreach ($inline_comments as $inline) {
- $inline_xaction_comment = $inline->getTransactionCommentForSave();
- $inline_xaction_comment->setRevisionPHID($revision->getPHID());
-
- $inline_xaction = id(clone $template)
- ->setAction(DifferentialTransaction::TYPE_INLINE)
- ->setProxyComment($inline_xaction_comment)
- ->save();
-
- $comments[] = $inline_xaction;
- $mail_inlines[] = $inline_xaction->getProxyTransaction();
- }
- }
-
- $revision->saveTransaction();
-
- $phids = array($actor_phid);
- $handles = id(new PhabricatorHandleQuery())
- ->setViewer($actor)
- ->withPHIDs($phids)
- ->execute();
- $actor_handle = $handles[$actor_phid];
-
- $xherald_header = HeraldTranscript::loadXHeraldRulesHeader(
- $revision->getPHID());
-
- $mailed_phids = array();
- if (!$this->noEmail) {
- $mail = id(new DifferentialCommentMail(
- $revision,
- $actor_handle,
- $comments,
- $changesets,
- $mail_inlines))
- ->setActor($actor)
- ->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
- ->setToPHIDs(
- array_merge(
- $revision->getReviewers(),
- array($revision->getAuthorPHID())))
- ->setCCPHIDs($revision->getCCPHIDs())
- ->setChangedByCommit($this->getChangedByCommit())
- ->setXHeraldRulesHeader($xherald_header)
- ->setParentMessageID($this->parentMessageID)
- ->send();
-
- $mailed_phids = $mail->getRawMail()->buildRecipientList();
- }
-
-
- $event_data = array(
- 'revision_id' => $revision->getID(),
- 'revision_phid' => $revision->getPHID(),
- 'revision_name' => $revision->getTitle(),
- 'revision_author_phid' => $revision->getAuthorPHID(),
- 'action' => head($comments)->getAction(),
- 'feedback_content' => $this->message,
- 'actor_phid' => $actor_phid,
-
- // NOTE: Don't use this, it will be removed after ApplicationTransactions.
- // For now, it powers inline comment rendering over the Asana brdige.
- 'temporaryTransactionPHIDs' => mpull($comments, 'getPHID'),
- );
-
- id(new PhabricatorFeedStoryPublisher())
- ->setStoryType('PhabricatorFeedStoryDifferential')
- ->setStoryData($event_data)
- ->setStoryTime(time())
- ->setStoryAuthorPHID($actor_phid)
- ->setRelatedPHIDs(
- array(
- $revision->getPHID(),
- $actor_phid,
- $revision->getAuthorPHID(),
- ))
- ->setPrimaryObjectPHID($revision->getPHID())
- ->setSubscribedPHIDs(
- array_merge(
- array($revision->getAuthorPHID()),
- $revision->getReviewers(),
- $revision->getCCPHIDs()))
- ->setMailRecipientPHIDs($mailed_phids)
- ->publish();
-
- id(new PhabricatorSearchIndexer())
- ->queueDocumentForIndexing($revision->getPHID());
- }
-
- private function filterAddedCCs(array $ccs) {
- $revision = $this->revision;
-
- $current_ccs = $revision->getCCPHIDs();
- $current_ccs = array_fill_keys($current_ccs, true);
-
- $reviewer_phids = $revision->getReviewers();
- $reviewer_phids = array_fill_keys($reviewer_phids, true);
-
- foreach ($ccs as $key => $cc) {
- if (isset($current_ccs[$cc])) {
- unset($ccs[$key]);
- }
- if (isset($reviewer_phids[$cc])) {
- unset($ccs[$key]);
- }
- if ($cc == $revision->getAuthorPHID()) {
- unset($ccs[$key]);
- }
- }
-
- return $ccs;
- }
-
- private function alterReviewers() {
- $actor_phid = $this->getActor()->getPHID();
- $revision = $this->revision;
- $added_reviewers = $this->getAddedReviewers();
- $removed_reviewers = $this->getRemovedReviewers();
- $reviewer_phids = $revision->getReviewers();
- $allow_self_accept = PhabricatorEnv::getEnvConfig(
- 'differential.allow-self-accept');
-
- $reviewer_phids_map = array_fill_keys($reviewer_phids, true);
- foreach ($added_reviewers as $k => $user_phid) {
- if (!$allow_self_accept && $user_phid == $revision->getAuthorPHID()) {
- unset($added_reviewers[$k]);
- }
- if (isset($reviewer_phids_map[$user_phid])) {
- unset($added_reviewers[$k]);
- }
- }
-
- foreach ($removed_reviewers as $k => $user_phid) {
- if (!isset($reviewer_phids_map[$user_phid])) {
- unset($removed_reviewers[$k]);
- }
- }
-
- $added_reviewers = array_unique($added_reviewers);
- $removed_reviewers = array_unique($removed_reviewers);
-
- if ($added_reviewers) {
- DifferentialRevisionEditor::updateReviewers(
- $revision,
- $this->getActor(),
- $added_reviewers,
- $removed_reviewers);
- }
-
- return array($added_reviewers, $removed_reviewers);
- }
-
-}
diff --git a/src/applications/differential/editor/DifferentialRevisionEditor.php b/src/applications/differential/editor/DifferentialRevisionEditor.php
--- a/src/applications/differential/editor/DifferentialRevisionEditor.php
+++ b/src/applications/differential/editor/DifferentialRevisionEditor.php
@@ -153,14 +153,6 @@
return !$this->getRevision()->getID();
}
- /**
- * A silent update does not trigger Herald rules or send emails. This is used
- * for auto-amends at commit time.
- */
- public function setSilentUpdate($silent) {
- $this->silentUpdate = $silent;
- return $this;
- }
public function save() {
$revision = $this->getRevision();
@@ -540,18 +532,6 @@
->queueDocumentForIndexing($revision->getPHID());
}
- public static function addCC(
- DifferentialRevision $revision,
- $phid,
- $reason) {
- return self::alterCCs(
- $revision,
- $revision->getCCPHIDs(),
- $rem = array(),
- $add = array($phid),
- $reason);
- }
-
protected static function alterCCs(
DifferentialRevision $revision,
array $stable_phids,
@@ -631,33 +611,6 @@
$editor->save();
}
- public static function updateReviewerStatus(
- DifferentialRevision $revision,
- PhabricatorUser $actor,
- $reviewer_phid,
- $status) {
-
- $options = array(
- 'data' => array(
- 'status' => $status
- )
- );
-
- $active_diff = $revision->loadActiveDiff();
- if ($active_diff) {
- $options['data']['diff'] = $active_diff->getID();
- }
-
- id(new PhabricatorEdgeEditor())
- ->setActor($actor)
- ->addEdge(
- $revision->getPHID(),
- PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER,
- $reviewer_phid,
- $options)
- ->save();
- }
-
private function createComment() {
$template = id(new DifferentialComment())
->setAuthorPHID($this->getActorPHID())
diff --git a/src/applications/differential/exception/DifferentialActionHasNoEffectException.php b/src/applications/differential/exception/DifferentialActionHasNoEffectException.php
deleted file mode 100644
--- a/src/applications/differential/exception/DifferentialActionHasNoEffectException.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-final class DifferentialActionHasNoEffectException
- extends DifferentialException {
-
-
-
-}
diff --git a/src/applications/differential/mail/DifferentialCommentMail.php b/src/applications/differential/mail/DifferentialCommentMail.php
deleted file mode 100644
--- a/src/applications/differential/mail/DifferentialCommentMail.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-
-final class DifferentialCommentMail extends DifferentialMail {
-
- protected $changedByCommit;
-
- private $addedReviewers;
- private $addedCCs;
-
- public function setChangedByCommit($changed_by_commit) {
- $this->changedByCommit = $changed_by_commit;
- return $this;
- }
-
- public function getChangedByCommit() {
- return $this->changedByCommit;
- }
-
- public function __construct(
- DifferentialRevision $revision,
- PhabricatorObjectHandle $actor,
- array $comments,
- array $changesets,
- array $inline_comments) {
-
- assert_instances_of($comments, 'DifferentialComment');
- assert_instances_of($changesets, 'DifferentialChangeset');
- assert_instances_of($inline_comments, 'DifferentialTransaction');
-
- $this->setRevision($revision);
- $this->setActorHandle($actor);
- $this->setComments($comments);
- $this->setChangesets($changesets);
- $this->setInlineComments($inline_comments);
-
- }
-
- protected function getMailTags() {
- $tags = array();
-
- foreach ($this->getComments() as $comment) {
- $action = $comment->getAction();
-
- switch ($action) {
- case DifferentialAction::ACTION_ADDCCS:
- $tags[] = MetaMTANotificationType::TYPE_DIFFERENTIAL_CC;
- break;
- case DifferentialAction::ACTION_CLOSE:
- $tags[] = MetaMTANotificationType::TYPE_DIFFERENTIAL_CLOSED;
- break;
- case DifferentialAction::ACTION_ADDREVIEWERS:
- $tags[] = MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEWERS;
- break;
- case DifferentialAction::ACTION_COMMENT:
- // this is a comment which we will check separately below for content
- break;
- default:
- $tags[] = MetaMTANotificationType::TYPE_DIFFERENTIAL_OTHER;
- break;
- }
-
- $has_comment = strlen(trim($comment->getContent()));
- $has_inlines = (bool)$this->getInlineComments();
-
- if ($has_comment || $has_inlines) {
- switch ($action) {
- case DifferentialAction::ACTION_CLOSE:
- // Commit comments are auto-generated and not especially
- // interesting, so don't tag them as having a comment.
- break;
- default:
- $tags[] = MetaMTANotificationType::TYPE_DIFFERENTIAL_COMMENT;
- break;
- }
- }
- }
-
- if (!$tags) {
- $tags[] = MetaMTANotificationType::TYPE_DIFFERENTIAL_OTHER;
- }
-
- return $tags;
- }
-
- protected function renderVaryPrefix() {
- $verb = ucwords($this->getVerb());
- return "[{$verb}]";
- }
-
- protected function getVerb() {
- // NOTE: Eventually, this will use getStrongestAction() transaction logic.
- // For now, pick the first comment.
- $comment = head($this->getComments());
- $action = $comment->getAction();
- $verb = DifferentialAction::getActionPastTenseVerb($action);
- return $verb;
- }
-
- protected function prepareBody() {
- parent::prepareBody();
-
- // If the commented added reviewers or CCs, list them explicitly.
- $load = array();
- foreach ($this->comments as $comment) {
- $meta = $comment->getMetadata();
- $m_reviewers = idx(
- $meta,
- DifferentialComment::METADATA_ADDED_REVIEWERS,
- array());
- $m_cc = idx(
- $meta,
- DifferentialComment::METADATA_ADDED_CCS,
- array());
- $load[] = $m_reviewers;
- $load[] = $m_cc;
- }
-
- $load = array_mergev($load);
- if ($load) {
- $handles = id(new PhabricatorHandleQuery())
- ->setViewer($this->getActor())
- ->withPHIDs($load)
- ->execute();
- if ($m_reviewers) {
- $this->addedReviewers = $this->renderHandleList($handles, $m_reviewers);
- }
- if ($m_cc) {
- $this->addedCCs = $this->renderHandleList($handles, $m_cc);
- }
- }
- }
-
- protected function renderBody() {
- // TODO: This will be ApplicationTransactions eventually, but split the
- // difference for now.
-
- $comment = head($this->getComments());
-
- $actor = $this->getActorName();
- $name = $this->getRevision()->getTitle();
- $verb = $this->getVerb();
-
- $body = array();
-
- $body[] = "{$actor} has {$verb} the revision \"{$name}\".";
-
- if ($this->addedReviewers) {
- $body[] = 'Added Reviewers: '.$this->addedReviewers;
- }
- if ($this->addedCCs) {
- $body[] = 'Added CCs: '.$this->addedCCs;
- }
-
- $body[] = null;
-
- foreach ($this->getComments() as $dcomment) {
- if ($dcomment->getAction() == DifferentialTransaction::TYPE_INLINE) {
- // These have comment content now, but are rendered below.
- continue;
- }
- $content = $dcomment->getContent();
- if (strlen($content)) {
- $body[] = $this->formatText($content);
- $body[] = null;
- }
- }
-
- if ($this->getChangedByCommit()) {
- $body[] = 'CHANGED PRIOR TO COMMIT';
- $body[] = ' '.$this->getChangedByCommit();
- $body[] = null;
- }
-
- $context_key = 'metamta.differential.unified-comment-context';
- $show_context = PhabricatorEnv::getEnvConfig($context_key);
-
- $inlines = $this->getInlineComments();
- if ($inlines) {
- $body[] = 'INLINE COMMENTS';
- $changesets = $this->getChangesets();
- $hunk_parser = new DifferentialHunkParser();
-
- if ($show_context) {
- foreach ($changesets as $changeset) {
- $changeset->attachHunks($changeset->loadHunks());
- }
- }
-
- $inline_groups = DifferentialTransactionComment::sortAndGroupInlines(
- $inlines,
- $changesets);
- foreach ($inline_groups as $changeset_id => $group) {
- $changeset = $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) {
- $body[] = $this->formatText("{$file}:{$range} {$inline_content}");
- } else {
- $body[] = "================";
- $body[] = "Comment at: " . $file . ":" . $range;
- $body[] = $hunk_parser->makeContextDiff(
- $changeset->getHunks(),
- $comment->getIsNewFile(),
- $comment->getLineNumber(),
- $comment->getLineLength(),
- 1);
- $body[] = "----------------";
-
- $body[] = $inline_content;
- $body[] = null;
- }
- }
- }
- $body[] = null;
- }
-
- $body[] = $this->renderAuxFields(DifferentialMailPhase::COMMENT);
-
- return implode("\n", $body);
- }
-}

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 31, 3:50 AM (2 w, 6 d ago)
Storage Engine
amazon-s3
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
phabricator/secure/k6/a4/3lr5cxxt4ga3w7x2
Default Alt Text
D8443.id20038.diff (40 KB)

Event Timeline

Phabricator · Built by Phacility