Page MenuHomePhabricator
Files F18734086

D20869.id.diff
No OneTemporary
Actions

D20869.id.diff
View Options

diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php
--- a/src/workflow/ArcanistLandWorkflow.php
+++ b/src/workflow/ArcanistLandWorkflow.php
@@ -44,10 +44,10 @@
public function getCommandHelp() {
return phutil_console_format(<<<EOTEXT
- Supports: git, hg
+ Supports: git, git/p4, hg
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
revision that are currently sitting in __ref__, which is usually the
@@ -57,6 +57,9 @@
Under Git: branches, tags, and arbitrary commits (detached HEADs)
may be landed.
+ Under Git/Perforce: branches, tags, and arbitrary commits may
+ be submitted.
+
Under Mercurial: branches and bookmarks may be landed, but only
onto a target of the same type. See T3855.
@@ -66,7 +69,8 @@
A target branch is selected by examining these sources in order:
- 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;
- or by falling back to a standard default:
- "master" in Git;
@@ -76,6 +80,8 @@
- the **--remote** flag;
- 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:
- "origin" in Git;
- the default remote in Mercurial.
@@ -159,7 +165,7 @@
'remote' => array(
'param' => 'origin',
'help' => pht(
- "Push to a remote other than the default ('origin' in git)."),
+ 'Push to a remote other than the default.'),
),
'merge' => array(
'help' => pht(

File Metadata

Mime Type
text/plain
Expires
Oct 1 2025, 10:47 PM (7 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
9035976
Default Alt Text
D20869.id.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility