diff --git a/src/land/engine/ArcanistGitLandEngine.php b/src/land/engine/ArcanistGitLandEngine.php --- a/src/land/engine/ArcanistGitLandEngine.php +++ b/src/land/engine/ArcanistGitLandEngine.php @@ -103,6 +103,11 @@ } } + // Sort the result so that branches are processed in natural order. + $names = array_keys($result); + natcasesort($names); + $result = array_select_keys($result, $names); + return $result; } diff --git a/src/land/engine/ArcanistLandEngine.php b/src/land/engine/ArcanistLandEngine.php --- a/src/land/engine/ArcanistLandEngine.php +++ b/src/land/engine/ArcanistLandEngine.php @@ -140,6 +140,15 @@ return $this->shouldKeep; } + final public function setStrategyArgument($strategy_argument) { + $this->strategyArgument = $strategy_argument; + return $this; + } + + final public function getStrategyArgument() { + return $this->strategyArgument; + } + final public function setStrategy($strategy) { $this->strategy = $strategy; return $this; diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php --- a/src/workflow/ArcanistWorkflow.php +++ b/src/workflow/ArcanistWorkflow.php @@ -2357,11 +2357,13 @@ $prompts = $this->newPrompts(); assert_instances_of($prompts, 'ArcanistPrompt'); + // TODO: Move this somewhere modular. + $prompts[] = $this->newPrompt('arc.state.stash') ->setDescription( pht( 'Prompts the user to stash changes and continue when the '. - 'working copy has untracked, uncommitted. or unstaged '. + 'working copy has untracked, uncommitted, or unstaged '. 'changes.')); // TODO: Swap to ArrayCheck?