1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-22 06:42: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:
epriestley 2015-12-13 03:08:06 -08:00
parent 7d25fcdbdb
commit 9a373c88d7

View file

@ -29,9 +29,7 @@ final class ArcanistGitLandEngine
$this->updateWorkingCopy(); $this->updateWorkingCopy();
if ($this->getShouldHold()) { if ($this->getShouldHold()) {
$this->writeInfo( $this->didHoldChanges();
pht('HOLD'),
pht('Holding change locally, it has not been pushed.'));
} else { } else {
$this->pushChange(); $this->pushChange();
$this->reconcileLocalState(); $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.'));
}
} }