No OneTemporary
Actions

Size

61 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/repository/api/ArcanistGitAPI.php b/src/repository/api/ArcanistGitAPI.php
	index 38865f8e..34113f45 100644
	--- a/src/repository/api/ArcanistGitAPI.php
	+++ b/src/repository/api/ArcanistGitAPI.php
	@@ -1,972 +1,974 @@
	<?php

	/*
	* Copyright 2012 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* Interfaces with Git working copies.
	*
	* @group workingcopy
	*/
	final class ArcanistGitAPI extends ArcanistRepositoryAPI {

	private $status;
	private $relativeCommit = null;
	private $repositoryHasNoCommits = false;
	const SEARCH_LENGTH_FOR_PARENT_REVISIONS = 16;

	/**
	* For the repository's initial commit, 'git diff HEAD^' and similar do
	* not work. Using this instead does work.
	*/
	const GIT_MAGIC_ROOT_COMMIT = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';

	public static function newHookAPI($root) {
	return new ArcanistGitAPI($root);
	}

	protected function buildLocalFuture(array $argv) {

	$argv[0] = 'git '.$argv[0];

	$future = newv('ExecFuture', $argv);
	$future->setCWD($this->getPath());
	return $future;
	}


	public function getSourceControlSystemName() {
	return 'git';
	}

	public function getMetadataPath() {
	return $this->getPath('.git');
	}

	public function getHasCommits() {
	return !$this->repositoryHasNoCommits;
	}

	public function setRelativeCommit($relative_commit) {
	$this->relativeCommit = $relative_commit;
	return $this;
	}

	public function getLocalCommitInformation() {
	if ($this->repositoryHasNoCommits) {
	// Zero commits.
	throw new Exception(
	"You can't get local commit information for a repository with no ".
	"commits.");
	} else if ($this->relativeCommit == self::GIT_MAGIC_ROOT_COMMIT) {
	// One commit.
	$against = 'HEAD';
	} else {

	// 2..N commits. We include commits reachable from HEAD which are
	// not reachable from the relative commit; this is consistent with
	// user expectations even though it is not actually the diff range.
	// Particularly:
	//
	// \|
	// D <----- master branch
	// \|
	// C Y <- feature branch
	// \| /\|
	// B X
	// \| /
	// A
	// \|
	//
	// If "A, B, C, D" are master, and the user is at Y, when they run
	// "arc diff B" they want (and get) a diff of B vs Y, but they think about
	// this as being the commits X and Y. If we log "B..Y", we only show
	// Y. With "Y --not B", we show X and Y.

	$against = csprintf('%s --not %s', 'HEAD', $this->getRelativeCommit());
	}

	// NOTE: Windows escaping of "%" symbols apparently is inherently broken;
	// when passed throuhgh escapeshellarg() they are replaced with spaces.

	// TODO: Learn how cmd.exe works and find some clever workaround?

	// NOTE: If we use "%x00", output is truncated in Windows.

	list($info) = $this->execxLocal(
	phutil_is_windows()
	? 'log %C --format=%C --'
	: 'log %C --format=%s --',
	$against,
	// NOTE: "%B" is somewhat new, use "%s%n%n%b" instead.
	'%H%x01%T%x01%P%x01%at%x01%an%x01%s%x01%s%n%n%b%x02');

	$commits = array();

	$info = trim($info, " \n\2");
	if (!strlen($info)) {
	return array();
	}

	$info = explode("\2", $info);
	foreach ($info as $line) {
	list($commit, $tree, $parents, $time, $author, $title, $message)
	= explode("\1", trim($line), 7);
	$message = rtrim($message);

	$commits[$commit] = array(
	'commit' => $commit,
	'tree' => $tree,
	'parents' => array_filter(explode(' ', $parents)),
	'time' => $time,
	'author' => $author,
	'summary' => $title,
	'message' => $message,
	);
	}

	return $commits;
	}

	public function getRelativeCommit() {
	if ($this->relativeCommit === null) {

	// Detect zero-commit or one-commit repositories. There is only one
	// relative-commit value that makes any sense in these repositories: the
	// empty tree.
	list($err) = $this->execManualLocal('rev-parse --verify HEAD^');
	if ($err) {
	list($err) = $this->execManualLocal('rev-parse --verify HEAD');
	if ($err) {
	$this->repositoryHasNoCommits = true;
	}

	$this->relativeCommit = self::GIT_MAGIC_ROOT_COMMIT;

	if ($this->repositoryHasNoCommits) {
	$this->setBaseCommitExplanation(
	"the repository has no commits.");
	} else {
	$this->setBaseCommitExplanation(
	"the repository has only one commit.");
	}

	return $this->relativeCommit;
	}

	if ($this->getBaseCommitArgumentRules() \|\|
	$this->getWorkingCopyIdentity()->getConfigFromAnySource('base')) {
	$base = $this->resolveBaseCommit();
	if (!$base) {
	throw new ArcanistUsageException(
	"None of the rules in your 'base' configuration matched a valid ".
	"commit. Adjust rules or specify which commit you want to use ".
	"explicitly.");
	}
	$this->relativeCommit = $base;
	return $this->relativeCommit;
	}

	$do_write = false;
	$default_relative = null;
	$working_copy = $this->getWorkingCopyIdentity();
	if ($working_copy) {
	$default_relative = $working_copy->getConfig(
	'git.default-relative-commit');
	$this->setBaseCommitExplanation(
	"it is the merge-base of '{$default_relative}' and HEAD, as ".
	"specified in 'git.default-relative-commit' in '.arcconfig'. This ".
	"setting overrides other settings.");
	}

	if (!$default_relative) {
	list($err, $upstream) = $this->execManualLocal(
	"rev-parse --abbrev-ref --symbolic-full-name '@{upstream}'");

	if (!$err) {
	$default_relative = trim($upstream);
	$this->setBaseCommitExplanation(
	"it is the merge-base of '{$default_relative}' (the Git upstream ".
	"of the current branch) HEAD.");
	}
	}

	if (!$default_relative) {
	$default_relative = $this->readScratchFile('default-relative-commit');
	$default_relative = trim($default_relative);
	if ($default_relative) {
	$this->setBaseCommitExplanation(
	"it is the merge-base of '{$default_relative}' and HEAD, as ".
	"specified in '.git/arc/default-relative-commit'.");
	}
	}

	if (!$default_relative) {

	// TODO: Remove the history lesson soon.

	echo phutil_console_format(
	"<bg:green> Select a Default Commit Range </bg>\n\n");
	echo phutil_console_wrap(
	"You're running a command which operates on a range of revisions ".
	"(usually, from some revision to HEAD) but have not specified the ".
	"revision that should determine the start of the range.\n\n".
	"Previously, arc assumed you meant 'HEAD^' when you did not specify ".
	"a start revision, but this behavior does not make much sense in ".
	"most workflows outside of Facebook's historic git-svn workflow.\n\n".
	"arc no longer assumes 'HEAD^'. You must specify a relative commit ".
	"explicitly when you invoke a command (e.g., `arc diff HEAD^`, not ".
	"just `arc diff`) or select a default for this working copy.\n\n".
	"In most cases, the best default is 'origin/master'. You can also ".
	"select 'HEAD^' to preserve the old behavior, or some other remote ".
	"or branch. But you almost certainly want to select ".
	"'origin/master'.\n\n".
	"(Technically: the merge-base of the selected revision and HEAD is ".
	"used to determine the start of the commit range.)");

	$prompt = "What default do you want to use? [origin/master]";
	$default = phutil_console_prompt($prompt);

	if (!strlen(trim($default))) {
	$default = 'origin/master';
	}

	$default_relative = $default;
	$do_write = true;
	}

	list($object_type) = $this->execxLocal(
	'cat-file -t %s',
	$default_relative);

	if (trim($object_type) !== 'commit') {
	throw new Exception(
	"Relative commit '{$default_relative}' is not the name of a commit!");
	}

	if ($do_write) {
	// Don't perform this write until we've verified that the object is a
	// valid commit name.
	$this->writeScratchFile('default-relative-commit', $default_relative);
	$this->setBaseCommitExplanation(
	"it is the merge-base of '{$default_relative}' and HEAD, as you ".
	"just specified.");
	}

	list($merge_base) = $this->execxLocal(
	'merge-base %s HEAD',
	$default_relative);

	$this->relativeCommit = trim($merge_base);
	}

	return $this->relativeCommit;
	}

	private function getDiffFullOptions($detect_moves_and_renames = true) {
	$options = array(
	self::getDiffBaseOptions(),
	'--no-color',
	'--src-prefix=a/',
	'--dst-prefix=b/',
	'-U'.$this->getDiffLinesOfContext(),
	);

	if ($detect_moves_and_renames) {
	$options[] = '-M';
	$options[] = '-C';
	}

	return implode(' ', $options);
	}

	private function getDiffBaseOptions() {
	$options = array(
	// Disable external diff drivers, like graphical differs, since Arcanist
	// needs to capture the diff text.
	'--no-ext-diff',
	// Disable textconv so we treat binary files as binary, even if they have
	// an alternative textual representation. TODO: Ideally, Differential
	// would ship up the binaries for 'arc patch' but display the textconv
	// output in the visual diff.
	'--no-textconv',
	);
	return implode(' ', $options);
	}

	public function getFullGitDiff() {
	$options = $this->getDiffFullOptions();
	list($stdout) = $this->execxLocal(
	"diff {$options} %s --",
	$this->getRelativeCommit());
	return $stdout;
	}

	/**
	* @param string Path to generate a diff for.
	* @param bool If true, detect moves and renames. Otherwise, ignore
	* moves/renames; this is useful because it prompts git to
	* generate real diff text.
	*/
	public function getRawDiffText($path, $detect_moves_and_renames = true) {
	$options = $this->getDiffFullOptions($detect_moves_and_renames);
	list($stdout) = $this->execxLocal(
	"diff {$options} %s -- %s",
	$this->getRelativeCommit(),
	$path);
	return $stdout;
	}

	public function getBranchName() {
	// TODO: consider:
	//
	// $ git rev-parse --abbrev-ref `git symbolic-ref HEAD`
	//
	// But that may fail if you're not on a branch.
	list($stdout) = $this->execxLocal('branch --no-color');

	+ // Assume that any branch beginning with '(' means 'no branch', or whatever
	+ // 'no branch' is in the current locale.
	$matches = null;
	- if (preg_match('/^\* (.+)$/m', $stdout, $matches)) {
	+ if (preg_match('/^\* ([^\(].*)$/m', $stdout, $matches)) {
	return $matches[1];
	}
	return null;
	}

	public function getSourceControlPath() {
	// TODO: Try to get something useful here.
	return null;
	}

	public function getGitCommitLog() {
	$relative = $this->getRelativeCommit();
	if ($this->repositoryHasNoCommits) {
	// No commits yet.
	return '';
	} else if ($relative == self::GIT_MAGIC_ROOT_COMMIT) {
	// First commit.
	list($stdout) = $this->execxLocal(
	'log --format=medium HEAD');
	} else {
	// 2..N commits.
	list($stdout) = $this->execxLocal(
	'log --first-parent --format=medium %s..HEAD',
	$this->getRelativeCommit());
	}
	return $stdout;
	}

	public function getGitHistoryLog() {
	list($stdout) = $this->execxLocal(
	'log --format=medium -n%d %s',
	self::SEARCH_LENGTH_FOR_PARENT_REVISIONS,
	$this->getRelativeCommit());
	return $stdout;
	}

	public function getSourceControlBaseRevision() {
	list($stdout) = $this->execxLocal(
	'rev-parse %s',
	$this->getRelativeCommit());
	return rtrim($stdout, "\n");
	}

	public function getCanonicalRevisionName($string) {
	$match = null;
	if (preg_match('/@([0-9]+)$/', $string, $match)) {
	list($stdout) = $this->execxLocal(
	'svn find-rev r%d',
	$match[1]);
	} else {
	list($stdout) = $this->execxLocal(
	'show -s --format=%C %s',
	'%H',
	$string);
	}
	return rtrim($stdout);
	}

	public function getWorkingCopyStatus() {
	if (!isset($this->status)) {

	$options = $this->getDiffBaseOptions();

	// -- parallelize these slow cpu bound git calls.

	// Find committed changes.
	$committed_future = $this->buildLocalFuture(
	array(
	"diff {$options} --raw %s --",
	$this->getRelativeCommit(),
	));

	// Find uncommitted changes.
	$uncommitted_future = $this->buildLocalFuture(
	array(
	"diff {$options} --raw %s --",
	$this->repositoryHasNoCommits
	? self::GIT_MAGIC_ROOT_COMMIT
	: 'HEAD',
	));

	// Untracked files
	$untracked_future = $this->buildLocalFuture(
	array(
	'ls-files --others --exclude-standard',
	));

	// TODO: This doesn't list unstaged adds. It's not clear how to get that
	// list other than "git status --porcelain" and then parsing it. :/

	// Unstaged changes
	$unstaged_future = $this->buildLocalFuture(
	array(
	'ls-files -m',
	));

	$futures = array(
	$committed_future,
	$uncommitted_future,
	$untracked_future,
	$unstaged_future
	);
	Futures($futures)->resolveAll();


	// -- read back and process the results

	list($stdout, $stderr) = $committed_future->resolvex();
	$files = $this->parseGitStatus($stdout);

	list($stdout, $stderr) = $uncommitted_future->resolvex();
	$uncommitted_files = $this->parseGitStatus($stdout);
	foreach ($uncommitted_files as $path => $mask) {
	$mask \|= self::FLAG_UNCOMMITTED;
	if (!isset($files[$path])) {
	$files[$path] = 0;
	}
	$files[$path] \|= $mask;
	}

	list($stdout, $stderr) = $untracked_future->resolvex();
	$stdout = rtrim($stdout, "\n");
	if (strlen($stdout)) {
	$stdout = explode("\n", $stdout);
	foreach ($stdout as $file) {
	$files[$file] = self::FLAG_UNTRACKED;
	}
	}

	list($stdout, $stderr) = $unstaged_future->resolvex();
	$stdout = rtrim($stdout, "\n");
	if (strlen($stdout)) {
	$stdout = explode("\n", $stdout);
	foreach ($stdout as $file) {
	$files[$file] = isset($files[$file])
	? ($files[$file] \| self::FLAG_UNSTAGED)
	: self::FLAG_UNSTAGED;
	}
	}

	$this->status = $files;
	}

	return $this->status;
	}

	public function amendCommit($message) {
	$tmp_file = new TempFile();
	Filesystem::writeFile($tmp_file, $message);
	$this->execxLocal(
	'commit --amend --allow-empty -F %s',
	$tmp_file);
	}

	public function getPreReceiveHookStatus($old_ref, $new_ref) {
	$options = $this->getDiffBaseOptions();
	list($stdout) = $this->execxLocal(
	"diff {$options} --raw %s %s --",
	$old_ref,
	$new_ref);
	return $this->parseGitStatus($stdout, $full = true);
	}

	private function parseGitStatus($status, $full = false) {
	static $flags = array(
	'A' => self::FLAG_ADDED,
	'M' => self::FLAG_MODIFIED,
	'D' => self::FLAG_DELETED,
	);

	$status = trim($status);
	$lines = array();
	foreach (explode("\n", $status) as $line) {
	if ($line) {
	$lines[] = preg_split("/[ \t]/", $line);
	}
	}

	$files = array();
	foreach ($lines as $line) {
	$mask = 0;
	$flag = $line[4];
	$file = $line[5];
	foreach ($flags as $key => $bits) {
	if ($flag == $key) {
	$mask \|= $bits;
	}
	}
	if ($full) {
	$files[$file] = array(
	'mask' => $mask,
	'ref' => rtrim($line[3], '.'),
	);
	} else {
	$files[$file] = $mask;
	}
	}

	return $files;
	}

	public function getBlame($path) {
	// TODO: 'git blame' supports --porcelain and we should probably use it.
	list($stdout) = $this->execxLocal(
	'blame --date=iso -w -M %s -- %s',
	$this->getRelativeCommit(),
	$path);

	$blame = array();
	foreach (explode("\n", trim($stdout)) as $line) {
	if (!strlen($line)) {
	continue;
	}

	// lines predating a git repo's history are blamed to the oldest revision,
	// with the commit hash prepended by a ^. we shouldn't count these lines
	// as blaming to the oldest diff's unfortunate author
	if ($line[0] == '^') {
	continue;
	}

	$matches = null;
	$ok = preg_match(
	'/^([0-9a-f]+)[^(]+?[(](.*?) +\d\d\d\d-\d\d-\d\d/',
	$line,
	$matches);
	if (!$ok) {
	throw new Exception("Bad blame? `{$line}'");
	}
	$revision = $matches[1];
	$author = $matches[2];

	$blame[] = array($author, $revision);
	}

	return $blame;
	}

	public function getOriginalFileData($path) {
	return $this->getFileDataAtRevision($path, $this->getRelativeCommit());
	}

	public function getCurrentFileData($path) {
	return $this->getFileDataAtRevision($path, 'HEAD');
	}

	private function parseGitTree($stdout) {
	$result = array();

	$stdout = trim($stdout);
	if (!strlen($stdout)) {
	return $result;
	}

	$lines = explode("\n", $stdout);
	foreach ($lines as $line) {
	$matches = array();
	$ok = preg_match(
	'/^(\d{6}) (blob\|tree) ([a-z0-9]{40})[\t](.*)$/',
	$line,
	$matches);
	if (!$ok) {
	throw new Exception("Failed to parse git ls-tree output!");
	}
	$result[$matches[4]] = array(
	'mode' => $matches[1],
	'type' => $matches[2],
	'ref' => $matches[3],
	);
	}
	return $result;
	}

	private function getFileDataAtRevision($path, $revision) {

	// NOTE: We don't want to just "git show {$revision}:{$path}" since if the
	// path was a directory at the given revision we'll get a list of its files
	// and treat it as though it as a file containing a list of other files,
	// which is silly.

	list($stdout) = $this->execxLocal(
	'ls-tree %s -- %s',
	$revision,
	$path);

	$info = $this->parseGitTree($stdout);
	if (empty($info[$path])) {
	// No such path, or the path is a directory and we executed 'ls-tree dir/'
	// and got a list of its contents back.
	return null;
	}

	if ($info[$path]['type'] != 'blob') {
	// Path is or was a directory, not a file.
	return null;
	}

	list($stdout) = $this->execxLocal(
	'cat-file blob %s',
	$info[$path]['ref']);
	return $stdout;
	}

	/**
	* Returns names of all the branches in the current repository.
	*
	* @return list<dict<string, string>> Dictionary of branch information.
	*/
	public function getAllBranches() {
	list($branch_info) = $this->execxLocal(
	'branch --no-color');
	$lines = explode("\n", rtrim($branch_info));

	$result = array();
	foreach ($lines as $line) {

	if (preg_match('/^[* ]+$no branch$/', $line)) {
	// This is indicating that the working copy is in a detached state;
	// just ignore it.
	continue;
	}

	list($current, $name) = preg_split('/\s+/', $line, 2);
	$result[] = array(
	'current' => !empty($current),
	'name' => $name,
	);
	}

	return $result;
	}

	public function getWorkingCopyRevision() {
	list($stdout) = $this->execxLocal('rev-parse HEAD');
	return rtrim($stdout, "\n");
	}

	public function isHistoryDefaultImmutable() {
	return false;
	}

	public function supportsAmend() {
	return true;
	}

	public function supportsRelativeLocalCommits() {
	return true;
	}

	public function setDefaultBaseCommit() {
	$this->setRelativeCommit('HEAD^');
	return $this;
	}

	public function hasLocalCommit($commit) {
	try {
	if (!$this->getCanonicalRevisionName($commit)) {
	return false;
	}
	} catch (CommandException $exception) {
	return false;
	}
	return true;
	}

	public function parseRelativeLocalCommit(array $argv) {
	if (count($argv) == 0) {
	return;
	}
	if (count($argv) != 1) {
	throw new ArcanistUsageException("Specify only one commit.");
	}
	$base = reset($argv);
	if ($base == ArcanistGitAPI::GIT_MAGIC_ROOT_COMMIT) {
	$merge_base = $base;
	$this->setBaseCommitExplanation(
	"you explicitly specified the empty tree.");
	} else {
	list($err, $merge_base) = $this->execManualLocal(
	'merge-base %s HEAD',
	$base);
	if ($err) {
	throw new ArcanistUsageException(
	"Unable to find any git commit named '{$base}' in this repository.");
	}
	$this->setBaseCommitExplanation(
	"it is the merge-base of '{$base}' and HEAD, as you explicitly ".
	"specified.");
	}
	$this->setRelativeCommit(trim($merge_base));
	}

	public function getAllLocalChanges() {
	$diff = $this->getFullGitDiff();
	if (!strlen(trim($diff))) {
	return array();
	}
	$parser = new ArcanistDiffParser();
	return $parser->parseDiff($diff);
	}

	public function supportsLocalBranchMerge() {
	return true;
	}

	public function performLocalBranchMerge($branch, $message) {
	if (!$branch) {
	throw new ArcanistUsageException(
	"Under git, you must specify the branch you want to merge.");
	}
	$err = phutil_passthru(
	'(cd %s && git merge --no-ff -m %s %s)',
	$this->getPath(),
	$message,
	$branch);

	if ($err) {
	throw new ArcanistUsageException("Merge failed!");
	}
	}

	public function getFinalizedRevisionMessage() {
	return "You may now push this commit upstream, as appropriate (e.g. with ".
	"'git push', or 'git svn dcommit', or by printing and faxing it).";
	}

	public function getCommitMessage($commit) {
	list($message) = $this->execxLocal(
	'log -n1 --format=%C %s --',
	'%s%n%n%b',
	$commit);
	return $message;
	}

	public function loadWorkingCopyDifferentialRevisions(
	ConduitClient $conduit,
	array $query) {

	$messages = $this->getGitCommitLog();
	if (!strlen($messages)) {
	return array();
	}

	$parser = new ArcanistDiffParser();
	$messages = $parser->parseDiff($messages);

	// First, try to find revisions by explicit revision IDs in commit messages.
	$reason_map = array();
	$revision_ids = array();
	foreach ($messages as $message) {
	$object = ArcanistDifferentialCommitMessage::newFromRawCorpus(
	$message->getMetadata('message'));
	if ($object->getRevisionID()) {
	$revision_ids[] = $object->getRevisionID();
	$reason_map[$object->getRevisionID()] = $message->getCommitHash();
	}
	}

	if ($revision_ids) {
	$results = $conduit->callMethodSynchronous(
	'differential.query',
	$query + array(
	'ids' => $revision_ids,
	));

	foreach ($results as $key => $result) {
	$hash = substr($reason_map[$result['id']], 0, 16);
	$results[$key]['why'] =
	"Commit message for '{$hash}' has explicit 'Differential Revision'.";
	}

	return $results;
	}

	// If we didn't succeed, try to find revisions by hash.
	$hashes = array();
	foreach ($this->getLocalCommitInformation() as $commit) {
	$hashes[] = array('gtcm', $commit['commit']);
	$hashes[] = array('gttr', $commit['tree']);
	}

	$results = $conduit->callMethodSynchronous(
	'differential.query',
	$query + array(
	'commitHashes' => $hashes,
	));

	foreach ($results as $key => $result) {
	$results[$key]['why'] =
	"A git commit or tree hash in the commit range is already attached ".
	"to the Differential revision.";
	}

	return $results;
	}

	public function updateWorkingCopy() {
	$this->execxLocal('pull');
	}

	public function getCommitSummary($commit) {
	if ($commit == self::GIT_MAGIC_ROOT_COMMIT) {
	return '(The Empty Tree)';
	}

	list($summary) = $this->execxLocal(
	'log -n 1 --format=%C %s',
	'%s',
	$commit);

	return trim($summary);
	}

	public function resolveBaseCommitRule($rule, $source) {
	list($type, $name) = explode(':', $rule, 2);

	switch ($type) {
	case 'git':
	$matches = null;
	if (preg_match('/^merge-base$(.+)$$/', $name, $matches)) {
	list($err, $merge_base) = $this->execManualLocal(
	'merge-base %s HEAD',
	$matches[1]);
	if (!$err) {
	$this->setBaseCommitExplanation(
	"it is the merge-base of '{$matches[1]}' and HEAD, as ".
	"specified by '{$rule}' in your {$source} 'base' ".
	"configuration.");
	return trim($merge_base);
	}
	} else if (preg_match('/^branch-unique$(.+)$$/', $name, $matches)) {
	list($err, $merge_base) = $this->execManualLocal(
	'merge-base %s HEAD',
	$matches[1]);
	if ($err) {
	return null;
	}
	$merge_base = trim($merge_base);

	list($commits) = $this->execxLocal(
	'log --format=%C %s..HEAD --',
	'%H',
	$merge_base);
	$commits = array_filter(explode("\n", $commits));

	if (!$commits) {
	return null;
	}

	$commits[] = $merge_base;

	$head_branch_count = null;
	foreach ($commits as $commit) {
	list($branches) = $this->execxLocal(
	'branch --contains %s',
	$commit);
	$branches = array_filter(explode("\n", $branches));
	if ($head_branch_count === null) {
	// If this is the first commit, it's HEAD. Count how many
	// branches it is on; we want to include commits on the same
	// number of branches. This covers a case where this branch
	// has sub-branches and we're running "arc diff" here again
	// for whatever reason.
	$head_branch_count = count($branches);
	} else if (count($branches) > $head_branch_count) {
	foreach ($branches as $key => $branch) {
	$branches[$key] = trim($branch, ' *');
	}
	$branches = implode(', ', $branches);
	$this->setBaseCommitExplanation(
	"it is the first commit between '{$merge_base}' (the ".
	"merge-base of '{$matches[1]}' and HEAD) which is also ".
	"contained by another branch ({$branches}).");
	return $commit;
	}
	}
	} else {
	list($err) = $this->execManualLocal(
	'cat-file -t %s',
	$name);
	if (!$err) {
	$this->setBaseCommitExplanation(
	"it is specified by '{$rule}' in your {$source} 'base' ".
	"configuration.");
	return $name;
	}
	}
	break;
	case 'arc':
	switch ($name) {
	case 'empty':
	$this->setBaseCommitExplanation(
	"you specified '{$rule}' in your {$source} 'base' ".
	"configuration.");
	return self::GIT_MAGIC_ROOT_COMMIT;
	case 'amended':
	$text = $this->getCommitMessage('HEAD');
	$message = ArcanistDifferentialCommitMessage::newFromRawCorpus(
	$text);
	if ($message->getRevisionID()) {
	$this->setBaseCommitExplanation(
	"HEAD has been amended with 'Differential Revision:', ".
	"as specified by '{$rule}' in your {$source} 'base' ".
	"configuration.");
	return 'HEAD^';
	}
	break;
	case 'upstream':
	list($err, $upstream) = $this->execManualLocal(
	"rev-parse --abbrev-ref --symbolic-full-name '@{upstream}'");
	if (!$err) {
	list($upstream_merge_base) = $this->execxLocal(
	'merge-base %s HEAD',
	$upstream);
	$this->setBaseCommitExplanation(
	"it is the merge-base of the upstream of the current branch ".
	"and HEAD, and matched the rule '{$rule}' in your {$source} ".
	"'base' configuration.");
	return $upstream_merge_base;
	}
	break;
	}
	default:
	return null;
	}

	return null;
	}

	}
	diff --git a/src/workflow/ArcanistPatchWorkflow.php b/src/workflow/ArcanistPatchWorkflow.php
	index 6d2e2dfd..c0896250 100644
	--- a/src/workflow/ArcanistPatchWorkflow.php
	+++ b/src/workflow/ArcanistPatchWorkflow.php
	@@ -1,992 +1,1001 @@
	<?php

	/*
	* Copyright 2012 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* Applies changes from Differential or a file to the working copy.
	*
	* @group workflow
	*/
	final class ArcanistPatchWorkflow extends ArcanistBaseWorkflow {

	const SOURCE_BUNDLE = 'bundle';
	const SOURCE_PATCH = 'patch';
	const SOURCE_REVISION = 'revision';
	const SOURCE_DIFF = 'diff';

	private $source;
	private $sourceParam;

	public function getWorkflowName() {
	return 'patch';
	}

	public function getCommandSynopses() {
	return phutil_console_format(<<<EOTEXT
	patch __D12345__
	patch __--revision__ __revision_id__
	patch __--diff__ __diff_id__
	patch __--patch__ __file__
	patch __--arcbundle__ __bundlefile__
	EOTEXT
	);
	}

	public function getCommandHelp() {
	return phutil_console_format(<<<EOTEXT
	Supports: git, svn, hg
	Apply the changes in a Differential revision, patchfile, or arc
	bundle to the working copy.
	EOTEXT
	);
	}

	public function getArguments() {
	return array(
	'revision' => array(
	'param' => 'revision_id',
	'paramtype' => 'complete',
	'help' =>
	"Apply changes from a Differential revision, using the most recent ".
	"diff that has been attached to it. You can run 'arc patch D12345' ".
	"as a shorthand.",
	),
	'diff' => array(
	'param' => 'diff_id',
	'help' =>
	"Apply changes from a Differential diff. Normally you want to use ".
	"--revision to get the most recent changes, but you can ".
	"specifically apply an out-of-date diff or a diff which was never ".
	"attached to a revision by using this flag.",
	),
	'arcbundle' => array(
	'param' => 'bundlefile',
	'paramtype' => 'file',
	'help' =>
	"Apply changes from an arc bundle generated with 'arc export'.",
	),
	'patch' => array(
	'param' => 'patchfile',
	'paramtype' => 'file',
	'help' =>
	"Apply changes from a git patchfile or unified patchfile.",
	),
	'encoding' => array(
	'param' => 'encoding',
	'help' =>
	"Attempt to convert non UTF-8 patch into specified encoding.",
	),
	'update' => array(
	'supports' => array(
	'git', 'svn', 'hg'
	),
	'help' =>
	"Update the local working copy before applying the patch.",
	'conflicts' => array(
	'nobranch' => true,
	'bookmark' => true,
	),
	),
	'nocommit' => array(
	'supports' => array(
	'git', 'hg'
	),
	'help' =>
	"Normally under git/hg, if the patch is successful, the changes ".
	"are committed to the working copy. This flag prevents the commit.",
	),
	'nobranch' => array(
	'supports' => array(
	'git'
	),
	'help' =>
	"Normally under git, a new branch is created and then the patch ".
	"is applied and committed in the new branch. This flag ".
	"cherry-picks the resultant commit onto the original branch and ".
	"deletes the temporary branch.",
	'conflicts' => array(
	'update' => true,
	),
	),
	'bookmark' => array(
	'supports' => array(
	'hg'
	),
	'help' =>
	"Normally under hg, a new bookmark is not created and the patch ".
	"is applied and committed in the current bookmark. With this flag, ".
	"a new bookmark is created and the patch is applied and committed ".
	"in the new bookmark.",
	'conflicts' => array(
	'update' => true,
	),
	),
	'force' => array(
	'help' =>
	"Do not run any sanity checks.",
	),
	'*' => 'name',
	);
	}

	protected function didParseArguments() {
	$source = null;
	$requested = 0;
	if ($this->getArgument('revision')) {
	$source = self::SOURCE_REVISION;
	$requested++;
	}
	if ($this->getArgument('diff')) {
	$source = self::SOURCE_DIFF;
	$requested++;
	}
	if ($this->getArgument('arcbundle')) {
	$source = self::SOURCE_BUNDLE;
	$requested++;
	}
	if ($this->getArgument('patch')) {
	$source = self::SOURCE_PATCH;
	$requested++;
	}

	$use_revision_id = null;
	if ($this->getArgument('name')) {
	$namev = $this->getArgument('name');
	if (count($namev) > 1) {
	throw new ArcanistUsageException("Specify at most one revision name.");
	}
	$source = self::SOURCE_REVISION;
	$requested++;

	$use_revision_id = $this->normalizeRevisionID(head($namev));
	}

	if ($requested === 0) {
	throw new ArcanistUsageException(
	"Specify one of 'D12345', '--revision <revision_id>' (to select the ".
	"current changes attached to a Differential revision), ".
	"'--diff <diff_id>' (to select a specific, out-of-date diff or a ".
	"diff which is not attached to a revision), '--arcbundle <file>' ".
	"or '--patch <file>' to choose a patch source.");
	} else if ($requested > 1) {
	throw new ArcanistUsageException(
	"Options 'D12345', '--revision', '--diff', '--arcbundle' and ".
	"'--patch' are not compatible. Choose exactly one patch source.");
	}

	$this->source = $source;
	$this->sourceParam = nonempty(
	$use_revision_id,
	$this->getArgument($source));
	}

	public function requiresConduit() {
	return ($this->getSource() != self::SOURCE_PATCH);
	}

	public function requiresRepositoryAPI() {
	return true;
	}

	public function requiresWorkingCopy() {
	return true;
	}

	private function getSource() {
	return $this->source;
	}

	private function getSourceParam() {
	return $this->sourceParam;
	}

	private function shouldCommit() {
	$no_commit = $this->getArgument('nocommit', false);
	if ($no_commit) {
	return false;
	}

	return true;
	}

	private function canBranch() {
	// git only for now
	$repository_api = $this->getRepositoryAPI();
	if (!($repository_api instanceof ArcanistGitAPI)) {
	return false;
	}
	return true;
	}

	private function shouldBranch() {
	$no_branch = $this->getArgument('nobranch', false);
	if ($no_branch) {
	return false;
	}
	return true;
	}

	private function shouldBookmark() {
	// specific to hg
	$repository_api = $this->getRepositoryAPI();
	if (!($repository_api instanceof ArcanistMercurialAPI)) {
	return false;
	}

	$bookmark = $this->getArgument('bookmark', false);
	if ($bookmark) {
	return true;
	}

	return false;
	}


	private function getBranchName(ArcanistBundle $bundle) {
	$branch_name = null;
	$repository_api = $this->getRepositoryAPI();
	$revision_id = $bundle->getRevisionID();
	$base_name = "arcpatch";
	if ($revision_id) {
	$base_name .= "-D{$revision_id}";
	}

	$suffixes = array(null, '-1', '-2', '-3');
	foreach ($suffixes as $suffix) {
	$proposed_name = $base_name.$suffix;

	list($err) = $repository_api->execManualLocal(
	'rev-parse --verify %s',
	$proposed_name);

	// no error means git rev-parse found a branch
	if (!$err) {
	echo phutil_console_format(
	"Branch name {$proposed_name} already exists; trying a new name.\n"
	);
	continue;
	} else {
	$branch_name = $proposed_name;
	break;
	}
	}

	if (!$branch_name) {
	throw new Exception(
	"Arc was unable to automagically make a name for this patch. ".
	"Please clean up your working copy and try again."
	);
	}

	return $branch_name;
	}

	private function getBookmarkName(ArcanistBundle $bundle) {
	$bookmark_name = null;
	$repository_api = $this->getRepositoryAPI();
	$revision_id = $bundle->getRevisionID();
	$base_name = "arcpatch";
	if ($revision_id) {
	$base_name .= "-D{$revision_id}";
	}

	$suffixes = array(null, '-1', '-2', '-3');
	foreach ($suffixes as $suffix) {
	$proposed_name = $base_name.$suffix;

	list($err) = $repository_api->execManualLocal(
	'log -r %s',
	$proposed_name);

	// no error means hg log found a bookmark
	if (!$err) {
	echo phutil_console_format(
	"Bookmark name {$proposed_name} already exists; trying a new name.\n"
	);
	continue;
	} else {
	$bookmark_name = $proposed_name;
	break;
	}
	}

	if (!$bookmark_name) {
	throw new Exception(
	"Arc was unable to automagically make a name for this patch. ".
	"Please clean up your working copy and try again."
	);
	}

	return $bookmark_name;
	}

	private function hasBaseRevision(ArcanistBundle $bundle) {
	$base_revision = $bundle->getBaseRevision();
	$repository_api = $this->getRepositoryAPI();

	// verify the base revision is valid
	// in a working copy that uses the git-svn bridge, the base revision might
	// be a svn uri instead of a git ref

	// NOTE: Use 'cat-file', not 'rev-parse --verify', because 'rev-parse'
	// always "verifies" any properly-formatted commit even if it does not
	// exist.
	list($err) = $repository_api->execManualLocal(
	'cat-file -t %s',
	$base_revision);
	return !$err;
	}

	private function createBranch(ArcanistBundle $bundle, $has_base_revision) {
	$branch_name = $this->getBranchName($bundle);
	$base_revision = $bundle->getBaseRevision();
	$repository_api = $this->getRepositoryAPI();

	if ($base_revision && $has_base_revision) {
	$repository_api->execxLocal(
	'checkout -b %s %s',
	$branch_name,
	$base_revision);
	} else {
	$repository_api->execxLocal(
	'checkout -b %s',
	$branch_name);
	}

	echo phutil_console_format(
	"Created and checked out branch %s.\n",
	$branch_name);

	return $branch_name;
	}

	private function createBookmark(ArcanistBundle $bundle) {
	$bookmark_name = $this->getBookmarkName($bundle);
	$repository_api = $this->getRepositoryAPI();

	$repository_api->execxLocal(
	'bookmark %s',
	$bookmark_name);

	echo phutil_console_format(
	"Created and applied bookmark %s.\n",
	$bookmark_name);
	}

	private function shouldUpdateWorkingCopy() {
	return $this->getArgument('update', false);
	}

	private function updateWorkingCopy() {
	echo "Updating working copy...\n";
	$this->getRepositoryAPI()->updateWorkingCopy();
	echo "Done.\n";
	}

	public function run() {

	$source = $this->getSource();
	$param = $this->getSourceParam();
	try {
	switch ($source) {
	case self::SOURCE_PATCH:
	if ($param == '-') {
	$patch = @file_get_contents('php://stdin');
	if (!strlen($patch)) {
	throw new ArcanistUsageException(
	"Failed to read patch from stdin!");
	}
	} else {
	$patch = Filesystem::readFile($param);
	}
	$bundle = ArcanistBundle::newFromDiff($patch);
	break;
	case self::SOURCE_BUNDLE:
	$path = $this->getArgument('arcbundle');
	$bundle = ArcanistBundle::newFromArcBundle($path);
	break;
	case self::SOURCE_REVISION:
	$bundle = $this->loadRevisionBundleFromConduit(
	$this->getConduit(),
	$param);
	break;
	case self::SOURCE_DIFF:
	$bundle = $this->loadDiffBundleFromConduit(
	$this->getConduit(),
	$param);
	break;
	}
	} catch (ConduitClientException $ex) {
	if ($ex->getErrorCode() == 'ERR-INVALID-SESSION') {
	// Phabricator is not configured to allow anonymous access to
	// Differential.
	$this->authenticateConduit();
	return $this->run();
	} else {
	throw $ex;
	}
	}

	$try_encoding = nonempty($this->getArgument('encoding'), null);
	if (!$try_encoding) {
	if ($this->requiresConduit()) {
	try {
	$try_encoding = $this->getRepositoryEncoding();
	} catch (ConduitClientException $e) {
	$try_encoding = null;
	}
	}
	}

	if ($try_encoding) {
	$bundle->setEncoding($try_encoding);
	}

	$force = $this->getArgument('force', false);
	if ($force) {
	// force means don't do any sanity checks about the patch
	} else {
	$this->sanityCheck($bundle);
	}

	// we should update the working copy before we do ANYTHING else
	if ($this->shouldUpdateWorkingCopy()) {
	$this->updateWorkingCopy();
	}

	$repository_api = $this->getRepositoryAPI();

	$has_base_revision = $this->hasBaseRevision($bundle);
	- if ($this->canBranch() && ($this->shouldBranch() \|\| $has_base_revision)) {
	+ if ($this->shouldCommit() &&
	+ $this->canBranch() &&
	+ ($this->shouldBranch() \|\| $has_base_revision)) {
	+
	$original_branch = $repository_api->getBranchName();
	+ // If we weren't on a branch, then record the ref we'll return to
	+ // instead.
	+ if ($original_branch === null) {
	+ $original_branch = $repository_api->getCanonicalRevisionName('HEAD');
	+ }
	$new_branch = $this->createBranch($bundle, $has_base_revision);
	}

	if ($this->shouldBookmark()) {
	$this->createBookmark($bundle);
	}

	if ($repository_api instanceof ArcanistSubversionAPI) {
	$patch_err = 0;

	$copies = array();
	$deletes = array();
	$patches = array();
	$propset = array();
	$adds = array();
	$symlinks = array();

	$changes = $bundle->getChanges();
	foreach ($changes as $change) {
	$type = $change->getType();
	$should_patch = true;

	$filetype = $change->getFileType();
	switch ($filetype) {
	case ArcanistDiffChangeType::FILE_SYMLINK:
	$should_patch = false;
	$symlinks[] = $change;
	break;
	}

	switch ($type) {
	case ArcanistDiffChangeType::TYPE_MOVE_AWAY:
	case ArcanistDiffChangeType::TYPE_MULTICOPY:
	case ArcanistDiffChangeType::TYPE_DELETE:
	$path = $change->getCurrentPath();
	$fpath = $repository_api->getPath($path);
	if (!@file_exists($fpath)) {
	$ok = phutil_console_confirm(
	"Patch deletes file '{$path}', but the file does not exist in ".
	"the working copy. Continue anyway?");
	if (!$ok) {
	throw new ArcanistUserAbortException();
	}
	} else {
	$deletes[] = $change->getCurrentPath();
	}
	$should_patch = false;
	break;
	case ArcanistDiffChangeType::TYPE_COPY_HERE:
	case ArcanistDiffChangeType::TYPE_MOVE_HERE:
	$path = $change->getOldPath();
	$fpath = $repository_api->getPath($path);
	if (!@file_exists($fpath)) {
	$cpath = $change->getCurrentPath();
	if ($type == ArcanistDiffChangeType::TYPE_COPY_HERE) {
	$verbs = 'copies';
	} else {
	$verbs = 'moves';
	}
	$ok = phutil_console_confirm(
	"Patch {$verbs} '{$path}' to '{$cpath}', but source path ".
	"does not exist in the working copy. Continue anyway?");
	if (!$ok) {
	throw new ArcanistUserAbortException();
	}
	} else {
	$copies[] = array(
	$change->getOldPath(),
	$change->getCurrentPath());
	}
	break;
	case ArcanistDiffChangeType::TYPE_ADD:
	$adds[] = $change->getCurrentPath();
	break;
	}
	if ($should_patch) {
	$cbundle = ArcanistBundle::newFromChanges(array($change));
	$patches[$change->getCurrentPath()] = $cbundle->toUnifiedDiff();
	$prop_old = $change->getOldProperties();
	$prop_new = $change->getNewProperties();
	$props = $prop_old + $prop_new;
	foreach ($props as $key => $ignored) {
	if (idx($prop_old, $key) !== idx($prop_new, $key)) {
	$propset[$change->getCurrentPath()][$key] = idx($prop_new, $key);
	}
	}
	}
	}

	// Before we start doing anything, create all the directories we're going
	// to add files to if they don't already exist.
	foreach ($copies as $copy) {
	list($src, $dst) = $copy;
	$this->createParentDirectoryOf($dst);
	}

	foreach ($patches as $path => $patch) {
	$this->createParentDirectoryOf($path);
	}

	foreach ($adds as $add) {
	$this->createParentDirectoryOf($add);
	}

	// TODO: The SVN patch workflow likely does not work on windows because
	// of the (cd ...) stuff.

	foreach ($copies as $copy) {
	list($src, $dst) = $copy;
	passthru(
	csprintf(
	'(cd %s; svn cp %s %s)',
	$repository_api->getPath(),
	$src,
	$dst));
	}

	foreach ($deletes as $delete) {
	passthru(
	csprintf(
	'(cd %s; svn rm %s)',
	$repository_api->getPath(),
	$delete));
	}

	foreach ($symlinks as $symlink) {
	$link_target = $symlink->getSymlinkTarget();
	$link_path = $symlink->getCurrentPath();
	switch ($symlink->getType()) {
	case ArcanistDiffChangeType::TYPE_ADD:
	case ArcanistDiffChangeType::TYPE_CHANGE:
	case ArcanistDiffChangeType::TYPE_MOVE_HERE:
	case ArcanistDiffChangeType::TYPE_COPY_HERE:
	execx(
	'(cd %s && ln -sf %s %s)',
	$repository_api->getPath(),
	$link_target,
	$link_path);
	break;
	}
	}

	foreach ($patches as $path => $patch) {
	$err = null;
	if ($patch) {
	$tmp = new TempFile();
	Filesystem::writeFile($tmp, $patch);
	passthru(
	csprintf(
	'(cd %s; patch -p0 < %s)',
	$repository_api->getPath(),
	$tmp),
	$err);
	} else {
	passthru(
	csprintf(
	'(cd %s; touch %s)',
	$repository_api->getPath(),
	$path),
	$err);
	}
	if ($err) {
	$patch_err = max($patch_err, $err);
	}
	}

	foreach ($adds as $add) {
	passthru(
	csprintf(
	'(cd %s; svn add %s)',
	$repository_api->getPath(),
	$add));
	}

	foreach ($propset as $path => $changes) {
	foreach ($changes as $prop => $value) {
	if ($prop == 'unix:filemode') {
	// Setting this property also changes the file mode.
	$prop = 'svn:executable';
	$value = (octdec($value) & 0111 ? 'on' : null);
	}
	if ($value === null) {
	passthru(
	csprintf(
	'(cd %s; svn propdel %s %s)',
	$repository_api->getPath(),
	$prop,
	$path));
	} else {
	passthru(
	csprintf(
	'(cd %s; svn propset %s %s %s)',
	$repository_api->getPath(),
	$prop,
	$value,
	$path));
	}
	}
	}

	if ($patch_err == 0) {
	echo phutil_console_format(
	"<bg:green> OKAY </bg> Successfully applied patch ".
	"to the working copy.\n");
	} else {
	echo phutil_console_format(
	"\n\n<bg:yellow> WARNING </bg> Some hunks could not be applied ".
	"cleanly by the unix 'patch' utility. Your working copy may be ".
	"different from the revision's base, or you may be in the wrong ".
	"subdirectory. You can export the raw patch file using ".
	"'arc export --unified', and then try to apply it by fiddling with ".
	"options to 'patch' (particularly, -p), or manually. The output ".
	"above, from 'patch', may be helpful in figuring out what went ".
	"wrong.\n");
	}

	return $patch_err;
	} else if ($repository_api instanceof ArcanistGitAPI) {
	$future = $repository_api->execFutureLocal(
	'apply --index --reject');
	$future->write($bundle->toGitPatch());

	try {
	$future->resolvex();
	} catch (CommandException $ex) {
	echo phutil_console_format(
	"\n<bg:red> Patch Failed! </bg>\n");
	$stderr = $ex->getStdErr();
	if (preg_match('/already exists in working directory/', $stderr)) {
	echo phutil_console_wrap(
	phutil_console_format(
	"\n<bg:yellow> WARNING </bg> This patch may have failed ".
	"because it attempts to change the case of a filename (for ".
	"instance, from 'example.c' to 'Example.c'). Git cannot apply ".
	"patches like this on case-insensitive filesystems. You must ".
	"apply this patch manually.\n"));
	}
	throw $ex;
	}

	if ($this->shouldCommit()) {
	$commit_message = $this->getCommitMessage($bundle);
	$future = $repository_api->execFutureLocal(
	'commit -a -F -');
	$future->write($commit_message);
	$future->resolvex();
	$verb = 'committed';
	} else {
	$verb = 'applied';
	}

	- if ($this->canBranch() && !$this->shouldBranch() && $has_base_revision) {
	+ if ($this->shouldCommit() && $this->canBranch() &&
	+ !$this->shouldBranch() && $has_base_revision) {
	$repository_api->execxLocal('checkout %s', $original_branch);
	$ex = null;
	try {
	$repository_api->execxLocal('cherry-pick %s', $new_branch);
	} catch (Exception $ex) {}
	$repository_api->execxLocal('branch -D %s', $new_branch);
	if ($ex) {
	echo phutil_console_format(
	"\n<bg:red> Cherry Pick Failed!</bg>\n");
	throw $ex;
	}
	}

	echo phutil_console_format(
	"<bg:green> OKAY </bg> Successfully {$verb} patch.\n");
	} else if ($repository_api instanceof ArcanistMercurialAPI) {

	$future = $repository_api->execFutureLocal(
	'import --no-commit -');
	$future->write($bundle->toGitPatch());

	try {
	$future->resolvex();
	} catch (CommandException $ex) {
	echo phutil_console_format(
	"\n<bg:red> Patch Failed! </bg>\n");
	$stderr = $ex->getStdErr();
	if (preg_match('/case-folding collision/', $stderr)) {
	echo phutil_console_wrap(
	phutil_console_format(
	"\n<bg:yellow> WARNING </bg> This patch may have failed ".
	"because it attempts to change the case of a filename (for ".
	"instance, from 'example.c' to 'Example.c'). Mercurial cannot ".
	"apply patches like this on case-insensitive filesystems. You ".
	"must apply this patch manually.\n"));
	}
	throw $ex;
	}

	if ($this->shouldCommit()) {
	$commit_message = $this->getCommitMessage($bundle);
	$future = $repository_api->execFutureLocal(
	'commit -A -l -');
	$future->write($commit_message);
	$future->resolvex();
	$verb = 'committed';
	} else {
	$verb = 'applied';
	}
	echo phutil_console_format(
	"<bg:green> OKAY </bg> Successfully {$verb} patch.\n");

	} else {
	throw new Exception('Unknown version control system.');
	}

	return 0;
	}

	private function getCommitMessage(ArcanistBundle $bundle) {
	$revision_id = $bundle->getRevisionID();
	$commit_message = null;
	$prompt_message = null;

	// if we have a revision id the commit message is in differential

	// TODO: See T848 for the authenticated stuff.
	if ($revision_id && $this->isConduitAuthenticated()) {

	$conduit = $this->getConduit();
	$commit_message = $conduit->callMethodSynchronous(
	'differential.getcommitmessage',
	array(
	'revision_id' => $revision_id,
	));
	$prompt_message = " Note arcanist failed to load the commit message ".
	"from differential for revision D{$revision_id}.";
	}

	// no revision id or failed to fetch commit message so get it from the
	// user on the command line
	if (!$commit_message) {
	$template =
	"\n\n".
	"# Enter a commit message for this patch. If you just want to apply ".
	"the patch to the working copy without committing, re-run arc patch ".
	"with the --nocommit flag.".
	$prompt_message.
	"\n";

	$commit_message = $this->newInteractiveEditor($template)
	->setName('arcanist-patch-commit-message')
	->editInteractively();

	$commit_message = ArcanistCommentRemover::removeComments($commit_message);
	if (!strlen(trim($commit_message))) {
	throw new ArcanistUserAbortException();
	}
	}

	return $commit_message;
	}

	public function getShellCompletions(array $argv) {
	// TODO: Pull open diffs from 'arc list'?
	return array('ARGUMENT');
	}

	/**
	* Do the best we can to prevent PEBKAC and id10t issues.
	*/
	private function sanityCheck(ArcanistBundle $bundle) {
	$repository_api = $this->getRepositoryAPI();

	if ($repository_api->supportsRelativeLocalCommits()) {
	$repository_api->setDefaultBaseCommit();
	}

	// Require clean working copy
	$this->requireCleanWorkingCopy();

	// Check to see if the bundle's project id matches the working copy
	// project id
	$bundle_project_id = $bundle->getProjectID();
	$working_copy_project_id = $this->getWorkingCopy()->getProjectID();
	if (empty($bundle_project_id)) {
	// this means $source is SOURCE_PATCH \|\| SOURCE_BUNDLE w/ $version = 0
	// they don't come with a project id so just do nothing
	} else if ($bundle_project_id != $working_copy_project_id) {
	if ($working_copy_project_id) {
	$issue =
	"This patch is for the '{$bundle_project_id}' project, but the ".
	"working copy belongs to the '{$working_copy_project_id}' project.";
	} else {
	$issue =
	"This patch is for the '{$bundle_project_id}' project, but the ".
	"working copy does not have an '.arcconfig' file to identify which ".
	"project it belongs to.";
	}
	$ok = phutil_console_confirm(
	"{$issue} Still try to apply the patch?",
	$default_no = false
	);
	if (!$ok) {
	throw new ArcanistUserAbortException();
	}
	}

	// Check to see if the bundle's base revision matches the working copy
	// base revision
	if ($repository_api->supportsRelativeLocalCommits()) {
	$bundle_base_rev = $bundle->getBaseRevision();
	if (empty($bundle_base_rev)) {
	// this means $source is SOURCE_PATCH \|\| SOURCE_BUNDLE w/ $version < 2
	// they don't have a base rev so just do nothing
	$commit_exists = true;
	} else {
	$commit_exists =
	$repository_api->hasLocalCommit($bundle_base_rev);
	}
	if (!$commit_exists) {
	// we have a problem...! lots of work because we need to ask
	// differential for revision information for these base revisions
	// to improve our error message.
	$bundle_base_rev_str = null;
	$source_base_rev = $repository_api->getWorkingCopyRevision();
	$source_base_rev_str = null;

	if ($repository_api instanceof ArcanistGitAPI) {
	$hash_type = ArcanistDifferentialRevisionHash::HASH_GIT_COMMIT;
	} else if ($repository_api instanceof ArcanistMercurialAPI) {
	$hash_type = ArcanistDifferentialRevisionHash::HASH_MERCURIAL_COMMIT;
	} else {
	$hash_type = null;
	}

	if ($hash_type) {
	// 2 round trips because even though we could send off one query
	// we wouldn't be able to tell which revisions were for which hash
	$hash = array($hash_type, $bundle_base_rev);
	$bundle_revision = $this->loadRevisionFromHash($hash);
	$hash = array($hash_type, $source_base_rev);
	$source_revision = $this->loadRevisionFromHash($hash);

	if ($bundle_revision) {
	$bundle_base_rev_str = $bundle_base_rev .
	' \ D' . $bundle_revision['id'];
	}
	if ($source_revision) {
	$source_base_rev_str = $source_base_rev .
	' \ D' . $source_revision['id'];
	}
	}
	$bundle_base_rev_str = nonempty($bundle_base_rev_str,
	$bundle_base_rev);
	$source_base_rev_str = nonempty($source_base_rev_str,
	$source_base_rev);

	$ok = phutil_console_confirm(
	"This diff is against commit {$bundle_base_rev_str}, but the ".
	"commit is nowhere in the working copy. Try to apply it against ".
	"the current working copy state? ({$source_base_rev_str})",
	$default_no = false
	);
	if (!$ok) {
	throw new ArcanistUserAbortException();
	}
	}
	}

	// TODO -- more sanity checks here
	}

	/**
	* Create parent directories one at a time, since we need to "svn add" each
	* one. (Technically we could "svn add" just the topmost new directory.)
	*/
	private function createParentDirectoryOf($path) {
	$repository_api = $this->getRepositoryAPI();
	$dir = dirname($path);
	if (Filesystem::pathExists($dir)) {
	return;
	} else {
	// Make sure the parent directory exists before we make this one.
	$this->createParentDirectoryOf($dir);
	execx(
	'(cd %s && mkdir %s)',
	$repository_api->getPath(),
	$dir);
	passthru(
	csprintf(
	'(cd %s && svn add %s)',
	$repository_api->getPath(),
	$dir));
	}
	}

	private function loadRevisionFromHash($hash) {
	// TODO -- de-hack this as permissions become more clear with things
	// like T848 (add scope to OAuth)
	if (!$this->isConduitAuthenticated()) {
	return null;
	}

	$conduit = $this->getConduit();

	$revisions = $conduit->callMethodSynchronous(
	'differential.query',
	array(
	'commitHashes' => array($hash),
	)
	);


	// grab the latest closed revision only
	$found_revision = null;
	$revisions = isort($revisions, 'dateModified');
	foreach ($revisions as $revision) {
	if ($revision['status'] == ArcanistDifferentialRevisionStatus::CLOSED) {
	$found_revision = $revision;
	}
	}
	return $found_revision;
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 16:43 (2 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1126605
Default Alt Text: (61 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions