Page MenuHomePhabricator
Files F15402953

D11730.diff
No OneTemporary
Actions

D11730.diff
View Options

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
@@ -106,7 +106,7 @@
const WHITESPACE_SHOW_ALL = 'show-all';
const WHITESPACE_IGNORE_TRAILING = 'ignore-trailing';
const WHITESPACE_IGNORE_MOST = 'ignore-most';
- const WHITESPACE_IGNORE_FORCE = 'ignore-force';
+ const WHITESPACE_IGNORE_ALL = 'ignore-all';
public function setOldLines(array $lines) {
$this->old = $lines;
@@ -493,7 +493,7 @@
switch ($whitespace_mode) {
case self::WHITESPACE_SHOW_ALL:
case self::WHITESPACE_IGNORE_TRAILING:
- case self::WHITESPACE_IGNORE_FORCE:
+ case self::WHITESPACE_IGNORE_ALL:
break;
default:
$whitespace_mode = self::WHITESPACE_IGNORE_MOST;
@@ -537,9 +537,9 @@
$changeset = $this->changeset;
$ignore_all = (($whitespace_mode == self::WHITESPACE_IGNORE_MOST) ||
- ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE));
+ ($whitespace_mode == self::WHITESPACE_IGNORE_ALL));
- $force_ignore = ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE);
+ $force_ignore = ($whitespace_mode == self::WHITESPACE_IGNORE_ALL);
if (!$force_ignore) {
if ($ignore_all && $changeset->getWhitespaceMatters()) {
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
@@ -205,11 +205,11 @@
));
$options = array(
- DifferentialChangesetParser::WHITESPACE_IGNORE_FORCE => 'Ignore All',
- DifferentialChangesetParser::WHITESPACE_IGNORE_MOST => 'Ignore Most',
+ DifferentialChangesetParser::WHITESPACE_IGNORE_ALL => pht('Ignore All'),
+ DifferentialChangesetParser::WHITESPACE_IGNORE_MOST => pht('Ignore Most'),
DifferentialChangesetParser::WHITESPACE_IGNORE_TRAILING =>
- 'Ignore Trailing',
- DifferentialChangesetParser::WHITESPACE_SHOW_ALL => 'Show All',
+ pht('Ignore Trailing'),
+ DifferentialChangesetParser::WHITESPACE_SHOW_ALL => pht('Show All'),
);
foreach ($options as $value => $label) {

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 19, 1:16 AM (2 w, 21 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7224784
Default Alt Text
D11730.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility