Differential D21706 Diff 51695 src/land/engine/ArcanistMercurialLandEngine.php

Changeset View

Standalone View

Show First 20 Lines • Show All 828 Lines • ▼ Show 20 Lines	try {
$argv[] = hgsprintf('%s..%s', $min_commit, $max_commit);		$argv[] = hgsprintf('%s..%s', $min_commit, $max_commit);

$argv[] = '--logfile';		$argv[] = '--logfile';
$argv[] = '-';		$argv[] = '-';

$argv[] = '--keep';		$argv[] = '--keep';
$argv[] = '--collapse';		$argv[] = '--collapse';

$future = $api->execFutureLocal('rebase %Ls', $argv);		$future = $api->execFutureLocalWithExtension(
		'rebase',
		'rebase %Ls',
		$argv);
$future->write($commit_message);		$future->write($commit_message);
$future->resolvex();		$future->resolvex();

} catch (CommandException $ex) {		} catch (CommandException $ex) {
// Aborting the rebase should restore the same state prior to running the		// Aborting the rebase should restore the same state prior to running the
// rebase command.		// rebase command.
$api->execManualLocal('rebase --abort');		$api->execManualLocalWithExtension(
		'rebase',
		'rebase --abort');
throw $ex;		throw $ex;
}		}

// Find all the bookmarks which pointed at commits we just rebased, and		// Find all the bookmarks which pointed at commits we just rebased, and
// put them back the way they were before rebasing moved them. We aren't		// put them back the way they were before rebasing moved them. We aren't
// deleting the old commits yet and don't want to move the bookmarks.		// deleting the old commits yet and don't want to move the bookmarks.

$obsolete_map = array();		$obsolete_map = array();
▲ Show 20 Lines • Show All 424 Lines • Show Last 20 Lines