1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2025-02-02 09:58:23 +01:00

Allow the "arc land --onto" default to be read from user config

Summary: Allow the default to be set in global config, not just project config.

Test Plan: `arc set-config arc.land.onto.default derp; arc land`

Reviewers: btrahan, vrana

Reviewed By: btrahan

CC: aran

Differential Revision: https://secure.phabricator.com/D2686
This commit is contained in:
epriestley 2012-06-20 12:29:07 -07:00
parent a121313ca4
commit 1d5a2aff20
2 changed files with 9 additions and 2 deletions

View file

@ -70,7 +70,8 @@ EOTEXT
'param' => 'master',
'help' => "Land feature branch onto a branch other than ".
"'master' (default). You can change the default by setting ".
"'arc.land.onto.default' in your .arcconfig.",
"'arc.land.onto.default' with `arc set-config` or for the ".
"entire project in .arcconfig.",
),
'hold' => array(
'help' => "Prepare the change to be pushed, but do not actually ".
@ -135,7 +136,7 @@ EOTEXT
$branch = head($branch);
$onto_default = nonempty(
$this->getWorkingCopy()->getConfig('arc.land.onto.default'),
$this->getWorkingCopy()->getConfigFromAnySource('arc.land.onto.default'),
'master');
$remote = $this->getArgument('remote', 'origin');

View file

@ -159,6 +159,12 @@ EOTEXT
'engine is specified by the current project.',
'example' => 'ExampleUnitTestEngine',
),
'arc.land.onto.default' => array(
'help' =>
'The name of the default branch to land changes onto when '.
'`arc land` is run.',
'example' => 'develop',
),
);
$config = self::readGlobalArcConfig();