revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-26 08:42:40 +01:00
Code Issues Releases Wiki Activity

Fix hg 'arc land' when the mq extension is not enabled

Browse source 
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
This commit is contained in:
durham 2013-02-14 11:37:49 -08:00
parent 299b9c4c6b
commit 0795edfe1a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/workflow/ArcanistLandWorkflow.php
View file

@ -596,7 +596,7 @@ EOTEXT
// delete the old branch if necessary // delete the old branch if necessary
if (!$this->keepBranch) { if (!$this->keepBranch) {
$repository_api->execxLocal( $repository_api->execxLocal(
'strip -r %s', '--config extensions.mq= strip -r %s',
$branch_root); $branch_root);
if ($repository_api->isBookmark($this->branch)) { if ($repository_api->isBookmark($this->branch)) {