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 @@ -406,6 +406,8 @@ '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', 'DifferentialRevisionHasTaskEdgeType' => 'applications/differential/edge/DifferentialRevisionHasTaskEdgeType.php', @@ -3455,6 +3457,8 @@ 'PhabricatorProjectInterface', ), 'DifferentialRevisionCloseDetailsController' => 'DifferentialController', + 'DifferentialRevisionDependedOnByRevisionEdgeType' => 'PhabricatorEdgeType', + 'DifferentialRevisionDependsOnRevisionEdgeType' => 'PhabricatorEdgeType', 'DifferentialRevisionDetailView' => 'AphrontView', 'DifferentialRevisionEditController' => 'DifferentialController', 'DifferentialRevisionHasTaskEdgeType' => 'PhabricatorEdgeType', 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/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php b/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php new file mode 100644 --- /dev/null +++ b/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php @@ -0,0 +1,107 @@ +getPHID()]); if ($revs) { - $edge_depends = PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV; - $edges[$edge_depends] = $rev_phids; + $depends = DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST; + $edges[$depends] = $rev_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/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; @@ -112,9 +109,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, @@ -163,8 +157,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]); } @@ -200,8 +193,6 @@ 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.'; @@ -244,11 +235,8 @@ 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.'; @@ -290,8 +278,6 @@ 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.'; @@ -333,8 +319,6 @@ 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.';