Changeset View
Changeset View
Standalone View
Standalone View
src/workflow/ArcanistLandWorkflow.php
| Show All 38 Lines | public function getCommandSynopses() { | ||||
| return phutil_console_format(<<<EOTEXT | return phutil_console_format(<<<EOTEXT | ||||
| **land** [__options__] [__ref__] | **land** [__options__] [__ref__] | ||||
| EOTEXT | 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 | ||||
| name of a local branch. Without __ref__, the current working copy | name of a local branch. Without __ref__, the current working copy | ||||
| state will be used. | state will be used. | ||||
| 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. | ||||
| The workflow selects a target branch to land onto and a remote where | The workflow selects a target branch to land onto and a remote where | ||||
| the change will be pushed to. | the change will be pushed to. | ||||
| 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; | ||||
| - "default" in Mercurial. | - "default" in Mercurial. | ||||
| A remote is selected by examining these sources in order: | A remote is selected by examining these sources in order: | ||||
| - 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. | ||||
| After selecting a target branch and a remote, the commits which will | After selecting a target branch and a remote, the commits which will | ||||
| be landed are printed. | be landed are printed. | ||||
| With **--preview**, execution stops here, before the change is | With **--preview**, execution stops here, before the change is | ||||
| ▲ Show 20 Lines • Show All 67 Lines • ▼ Show 20 Lines | return array( | ||||
| 'keep-branch' => array( | 'keep-branch' => array( | ||||
| 'help' => pht( | 'help' => pht( | ||||
| 'Keep the feature branch after pushing changes to the '. | 'Keep the feature branch after pushing changes to the '. | ||||
| 'remote (by default, it is deleted).'), | 'remote (by default, it is deleted).'), | ||||
| ), | ), | ||||
| '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( | ||||
| 'Perform a %s merge, not a %s merge. If the project '. | 'Perform a %s merge, not a %s merge. If the project '. | ||||
| 'is marked as having an immutable history, this is the default '. | 'is marked as having an immutable history, this is the default '. | ||||
| 'behavior.', | 'behavior.', | ||||
| '--no-ff', | '--no-ff', | ||||
| '--squash'), | '--squash'), | ||||
| ▲ Show 20 Lines • Show All 1,434 Lines • Show Last 20 Lines | |||||