From c0dc411d231989b01c377eed21f39dd8f0ea4b9f Mon Sep 17 00:00:00 2001 From: epriestley Date: Thu, 20 Jun 2019 12:13:28 -0700 Subject: [PATCH] Update "phabricator/" for "topological" API changes Summary: Ref T13325. Test Plan: - Grepped for `topograph`. - Viewed a task graph since that's easy, looked fine. Reviewers: amckinley Reviewed By: amckinley Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam Maniphest Tasks: T13325 Differential Revision: https://secure.phabricator.com/D20599 --- .../harbormaster/engine/HarbormasterBuildGraph.php | 3 +-- .../engine/PhabricatorRepositoryDiscoveryEngine.php | 4 ++-- src/infrastructure/graph/PhabricatorObjectGraph.php | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/applications/harbormaster/engine/HarbormasterBuildGraph.php b/src/applications/harbormaster/engine/HarbormasterBuildGraph.php index dc9e4b7691..64c12c2e8f 100644 --- a/src/applications/harbormaster/engine/HarbormasterBuildGraph.php +++ b/src/applications/harbormaster/engine/HarbormasterBuildGraph.php @@ -25,8 +25,7 @@ final class HarbormasterBuildGraph extends AbstractDirectedGraph { $graph = id(new HarbormasterBuildGraph($steps_by_phid)) ->addNodes($step_phids); - $raw_results = - $graph->getBestEffortTopographicallySortedNodes(); + $raw_results = $graph->getNodesInRoughTopologicalOrder(); $results = array(); foreach ($raw_results as $node) { diff --git a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php b/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php index 038fa416f8..c1bb9190b3 100644 --- a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php +++ b/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php @@ -398,7 +398,7 @@ final class PhabricatorRepositoryDiscoveryEngine } } - // Now, sort them topographically. + // Now, sort them topologically. $commits = $this->reduceGraph($graph); $refs = array(); @@ -437,7 +437,7 @@ final class PhabricatorRepositoryDiscoveryEngine $graph = new PhutilDirectedScalarGraph(); $graph->addNodes($edges); - $commits = $graph->getTopographicallySortedNodes(); + $commits = $graph->getNodesInTopologicalOrder(); // NOTE: We want the most ancestral nodes first, so we need to reverse the // list we get out of AbstractDirectedGraph. diff --git a/src/infrastructure/graph/PhabricatorObjectGraph.php b/src/infrastructure/graph/PhabricatorObjectGraph.php index 48e0fcbe73..67130e8c05 100644 --- a/src/infrastructure/graph/PhabricatorObjectGraph.php +++ b/src/infrastructure/graph/PhabricatorObjectGraph.php @@ -189,7 +189,7 @@ abstract class PhabricatorObjectGraph $order = id(new PhutilDirectedScalarGraph()) ->addNodes($ancestry) - ->getTopographicallySortedNodes(); + ->getNodesInTopologicalOrder(); $ancestry = array_select_keys($ancestry, $order);