D8717.id20669.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8717.id20669.diff
View Options

	diff --git a/src/workflow/ArcanistPatchWorkflow.php b/src/workflow/ArcanistPatchWorkflow.php
	--- a/src/workflow/ArcanistPatchWorkflow.php
	+++ b/src/workflow/ArcanistPatchWorkflow.php
	@@ -265,7 +265,7 @@

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

	// no error means hg log found a bookmark
	if (!$err) {
	@@ -295,6 +295,18 @@
	$branch_name = $this->getBranchName($bundle);
	$base_revision = $bundle->getBaseRevision();

	+ if ($has_base_revision) {
	+ // 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);
	+ $has_base_revision = !$err;
	+ }
	+
	if ($base_revision && $has_base_revision) {
	$repository_api->execxLocal(
	'checkout -b %s %s',