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

Update "arc help land" to reference Perforce support

Browse source 
Summary: Fixes T12668. Ref T13434. This is far from exhasutive, but suggest that Perforce probably works.

Test Plan: Read documentation.

Maniphest Tasks: T13434, T12668

Differential Revision: https://secure.phabricator.com/D20869
This commit is contained in:
epriestley 2019-10-28 11:00:33 -07:00
parent ca66743905
commit a76054f8d6
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/workflow/ArcanistLandWorkflow.php
View file

@ -44,10 +44,10 @@ EOTEXT
public function getCommandHelp() { public function getCommandHelp() {
return phutil_console_format(<<<EOTEXT return phutil_console_format(<<<EOTEXT
Supports: git, hg Supports: git, git/p4, hg
Publish an accepted revision after review. This command is the last Publish an accepted revision after review. This command is the last
step in the standard Differential pre-publish code review workflow. step in the standard Differential code review workflow.
This command merges and pushes changes associated with an accepted This command merges and pushes changes associated with an accepted
revision that are currently sitting in __ref__, which is usually the revision that are currently sitting in __ref__, which is usually the
@ -57,6 +57,9 @@ EOTEXT
Under Git: branches, tags, and arbitrary commits (detached HEADs) Under Git: branches, tags, and arbitrary commits (detached HEADs)
may be landed. may be landed.
Under Git/Perforce: branches, tags, and arbitrary commits may
be submitted.
Under Mercurial: branches and bookmarks may be landed, but only Under Mercurial: branches and bookmarks may be landed, but only
onto a target of the same type. See T3855. onto a target of the same type. See T3855.
@ -66,7 +69,8 @@ EOTEXT
A target branch is selected by examining these sources in order: A target branch is selected by examining these sources in order:
- the **--onto** flag; - the **--onto** flag;
- the upstream of the current branch, recursively (Git only); - the upstream of the branch targeted by the land operation,
recursively (Git only);
- the __arc.land.onto.default__ configuration setting; - the __arc.land.onto.default__ configuration setting;
- or by falling back to a standard default: - or by falling back to a standard default:
- "master" in Git; - "master" in Git;
@ -76,6 +80,8 @@ EOTEXT
- the **--remote** flag; - the **--remote** flag;
- the upstream of the current branch, recursively (Git only); - the upstream of the current branch, recursively (Git only);
- the special "p4" remote which indicates a repository has
been synchronized with Perforce (Git only);
- or by falling back to a standard default: - or by falling back to a standard default:
- "origin" in Git; - "origin" in Git;
- the default remote in Mercurial. - the default remote in Mercurial.
@ -159,7 +165,7 @@ EOTEXT
'remote' => array( 'remote' => array(
'param' => 'origin', 'param' => 'origin',
'help' => pht( 'help' => pht(
"Push to a remote other than the default ('origin' in git)."), 'Push to a remote other than the default.'),
), ),
'merge' => array( 'merge' => array(
'help' => pht( 'help' => pht(