D21050.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21050.diff
View Options

	diff --git a/src/toolset/workflow/ArcanistVersionWorkflow.php b/src/toolset/workflow/ArcanistVersionWorkflow.php
	--- a/src/toolset/workflow/ArcanistVersionWorkflow.php
	+++ b/src/toolset/workflow/ArcanistVersionWorkflow.php
	@@ -48,15 +48,23 @@
	);

	foreach ($roots as $lib => $root) {
	+ $is_git = false;
	+
	$working_copy = ArcanistWorkingCopy::newFromWorkingDirectory($root);
	- $repository_api = $working_copy->newRepositoryAPI();
	+ if ($working_copy) {
	+ $repository_api = $working_copy->newRepositoryAPI();
	+ if ($repository_api instanceof ArcanistGitAPI) {
	+ $is_git = true;
	+ }
	+ }

	- if (!$repository_api instanceof ArcanistGitAPI) {
	- throw new ArcanistUsageException(
	+ if (!$is_git) {
	+ throw new PhutilArgumentUsageException(
	pht(
	- 'Library "%s" is not a Git working copy, so no version '.
	+ 'Library "%s" (at "%s") is not a Git working copy, so no version '.
	'information can be provided.',
	- $lib));
	+ $lib,
	+ Filesystem::readablePath($root)));
	}

	// NOTE: Carefully execute these commands in a way that works on Windows