revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-09 16:32:39 +01:00
Code Issues Releases Wiki Activity

Fix a potential double-prompt in "arc land" when landing with ongoing builds

Browse source 
Summary: The recently-added, build-plan-behavior-aware check here does all of its own prompting, so we should skip the other prompting if it doesn't throw.

Test Plan: Will `arc land` something sketchy sooner or later.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D20494
This commit is contained in:
epriestley 2019-05-03 10:14:51 -07:00
parent b61e890a0c
commit 9ccbbee336
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/workflow/ArcanistLandWorkflow.php
View file

@ -1376,6 +1376,7 @@ EOTEXT
// if this one doesn't work out. // if this one doesn't work out.
try { try {
$this->checkForBuildablesWithPlanBehaviors($diff_phid); $this->checkForBuildablesWithPlanBehaviors($diff_phid);
return;
} catch (ArcanistUserAbortException $abort_ex) { } catch (ArcanistUserAbortException $abort_ex) {
throw $abort_ex; throw $abort_ex;
} catch (Exception $ex) { } catch (Exception $ex) {