revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-26 16:52:40 +01:00
Code Issues Releases Wiki Activity

Revert "accommodate git's diff.suppress-blank-empty=true setting (D3963)"

Browse source 
Summary: Reverts D3963, which is obsoleted by D3969.

Test Plan: Straight revert.

Reviewers: vrana, jiiix, btrahan

Reviewed By: vrana

CC: aran

Differential Revision: https://secure.phabricator.com/D3970
This commit is contained in:
epriestley 2012-11-15 15:47:43 -08:00
parent 2d3d7be09a
commit f4222b3c8b
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/repository/api/ArcanistGitAPI.php
View file

@ -260,14 +260,8 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI {
return $this->relativeCommit; return $this->relativeCommit;
} }
private function getDiffFullCommand($detect_moves_and_renames = true) { private function getDiffFullOptions($detect_moves_and_renames = true) {
$diff_cmd = array( $options = array(
// Our diff parser relies on the trailing spaces that are suppressed
// when the diff.suppress-blank-empty boolean is set to "true".
// Without the following, "arc lint" would always fail with this:
// "Diff Parse Exception: Found the wrong number of hunk lines."
'-c diff.suppress-blank-empty=false',
'diff',
self::getDiffBaseOptions(), self::getDiffBaseOptions(),
'--no-color', '--no-color',
'--src-prefix=a/', '--src-prefix=a/',
@ -276,11 +270,11 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI {
); );
if ($detect_moves_and_renames) { if ($detect_moves_and_renames) {
$diff_cmd[] = '-M'; $options[] = '-M';
$diff_cmd[] = '-C'; $options[] = '-C';
} }
return implode(' ', $diff_cmd); return implode(' ', $options);
} }
private function getDiffBaseOptions() { private function getDiffBaseOptions() {
@ -298,9 +292,9 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI {
} }
public function getFullGitDiff() { public function getFullGitDiff() {
$diff_cmd = $this->getDiffFullCommand(); $options = $this->getDiffFullOptions();
list($stdout) = $this->execxLocal( list($stdout) = $this->execxLocal(
"{$diff_cmd} %s --", "diff {$options} %s --",
$this->getRelativeCommit()); $this->getRelativeCommit());
return $stdout; return $stdout;
} }
@ -312,9 +306,9 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI {
* generate real diff text. * generate real diff text.
*/ */
public function getRawDiffText($path, $detect_moves_and_renames = true) { public function getRawDiffText($path, $detect_moves_and_renames = true) {
$diff_cmd = $this->getDiffFullCommand($detect_moves_and_renames); $options = $this->getDiffFullOptions($detect_moves_and_renames);
list($stdout) = $this->execxLocal( list($stdout) = $this->execxLocal(
"{$diff_cmd} %s -- %s", "diff {$options} %s -- %s",
$this->getRelativeCommit(), $this->getRelativeCommit(),
$path); $path);
return $stdout; return $stdout;