mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-25 00:02:40 +01:00
Remove "--encoding" flag from "arc diff"
Summary: Ref T13544. This flag is generally questionable, likely has no actual uses, and is slated for obsoletion and replacement elsewhere (see T13338). Test Plan: Grepped for "encoding", found no relevant hits. Maniphest Tasks: T13544 Differential Revision: https://secure.phabricator.com/D21300
This commit is contained in:
parent
bb81172eb7
commit
466de2d2e1
1 changed files with 9 additions and 18 deletions
|
@ -199,11 +199,6 @@ EOTEXT
|
||||||
'message' => pht('%s does not update any revision.', '--only'),
|
'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(
|
'allow-untracked' => array(
|
||||||
'help' => pht('Skip checks for untracked files in the working copy.'),
|
'help' => pht('Skip checks for untracked files in the working copy.'),
|
||||||
),
|
),
|
||||||
|
@ -956,8 +951,6 @@ EOTEXT
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$try_encoding = nonempty($this->getArgument('encoding'), null);
|
|
||||||
|
|
||||||
$utf8_problems = array();
|
$utf8_problems = array();
|
||||||
foreach ($changes as $change) {
|
foreach ($changes as $change) {
|
||||||
foreach ($change->getHunks() as $hunk) {
|
foreach ($change->getHunks() as $hunk) {
|
||||||
|
@ -970,7 +963,6 @@ EOTEXT
|
||||||
$is_binary = ArcanistDiffUtils::isHeuristicBinaryFile($corpus);
|
$is_binary = ArcanistDiffUtils::isHeuristicBinaryFile($corpus);
|
||||||
if (!$is_binary) {
|
if (!$is_binary) {
|
||||||
|
|
||||||
if (!$try_encoding) {
|
|
||||||
try {
|
try {
|
||||||
$try_encoding = $this->getRepositoryEncoding();
|
$try_encoding = $this->getRepositoryEncoding();
|
||||||
} catch (ConduitClientException $e) {
|
} catch (ConduitClientException $e) {
|
||||||
|
@ -982,7 +974,6 @@ EOTEXT
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if ($try_encoding) {
|
if ($try_encoding) {
|
||||||
$corpus = phutil_utf8_convert($corpus, 'UTF-8', $try_encoding);
|
$corpus = phutil_utf8_convert($corpus, 'UTF-8', $try_encoding);
|
||||||
|
|
Loading…
Reference in a new issue