From e2ac83ce572c8c8c1664c5266355f342474b7346 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 6 Jul 2020 14:05:16 -0700 Subject: [PATCH] (stable) Fix a MarkerRef call to get the active bookmark in Mercurial Summary: See PHI1805. This call is constructed improperly and can lead to a fatal in `arc patch` under Mercurial. Test Plan: In Mercurial, ran a valid `arc patch` operation. Differential Revision: https://secure.phabricator.com/D21391 --- src/repository/api/ArcanistMercurialAPI.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/repository/api/ArcanistMercurialAPI.php b/src/repository/api/ArcanistMercurialAPI.php index cffb9306..cbc6b5a0 100644 --- a/src/repository/api/ArcanistMercurialAPI.php +++ b/src/repository/api/ArcanistMercurialAPI.php @@ -890,7 +890,10 @@ final class ArcanistMercurialAPI extends ArcanistRepositoryAPI { public function getActiveBookmark() { $bookmark = $this->newMarkerRefQuery() - ->withMarkerTypes(ArcanistMarkerRef::TYPE_BOOKMARK) + ->withMarkerTypes( + array( + ArcanistMarkerRef::TYPE_BOOKMARK, + )) ->withIsActive(true) ->executeOne();