D21300.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21300.diff
View Options

	diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
	--- a/src/workflow/ArcanistDiffWorkflow.php
	+++ b/src/workflow/ArcanistDiffWorkflow.php
	@@ -199,11 +199,6 @@
	'message' => pht('%s does not update any revision.', '--only'),
	),
	),
	- 'encoding' => array(
	- 'param' => 'encoding',
	- 'help' => pht(
	- 'Attempt to convert non UTF-8 hunks into specified encoding.'),
	- ),
	'allow-untracked' => array(
	'help' => pht('Skip checks for untracked files in the working copy.'),
	),
	@@ -956,8 +951,6 @@
	}
	}

	- $try_encoding = nonempty($this->getArgument('encoding'), null);
	-
	$utf8_problems = array();
	foreach ($changes as $change) {
	foreach ($change->getHunks() as $hunk) {
	@@ -970,17 +963,15 @@
	$is_binary = ArcanistDiffUtils::isHeuristicBinaryFile($corpus);
	if (!$is_binary) {

	- if (!$try_encoding) {
	- try {
	- $try_encoding = $this->getRepositoryEncoding();
	- } catch (ConduitClientException $e) {
	- if ($e->getErrorCode() == 'ERR-BAD-ARCANIST-PROJECT') {
	- echo phutil_console_wrap(
	- pht('Lookup of encoding in arcanist project failed: %s',
	- $e->getMessage())."\n");
	- } else {
	- throw $e;
	- }
	+ try {
	+ $try_encoding = $this->getRepositoryEncoding();
	+ } catch (ConduitClientException $e) {
	+ if ($e->getErrorCode() == 'ERR-BAD-ARCANIST-PROJECT') {
	+ echo phutil_console_wrap(
	+ pht('Lookup of encoding in arcanist project failed: %s',
	+ $e->getMessage())."\n");
	+ } else {
	+ throw $e;
	}
	}