diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -235,7 +235,7 @@ $whitespace = $request->getStr( 'whitespace', - DifferentialChangesetParser::WHITESPACE_IGNORE_ALL); + DifferentialChangesetParser::WHITESPACE_IGNORE_MOST); $arc_project = $target->getArcanistProject(); if ($arc_project) { diff --git a/src/applications/differential/parser/DifferentialChangesetParser.php b/src/applications/differential/parser/DifferentialChangesetParser.php --- a/src/applications/differential/parser/DifferentialChangesetParser.php +++ b/src/applications/differential/parser/DifferentialChangesetParser.php @@ -105,10 +105,7 @@ const WHITESPACE_SHOW_ALL = 'show-all'; const WHITESPACE_IGNORE_TRAILING = 'ignore-trailing'; - - // TODO: This is now "Ignore Most" in the UI. - const WHITESPACE_IGNORE_ALL = 'ignore-all'; - + const WHITESPACE_IGNORE_MOST = 'ignore-most'; const WHITESPACE_IGNORE_FORCE = 'ignore-force'; public function setOldLines(array $lines) { @@ -499,11 +496,11 @@ case self::WHITESPACE_IGNORE_FORCE: break; default: - $whitespace_mode = self::WHITESPACE_IGNORE_ALL; + $whitespace_mode = self::WHITESPACE_IGNORE_MOST; break; } - $skip_cache = ($whitespace_mode != self::WHITESPACE_IGNORE_ALL); + $skip_cache = ($whitespace_mode != self::WHITESPACE_IGNORE_MOST); if ($this->disableCache) { $skip_cache = true; } @@ -539,7 +536,7 @@ $whitespace_mode = $this->whitespaceMode; $changeset = $this->changeset; - $ignore_all = (($whitespace_mode == self::WHITESPACE_IGNORE_ALL) || + $ignore_all = (($whitespace_mode == self::WHITESPACE_IGNORE_MOST) || ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE)); $force_ignore = ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE); diff --git a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php --- a/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php +++ b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php @@ -206,7 +206,7 @@ $options = array( DifferentialChangesetParser::WHITESPACE_IGNORE_FORCE => 'Ignore All', - DifferentialChangesetParser::WHITESPACE_IGNORE_ALL => 'Ignore Most', + DifferentialChangesetParser::WHITESPACE_IGNORE_MOST => 'Ignore Most', DifferentialChangesetParser::WHITESPACE_IGNORE_TRAILING => 'Ignore Trailing', DifferentialChangesetParser::WHITESPACE_SHOW_ALL => 'Show All',