diff --git a/resources/sql/autopatches/20140212.dx.1.armageddon.php b/resources/sql/autopatches/20140212.dx.1.armageddon.php --- a/resources/sql/autopatches/20140212.dx.1.armageddon.php +++ b/resources/sql/autopatches/20140212.dx.1.armageddon.php @@ -100,7 +100,7 @@ } $old[$phid] = array( 'src' => $revision_phid, - 'type' => PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, + 'type' => DifferentialRevisionHasReviewerEdgeType::EDGECONST, 'dst' => $phid, ); } @@ -112,7 +112,7 @@ } $new[$phid] = array( 'src' => $revision_phid, - 'type' => PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, + 'type' => DifferentialRevisionHasReviewerEdgeType::EDGECONST, 'dst' => $phid, ); } @@ -122,7 +122,7 @@ 'old' => $old, 'new' => $new, 'meta' => array( - 'edge:type' => PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, + 'edge:type' => DifferentialRevisionHasReviewerEdgeType::EDGECONST, ), ); } diff --git a/resources/sql/autopatches/20140420.rel.2.objectmig.php b/resources/sql/autopatches/20140420.rel.2.objectmig.php --- a/resources/sql/autopatches/20140420.rel.2.objectmig.php +++ b/resources/sql/autopatches/20140420.rel.2.objectmig.php @@ -26,7 +26,7 @@ $revision_phids = PhabricatorEdgeQuery::loadDestinationPHIDs( $commit_phid, - PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV); + DiffusionCommitHasRevisionEdgeType::EDGECONST); if ($revision_phids) { $object_phid = head($revision_phids); diff --git a/resources/sql/patches/20130409.commitdrev.php b/resources/sql/patches/20130409.commitdrev.php --- a/resources/sql/patches/20130409.commitdrev.php +++ b/resources/sql/patches/20130409.commitdrev.php @@ -18,7 +18,7 @@ continue; } - $commit_drev = PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV; + $commit_drev = DiffusionCommitHasRevisionEdgeType::EDGECONST; $editor->addEdge($commit->getPHID(), $commit_drev, $revision_phid); $edges++; if ($edges % 256 == 0) { diff --git a/resources/sql/patches/20131004.dxreviewers.php b/resources/sql/patches/20131004.dxreviewers.php --- a/resources/sql/patches/20131004.dxreviewers.php +++ b/resources/sql/patches/20131004.dxreviewers.php @@ -36,7 +36,7 @@ $editor->addEdge( $revision_phid, - PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, + DifferentialRevisionHasReviewerEdgeType::EDGECONST, $dst, array( 'data' => array( diff --git a/resources/sql/patches/migrate-differential-dependencies.php b/resources/sql/patches/migrate-differential-dependencies.php --- a/resources/sql/patches/migrate-differential-dependencies.php +++ b/resources/sql/patches/migrate-differential-dependencies.php @@ -18,7 +18,7 @@ foreach ($deps as $dep) { $editor->addEdge( $rev->getPHID(), - PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV, + DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST, $dep); } $editor->save(); 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 @@ -400,14 +400,19 @@ 'DifferentialRevertPlanField' => 'applications/differential/customfield/DifferentialRevertPlanField.php', 'DifferentialReviewedByField' => 'applications/differential/customfield/DifferentialReviewedByField.php', 'DifferentialReviewer' => 'applications/differential/storage/DifferentialReviewer.php', + 'DifferentialReviewerForRevisionEdgeType' => 'applications/differential/edge/DifferentialReviewerForRevisionEdgeType.php', 'DifferentialReviewerStatus' => 'applications/differential/constants/DifferentialReviewerStatus.php', 'DifferentialReviewersField' => 'applications/differential/customfield/DifferentialReviewersField.php', 'DifferentialReviewersView' => 'applications/differential/view/DifferentialReviewersView.php', 'DifferentialRevision' => 'applications/differential/storage/DifferentialRevision.php', 'DifferentialRevisionCloseDetailsController' => 'applications/differential/controller/DifferentialRevisionCloseDetailsController.php', 'DifferentialRevisionControlSystem' => 'applications/differential/constants/DifferentialRevisionControlSystem.php', + 'DifferentialRevisionDependedOnByRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php', + 'DifferentialRevisionDependsOnRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php', 'DifferentialRevisionDetailView' => 'applications/differential/view/DifferentialRevisionDetailView.php', 'DifferentialRevisionEditController' => 'applications/differential/controller/DifferentialRevisionEditController.php', + 'DifferentialRevisionHasCommitEdgeType' => 'applications/differential/edge/DifferentialRevisionHasCommitEdgeType.php', + 'DifferentialRevisionHasReviewerEdgeType' => 'applications/differential/edge/DifferentialRevisionHasReviewerEdgeType.php', 'DifferentialRevisionHasTaskEdgeType' => 'applications/differential/edge/DifferentialRevisionHasTaskEdgeType.php', 'DifferentialRevisionIDField' => 'applications/differential/customfield/DifferentialRevisionIDField.php', 'DifferentialRevisionLandController' => 'applications/differential/controller/DifferentialRevisionLandController.php', @@ -457,6 +462,7 @@ 'DiffusionCommitChangeTableView' => 'applications/diffusion/view/DiffusionCommitChangeTableView.php', 'DiffusionCommitController' => 'applications/diffusion/controller/DiffusionCommitController.php', 'DiffusionCommitEditController' => 'applications/diffusion/controller/DiffusionCommitEditController.php', + 'DiffusionCommitHasRevisionEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasRevisionEdgeType.php', 'DiffusionCommitHasTaskEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasTaskEdgeType.php', 'DiffusionCommitHash' => 'applications/diffusion/data/DiffusionCommitHash.php', 'DiffusionCommitHookEngine' => 'applications/diffusion/engine/DiffusionCommitHookEngine.php', @@ -3438,6 +3444,7 @@ 'DifferentialResultsTableView' => 'AphrontView', 'DifferentialRevertPlanField' => 'DifferentialStoredCustomField', 'DifferentialReviewedByField' => 'DifferentialCoreCustomField', + 'DifferentialReviewerForRevisionEdgeType' => 'PhabricatorEdgeType', 'DifferentialReviewersField' => 'DifferentialCoreCustomField', 'DifferentialReviewersView' => 'AphrontView', 'DifferentialRevision' => array( @@ -3455,8 +3462,12 @@ 'PhabricatorProjectInterface', ), 'DifferentialRevisionCloseDetailsController' => 'DifferentialController', + 'DifferentialRevisionDependedOnByRevisionEdgeType' => 'PhabricatorEdgeType', + 'DifferentialRevisionDependsOnRevisionEdgeType' => 'PhabricatorEdgeType', 'DifferentialRevisionDetailView' => 'AphrontView', 'DifferentialRevisionEditController' => 'DifferentialController', + 'DifferentialRevisionHasCommitEdgeType' => 'PhabricatorEdgeType', + 'DifferentialRevisionHasReviewerEdgeType' => 'PhabricatorEdgeType', 'DifferentialRevisionHasTaskEdgeType' => 'PhabricatorEdgeType', 'DifferentialRevisionIDField' => 'DifferentialCustomField', 'DifferentialRevisionLandController' => 'DifferentialController', @@ -3502,6 +3513,7 @@ 'DiffusionCommitChangeTableView' => 'DiffusionView', 'DiffusionCommitController' => 'DiffusionController', 'DiffusionCommitEditController' => 'DiffusionController', + 'DiffusionCommitHasRevisionEdgeType' => 'PhabricatorEdgeType', 'DiffusionCommitHasTaskEdgeType' => 'PhabricatorEdgeType', 'DiffusionCommitHash' => 'Phobject', 'DiffusionCommitHookEngine' => 'Phobject', diff --git a/src/applications/differential/controller/DifferentialCommentPreviewController.php b/src/applications/differential/controller/DifferentialCommentPreviewController.php --- a/src/applications/differential/controller/DifferentialCommentPreviewController.php +++ b/src/applications/differential/controller/DifferentialCommentPreviewController.php @@ -41,7 +41,7 @@ break; } - $edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; + $edge_reviewer = DifferentialRevisionHasReviewerEdgeType::EDGECONST; $reviewers = $request->getStrList('reviewers'); if (DifferentialAction::allowReviewers($action) && $reviewers) { diff --git a/src/applications/differential/controller/DifferentialCommentSaveController.php b/src/applications/differential/controller/DifferentialCommentSaveController.php --- a/src/applications/differential/controller/DifferentialCommentSaveController.php +++ b/src/applications/differential/controller/DifferentialCommentSaveController.php @@ -33,7 +33,7 @@ $type_comment = PhabricatorTransactions::TYPE_COMMENT; $type_inline = DifferentialTransaction::TYPE_INLINE; - $edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; + $edge_reviewer = DifferentialRevisionHasReviewerEdgeType::EDGECONST; $xactions = array(); diff --git a/src/applications/differential/customfield/DifferentialDependenciesField.php b/src/applications/differential/customfield/DifferentialDependenciesField.php --- a/src/applications/differential/customfield/DifferentialDependenciesField.php +++ b/src/applications/differential/customfield/DifferentialDependenciesField.php @@ -30,7 +30,7 @@ public function getRequiredHandlePHIDsForPropertyView() { return PhabricatorEdgeQuery::loadDestinationPHIDs( $this->getObject()->getPHID(), - PhabricatorEdgeConfig::TYPE_DREV_DEPENDED_ON_BY_DREV); + DifferentialRevisionDependedOnByRevisionEdgeType::EDGECONST); } public function renderPropertyViewValue(array $handles) { diff --git a/src/applications/differential/customfield/DifferentialDependsOnField.php b/src/applications/differential/customfield/DifferentialDependsOnField.php --- a/src/applications/differential/customfield/DifferentialDependsOnField.php +++ b/src/applications/differential/customfield/DifferentialDependsOnField.php @@ -34,7 +34,7 @@ public function getRequiredHandlePHIDsForPropertyView() { return PhabricatorEdgeQuery::loadDestinationPHIDs( $this->getObject()->getPHID(), - PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV); + DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST); } public function renderPropertyViewValue(array $handles) { @@ -56,7 +56,7 @@ public function getConduitDictionaryValue() { return PhabricatorEdgeQuery::loadDestinationPHIDs( $this->getObject()->getPHID(), - PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV); + DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST); } } diff --git a/src/applications/differential/customfield/DifferentialReviewersField.php b/src/applications/differential/customfield/DifferentialReviewersField.php --- a/src/applications/differential/customfield/DifferentialReviewersField.php +++ b/src/applications/differential/customfield/DifferentialReviewersField.php @@ -85,7 +85,7 @@ public function getApplicationTransactionMetadata() { return array( - 'edge:type' => PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, + 'edge:type' => DifferentialRevisionHasReviewerEdgeType::EDGECONST, ); } diff --git a/src/applications/differential/edge/DifferentialReviewerForRevisionEdgeType.php b/src/applications/differential/edge/DifferentialReviewerForRevisionEdgeType.php new file mode 100644 --- /dev/null +++ b/src/applications/differential/edge/DifferentialReviewerForRevisionEdgeType.php @@ -0,0 +1,16 @@ +getMetadataValue('edge:type')) { - case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER: + case DifferentialRevisionHasReviewerEdgeType::EDGECONST: // Prevent the author from becoming a reviewer. @@ -1299,8 +1299,8 @@ unset($rev_phids[$object->getPHID()]); if ($revs) { - $edge_depends = PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV; - $edges[$edge_depends] = $rev_phids; + $depends = DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST; + $edges[$depends] = $rev_phids; } } @@ -1608,7 +1608,7 @@ } if ($value) { - $edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; + $edge_reviewer = DifferentialRevisionHasReviewerEdgeType::EDGECONST; $xactions[] = id(new DifferentialTransaction()) ->setTransactionType(PhabricatorTransactions::TYPE_EDGE) diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php --- a/src/applications/differential/query/DifferentialRevisionQuery.php +++ b/src/applications/differential/query/DifferentialRevisionQuery.php @@ -639,7 +639,7 @@ 'AND e_reviewers.type = %s '. 'AND e_reviewers.dst in (%Ls)', PhabricatorEdgeConfig::TABLE_NAME_EDGE, - PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER, + DifferentialRevisionHasReviewerEdgeType::EDGECONST, $this->reviewers); } @@ -900,7 +900,7 @@ private function loadRelationships($conn_r, array $revisions) { assert_instances_of($revisions, 'DifferentialRevision'); - $type_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; + $type_reviewer = DifferentialRevisionHasReviewerEdgeType::EDGECONST; $type_subscriber = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_SUBSCRIBER; $edges = id(new PhabricatorEdgeQuery()) @@ -1019,7 +1019,7 @@ array $revisions) { assert_instances_of($revisions, 'DifferentialRevision'); - $edge_type = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; + $edge_type = DifferentialRevisionHasReviewerEdgeType::EDGECONST; $edges = id(new PhabricatorEdgeQuery()) ->withSourcePHIDs(mpull($revisions, 'getPHID')) @@ -1125,7 +1125,7 @@ // Find all the project reviewers which the user may have authority over. $project_phids = array(); $project_type = PhabricatorProjectProjectPHIDType::TYPECONST; - $edge_type = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER; + $edge_type = DifferentialRevisionHasReviewerEdgeType::EDGECONST; foreach ($edges as $src => $types) { if (!$allow_self) { if ($revision_map[$src]->getAuthorPHID() == $viewer_phid) { diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php --- a/src/applications/differential/storage/DifferentialRevision.php +++ b/src/applications/differential/storage/DifferentialRevision.php @@ -226,7 +226,7 @@ $reviewer_phids = PhabricatorEdgeQuery::loadDestinationPHIDs( $this->getPHID(), - PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER); + DifferentialRevisionHasReviewerEdgeType::EDGECONST); $reviewer_phids = array_reverse($reviewer_phids); foreach ($reviewer_phids as $phid) { $data[] = array( diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php --- a/src/applications/differential/storage/DifferentialTransaction.php +++ b/src/applications/differential/storage/DifferentialTransaction.php @@ -201,7 +201,7 @@ break; case PhabricatorTransactions::TYPE_EDGE: switch ($this->getMetadataValue('edge:type')) { - case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER: + case DifferentialRevisionHasReviewerEdgeType::EDGECONST: $tags[] = MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEWERS; break; } @@ -495,7 +495,7 @@ } case PhabricatorTransactions::TYPE_EDGE: switch ($this->getMetadataValue('edge:type')) { - case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER: + case DifferentialRevisionHasReviewerEdgeType::EDGECONST: return 'fa-user'; } } @@ -571,7 +571,7 @@ switch ($this->getTransactionType()) { case PhabricatorTransactions::TYPE_EDGE: switch ($this->getMetadataValue('edge:type')) { - case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER: + case DifferentialRevisionHasReviewerEdgeType::EDGECONST: return pht( 'The reviewers you are trying to add are already reviewing '. 'this revision.'); diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php --- a/src/applications/diffusion/controller/DiffusionCommitController.php +++ b/src/applications/diffusion/controller/DiffusionCommitController.php @@ -418,7 +418,7 @@ ->withSourcePHIDs(array($commit_phid)) ->withEdgeTypes(array( DiffusionCommitHasTaskEdgeType::EDGECONST, - PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV, + DiffusionCommitHasRevisionEdgeType::EDGECONST, )); $edges = $edge_query->execute(); @@ -426,7 +426,7 @@ $task_phids = array_keys( $edges[$commit_phid][DiffusionCommitHasTaskEdgeType::EDGECONST]); $revision_phid = key( - $edges[$commit_phid][PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV]); + $edges[$commit_phid][DiffusionCommitHasRevisionEdgeType::EDGECONST]); $phids = $edge_query->getDestinationPHIDs(array($commit_phid)); diff --git a/src/applications/diffusion/edge/DiffusionCommitHasRevisionEdgeType.php b/src/applications/diffusion/edge/DiffusionCommitHasRevisionEdgeType.php new file mode 100644 --- /dev/null +++ b/src/applications/diffusion/edge/DiffusionCommitHasRevisionEdgeType.php @@ -0,0 +1,15 @@ +getPHID(), - PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV); + DiffusionCommitHasRevisionEdgeType::EDGECONST); $revision = reset($revision); $author = $commit->getAuthorPHID(); diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -498,7 +498,7 @@ $commit_phids = array_keys( $edges[ManiphestTaskHasCommitEdgeType::EDGECONST]); if ($commit_phids) { - $commit_drev = PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV; + $commit_drev = DiffusionCommitHasRevisionEdgeType::EDGECONST; $drev_edges = id(new PhabricatorEdgeQuery()) ->withSourcePHIDs($commit_phids) ->withEdgeTypes(array($commit_drev)) diff --git a/src/applications/maniphest/edge/ManiphestTaskDependedOnByTaskEdgeType.php b/src/applications/maniphest/edge/ManiphestTaskDependedOnByTaskEdgeType.php --- a/src/applications/maniphest/edge/ManiphestTaskDependedOnByTaskEdgeType.php +++ b/src/applications/maniphest/edge/ManiphestTaskDependedOnByTaskEdgeType.php @@ -7,7 +7,7 @@ return ManiphestTaskDependsOnTaskEdgeType::EDGECONST; } - public function shouldWriteInverseTransaction() { + public function shouldWriteInverseTransactions() { return true; } diff --git a/src/applications/releeph/commitfinder/ReleephCommitFinder.php b/src/applications/releeph/commitfinder/ReleephCommitFinder.php --- a/src/applications/releeph/commitfinder/ReleephCommitFinder.php +++ b/src/applications/releeph/commitfinder/ReleephCommitFinder.php @@ -94,7 +94,7 @@ // right rule in the future. $phids = PhabricatorEdgeQuery::loadDestinationPHIDs( $phabricator_repository_commit->getPHID(), - PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV); + DiffusionCommitHasRevisionEdgeType::EDGECONST); if ($phids) { $this->objectPHID = head($phids); } diff --git a/src/applications/releeph/field/specification/ReleephDependsOnFieldSpecification.php b/src/applications/releeph/field/specification/ReleephDependsOnFieldSpecification.php --- a/src/applications/releeph/field/specification/ReleephDependsOnFieldSpecification.php +++ b/src/applications/releeph/field/specification/ReleephDependsOnFieldSpecification.php @@ -28,6 +28,6 @@ return PhabricatorEdgeQuery::loadDestinationPHIDs( $revision->getPHID(), - PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV); + DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST); } } diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php --- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php +++ b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php @@ -126,7 +126,7 @@ 'precommitRevisionStatus', $revision->getStatus()); } - $commit_drev = PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV; + $commit_drev = DiffusionCommitHasRevisionEdgeType::EDGECONST; id(new PhabricatorEdgeEditor()) ->addEdge($commit->getPHID(), $commit_drev, $revision->getPHID()) ->save(); diff --git a/src/applications/search/controller/PhabricatorSearchAttachController.php b/src/applications/search/controller/PhabricatorSearchAttachController.php --- a/src/applications/search/controller/PhabricatorSearchAttachController.php +++ b/src/applications/search/controller/PhabricatorSearchAttachController.php @@ -297,7 +297,7 @@ $t_mock => PhabricatorEdgeConfig::TYPE_TASK_HAS_MOCK, ), $t_drev => array( - $t_drev => PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV, + $t_drev => DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST, $t_task => DifferentialRevisionHasTaskEdgeType::EDGECONST, ), $t_mock => array( diff --git a/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php b/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php --- a/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php +++ b/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php @@ -5,9 +5,6 @@ const TABLE_NAME_EDGE = 'edge'; const TABLE_NAME_EDGEDATA = 'edgedata'; - const TYPE_DREV_DEPENDS_ON_DREV = 5; - const TYPE_DREV_DEPENDED_ON_BY_DREV = 6; - const TYPE_PROJ_MEMBER = 13; const TYPE_MEMBER_OF_PROJ = 14; @@ -20,15 +17,9 @@ const TYPE_OBJECT_HAS_FILE = 25; const TYPE_FILE_HAS_OBJECT = 26; - const TYPE_DREV_HAS_COMMIT = 31; - const TYPE_COMMIT_HAS_DREV = 32; - const TYPE_OBJECT_HAS_CONTRIBUTOR = 33; const TYPE_CONTRIBUTED_TO_OBJECT = 34; - const TYPE_DREV_HAS_REVIEWER = 35; - const TYPE_REVIEWER_FOR_DREV = 36; - const TYPE_MOCK_HAS_TASK = 37; const TYPE_TASK_HAS_MOCK = 38; @@ -112,9 +103,6 @@ private static function getInverse($edge_type) { static $map = array( - self::TYPE_DREV_DEPENDS_ON_DREV => self::TYPE_DREV_DEPENDED_ON_BY_DREV, - self::TYPE_DREV_DEPENDED_ON_BY_DREV => self::TYPE_DREV_DEPENDS_ON_DREV, - self::TYPE_PROJ_MEMBER => self::TYPE_MEMBER_OF_PROJ, self::TYPE_MEMBER_OF_PROJ => self::TYPE_PROJ_MEMBER, @@ -127,9 +115,6 @@ self::TYPE_OBJECT_HAS_FILE => self::TYPE_FILE_HAS_OBJECT, self::TYPE_FILE_HAS_OBJECT => self::TYPE_OBJECT_HAS_FILE, - self::TYPE_DREV_HAS_COMMIT => self::TYPE_COMMIT_HAS_DREV, - self::TYPE_COMMIT_HAS_DREV => self::TYPE_DREV_HAS_COMMIT, - self::TYPE_OBJECT_HAS_CONTRIBUTOR => self::TYPE_CONTRIBUTED_TO_OBJECT, self::TYPE_CONTRIBUTED_TO_OBJECT => self::TYPE_OBJECT_HAS_CONTRIBUTOR, @@ -142,9 +127,6 @@ self::TYPE_PHOB_HAS_ASANASUBTASK => self::TYPE_ASANASUBTASK_HAS_PHOB, self::TYPE_ASANASUBTASK_HAS_PHOB => self::TYPE_PHOB_HAS_ASANASUBTASK, - self::TYPE_DREV_HAS_REVIEWER => self::TYPE_REVIEWER_FOR_DREV, - self::TYPE_REVIEWER_FOR_DREV => self::TYPE_DREV_HAS_REVIEWER, - self::TYPE_PHOB_HAS_JIRAISSUE => self::TYPE_JIRAISSUE_HAS_PHOB, self::TYPE_JIRAISSUE_HAS_PHOB => self::TYPE_PHOB_HAS_JIRAISSUE, @@ -163,8 +145,7 @@ private static function shouldPreventCycles($edge_type) { static $map = array( - self::TYPE_TEST_NO_CYCLE => true, - self::TYPE_DREV_DEPENDS_ON_DREV => true, + self::TYPE_TEST_NO_CYCLE => true, ); return isset($map[$edge_type]); } @@ -196,15 +177,8 @@ public static function getEditStringForEdgeType($type) { switch ($type) { - case self::TYPE_DREV_HAS_COMMIT: - return '%s edited commit(s), added %d: %s; removed %d: %s.'; case self::TYPE_MOCK_HAS_TASK: return '%s edited task(s), added %d: %s; removed %d: %s.'; - case self::TYPE_DREV_DEPENDS_ON_DREV: - case self::TYPE_DREV_DEPENDED_ON_BY_DREV: - case self::TYPE_COMMIT_HAS_DREV: - case self::TYPE_REVIEWER_FOR_DREV: - return '%s edited revision(s), added %d: %s; removed %d: %s.'; case self::TYPE_PROJ_MEMBER: return '%s edited member(s), added %d: %s; removed %d: %s.'; case self::TYPE_MEMBER_OF_PROJ: @@ -222,8 +196,6 @@ return '%s edited file(s), added %d: %s; removed %d: %s.'; case self::TYPE_OBJECT_HAS_CONTRIBUTOR: return '%s edited contributor(s), added %d: %s; removed %d: %s.'; - case self::TYPE_DREV_HAS_REVIEWER: - return '%s edited reviewer(s), added %d: %s; removed %d: %s.'; case self::TYPE_TASK_HAS_MOCK: return '%s edited mock(s), added %d: %s; removed %d: %s.'; case self::TYPE_DASHBOARD_HAS_PANEL: @@ -242,16 +214,8 @@ public static function getAddStringForEdgeType($type) { switch ($type) { - case self::TYPE_DREV_HAS_COMMIT: - return '%s added %d commit(s): %s.'; - case self::TYPE_DREV_DEPENDS_ON_DREV: - return '%s added %d dependencie(s): %s.'; case self::TYPE_MOCK_HAS_TASK: return '%s added %d task(s): %s.'; - case self::TYPE_DREV_DEPENDED_ON_BY_DREV: - case self::TYPE_COMMIT_HAS_DREV: - case self::TYPE_REVIEWER_FOR_DREV: - return '%s added %d revision(s): %s.'; case self::TYPE_PROJ_MEMBER: return '%s added %d member(s): %s.'; case self::TYPE_MEMBER_OF_PROJ: @@ -264,8 +228,6 @@ return '%s added %d file(s): %s.'; case self::TYPE_OBJECT_HAS_CONTRIBUTOR: return '%s added %d contributor(s): %s.'; - case self::TYPE_DREV_HAS_REVIEWER: - return '%s added %d reviewer(s): %s.'; case self::TYPE_TASK_HAS_MOCK: return '%s added %d mock(s): %s.'; case self::TYPE_DASHBOARD_HAS_PANEL: @@ -286,15 +248,8 @@ public static function getRemoveStringForEdgeType($type) { switch ($type) { - case self::TYPE_DREV_HAS_COMMIT: - return '%s removed %d commit(s): %s.'; case self::TYPE_MOCK_HAS_TASK: return '%s removed %d task(s): %s.'; - case self::TYPE_DREV_DEPENDS_ON_DREV: - case self::TYPE_DREV_DEPENDED_ON_BY_DREV: - case self::TYPE_COMMIT_HAS_DREV: - case self::TYPE_REVIEWER_FOR_DREV: - return '%s removed %d revision(s): %s.'; case self::TYPE_PROJ_MEMBER: return '%s removed %d member(s): %s.'; case self::TYPE_MEMBER_OF_PROJ: @@ -307,8 +262,6 @@ return '%s removed %d file(s): %s.'; case self::TYPE_OBJECT_HAS_CONTRIBUTOR: return '%s removed %d contributor(s): %s.'; - case self::TYPE_DREV_HAS_REVIEWER: - return '%s removed %d reviewer(s): %s.'; case self::TYPE_TASK_HAS_MOCK: return '%s removed %d mock(s): %s.'; case self::TYPE_DASHBOARD_HAS_PANEL: @@ -329,15 +282,8 @@ public static function getFeedStringForEdgeType($type) { switch ($type) { - case self::TYPE_DREV_HAS_COMMIT: - return '%s updated commits of %s.'; case self::TYPE_MOCK_HAS_TASK: return '%s updated tasks of %s.'; - case self::TYPE_DREV_DEPENDS_ON_DREV: - case self::TYPE_DREV_DEPENDED_ON_BY_DREV: - case self::TYPE_COMMIT_HAS_DREV: - case self::TYPE_REVIEWER_FOR_DREV: - return '%s updated revisions of %s.'; case self::TYPE_PROJ_MEMBER: return '%s updated members of %s.'; case self::TYPE_MEMBER_OF_PROJ: @@ -350,8 +296,6 @@ return '%s updated files of %s.'; case self::TYPE_OBJECT_HAS_CONTRIBUTOR: return '%s updated contributors of %s.'; - case self::TYPE_DREV_HAS_REVIEWER: - return '%s updated reviewers of %s.'; case self::TYPE_TASK_HAS_MOCK: return '%s updated mocks of %s.'; case self::TYPE_PANEL_HAS_DASHBOARD: diff --git a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php --- a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php +++ b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php @@ -67,27 +67,27 @@ 'removed mocks: %2$s', ), - 'added %d dependencie(s): %s' => array( + 'added %s dependencie(s): %s' => array( 'added dependency: %2$s', 'added dependencies: %2$s', ), - 'removed %d dependencie(s): %s' => array( + 'removed %s dependencie(s): %s' => array( 'removed dependency: %2$s', 'removed dependencies: %2$s', ), - 'added %d revision(s): %s' => array( + 'added %s revision(s): %s' => array( 'added revision: %2$s', 'added revisions: %2$s', ), - 'removed %d revision(s): %s' => array( + 'removed %s revision(s): %s' => array( 'removed revision: %2$s', 'removed revisions: %2$s', ), - '%s edited revision(s), added %d: %s; removed %d: %s.' => + '%s edited revision(s), added %s: %s; removed %s: %s.' => '%s edited revisions, added: %3$s; removed: %5$s', 'There are %d raw fact(s) in storage.' => array( @@ -437,17 +437,17 @@ ), ), - '%s edited reviewer(s), added %d: %s; removed %d: %s.' => + '%s edited reviewer(s), added %s: %s; removed %s: %s.' => '%s edited reviewers, added: %4$s; removed: %6$s', - '%s added %d reviewer(s): %s.' => array( + '%s added %s reviewer(s): %s.' => array( array( '%s added a reviewer: %3$s.', '%s added reviewers: %3$s.', ), ), - '%s removed %d reviewer(s): %s.' => array( + '%s removed %s reviewer(s): %s.' => array( array( '%s removed a reviewer: %3$s.', '%s removed reviewers: %3$s.', @@ -677,49 +677,49 @@ '%s changed files, attached: %3$s; detached: %5$s', - '%s added %d dependencie(s): %s.' => array( + '%s added %s dependencie(s): %s.' => array( array( - '%s added a dependency: %3$s', - '%s added dependencies: %3$s', + '%s added a dependency: %3$s.', + '%s added dependencies: %3$s.', ), ), - '%s removed %d dependencie(s): %s.' => array( + '%s removed %s dependencie(s): %s.' => array( array( '%s removed a dependency: %3$s.', '%s removed dependencies: %3$s.', ), ), - '%s added %d revision(s): %s.' => array( + '%s added %s dependent revision(s): %s.' => array( array( - '%s added a revision: %3$s.', - '%s added revisions: %3$s.', + '%s added a dependent revision: %3$s.', + '%s added dependent revisions: %3$s.', ), ), - '%s removed %d revision(s): %s.' => array( + '%s removed %s dependent revision(s): %s.' => array( array( - '%s removed a revision: %3$s.', - '%s removed revisions: %3$s.', + '%s removed a dependent revision: %3$s.', + '%s removed dependent revisions: %3$s.', ), ), - '%s added %d commit(s): %s.' => array( + '%s added %s commit(s): %s.' => array( array( '%s added a commit: %3$s.', '%s added commits: %3$s.', ), ), - '%s removed %d commit(s): %s.' => array( + '%s removed %s commit(s): %s.' => array( array( '%s removed a commit: %3$s.', '%s removed commits: %3$s.', ), ), - '%s edited commit(s), added %d: %s; removed %d: %s.' => + '%s edited commit(s), added %s: %s; removed %s: %s.' => '%s edited commits, added %3$s; removed %5$s.', '%s changed project member(s), added %d: %s; removed %d: %s' => @@ -846,20 +846,6 @@ '%s edited %s task(s) for %s, added %s: %s; removed %s: %s.' => '%s edited tasks for %3$s, added: %5$s; removed %7$s.', - '%s added %s commit(s): %s.' => array( - array( - '%s added a commit: %3$s.', - '%s added commits: %3$s.', - ), - ), - - '%s removed %s commit(s): %s.' => array( - array( - '%s removed a commit: %3$s.', - '%s removed commits: %3$s.', - ), - ), - '%s edited %s commit(s), added %s: %s; removed %s: %s.' => '%s edited commits, added %4$s; removed %6$s.',