Differential D21328 Diff 50790 src/land/engine/ArcanistMercurialLandEngine.php

Changeset View

Standalone View

src/land/engine/ArcanistMercurialLandEngine.php

Show First 20 Lines • Show All 497 Lines • ▼ Show 20 Lines	final class ArcanistMercurialLandEngine

protected function pushChange($into_commit) {		protected function pushChange($into_commit) {
$api = $this->getRepositoryAPI();		$api = $this->getRepositoryAPI();

// TODO: This does not respect "--into" or "--onto" properly.		// TODO: This does not respect "--into" or "--onto" properly.

$api->execxLocal(		$api->execxLocal(
'push --rev %s -- %s',		'push --rev %s -- %s',
$into_commit,		hgsprintf('%s', $into_commit),
$this->getOntoRemote());		$this->getOntoRemote());
}		}

protected function cascadeState(ArcanistLandCommitSet $set, $into_commit) {		protected function cascadeState(ArcanistLandCommitSet $set, $into_commit) {
$api = $this->getRepositoryAPI();		$api = $this->getRepositoryAPI();
$log = $this->getLogEngine();		$log = $this->getLogEngine();

// This has no effect when we're executing a merge strategy.		// This has no effect when we're executing a merge strategy.
▲ Show 20 Lines • Show All 80 Lines • ▼ Show 20 Lines	protected function reconcileLocalState(
$into_commit,		$into_commit,
ArcanistRepositoryLocalState $state) {		ArcanistRepositoryLocalState $state) {

// TODO: For now, just leave users wherever they ended up.		// TODO: For now, just leave users wherever they ended up.

$state->discardLocalState();		$state->discardLocalState();
}		}

		protected function didHoldChanges($into_commit) {
		$log = $this->getLogEngine();
		$local_state = $this->getLocalState();

		$message = pht(
		'Holding changes locally, they have not been pushed.');

		$push_command = csprintf(
		'$ hg push -- %s %Ls',

		// TODO: When a parameter contains only "safe" characters, we could
		// relax the behavior of hgsprintf().

		hgsprintf('%s', $this->getDisplayHash($into_commit)),
		$this->newOntoRefArguments($into_commit));

		echo tsprintf(
		"\n%!\n%s\n\n",
		pht('HOLD CHANGES'),
		$message);

		echo tsprintf(
		"%s\n\n %s\n\n",
		pht('To push changes manually, run this command:'),
		$push_command);

		$restore_commands = $local_state->getRestoreCommandsForDisplay();
		if ($restore_commands) {
		echo tsprintf(
		"%s\n\n",
		pht(
		'To go back to how things were before you ran "arc land", run '.
		'these %s command(s):',
		phutil_count($restore_commands)));

		foreach ($restore_commands as $restore_command) {
		echo tsprintf(" %s\n", $restore_command);
		}

		echo tsprintf("\n");
		}

		echo tsprintf(
		"%s\n".
		pht(
		'Local branches and bookmarks have not been changed, and are still '.
		'in the same state as before.'));
		}
}		}