@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Migrate Differential revision edges to use modern `EdgeType` subclasses

Summary: Modernize Differential edges to subclass `PhabricatorEdgeType`. Largely based on D11045.

Test Plan: From previous experience, these changes are fairly trivial and safe. I poked around a little to make sure things looked reasonably okay.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin, Krenair, epriestley

Differential Revision: https://secure.phabricator.com/D11074

+516 -128
+3 -3
resources/sql/autopatches/20140212.dx.1.armageddon.php
··· 100 100 } 101 101 $old[$phid] = array( 102 102 'src' => $revision_phid, 103 - 'type' => PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, 103 + 'type' => DifferentialRevisionHasReviewerEdgeType::EDGECONST, 104 104 'dst' => $phid, 105 105 ); 106 106 } ··· 112 112 } 113 113 $new[$phid] = array( 114 114 'src' => $revision_phid, 115 - 'type' => PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, 115 + 'type' => DifferentialRevisionHasReviewerEdgeType::EDGECONST, 116 116 'dst' => $phid, 117 117 ); 118 118 } ··· 122 122 'old' => $old, 123 123 'new' => $new, 124 124 'meta' => array( 125 - 'edge:type' => PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, 125 + 'edge:type' => DifferentialRevisionHasReviewerEdgeType::EDGECONST, 126 126 ), 127 127 ); 128 128 }
+1 -1
resources/sql/autopatches/20140420.rel.2.objectmig.php
··· 26 26 27 27 $revision_phids = PhabricatorEdgeQuery::loadDestinationPHIDs( 28 28 $commit_phid, 29 - PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV); 29 + DiffusionCommitHasRevisionEdgeType::EDGECONST); 30 30 31 31 if ($revision_phids) { 32 32 $object_phid = head($revision_phids);
+1 -1
resources/sql/patches/20130409.commitdrev.php
··· 18 18 continue; 19 19 } 20 20 21 - $commit_drev = PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV; 21 + $commit_drev = DiffusionCommitHasRevisionEdgeType::EDGECONST; 22 22 $editor->addEdge($commit->getPHID(), $commit_drev, $revision_phid); 23 23 $edges++; 24 24 if ($edges % 256 == 0) {
+1 -1
resources/sql/patches/20131004.dxreviewers.php
··· 36 36 37 37 $editor->addEdge( 38 38 $revision_phid, 39 - PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, 39 + DifferentialRevisionHasReviewerEdgeType::EDGECONST, 40 40 $dst, 41 41 array( 42 42 'data' => array(
+1 -1
resources/sql/patches/migrate-differential-dependencies.php
··· 18 18 foreach ($deps as $dep) { 19 19 $editor->addEdge( 20 20 $rev->getPHID(), 21 - PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV, 21 + DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST, 22 22 $dep); 23 23 } 24 24 $editor->save();
+12
src/__phutil_library_map__.php
··· 400 400 'DifferentialRevertPlanField' => 'applications/differential/customfield/DifferentialRevertPlanField.php', 401 401 'DifferentialReviewedByField' => 'applications/differential/customfield/DifferentialReviewedByField.php', 402 402 'DifferentialReviewer' => 'applications/differential/storage/DifferentialReviewer.php', 403 + 'DifferentialReviewerForRevisionEdgeType' => 'applications/differential/edge/DifferentialReviewerForRevisionEdgeType.php', 403 404 'DifferentialReviewerStatus' => 'applications/differential/constants/DifferentialReviewerStatus.php', 404 405 'DifferentialReviewersField' => 'applications/differential/customfield/DifferentialReviewersField.php', 405 406 'DifferentialReviewersView' => 'applications/differential/view/DifferentialReviewersView.php', 406 407 'DifferentialRevision' => 'applications/differential/storage/DifferentialRevision.php', 407 408 'DifferentialRevisionCloseDetailsController' => 'applications/differential/controller/DifferentialRevisionCloseDetailsController.php', 408 409 'DifferentialRevisionControlSystem' => 'applications/differential/constants/DifferentialRevisionControlSystem.php', 410 + 'DifferentialRevisionDependedOnByRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php', 411 + 'DifferentialRevisionDependsOnRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php', 409 412 'DifferentialRevisionDetailView' => 'applications/differential/view/DifferentialRevisionDetailView.php', 410 413 'DifferentialRevisionEditController' => 'applications/differential/controller/DifferentialRevisionEditController.php', 414 + 'DifferentialRevisionHasCommitEdgeType' => 'applications/differential/edge/DifferentialRevisionHasCommitEdgeType.php', 415 + 'DifferentialRevisionHasReviewerEdgeType' => 'applications/differential/edge/DifferentialRevisionHasReviewerEdgeType.php', 411 416 'DifferentialRevisionHasTaskEdgeType' => 'applications/differential/edge/DifferentialRevisionHasTaskEdgeType.php', 412 417 'DifferentialRevisionIDField' => 'applications/differential/customfield/DifferentialRevisionIDField.php', 413 418 'DifferentialRevisionLandController' => 'applications/differential/controller/DifferentialRevisionLandController.php', ··· 457 462 'DiffusionCommitChangeTableView' => 'applications/diffusion/view/DiffusionCommitChangeTableView.php', 458 463 'DiffusionCommitController' => 'applications/diffusion/controller/DiffusionCommitController.php', 459 464 'DiffusionCommitEditController' => 'applications/diffusion/controller/DiffusionCommitEditController.php', 465 + 'DiffusionCommitHasRevisionEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasRevisionEdgeType.php', 460 466 'DiffusionCommitHasTaskEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasTaskEdgeType.php', 461 467 'DiffusionCommitHash' => 'applications/diffusion/data/DiffusionCommitHash.php', 462 468 'DiffusionCommitHookEngine' => 'applications/diffusion/engine/DiffusionCommitHookEngine.php', ··· 3438 3444 'DifferentialResultsTableView' => 'AphrontView', 3439 3445 'DifferentialRevertPlanField' => 'DifferentialStoredCustomField', 3440 3446 'DifferentialReviewedByField' => 'DifferentialCoreCustomField', 3447 + 'DifferentialReviewerForRevisionEdgeType' => 'PhabricatorEdgeType', 3441 3448 'DifferentialReviewersField' => 'DifferentialCoreCustomField', 3442 3449 'DifferentialReviewersView' => 'AphrontView', 3443 3450 'DifferentialRevision' => array( ··· 3455 3462 'PhabricatorProjectInterface', 3456 3463 ), 3457 3464 'DifferentialRevisionCloseDetailsController' => 'DifferentialController', 3465 + 'DifferentialRevisionDependedOnByRevisionEdgeType' => 'PhabricatorEdgeType', 3466 + 'DifferentialRevisionDependsOnRevisionEdgeType' => 'PhabricatorEdgeType', 3458 3467 'DifferentialRevisionDetailView' => 'AphrontView', 3459 3468 'DifferentialRevisionEditController' => 'DifferentialController', 3469 + 'DifferentialRevisionHasCommitEdgeType' => 'PhabricatorEdgeType', 3470 + 'DifferentialRevisionHasReviewerEdgeType' => 'PhabricatorEdgeType', 3460 3471 'DifferentialRevisionHasTaskEdgeType' => 'PhabricatorEdgeType', 3461 3472 'DifferentialRevisionIDField' => 'DifferentialCustomField', 3462 3473 'DifferentialRevisionLandController' => 'DifferentialController', ··· 3502 3513 'DiffusionCommitChangeTableView' => 'DiffusionView', 3503 3514 'DiffusionCommitController' => 'DiffusionController', 3504 3515 'DiffusionCommitEditController' => 'DiffusionController', 3516 + 'DiffusionCommitHasRevisionEdgeType' => 'PhabricatorEdgeType', 3505 3517 'DiffusionCommitHasTaskEdgeType' => 'PhabricatorEdgeType', 3506 3518 'DiffusionCommitHash' => 'Phobject', 3507 3519 'DiffusionCommitHookEngine' => 'Phobject',
+1 -1
src/applications/differential/controller/DifferentialCommentPreviewController.php
··· 41 41 break; 42 42 } 43 43 44 - $edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; 44 + $edge_reviewer = DifferentialRevisionHasReviewerEdgeType::EDGECONST; 45 45 46 46 $reviewers = $request->getStrList('reviewers'); 47 47 if (DifferentialAction::allowReviewers($action) && $reviewers) {
+1 -1
src/applications/differential/controller/DifferentialCommentSaveController.php
··· 33 33 $type_comment = PhabricatorTransactions::TYPE_COMMENT; 34 34 $type_inline = DifferentialTransaction::TYPE_INLINE; 35 35 36 - $edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; 36 + $edge_reviewer = DifferentialRevisionHasReviewerEdgeType::EDGECONST; 37 37 38 38 $xactions = array(); 39 39
+1 -1
src/applications/differential/customfield/DifferentialDependenciesField.php
··· 30 30 public function getRequiredHandlePHIDsForPropertyView() { 31 31 return PhabricatorEdgeQuery::loadDestinationPHIDs( 32 32 $this->getObject()->getPHID(), 33 - PhabricatorEdgeConfig::TYPE_DREV_DEPENDED_ON_BY_DREV); 33 + DifferentialRevisionDependedOnByRevisionEdgeType::EDGECONST); 34 34 } 35 35 36 36 public function renderPropertyViewValue(array $handles) {
+2 -2
src/applications/differential/customfield/DifferentialDependsOnField.php
··· 34 34 public function getRequiredHandlePHIDsForPropertyView() { 35 35 return PhabricatorEdgeQuery::loadDestinationPHIDs( 36 36 $this->getObject()->getPHID(), 37 - PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV); 37 + DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST); 38 38 } 39 39 40 40 public function renderPropertyViewValue(array $handles) { ··· 56 56 public function getConduitDictionaryValue() { 57 57 return PhabricatorEdgeQuery::loadDestinationPHIDs( 58 58 $this->getObject()->getPHID(), 59 - PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV); 59 + DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST); 60 60 } 61 61 62 62 }
+1 -1
src/applications/differential/customfield/DifferentialReviewersField.php
··· 85 85 86 86 public function getApplicationTransactionMetadata() { 87 87 return array( 88 - 'edge:type' => PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, 88 + 'edge:type' => DifferentialRevisionHasReviewerEdgeType::EDGECONST, 89 89 ); 90 90 } 91 91
+16
src/applications/differential/edge/DifferentialReviewerForRevisionEdgeType.php
··· 1 + <?php 2 + 3 + final class DifferentialReviewerForRevisionEdgeType 4 + extends PhabricatorEdgeType { 5 + 6 + const EDGECONST = 36; 7 + 8 + public function getInverseEdgeConstant() { 9 + return DifferentialRevisionHasReviewerEdgeType::EDGECONST; 10 + } 11 + 12 + public function shouldWriteInverseTransactions() { 13 + return true; 14 + } 15 + 16 + }
+103
src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php
··· 1 + <?php 2 + 3 + final class DifferentialRevisionDependedOnByRevisionEdgeType 4 + extends PhabricatorEdgeType { 5 + 6 + const EDGECONST = 6; 7 + 8 + public function getInverseEdgeConstant() { 9 + return DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST; 10 + } 11 + 12 + public function shouldWriteInverseTransactions() { 13 + return true; 14 + } 15 + 16 + public function getTransactionAddString( 17 + $actor, 18 + $add_count, 19 + $add_edges) { 20 + 21 + return pht( 22 + '%s added %s dependent revision(s): %s.', 23 + $actor, 24 + $add_count, 25 + $add_edges); 26 + } 27 + 28 + public function getTransactionRemoveString( 29 + $actor, 30 + $rem_count, 31 + $rem_edges) { 32 + 33 + return pht( 34 + '%s removed %s dependent revision(s): %s.', 35 + $actor, 36 + $rem_count, 37 + $rem_edges); 38 + } 39 + 40 + public function getTransactionEditString( 41 + $actor, 42 + $total_count, 43 + $add_count, 44 + $add_edges, 45 + $rem_count, 46 + $rem_edges) { 47 + 48 + return pht( 49 + '%s edited dependent revision(s), added %s: %s; removed %s: %s.', 50 + $actor, 51 + $add_count, 52 + $add_edges, 53 + $rem_count, 54 + $rem_edges); 55 + } 56 + 57 + public function getFeedAddString( 58 + $actor, 59 + $object, 60 + $add_count, 61 + $add_edges) { 62 + 63 + return pht( 64 + '%s added %s dependent revision(s) for %s: %s.', 65 + $actor, 66 + $add_count, 67 + $object, 68 + $add_edges); 69 + } 70 + 71 + public function getFeedRemoveString( 72 + $actor, 73 + $object, 74 + $rem_count, 75 + $rem_edges) { 76 + 77 + return pht( 78 + '%s removed %s dependent revision(s) for %s: %s.', 79 + $actor, 80 + $rem_count, 81 + $object, 82 + $rem_edges); 83 + } 84 + 85 + public function getFeedEditString( 86 + $actor, 87 + $object, 88 + $total_count, 89 + $add_count, 90 + $add_edges, 91 + $rem_count, 92 + $rem_edges) { 93 + 94 + return pht( 95 + '%s edited dependent revision(s) for %s, added %s: %s; removed %s: %s.', 96 + $actor, 97 + $object, 98 + $add_count, 99 + $add_edges, 100 + $rem_count, 101 + $rem_edges); 102 + } 103 + }
+107
src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php
··· 1 + <?php 2 + 3 + final class DifferentialRevisionDependsOnRevisionEdgeType 4 + extends PhabricatorEdgeType { 5 + 6 + const EDGECONST = 5; 7 + 8 + public function getInverseEdgeConstant() { 9 + return DifferentialRevisionDependedOnByRevisionEdgeType::EDGECONST; 10 + } 11 + 12 + public function shouldWriteInverseTransactions() { 13 + return true; 14 + } 15 + 16 + public function shouldPreventCycles() { 17 + return true; 18 + } 19 + 20 + public function getTransactionAddString( 21 + $actor, 22 + $add_count, 23 + $add_edges) { 24 + 25 + return pht( 26 + '%s added %s dependencie(s): %s.', 27 + $actor, 28 + $add_count, 29 + $add_edges); 30 + } 31 + 32 + public function getTransactionRemoveString( 33 + $actor, 34 + $rem_count, 35 + $rem_edges) { 36 + 37 + return pht( 38 + '%s removed %s dependencie(s): %s.', 39 + $actor, 40 + $rem_count, 41 + $rem_edges); 42 + } 43 + 44 + public function getTransactionEditString( 45 + $actor, 46 + $total_count, 47 + $add_count, 48 + $add_edges, 49 + $rem_count, 50 + $rem_edges) { 51 + 52 + return pht( 53 + '%s edited dependencie(s), added %s: %s; removed %s: %s.', 54 + $actor, 55 + $add_count, 56 + $add_edges, 57 + $rem_count, 58 + $rem_edges); 59 + } 60 + 61 + public function getFeedAddString( 62 + $actor, 63 + $object, 64 + $add_count, 65 + $add_edges) { 66 + 67 + return pht( 68 + '%s added %s dependencie(s) for %s: %s.', 69 + $actor, 70 + $add_count, 71 + $object, 72 + $add_edges); 73 + } 74 + 75 + public function getFeedRemoveString( 76 + $actor, 77 + $object, 78 + $rem_count, 79 + $rem_edges) { 80 + 81 + return pht( 82 + '%s removed %s dependencie(s) for %s: %s.', 83 + $actor, 84 + $rem_count, 85 + $object, 86 + $rem_edges); 87 + } 88 + 89 + public function getFeedEditString( 90 + $actor, 91 + $object, 92 + $total_count, 93 + $add_count, 94 + $add_edges, 95 + $rem_count, 96 + $rem_edges) { 97 + 98 + return pht( 99 + '%s edited dependencie(s) for %s, added %s: %s; removed %s: %s.', 100 + $actor, 101 + $object, 102 + $add_count, 103 + $add_edges, 104 + $rem_count, 105 + $rem_edges); 106 + } 107 + }
+102
src/applications/differential/edge/DifferentialRevisionHasCommitEdgeType.php
··· 1 + <?php 2 + 3 + final class DifferentialRevisionHasCommitEdgeType extends PhabricatorEdgeType { 4 + 5 + const EDGECONST = 31; 6 + 7 + public function getInverseEdgeConstant() { 8 + return DiffusionCommitHasRevisionEdgeType::EDGECONST; 9 + } 10 + 11 + public function shouldWriteInverseTransactions() { 12 + return true; 13 + } 14 + 15 + public function getTransactionAddString( 16 + $actor, 17 + $add_count, 18 + $add_edges) { 19 + 20 + return pht( 21 + '%s added %s commit(s): %s.', 22 + $actor, 23 + $add_count, 24 + $add_edges); 25 + } 26 + 27 + public function getTransactionRemoveString( 28 + $actor, 29 + $rem_count, 30 + $rem_edges) { 31 + 32 + return pht( 33 + '%s removed %s commit(s): %s.', 34 + $actor, 35 + $rem_count, 36 + $rem_edges); 37 + } 38 + 39 + public function getTransactionEditString( 40 + $actor, 41 + $total_count, 42 + $add_count, 43 + $add_edges, 44 + $rem_count, 45 + $rem_edges) { 46 + 47 + return pht( 48 + '%s edited commit(s), added %s: %s; removed %s: %s.', 49 + $actor, 50 + $add_count, 51 + $add_edges, 52 + $rem_count, 53 + $rem_edges); 54 + } 55 + 56 + public function getFeedAddString( 57 + $actor, 58 + $object, 59 + $add_count, 60 + $add_edges) { 61 + 62 + return pht( 63 + '%s added %s commit(s) for %s: %s.', 64 + $actor, 65 + $add_count, 66 + $object, 67 + $add_edges); 68 + } 69 + 70 + public function getFeedRemoveString( 71 + $actor, 72 + $object, 73 + $rem_count, 74 + $rem_edges) { 75 + 76 + return pht( 77 + '%s removed %s commit(s) for %s: %s.', 78 + $actor, 79 + $rem_count, 80 + $object, 81 + $rem_edges); 82 + } 83 + 84 + public function getFeedEditString( 85 + $actor, 86 + $object, 87 + $total_count, 88 + $add_count, 89 + $add_edges, 90 + $rem_count, 91 + $rem_edges) { 92 + 93 + return pht( 94 + '%s edited commit(s) for %s, added %s: %s; removed %s: %s.', 95 + $actor, 96 + $object, 97 + $add_count, 98 + $add_edges, 99 + $rem_count, 100 + $rem_edges); 101 + } 102 + }
+103
src/applications/differential/edge/DifferentialRevisionHasReviewerEdgeType.php
··· 1 + <?php 2 + 3 + final class DifferentialRevisionHasReviewerEdgeType 4 + extends PhabricatorEdgeType { 5 + 6 + const EDGECONST = 35; 7 + 8 + public function getInverseEdgeConstant() { 9 + return DifferentialReviewerForRevisionEdgeType::EDGECONST; 10 + } 11 + 12 + public function shouldWriteInverseTransactions() { 13 + return true; 14 + } 15 + 16 + public function getTransactionAddString( 17 + $actor, 18 + $add_count, 19 + $add_edges) { 20 + 21 + return pht( 22 + '%s added %s reviewer(s): %s.', 23 + $actor, 24 + $add_count, 25 + $add_edges); 26 + } 27 + 28 + public function getTransactionRemoveString( 29 + $actor, 30 + $rem_count, 31 + $rem_edges) { 32 + 33 + return pht( 34 + '%s removed %s reviewer(s): %s.', 35 + $actor, 36 + $rem_count, 37 + $rem_edges); 38 + } 39 + 40 + public function getTransactionEditString( 41 + $actor, 42 + $total_count, 43 + $add_count, 44 + $add_edges, 45 + $rem_count, 46 + $rem_edges) { 47 + 48 + return pht( 49 + '%s edited reviewer(s), added %s: %s; removed %s: %s.', 50 + $actor, 51 + $add_count, 52 + $add_edges, 53 + $rem_count, 54 + $rem_edges); 55 + } 56 + 57 + public function getFeedAddString( 58 + $actor, 59 + $object, 60 + $add_count, 61 + $add_edges) { 62 + 63 + return pht( 64 + '%s added %s reviewer(s) for %s: %s.', 65 + $actor, 66 + $add_count, 67 + $object, 68 + $add_edges); 69 + } 70 + 71 + public function getFeedRemoveString( 72 + $actor, 73 + $object, 74 + $rem_count, 75 + $rem_edges) { 76 + 77 + return pht( 78 + '%s removed %s reviewer(s) for %s: %s.', 79 + $actor, 80 + $rem_count, 81 + $object, 82 + $rem_edges); 83 + } 84 + 85 + public function getFeedEditString( 86 + $actor, 87 + $object, 88 + $total_count, 89 + $add_count, 90 + $add_edges, 91 + $rem_count, 92 + $rem_edges) { 93 + 94 + return pht( 95 + '%s edited reviewer(s) for %s, added %s: %s; removed %s: %s.', 96 + $actor, 97 + $object, 98 + $add_count, 99 + $add_edges, 100 + $rem_count, 101 + $rem_edges); 102 + } 103 + }
+6 -6
src/applications/differential/editor/DifferentialTransactionEditor.php
··· 269 269 270 270 $status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED; 271 271 272 - $edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; 272 + $edge_reviewer = DifferentialRevisionHasReviewerEdgeType::EDGECONST; 273 273 $edge_ref_task = DifferentialRevisionHasTaskEdgeType::EDGECONST; 274 274 275 275 $is_sticky_accept = PhabricatorEnv::getEnvConfig( ··· 565 565 $result = parent::mergeEdgeData($type, $u, $v); 566 566 567 567 switch ($type) { 568 - case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER: 568 + case DifferentialRevisionHasReviewerEdgeType::EDGECONST: 569 569 // When the same reviewer has their status updated by multiple 570 570 // transactions, we want the strongest status to win. An example of 571 571 // this is when a user adds a comment and also accepts a revision which ··· 721 721 switch ($type) { 722 722 case PhabricatorTransactions::TYPE_EDGE: 723 723 switch ($xaction->getMetadataValue('edge:type')) { 724 - case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER: 724 + case DifferentialRevisionHasReviewerEdgeType::EDGECONST: 725 725 726 726 // Prevent the author from becoming a reviewer. 727 727 ··· 1299 1299 unset($rev_phids[$object->getPHID()]); 1300 1300 1301 1301 if ($revs) { 1302 - $edge_depends = PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV; 1303 - $edges[$edge_depends] = $rev_phids; 1302 + $depends = DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST; 1303 + $edges[$depends] = $rev_phids; 1304 1304 } 1305 1305 } 1306 1306 ··· 1608 1608 } 1609 1609 1610 1610 if ($value) { 1611 - $edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; 1611 + $edge_reviewer = DifferentialRevisionHasReviewerEdgeType::EDGECONST; 1612 1612 1613 1613 $xactions[] = id(new DifferentialTransaction()) 1614 1614 ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
+4 -4
src/applications/differential/query/DifferentialRevisionQuery.php
··· 639 639 'AND e_reviewers.type = %s '. 640 640 'AND e_reviewers.dst in (%Ls)', 641 641 PhabricatorEdgeConfig::TABLE_NAME_EDGE, 642 - PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, 642 + DifferentialRevisionHasReviewerEdgeType::EDGECONST, 643 643 $this->reviewers); 644 644 } 645 645 ··· 900 900 private function loadRelationships($conn_r, array $revisions) { 901 901 assert_instances_of($revisions, 'DifferentialRevision'); 902 902 903 - $type_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; 903 + $type_reviewer = DifferentialRevisionHasReviewerEdgeType::EDGECONST; 904 904 $type_subscriber = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_SUBSCRIBER; 905 905 906 906 $edges = id(new PhabricatorEdgeQuery()) ··· 1019 1019 array $revisions) { 1020 1020 1021 1021 assert_instances_of($revisions, 'DifferentialRevision'); 1022 - $edge_type = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; 1022 + $edge_type = DifferentialRevisionHasReviewerEdgeType::EDGECONST; 1023 1023 1024 1024 $edges = id(new PhabricatorEdgeQuery()) 1025 1025 ->withSourcePHIDs(mpull($revisions, 'getPHID')) ··· 1125 1125 // Find all the project reviewers which the user may have authority over. 1126 1126 $project_phids = array(); 1127 1127 $project_type = PhabricatorProjectProjectPHIDType::TYPECONST; 1128 - $edge_type = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; 1128 + $edge_type = DifferentialRevisionHasReviewerEdgeType::EDGECONST; 1129 1129 foreach ($edges as $src => $types) { 1130 1130 if (!$allow_self) { 1131 1131 if ($revision_map[$src]->getAuthorPHID() == $viewer_phid) {
+1 -1
src/applications/differential/storage/DifferentialRevision.php
··· 226 226 227 227 $reviewer_phids = PhabricatorEdgeQuery::loadDestinationPHIDs( 228 228 $this->getPHID(), 229 - PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER); 229 + DifferentialRevisionHasReviewerEdgeType::EDGECONST); 230 230 $reviewer_phids = array_reverse($reviewer_phids); 231 231 foreach ($reviewer_phids as $phid) { 232 232 $data[] = array(
+3 -3
src/applications/differential/storage/DifferentialTransaction.php
··· 201 201 break; 202 202 case PhabricatorTransactions::TYPE_EDGE: 203 203 switch ($this->getMetadataValue('edge:type')) { 204 - case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER: 204 + case DifferentialRevisionHasReviewerEdgeType::EDGECONST: 205 205 $tags[] = MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEWERS; 206 206 break; 207 207 } ··· 495 495 } 496 496 case PhabricatorTransactions::TYPE_EDGE: 497 497 switch ($this->getMetadataValue('edge:type')) { 498 - case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER: 498 + case DifferentialRevisionHasReviewerEdgeType::EDGECONST: 499 499 return 'fa-user'; 500 500 } 501 501 } ··· 571 571 switch ($this->getTransactionType()) { 572 572 case PhabricatorTransactions::TYPE_EDGE: 573 573 switch ($this->getMetadataValue('edge:type')) { 574 - case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER: 574 + case DifferentialRevisionHasReviewerEdgeType::EDGECONST: 575 575 return pht( 576 576 'The reviewers you are trying to add are already reviewing '. 577 577 'this revision.');
+2 -2
src/applications/diffusion/controller/DiffusionCommitController.php
··· 418 418 ->withSourcePHIDs(array($commit_phid)) 419 419 ->withEdgeTypes(array( 420 420 DiffusionCommitHasTaskEdgeType::EDGECONST, 421 - PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV, 421 + DiffusionCommitHasRevisionEdgeType::EDGECONST, 422 422 )); 423 423 424 424 $edges = $edge_query->execute(); ··· 426 426 $task_phids = array_keys( 427 427 $edges[$commit_phid][DiffusionCommitHasTaskEdgeType::EDGECONST]); 428 428 $revision_phid = key( 429 - $edges[$commit_phid][PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV]); 429 + $edges[$commit_phid][DiffusionCommitHasRevisionEdgeType::EDGECONST]); 430 430 431 431 $phids = $edge_query->getDestinationPHIDs(array($commit_phid)); 432 432
+15
src/applications/diffusion/edge/DiffusionCommitHasRevisionEdgeType.php
··· 1 + <?php 2 + 3 + final class DiffusionCommitHasRevisionEdgeType extends PhabricatorEdgeType { 4 + 5 + const EDGECONST = 32; 6 + 7 + public function getInverseEdgeConstant() { 8 + return DifferentialRevisionHasCommitEdgeType::EDGECONST; 9 + } 10 + 11 + public function shouldWriteInverseTransactions() { 12 + return true; 13 + } 14 + 15 + }
+1 -1
src/applications/diffusion/events/DiffusionHovercardEventListener.php
··· 28 28 29 29 $revision = PhabricatorEdgeQuery::loadDestinationPHIDs( 30 30 $commit->getPHID(), 31 - PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV); 31 + DiffusionCommitHasRevisionEdgeType::EDGECONST); 32 32 $revision = reset($revision); 33 33 34 34 $author = $commit->getAuthorPHID();
+1 -1
src/applications/maniphest/controller/ManiphestTaskDetailController.php
··· 498 498 $commit_phids = array_keys( 499 499 $edges[ManiphestTaskHasCommitEdgeType::EDGECONST]); 500 500 if ($commit_phids) { 501 - $commit_drev = PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV; 501 + $commit_drev = DiffusionCommitHasRevisionEdgeType::EDGECONST; 502 502 $drev_edges = id(new PhabricatorEdgeQuery()) 503 503 ->withSourcePHIDs($commit_phids) 504 504 ->withEdgeTypes(array($commit_drev))
+1 -1
src/applications/maniphest/edge/ManiphestTaskDependedOnByTaskEdgeType.php
··· 7 7 return ManiphestTaskDependsOnTaskEdgeType::EDGECONST; 8 8 } 9 9 10 - public function shouldWriteInverseTransaction() { 10 + public function shouldWriteInverseTransactions() { 11 11 return true; 12 12 } 13 13
+1 -1
src/applications/releeph/commitfinder/ReleephCommitFinder.php
··· 94 94 // right rule in the future. 95 95 $phids = PhabricatorEdgeQuery::loadDestinationPHIDs( 96 96 $phabricator_repository_commit->getPHID(), 97 - PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV); 97 + DiffusionCommitHasRevisionEdgeType::EDGECONST); 98 98 if ($phids) { 99 99 $this->objectPHID = head($phids); 100 100 }
+1 -1
src/applications/releeph/field/specification/ReleephDependsOnFieldSpecification.php
··· 28 28 29 29 return PhabricatorEdgeQuery::loadDestinationPHIDs( 30 30 $revision->getPHID(), 31 - PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV); 31 + DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST); 32 32 } 33 33 }
+1 -1
src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
··· 126 126 'precommitRevisionStatus', 127 127 $revision->getStatus()); 128 128 } 129 - $commit_drev = PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV; 129 + $commit_drev = DiffusionCommitHasRevisionEdgeType::EDGECONST; 130 130 id(new PhabricatorEdgeEditor()) 131 131 ->addEdge($commit->getPHID(), $commit_drev, $revision->getPHID()) 132 132 ->save();
+1 -1
src/applications/search/controller/PhabricatorSearchAttachController.php
··· 297 297 $t_mock => PhabricatorEdgeConfig::TYPE_TASK_HAS_MOCK, 298 298 ), 299 299 $t_drev => array( 300 - $t_drev => PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV, 300 + $t_drev => DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST, 301 301 $t_task => DifferentialRevisionHasTaskEdgeType::EDGECONST, 302 302 ), 303 303 $t_mock => array(
+1 -57
src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
··· 5 5 const TABLE_NAME_EDGE = 'edge'; 6 6 const TABLE_NAME_EDGEDATA = 'edgedata'; 7 7 8 - const TYPE_DREV_DEPENDS_ON_DREV = 5; 9 - const TYPE_DREV_DEPENDED_ON_BY_DREV = 6; 10 - 11 8 const TYPE_PROJ_MEMBER = 13; 12 9 const TYPE_MEMBER_OF_PROJ = 14; 13 10 ··· 20 17 const TYPE_OBJECT_HAS_FILE = 25; 21 18 const TYPE_FILE_HAS_OBJECT = 26; 22 19 23 - const TYPE_DREV_HAS_COMMIT = 31; 24 - const TYPE_COMMIT_HAS_DREV = 32; 25 - 26 20 const TYPE_OBJECT_HAS_CONTRIBUTOR = 33; 27 21 const TYPE_CONTRIBUTED_TO_OBJECT = 34; 28 - 29 - const TYPE_DREV_HAS_REVIEWER = 35; 30 - const TYPE_REVIEWER_FOR_DREV = 36; 31 22 32 23 const TYPE_MOCK_HAS_TASK = 37; 33 24 const TYPE_TASK_HAS_MOCK = 38; ··· 112 103 113 104 private static function getInverse($edge_type) { 114 105 static $map = array( 115 - self::TYPE_DREV_DEPENDS_ON_DREV => self::TYPE_DREV_DEPENDED_ON_BY_DREV, 116 - self::TYPE_DREV_DEPENDED_ON_BY_DREV => self::TYPE_DREV_DEPENDS_ON_DREV, 117 - 118 106 self::TYPE_PROJ_MEMBER => self::TYPE_MEMBER_OF_PROJ, 119 107 self::TYPE_MEMBER_OF_PROJ => self::TYPE_PROJ_MEMBER, 120 108 ··· 126 114 127 115 self::TYPE_OBJECT_HAS_FILE => self::TYPE_FILE_HAS_OBJECT, 128 116 self::TYPE_FILE_HAS_OBJECT => self::TYPE_OBJECT_HAS_FILE, 129 - 130 - self::TYPE_DREV_HAS_COMMIT => self::TYPE_COMMIT_HAS_DREV, 131 - self::TYPE_COMMIT_HAS_DREV => self::TYPE_DREV_HAS_COMMIT, 132 117 133 118 self::TYPE_OBJECT_HAS_CONTRIBUTOR => self::TYPE_CONTRIBUTED_TO_OBJECT, 134 119 self::TYPE_CONTRIBUTED_TO_OBJECT => self::TYPE_OBJECT_HAS_CONTRIBUTOR, ··· 142 127 self::TYPE_PHOB_HAS_ASANASUBTASK => self::TYPE_ASANASUBTASK_HAS_PHOB, 143 128 self::TYPE_ASANASUBTASK_HAS_PHOB => self::TYPE_PHOB_HAS_ASANASUBTASK, 144 129 145 - self::TYPE_DREV_HAS_REVIEWER => self::TYPE_REVIEWER_FOR_DREV, 146 - self::TYPE_REVIEWER_FOR_DREV => self::TYPE_DREV_HAS_REVIEWER, 147 - 148 130 self::TYPE_PHOB_HAS_JIRAISSUE => self::TYPE_JIRAISSUE_HAS_PHOB, 149 131 self::TYPE_JIRAISSUE_HAS_PHOB => self::TYPE_PHOB_HAS_JIRAISSUE, 150 132 ··· 163 145 164 146 private static function shouldPreventCycles($edge_type) { 165 147 static $map = array( 166 - self::TYPE_TEST_NO_CYCLE => true, 167 - self::TYPE_DREV_DEPENDS_ON_DREV => true, 148 + self::TYPE_TEST_NO_CYCLE => true, 168 149 ); 169 150 return isset($map[$edge_type]); 170 151 } ··· 196 177 197 178 public static function getEditStringForEdgeType($type) { 198 179 switch ($type) { 199 - case self::TYPE_DREV_HAS_COMMIT: 200 - return '%s edited commit(s), added %d: %s; removed %d: %s.'; 201 180 case self::TYPE_MOCK_HAS_TASK: 202 181 return '%s edited task(s), added %d: %s; removed %d: %s.'; 203 - case self::TYPE_DREV_DEPENDS_ON_DREV: 204 - case self::TYPE_DREV_DEPENDED_ON_BY_DREV: 205 - case self::TYPE_COMMIT_HAS_DREV: 206 - case self::TYPE_REVIEWER_FOR_DREV: 207 - return '%s edited revision(s), added %d: %s; removed %d: %s.'; 208 182 case self::TYPE_PROJ_MEMBER: 209 183 return '%s edited member(s), added %d: %s; removed %d: %s.'; 210 184 case self::TYPE_MEMBER_OF_PROJ: ··· 222 196 return '%s edited file(s), added %d: %s; removed %d: %s.'; 223 197 case self::TYPE_OBJECT_HAS_CONTRIBUTOR: 224 198 return '%s edited contributor(s), added %d: %s; removed %d: %s.'; 225 - case self::TYPE_DREV_HAS_REVIEWER: 226 - return '%s edited reviewer(s), added %d: %s; removed %d: %s.'; 227 199 case self::TYPE_TASK_HAS_MOCK: 228 200 return '%s edited mock(s), added %d: %s; removed %d: %s.'; 229 201 case self::TYPE_DASHBOARD_HAS_PANEL: ··· 242 214 243 215 public static function getAddStringForEdgeType($type) { 244 216 switch ($type) { 245 - case self::TYPE_DREV_HAS_COMMIT: 246 - return '%s added %d commit(s): %s.'; 247 - case self::TYPE_DREV_DEPENDS_ON_DREV: 248 - return '%s added %d dependencie(s): %s.'; 249 217 case self::TYPE_MOCK_HAS_TASK: 250 218 return '%s added %d task(s): %s.'; 251 - case self::TYPE_DREV_DEPENDED_ON_BY_DREV: 252 - case self::TYPE_COMMIT_HAS_DREV: 253 - case self::TYPE_REVIEWER_FOR_DREV: 254 - return '%s added %d revision(s): %s.'; 255 219 case self::TYPE_PROJ_MEMBER: 256 220 return '%s added %d member(s): %s.'; 257 221 case self::TYPE_MEMBER_OF_PROJ: ··· 264 228 return '%s added %d file(s): %s.'; 265 229 case self::TYPE_OBJECT_HAS_CONTRIBUTOR: 266 230 return '%s added %d contributor(s): %s.'; 267 - case self::TYPE_DREV_HAS_REVIEWER: 268 - return '%s added %d reviewer(s): %s.'; 269 231 case self::TYPE_TASK_HAS_MOCK: 270 232 return '%s added %d mock(s): %s.'; 271 233 case self::TYPE_DASHBOARD_HAS_PANEL: ··· 286 248 287 249 public static function getRemoveStringForEdgeType($type) { 288 250 switch ($type) { 289 - case self::TYPE_DREV_HAS_COMMIT: 290 - return '%s removed %d commit(s): %s.'; 291 251 case self::TYPE_MOCK_HAS_TASK: 292 252 return '%s removed %d task(s): %s.'; 293 - case self::TYPE_DREV_DEPENDS_ON_DREV: 294 - case self::TYPE_DREV_DEPENDED_ON_BY_DREV: 295 - case self::TYPE_COMMIT_HAS_DREV: 296 - case self::TYPE_REVIEWER_FOR_DREV: 297 - return '%s removed %d revision(s): %s.'; 298 253 case self::TYPE_PROJ_MEMBER: 299 254 return '%s removed %d member(s): %s.'; 300 255 case self::TYPE_MEMBER_OF_PROJ: ··· 307 262 return '%s removed %d file(s): %s.'; 308 263 case self::TYPE_OBJECT_HAS_CONTRIBUTOR: 309 264 return '%s removed %d contributor(s): %s.'; 310 - case self::TYPE_DREV_HAS_REVIEWER: 311 - return '%s removed %d reviewer(s): %s.'; 312 265 case self::TYPE_TASK_HAS_MOCK: 313 266 return '%s removed %d mock(s): %s.'; 314 267 case self::TYPE_DASHBOARD_HAS_PANEL: ··· 329 282 330 283 public static function getFeedStringForEdgeType($type) { 331 284 switch ($type) { 332 - case self::TYPE_DREV_HAS_COMMIT: 333 - return '%s updated commits of %s.'; 334 285 case self::TYPE_MOCK_HAS_TASK: 335 286 return '%s updated tasks of %s.'; 336 - case self::TYPE_DREV_DEPENDS_ON_DREV: 337 - case self::TYPE_DREV_DEPENDED_ON_BY_DREV: 338 - case self::TYPE_COMMIT_HAS_DREV: 339 - case self::TYPE_REVIEWER_FOR_DREV: 340 - return '%s updated revisions of %s.'; 341 287 case self::TYPE_PROJ_MEMBER: 342 288 return '%s updated members of %s.'; 343 289 case self::TYPE_MEMBER_OF_PROJ: ··· 350 296 return '%s updated files of %s.'; 351 297 case self::TYPE_OBJECT_HAS_CONTRIBUTOR: 352 298 return '%s updated contributors of %s.'; 353 - case self::TYPE_DREV_HAS_REVIEWER: 354 - return '%s updated reviewers of %s.'; 355 299 case self::TYPE_TASK_HAS_MOCK: 356 300 return '%s updated mocks of %s.'; 357 301 case self::TYPE_PANEL_HAS_DASHBOARD:
+21 -35
src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
··· 67 67 'removed mocks: %2$s', 68 68 ), 69 69 70 - 'added %d dependencie(s): %s' => array( 70 + 'added %s dependencie(s): %s' => array( 71 71 'added dependency: %2$s', 72 72 'added dependencies: %2$s', 73 73 ), 74 74 75 - 'removed %d dependencie(s): %s' => array( 75 + 'removed %s dependencie(s): %s' => array( 76 76 'removed dependency: %2$s', 77 77 'removed dependencies: %2$s', 78 78 ), 79 79 80 - 'added %d revision(s): %s' => array( 80 + 'added %s revision(s): %s' => array( 81 81 'added revision: %2$s', 82 82 'added revisions: %2$s', 83 83 ), 84 84 85 - 'removed %d revision(s): %s' => array( 85 + 'removed %s revision(s): %s' => array( 86 86 'removed revision: %2$s', 87 87 'removed revisions: %2$s', 88 88 ), 89 89 90 - '%s edited revision(s), added %d: %s; removed %d: %s.' => 90 + '%s edited revision(s), added %s: %s; removed %s: %s.' => 91 91 '%s edited revisions, added: %3$s; removed: %5$s', 92 92 93 93 'There are %d raw fact(s) in storage.' => array( ··· 437 437 ), 438 438 ), 439 439 440 - '%s edited reviewer(s), added %d: %s; removed %d: %s.' => 440 + '%s edited reviewer(s), added %s: %s; removed %s: %s.' => 441 441 '%s edited reviewers, added: %4$s; removed: %6$s', 442 442 443 - '%s added %d reviewer(s): %s.' => array( 443 + '%s added %s reviewer(s): %s.' => array( 444 444 array( 445 445 '%s added a reviewer: %3$s.', 446 446 '%s added reviewers: %3$s.', 447 447 ), 448 448 ), 449 449 450 - '%s removed %d reviewer(s): %s.' => array( 450 + '%s removed %s reviewer(s): %s.' => array( 451 451 array( 452 452 '%s removed a reviewer: %3$s.', 453 453 '%s removed reviewers: %3$s.', ··· 677 677 '%s changed files, attached: %3$s; detached: %5$s', 678 678 679 679 680 - '%s added %d dependencie(s): %s.' => array( 680 + '%s added %s dependencie(s): %s.' => array( 681 681 array( 682 - '%s added a dependency: %3$s', 683 - '%s added dependencies: %3$s', 682 + '%s added a dependency: %3$s.', 683 + '%s added dependencies: %3$s.', 684 684 ), 685 685 ), 686 686 687 - '%s removed %d dependencie(s): %s.' => array( 687 + '%s removed %s dependencie(s): %s.' => array( 688 688 array( 689 689 '%s removed a dependency: %3$s.', 690 690 '%s removed dependencies: %3$s.', 691 691 ), 692 692 ), 693 693 694 - '%s added %d revision(s): %s.' => array( 694 + '%s added %s dependent revision(s): %s.' => array( 695 695 array( 696 - '%s added a revision: %3$s.', 697 - '%s added revisions: %3$s.', 696 + '%s added a dependent revision: %3$s.', 697 + '%s added dependent revisions: %3$s.', 698 698 ), 699 699 ), 700 700 701 - '%s removed %d revision(s): %s.' => array( 701 + '%s removed %s dependent revision(s): %s.' => array( 702 702 array( 703 - '%s removed a revision: %3$s.', 704 - '%s removed revisions: %3$s.', 703 + '%s removed a dependent revision: %3$s.', 704 + '%s removed dependent revisions: %3$s.', 705 705 ), 706 706 ), 707 707 708 - '%s added %d commit(s): %s.' => array( 708 + '%s added %s commit(s): %s.' => array( 709 709 array( 710 710 '%s added a commit: %3$s.', 711 711 '%s added commits: %3$s.', 712 712 ), 713 713 ), 714 714 715 - '%s removed %d commit(s): %s.' => array( 715 + '%s removed %s commit(s): %s.' => array( 716 716 array( 717 717 '%s removed a commit: %3$s.', 718 718 '%s removed commits: %3$s.', 719 719 ), 720 720 ), 721 721 722 - '%s edited commit(s), added %d: %s; removed %d: %s.' => 722 + '%s edited commit(s), added %s: %s; removed %s: %s.' => 723 723 '%s edited commits, added %3$s; removed %5$s.', 724 724 725 725 '%s changed project member(s), added %d: %s; removed %d: %s' => ··· 845 845 846 846 '%s edited %s task(s) for %s, added %s: %s; removed %s: %s.' => 847 847 '%s edited tasks for %3$s, added: %5$s; removed %7$s.', 848 - 849 - '%s added %s commit(s): %s.' => array( 850 - array( 851 - '%s added a commit: %3$s.', 852 - '%s added commits: %3$s.', 853 - ), 854 - ), 855 - 856 - '%s removed %s commit(s): %s.' => array( 857 - array( 858 - '%s removed a commit: %3$s.', 859 - '%s removed commits: %3$s.', 860 - ), 861 - ), 862 848 863 849 '%s edited %s commit(s), added %s: %s; removed %s: %s.' => 864 850 '%s edited commits, added %4$s; removed %6$s.',