Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14722527
D21591.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
9 KB
Referenced Files
None
Subscribers
None
D21591.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
@@ -616,6 +616,7 @@
'DifferentialRevisionAuthorHeraldField' => 'applications/differential/herald/DifferentialRevisionAuthorHeraldField.php',
'DifferentialRevisionAuthorPackagesHeraldField' => 'applications/differential/herald/DifferentialRevisionAuthorPackagesHeraldField.php',
'DifferentialRevisionAuthorProjectsHeraldField' => 'applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php',
+ 'DifferentialRevisionAuthorTransaction' => 'applications/differential/xaction/DifferentialRevisionAuthorTransaction.php',
'DifferentialRevisionBuildableTransaction' => 'applications/differential/xaction/DifferentialRevisionBuildableTransaction.php',
'DifferentialRevisionCloseDetailsController' => 'applications/differential/controller/DifferentialRevisionCloseDetailsController.php',
'DifferentialRevisionCloseTransaction' => 'applications/differential/xaction/DifferentialRevisionCloseTransaction.php',
@@ -6727,6 +6728,7 @@
'DifferentialRevisionAuthorHeraldField' => 'DifferentialRevisionHeraldField',
'DifferentialRevisionAuthorPackagesHeraldField' => 'DifferentialRevisionHeraldField',
'DifferentialRevisionAuthorProjectsHeraldField' => 'DifferentialRevisionHeraldField',
+ 'DifferentialRevisionAuthorTransaction' => 'DifferentialRevisionTransactionType',
'DifferentialRevisionBuildableTransaction' => 'DifferentialRevisionTransactionType',
'DifferentialRevisionCloseDetailsController' => 'DifferentialController',
'DifferentialRevisionCloseTransaction' => 'DifferentialRevisionActionTransaction',
diff --git a/src/applications/differential/editor/DifferentialRevisionEditEngine.php b/src/applications/differential/editor/DifferentialRevisionEditEngine.php
--- a/src/applications/differential/editor/DifferentialRevisionEditEngine.php
+++ b/src/applications/differential/editor/DifferentialRevisionEditEngine.php
@@ -176,6 +176,23 @@
->setConduitTypeDescription(pht('New revision title.'))
->setValue($object->getTitle());
+ $author_field = id(new PhabricatorDatasourceEditField())
+ ->setKey(DifferentialRevisionAuthorTransaction::EDITKEY)
+ ->setLabel(pht('Author'))
+ ->setDatasource(new PhabricatorPeopleDatasource())
+ ->setTransactionType(
+ DifferentialRevisionAuthorTransaction::TRANSACTIONTYPE)
+ ->setDescription(pht('Foist this revision upon someone else.'))
+ ->setConduitDescription(pht('Foist this revision upon another user.'))
+ ->setConduitTypeDescription(pht('New author.'))
+ ->setSingleValue($object->getAuthorPHID());
+
+ if ($viewer->getPHID() === $object->getAuthorPHID()) {
+ $author_field->setCommentActionLabel(pht('Foist Upon'));
+ }
+
+ $fields[] = $author_field;
+
$fields[] = id(new PhabricatorRemarkupEditField())
->setKey(DifferentialRevisionSummaryTransaction::EDITKEY)
->setLabel(pht('Summary'))
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -198,7 +198,7 @@
->setNewValue($want_downgrade);
}
- $is_commandeer = false;
+ $new_author_phid = null;
switch ($xaction->getTransactionType()) {
case DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
if ($this->getIsCloseByCommit()) {
@@ -239,12 +239,22 @@
break;
case DifferentialRevisionCommandeerTransaction::TRANSACTIONTYPE:
- $is_commandeer = true;
+ $new_author_phid = $actor_phid;
break;
+
+ case DifferentialRevisionAuthorTransaction::TRANSACTIONTYPE:
+ $new_author_phid = $xaction->getNewValue();
+ break;
+
}
- if ($is_commandeer) {
- $results[] = $this->newCommandeerReviewerTransaction($object);
+ if ($new_author_phid) {
+ $swap_xaction = $this->newSwapReviewersTransaction(
+ $object,
+ $new_author_phid);
+ if ($swap_xaction) {
+ $results[] = $swap_xaction;
+ }
}
if (!$this->didExpandInlineState) {
@@ -1472,21 +1482,25 @@
return $this;
}
- private function newCommandeerReviewerTransaction(
- DifferentialRevision $revision) {
+ private function newSwapReviewersTransaction(
+ DifferentialRevision $revision,
+ $new_author_phid) {
- $actor_phid = $this->getActingAsPHID();
- $owner_phid = $revision->getAuthorPHID();
+ $old_author_phid = $revision->getAuthorPHID();
+
+ if ($old_author_phid === $new_author_phid) {
+ return;
+ }
- // If the user is commandeering, add the previous owner as a
- // reviewer and remove the actor.
+ // If the revision is changing authorship, add the previous author as a
+ // reviewer and remove the new author.
$edits = array(
'-' => array(
- $actor_phid,
+ $new_author_phid,
),
'+' => array(
- $owner_phid,
+ $old_author_phid,
),
);
@@ -1503,6 +1517,7 @@
->setNewValue($edits);
}
+
public function getActiveDiff($object) {
if ($this->getIsNewObject()) {
return null;
diff --git a/src/applications/differential/xaction/DifferentialRevisionAuthorTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAuthorTransaction.php
new file mode 100644
--- /dev/null
+++ b/src/applications/differential/xaction/DifferentialRevisionAuthorTransaction.php
@@ -0,0 +1,155 @@
+<?php
+
+final class DifferentialRevisionAuthorTransaction
+ extends DifferentialRevisionTransactionType {
+
+ const TRANSACTIONTYPE = 'differential.revision.author';
+ const EDITKEY = 'author';
+
+ public function generateOldValue($object) {
+ return $object->getAuthorPHID();
+ }
+
+ public function generateNewValue($object, $value) {
+ return $value;
+ }
+
+ public function applyInternalEffects($object, $value) {
+ $object->setAuthorPHID($value);
+ }
+
+ public function validateTransactions($object, array $xactions) {
+ $actor = $this->getActor();
+ $errors = array();
+
+ if (!$xactions) {
+ return $errors;
+ }
+
+ foreach ($xactions as $xaction) {
+ $old = $xaction->generateOldValue($object);
+ $new = $xaction->getNewValue();
+
+ if ($old === $new) {
+ continue;
+ }
+
+ if (!$new) {
+ $errors[] = $this->newInvalidError(
+ pht('Revisions must have an assigned author.'),
+ $xaction);
+ continue;
+ }
+
+ $author_objects = id(new PhabricatorPeopleQuery())
+ ->setViewer($actor)
+ ->withPHIDs(array($new))
+ ->execute();
+ if (!$author_objects) {
+ $errors[] = $this->newInvalidError(
+ pht('Author "%s" is not a valid user.', $new),
+ $xaction);
+ continue;
+ }
+ }
+
+ return $errors;
+ }
+
+ public function getIcon() {
+ $author_phid = $this->getAuthorPHID();
+ $old_phid = $this->getOldValue();
+ $new_phid = $this->getNewValue();
+
+ $is_commandeer = ($author_phid === $new_phid);
+ $is_foist = ($author_phid === $old_phid);
+
+ if ($is_commandeer) {
+ return 'fa-flag';
+ }
+
+ if ($is_foist) {
+ return 'fa-gift';
+ }
+
+ return 'fa-user';
+ }
+
+ public function getColor() {
+ return 'sky';
+ }
+
+ public function getTitle() {
+ $author_phid = $this->getAuthorPHID();
+ $old_phid = $this->getOldValue();
+ $new_phid = $this->getNewValue();
+
+ $is_commandeer = ($author_phid === $new_phid);
+ $is_foist = ($author_phid === $old_phid);
+
+ if ($is_commandeer) {
+ return pht(
+ '%s commandeered this revision from %s.',
+ $this->renderAuthor(),
+ $this->renderOldHandle());
+ }
+
+ if ($is_foist) {
+ return pht(
+ '%s foisted this revision upon %s.',
+ $this->renderAuthor(),
+ $this->renderNewHandle());
+ }
+
+ return pht(
+ '%s changed the author of this revision from %s to %s.',
+ $this->renderAuthor(),
+ $this->renderOldHandle(),
+ $this->renderNewHandle());
+ }
+
+ public function getTitleForFeed() {
+ $author_phid = $this->getAuthorPHID();
+ $old_phid = $this->getOldValue();
+ $new_phid = $this->getNewValue();
+
+ $is_commandeer = ($author_phid === $new_phid);
+ $is_foist = ($author_phid === $old_phid);
+
+ if ($is_commandeer) {
+ return pht(
+ '%s commandeered %s from %s.',
+ $this->renderAuthor(),
+ $this->renderObject(),
+ $this->renderOldHandle());
+ }
+
+ if ($is_foist) {
+ return pht(
+ '%s foisted %s upon %s.',
+ $this->renderAuthor(),
+ $this->renderObject(),
+ $this->renderNewHandle());
+ }
+
+ return pht(
+ '%s changed the author of %s from %s to %s.',
+ $this->renderAuthor(),
+ $this->renderObject(),
+ $this->renderOldHandle(),
+ $this->renderNewHandle());
+
+ }
+
+ public function getTransactionTypeForConduit($xaction) {
+ return 'author';
+ }
+
+ public function getFieldValuesForConduit($object, $data) {
+ return array(
+ 'old' => $object->getOldValue(),
+ 'new' => $object->getNewValue(),
+ );
+ }
+
+}
diff --git a/src/applications/maniphest/xaction/ManiphestTaskOwnerTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskOwnerTransaction.php
--- a/src/applications/maniphest/xaction/ManiphestTaskOwnerTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskOwnerTransaction.php
@@ -127,8 +127,7 @@
if (!$assignee_list) {
$errors[] = $this->newInvalidError(
- pht('User "%s" is not a valid user.',
- $new));
+ pht('User "%s" is not a valid user.', $new));
}
}
return $errors;
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Jan 18, 11:39 PM (2 h, 42 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7013296
Default Alt Text
D21591.diff (9 KB)
Attached To
Mode
D21591: Provide a more general "Author" transaction for Differential
Attached
Detach File
Event Timeline
Log In to Comment