From 0795edfe1acd5b7a598e0c48fa1f7116047e2a07 Mon Sep 17 00:00:00 2001 From: durham Date: Thu, 14 Feb 2013 11:37:49 -0800 Subject: [PATCH] Fix hg 'arc land' when the mq extension is not enabled Summary: Mercurial 'arc land' uses the 'hg strip' command to clean up after itself, but this command isn't available unless the mq extension is enabled. The fix is to enable it for that particular command only. Test Plan: Ran 'arc land' with the mq extension disabled. It worked. Reviewers: epriestley, bos, sid0, dschleimer Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4955 --- src/workflow/ArcanistLandWorkflow.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php index fee7fda1..31492dbe 100644 --- a/src/workflow/ArcanistLandWorkflow.php +++ b/src/workflow/ArcanistLandWorkflow.php @@ -596,7 +596,7 @@ EOTEXT // delete the old branch if necessary if (!$this->keepBranch) { $repository_api->execxLocal( - 'strip -r %s', + '--config extensions.mq= strip -r %s', $branch_root); if ($repository_api->isBookmark($this->branch)) {