@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
Rename a constant
Summary: Rename `DifferentialChangesetParser::WHITESPACE_IGNORE_FORCE` to `DifferentialChangesetParser::WHITESPACE_IGNORE_ALL` to better reflect reality.
Test Plan: Viewed a diff with various settings for the "Whitespace changes" option.
Reviewers: #blessed_reviewers, epriestley
Reviewed By: #blessed_reviewers, epriestley
Subscribers: epriestley
Differential Revision: https://secure.phabricator.com/D11730
+8
-8
+4
-4
src/applications/differential/parser/DifferentialChangesetParser.php
+4
-4
src/applications/differential/parser/DifferentialChangesetParser.php
···
106
106
const WHITESPACE_SHOW_ALL = 'show-all';
107
107
const WHITESPACE_IGNORE_TRAILING = 'ignore-trailing';
108
108
const WHITESPACE_IGNORE_MOST = 'ignore-most';
109
-
const WHITESPACE_IGNORE_FORCE = 'ignore-force';
109
+
const WHITESPACE_IGNORE_ALL = 'ignore-all';
110
110
111
111
public function setOldLines(array $lines) {
112
112
$this->old = $lines;
···
493
493
switch ($whitespace_mode) {
494
494
case self::WHITESPACE_SHOW_ALL:
495
495
case self::WHITESPACE_IGNORE_TRAILING:
496
-
case self::WHITESPACE_IGNORE_FORCE:
496
+
case self::WHITESPACE_IGNORE_ALL:
497
497
break;
498
498
default:
499
499
$whitespace_mode = self::WHITESPACE_IGNORE_MOST;
···
537
537
$changeset = $this->changeset;
538
538
539
539
$ignore_all = (($whitespace_mode == self::WHITESPACE_IGNORE_MOST) ||
540
-
($whitespace_mode == self::WHITESPACE_IGNORE_FORCE));
540
+
($whitespace_mode == self::WHITESPACE_IGNORE_ALL));
541
541
542
-
$force_ignore = ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE);
542
+
$force_ignore = ($whitespace_mode == self::WHITESPACE_IGNORE_ALL);
543
543
544
544
if (!$force_ignore) {
545
545
if ($ignore_all && $changeset->getWhitespaceMatters()) {
+4
-4
src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
+4
-4
src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
···
205
205
));
206
206
207
207
$options = array(
208
-
DifferentialChangesetParser::WHITESPACE_IGNORE_FORCE => 'Ignore All',
209
-
DifferentialChangesetParser::WHITESPACE_IGNORE_MOST => 'Ignore Most',
208
+
DifferentialChangesetParser::WHITESPACE_IGNORE_ALL => pht('Ignore All'),
209
+
DifferentialChangesetParser::WHITESPACE_IGNORE_MOST => pht('Ignore Most'),
210
210
DifferentialChangesetParser::WHITESPACE_IGNORE_TRAILING =>
211
-
'Ignore Trailing',
212
-
DifferentialChangesetParser::WHITESPACE_SHOW_ALL => 'Show All',
211
+
pht('Ignore Trailing'),
212
+
DifferentialChangesetParser::WHITESPACE_SHOW_ALL => pht('Show All'),
213
213
);
214
214
215
215
foreach ($options as $value => $label) {