mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-21 22:32:41 +01:00
Explain how to move forward or backward from arc land --hold
Summary: Fixes T9973. When users run `arc land --hold`, give them the commands to move forward (push) or backward (checkout the branch/tag/commit they were on) and be explicit that branches have not changed. Test Plan: Ran `arc land --hold`, got lots of explanatory text. Reviewers: chad Reviewed By: chad Maniphest Tasks: T9973 Differential Revision: https://secure.phabricator.com/D14762
This commit is contained in:
parent
7d25fcdbdb
commit
9a373c88d7
1 changed files with 38 additions and 3 deletions
|
@ -29,9 +29,7 @@ final class ArcanistGitLandEngine
|
|||
$this->updateWorkingCopy();
|
||||
|
||||
if ($this->getShouldHold()) {
|
||||
$this->writeInfo(
|
||||
pht('HOLD'),
|
||||
pht('Holding change locally, it has not been pushed.'));
|
||||
$this->didHoldChanges();
|
||||
} else {
|
||||
$this->pushChange();
|
||||
$this->reconcileLocalState();
|
||||
|
@ -542,4 +540,41 @@ final class ArcanistGitLandEngine
|
|||
);
|
||||
}
|
||||
|
||||
private function didHoldChanges() {
|
||||
$this->writeInfo(
|
||||
pht('HOLD'),
|
||||
pht(
|
||||
'Holding change locally, it has not been pushed.'));
|
||||
|
||||
$push_command = csprintf(
|
||||
'$ git push -- %R %R:%R',
|
||||
$this->getTargetRemote(),
|
||||
$this->mergedRef,
|
||||
$this->getTargetOnto());
|
||||
|
||||
$restore_command = csprintf(
|
||||
'$ git checkout %R --',
|
||||
$this->localRef);
|
||||
|
||||
echo tsprintf(
|
||||
"\n%s\n\n".
|
||||
"%s\n\n".
|
||||
" %s\n\n".
|
||||
"%s\n\n".
|
||||
" %s\n\n".
|
||||
"%s\n",
|
||||
pht(
|
||||
'This local working copy now contains the merged changes in a '.
|
||||
'detached state.'),
|
||||
pht('You can push the changes manually with this command:'),
|
||||
$push_command,
|
||||
pht(
|
||||
'You can go back to how things were before you ran `arc land` with '.
|
||||
'this command:'),
|
||||
$restore_command,
|
||||
pht(
|
||||
'Local branches have not been changed, and are still in exactly the '.
|
||||
'same state as before.'));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue