D14053.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D14053.diff
View Options

	diff --git a/scripts/arcanist.php b/scripts/arcanist.php
	--- a/scripts/arcanist.php
	+++ b/scripts/arcanist.php
	@@ -620,9 +620,9 @@
	throw new ArcanistUsageException($error);
	} else {
	fwrite(STDERR, phutil_console_wrap(
	- "%s: %s\n\n",
	- pht('WARNING'),
	- $error));
	+ phutil_console_format("%s: %s\n",
	+ pht('WARNING'),
	+ $error)));
	}
	} catch (PhutilLibraryConflictException $ex) {
	if ($ex->getLibrary() != 'arcanist') {
	diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
	--- a/src/workflow/ArcanistDiffWorkflow.php
	+++ b/src/workflow/ArcanistDiffWorkflow.php
	@@ -1030,9 +1030,8 @@
	} catch (ConduitClientException $e) {
	if ($e->getErrorCode() == 'ERR-BAD-ARCANIST-PROJECT') {
	echo phutil_console_wrap(
	- "%s\n",
	- pht('Lookup of encoding in arcanist project failed'),
	- $e->getMessage());
	+ pht('Lookup of encoding in arcanist project failed: %s',
	+ $e->getMessage())."\n");
	} else {
	throw $e;
	}
	diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
	--- a/src/workflow/ArcanistWorkflow.php
	+++ b/src/workflow/ArcanistWorkflow.php
	@@ -1585,12 +1585,11 @@
	} catch (ConduitClientException $ex) {
	if ($ex->getErrorCode() == 'ERR-CONDUIT-CALL') {
	echo phutil_console_wrap(
	- "%s\n\n",
	pht(
	'This feature requires a newer version of Phabricator. Please '.
	'update it using these instructions: %s',
	'https://secure.phabricator.com/book/phabricator/article/'.
	- 'upgrading/'));
	+ 'upgrading/')."\n\n");
	}
	throw $ex;
	}