Page MenuHomePhabricator
Files F15397043

D18839.id45196.diff
No OneTemporary
Actions

D18839.id45196.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
@@ -696,6 +696,7 @@
'DiffusionCommitRevertsCommitEdgeType' => 'applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php',
'DiffusionCommitReviewerHeraldField' => 'applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php',
'DiffusionCommitRevisionAcceptedHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php',
+ 'DiffusionCommitRevisionAcceptingReviewersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php',
'DiffusionCommitRevisionHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionHeraldField.php',
'DiffusionCommitRevisionReviewersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php',
'DiffusionCommitRevisionSubscribersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionSubscribersHeraldField.php',
@@ -809,6 +810,7 @@
'DiffusionPreCommitContentRepositoryHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRepositoryHeraldField.php',
'DiffusionPreCommitContentRepositoryProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRepositoryProjectsHeraldField.php',
'DiffusionPreCommitContentRevisionAcceptedHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php',
+ 'DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php',
'DiffusionPreCommitContentRevisionHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionHeraldField.php',
'DiffusionPreCommitContentRevisionReviewersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php',
'DiffusionPreCommitContentRevisionSubscribersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionSubscribersHeraldField.php',
@@ -5754,6 +5756,7 @@
'DiffusionCommitRevertsCommitEdgeType' => 'PhabricatorEdgeType',
'DiffusionCommitReviewerHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitRevisionAcceptedHeraldField' => 'DiffusionCommitHeraldField',
+ 'DiffusionCommitRevisionAcceptingReviewersHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitRevisionHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitRevisionReviewersHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitRevisionSubscribersHeraldField' => 'DiffusionCommitHeraldField',
@@ -5870,6 +5873,7 @@
'DiffusionPreCommitContentRepositoryHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentRepositoryProjectsHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentRevisionAcceptedHeraldField' => 'DiffusionPreCommitContentHeraldField',
+ 'DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentRevisionHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentRevisionReviewersHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentRevisionSubscribersHeraldField' => 'DiffusionPreCommitContentHeraldField',
diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php
copy from src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
copy to src/applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php
@@ -1,12 +1,12 @@
<?php
-final class DiffusionCommitRevisionReviewersHeraldField
+final class DiffusionCommitRevisionAcceptingReviewersHeraldField
extends DiffusionCommitHeraldField {
- const FIELDCONST = 'diffusion.commit.revision.reviewers';
+ const FIELDCONST = 'diffusion.commit.revision.accepting';
public function getHeraldFieldName() {
- return pht('Differential reviewers');
+ return pht('Accepting reviewers');
}
public function getFieldGroupKey() {
@@ -20,7 +20,16 @@
return array();
}
- return $revision->getReviewerPHIDs();
+ $diff_phid = $revision->getActiveDiffPHID();
+
+ $reviewer_phids = array();
+ foreach ($revision->getReviewers() as $reviewer) {
+ if ($reviewer->isAccepted($diff_phid)) {
+ $reviewer_phids[] = $reviewer->getReviewerPHID();
+ }
+ }
+
+ return $reviewer_phids;
}
protected function getHeraldFieldStandardType() {
@@ -28,7 +37,7 @@
}
protected function getDatasource() {
- return new PhabricatorProjectOrUserDatasource();
+ return new DifferentialReviewerDatasource();
}
}
diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
@@ -28,7 +28,7 @@
}
protected function getDatasource() {
- return new PhabricatorProjectOrUserDatasource();
+ return new DifferentialReviewerDatasource();
}
}
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php
new file mode 100644
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php
@@ -0,0 +1,43 @@
+<?php
+
+final class DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField
+ extends DiffusionPreCommitContentHeraldField {
+
+ const FIELDCONST = 'diffusion.pre.content.revision.accepting';
+
+ public function getHeraldFieldName() {
+ return pht('Accepting reviewers');
+ }
+
+ public function getFieldGroupKey() {
+ return HeraldRelatedFieldGroup::FIELDGROUPKEY;
+ }
+
+ public function getHeraldFieldValue($object) {
+ $revision = $this->getAdapter()->getRevision();
+
+ if (!$revision) {
+ return array();
+ }
+
+ $diff_phid = $revision->getActiveDiffPHID();
+
+ $reviewer_phids = array();
+ foreach ($revision->getReviewers() as $reviewer) {
+ if ($reviewer->isAccepted($diff_phid)) {
+ $reviewer_phids[] = $reviewer->getReviewerPHID();
+ }
+ }
+
+ return $reviewer_phids;
+ }
+
+ protected function getHeraldFieldStandardType() {
+ return self::STANDARD_PHID_LIST;
+ }
+
+ protected function getDatasource() {
+ return new DifferentialReviewerDatasource();
+ }
+
+}
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
@@ -28,7 +28,7 @@
}
protected function getDatasource() {
- return new PhabricatorProjectOrUserDatasource();
+ return new DifferentialReviewerDatasource();
}
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 17, 5:49 PM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7708666
Default Alt Text
D18839.id45196.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility