From 10c4a551ae9df1ebdf90dd4f89d73b213b1b4581 Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 17 Jun 2020 07:51:27 -0700 Subject: [PATCH] Remove implicit sorting from "MarkerRefQuery" Summary: Ref T13546. This is no longer necessary after the introduction of "msortv_natural()", which can handle natural string sorting. Test Plan: Ran "arc branches", saw the same sorting applied. Maniphest Tasks: T13546 Differential Revision: https://secure.phabricator.com/D21364 --- .../marker/ArcanistRepositoryMarkerQuery.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/repository/marker/ArcanistRepositoryMarkerQuery.php b/src/repository/marker/ArcanistRepositoryMarkerQuery.php index 02e12d64..e72ea78f 100644 --- a/src/repository/marker/ArcanistRepositoryMarkerQuery.php +++ b/src/repository/marker/ArcanistRepositoryMarkerQuery.php @@ -104,21 +104,6 @@ abstract class ArcanistRepositoryMarkerQuery } } - return $this->sortMarkers($markers); - } - - private function sortMarkers(array $markers) { - // Sort the list in natural order. If we apply a stable sort later, - // markers will sort in "feature1", "feature2", etc., order if they - // don't otherwise have a unique position. - - // This can improve behavior if two branches were updated at the same - // time, as is common when cascading rebases after changes land. - - $map = mpull($markers, 'getName'); - natcasesort($map); - $markers = array_select_keys($markers, array_keys($map)); - return $markers; }