revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-01 18:30:59 +01:00
Code Issues Releases Wiki Activity

Fix a TODO

Browse source 
Summary: Rename `DifferentialChangesetParser::WHITESPACE_IGNORE_ALL` to `DifferentialChangesetParser::WHITESPACE_IGNORE_MOST`.

Test Plan: Browsed a diff with a few different settings for "Whitespace changes".

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley

Differential Revision: https://secure.phabricator.com/D11715
This commit is contained in:
Joshua Spence 2015-02-10 18:34:43 +11:00
parent 2a0af8e299
commit c66954af26
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/applications/differential/controller/DifferentialRevisionViewController.php
View file

@ -235,7 +235,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
$whitespace = $request->getStr( $whitespace = $request->getStr(
'whitespace', 'whitespace',
DifferentialChangesetParser::WHITESPACE_IGNORE_ALL); DifferentialChangesetParser::WHITESPACE_IGNORE_MOST);
$arc_project = $target->getArcanistProject(); $arc_project = $target->getArcanistProject();
if ($arc_project) { if ($arc_project) {

11
src/applications/differential/parser/DifferentialChangesetParser.php
View file

@ -105,10 +105,7 @@ final class DifferentialChangesetParser {
const WHITESPACE_SHOW_ALL = 'show-all'; const WHITESPACE_SHOW_ALL = 'show-all';
const WHITESPACE_IGNORE_TRAILING = 'ignore-trailing'; const WHITESPACE_IGNORE_TRAILING = 'ignore-trailing';
const WHITESPACE_IGNORE_MOST = 'ignore-most';
// TODO: This is now "Ignore Most" in the UI.
const WHITESPACE_IGNORE_ALL = 'ignore-all';
const WHITESPACE_IGNORE_FORCE = 'ignore-force'; const WHITESPACE_IGNORE_FORCE = 'ignore-force';
public function setOldLines(array $lines) { public function setOldLines(array $lines) {
@ -499,11 +496,11 @@ final class DifferentialChangesetParser {
case self::WHITESPACE_IGNORE_FORCE: case self::WHITESPACE_IGNORE_FORCE:
break; break;
default: default:
$whitespace_mode = self::WHITESPACE_IGNORE_ALL; $whitespace_mode = self::WHITESPACE_IGNORE_MOST;
break; break;
} }
$skip_cache = ($whitespace_mode != self::WHITESPACE_IGNORE_ALL); $skip_cache = ($whitespace_mode != self::WHITESPACE_IGNORE_MOST);
if ($this->disableCache) { if ($this->disableCache) {
$skip_cache = true; $skip_cache = true;
} }
@ -539,7 +536,7 @@ final class DifferentialChangesetParser {
$whitespace_mode = $this->whitespaceMode; $whitespace_mode = $this->whitespaceMode;
$changeset = $this->changeset; $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)); ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE));
$force_ignore = ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE); $force_ignore = ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE);

2
src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
View file

@ -206,7 +206,7 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
$options = array( $options = array(
DifferentialChangesetParser::WHITESPACE_IGNORE_FORCE => 'Ignore All', DifferentialChangesetParser::WHITESPACE_IGNORE_FORCE => 'Ignore All',
DifferentialChangesetParser::WHITESPACE_IGNORE_ALL => 'Ignore Most', DifferentialChangesetParser::WHITESPACE_IGNORE_MOST => 'Ignore Most',
DifferentialChangesetParser::WHITESPACE_IGNORE_TRAILING => DifferentialChangesetParser::WHITESPACE_IGNORE_TRAILING =>
'Ignore Trailing', 'Ignore Trailing',
DifferentialChangesetParser::WHITESPACE_SHOW_ALL => 'Show All', DifferentialChangesetParser::WHITESPACE_SHOW_ALL => 'Show All',