@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Fix a TODO
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
+6
-9
+1
-1
src/applications/differential/controller/DifferentialRevisionViewController.php
+1
-1
src/applications/differential/controller/DifferentialRevisionViewController.php
+4
-7
src/applications/differential/parser/DifferentialChangesetParser.php
+4
-7
src/applications/differential/parser/DifferentialChangesetParser.php
···
105
105
106
106
const WHITESPACE_SHOW_ALL = 'show-all';
107
107
const WHITESPACE_IGNORE_TRAILING = 'ignore-trailing';
108
-
109
-
// TODO: This is now "Ignore Most" in the UI.
110
-
const WHITESPACE_IGNORE_ALL = 'ignore-all';
111
-
108
+
const WHITESPACE_IGNORE_MOST = 'ignore-most';
112
109
const WHITESPACE_IGNORE_FORCE = 'ignore-force';
113
110
114
111
public function setOldLines(array $lines) {
···
499
496
case self::WHITESPACE_IGNORE_FORCE:
500
497
break;
501
498
default:
502
-
$whitespace_mode = self::WHITESPACE_IGNORE_ALL;
499
+
$whitespace_mode = self::WHITESPACE_IGNORE_MOST;
503
500
break;
504
501
}
505
502
506
-
$skip_cache = ($whitespace_mode != self::WHITESPACE_IGNORE_ALL);
503
+
$skip_cache = ($whitespace_mode != self::WHITESPACE_IGNORE_MOST);
507
504
if ($this->disableCache) {
508
505
$skip_cache = true;
509
506
}
···
539
536
$whitespace_mode = $this->whitespaceMode;
540
537
$changeset = $this->changeset;
541
538
542
-
$ignore_all = (($whitespace_mode == self::WHITESPACE_IGNORE_ALL) ||
539
+
$ignore_all = (($whitespace_mode == self::WHITESPACE_IGNORE_MOST) ||
543
540
($whitespace_mode == self::WHITESPACE_IGNORE_FORCE));
544
541
545
542
$force_ignore = ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE);
+1
-1
src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
+1
-1
src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
···
206
206
207
207
$options = array(
208
208
DifferentialChangesetParser::WHITESPACE_IGNORE_FORCE => 'Ignore All',
209
-
DifferentialChangesetParser::WHITESPACE_IGNORE_ALL => 'Ignore Most',
209
+
DifferentialChangesetParser::WHITESPACE_IGNORE_MOST => 'Ignore Most',
210
210
DifferentialChangesetParser::WHITESPACE_IGNORE_TRAILING =>
211
211
'Ignore Trailing',
212
212
DifferentialChangesetParser::WHITESPACE_SHOW_ALL => 'Show All',