@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
Remove leftover code for "postponed" lint and unit status
Summary: Ref T9134. It looks like this functionality was removed in D13848.
Test Plan: Submitted a diff successfully.
Reviewers: #blessed_reviewers, epriestley
Reviewed By: #blessed_reviewers, epriestley
Subscribers: Korvin
Maniphest Tasks: T9134
Differential Revision: https://secure.phabricator.com/D13869
+17
-42
-7
src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php
-7
src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php
···
26
26
'okay',
27
27
'warn',
28
28
'fail',
29
-
'postponed',
30
29
));
31
30
32
31
return array(
···
95
94
case 'fail':
96
95
$lint_status = DifferentialLintStatus::LINT_FAIL;
97
96
break;
98
-
case 'postponed':
99
-
$lint_status = DifferentialLintStatus::LINT_POSTPONED;
100
-
break;
101
97
case 'none':
102
98
default:
103
99
$lint_status = DifferentialLintStatus::LINT_NONE;
···
116
112
break;
117
113
case 'fail':
118
114
$unit_status = DifferentialUnitStatus::UNIT_FAIL;
119
-
break;
120
-
case 'postponed':
121
-
$unit_status = DifferentialUnitStatus::UNIT_POSTPONED;
122
115
break;
123
116
case 'none':
124
117
default:
+6
-7
src/applications/differential/constants/DifferentialLintStatus.php
+6
-7
src/applications/differential/constants/DifferentialLintStatus.php
···
2
2
3
3
final class DifferentialLintStatus extends Phobject {
4
4
5
-
const LINT_NONE = 0;
6
-
const LINT_OKAY = 1;
7
-
const LINT_WARN = 2;
8
-
const LINT_FAIL = 3;
9
-
const LINT_SKIP = 4;
10
-
const LINT_POSTPONED = 5;
11
-
const LINT_AUTO_SKIP = 6;
5
+
const LINT_NONE = 0;
6
+
const LINT_OKAY = 1;
7
+
const LINT_WARN = 2;
8
+
const LINT_FAIL = 3;
9
+
const LINT_SKIP = 4;
10
+
const LINT_AUTO_SKIP = 6;
12
11
13
12
}
+6
-7
src/applications/differential/constants/DifferentialUnitStatus.php
+6
-7
src/applications/differential/constants/DifferentialUnitStatus.php
···
2
2
3
3
final class DifferentialUnitStatus extends Phobject {
4
4
5
-
const UNIT_NONE = 0;
6
-
const UNIT_OKAY = 1;
7
-
const UNIT_WARN = 2;
8
-
const UNIT_FAIL = 3;
9
-
const UNIT_SKIP = 4;
10
-
const UNIT_POSTPONED = 5;
11
-
const UNIT_AUTO_SKIP = 6;
5
+
const UNIT_NONE = 0;
6
+
const UNIT_OKAY = 1;
7
+
const UNIT_WARN = 2;
8
+
const UNIT_FAIL = 3;
9
+
const UNIT_SKIP = 4;
10
+
const UNIT_AUTO_SKIP = 6;
12
11
13
12
}
+5
-6
src/applications/differential/constants/DifferentialUnitTestResult.php
+5
-6
src/applications/differential/constants/DifferentialUnitTestResult.php
···
2
2
3
3
final class DifferentialUnitTestResult extends Phobject {
4
4
5
-
const RESULT_PASS = 'pass';
6
-
const RESULT_FAIL = 'fail';
7
-
const RESULT_SKIP = 'skip';
8
-
const RESULT_BROKEN = 'broken';
9
-
const RESULT_UNSOUND = 'unsound';
10
-
const RESULT_POSTPONED = 'postponed';
5
+
const RESULT_PASS = 'pass';
6
+
const RESULT_FAIL = 'fail';
7
+
const RESULT_SKIP = 'skip';
8
+
const RESULT_BROKEN = 'broken';
9
+
const RESULT_UNSOUND = 'unsound';
11
10
12
11
}
-4
src/applications/differential/customfield/DifferentialLintField.php
-4
src/applications/differential/customfield/DifferentialLintField.php
···
73
73
if ($status == DifferentialLintStatus::LINT_SKIP) {
74
74
$warnings[] = pht(
75
75
'Lint was skipped when generating these changes.');
76
-
} else if ($status == DifferentialLintStatus::LINT_POSTPONED) {
77
-
$warnings[] = pht(
78
-
'Background linting has not finished executing on these changes.');
79
76
} else {
80
77
$warnings[] = pht('These changes have lint problems.');
81
78
}
···
94
91
DifferentialLintStatus::LINT_FAIL => 'red',
95
92
DifferentialLintStatus::LINT_SKIP => 'blue',
96
93
DifferentialLintStatus::LINT_AUTO_SKIP => 'blue',
97
-
DifferentialLintStatus::LINT_POSTPONED => 'blue',
98
94
);
99
95
$icon_color = idx($colors, $diff->getLintStatus(), 'grey');
100
96
-4
src/applications/differential/customfield/DifferentialUnitField.php
-4
src/applications/differential/customfield/DifferentialUnitField.php
···
84
84
// Don't show any warnings.
85
85
} else if ($status == DifferentialUnitStatus::UNIT_AUTO_SKIP) {
86
86
// Don't show any warnings.
87
-
} else if ($status == DifferentialUnitStatus::UNIT_POSTPONED) {
88
-
$warnings[] = pht(
89
-
'Background tests have not finished executing on these changes.');
90
87
} else if ($status == DifferentialUnitStatus::UNIT_SKIP) {
91
88
$warnings[] = pht(
92
89
'Unit tests were skipped when generating these changes.');
···
108
105
DifferentialUnitStatus::UNIT_FAIL => 'red',
109
106
DifferentialUnitStatus::UNIT_SKIP => 'blue',
110
107
DifferentialUnitStatus::UNIT_AUTO_SKIP => 'blue',
111
-
DifferentialUnitStatus::UNIT_POSTPONED => 'blue',
112
108
);
113
109
$icon_color = idx($colors, $diff->getUnitStatus(), 'grey');
114
110
-6
src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
-6
src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
···
323
323
DifferentialLintStatus::LINT_FAIL => self::STAR_FAIL,
324
324
DifferentialLintStatus::LINT_SKIP => self::STAR_SKIP,
325
325
DifferentialLintStatus::LINT_AUTO_SKIP => self::STAR_SKIP,
326
-
DifferentialLintStatus::LINT_POSTPONED => self::STAR_SKIP,
327
326
);
328
327
329
328
$star = idx($map, $diff->getLintStatus(), self::STAR_FAIL);
···
339
338
DifferentialUnitStatus::UNIT_FAIL => self::STAR_FAIL,
340
339
DifferentialUnitStatus::UNIT_SKIP => self::STAR_SKIP,
341
340
DifferentialUnitStatus::UNIT_AUTO_SKIP => self::STAR_SKIP,
342
-
DifferentialUnitStatus::UNIT_POSTPONED => self::STAR_SKIP,
343
341
);
344
342
345
343
$star = idx($map, $diff->getUnitStatus(), self::STAR_FAIL);
···
361
359
return pht('Lint Skipped');
362
360
case DifferentialLintStatus::LINT_AUTO_SKIP:
363
361
return pht('Automatic diff as part of commit; lint not applicable.');
364
-
case DifferentialLintStatus::LINT_POSTPONED:
365
-
return pht('Lint Postponed');
366
362
}
367
363
return pht('Unknown');
368
364
}
···
382
378
case DifferentialUnitStatus::UNIT_AUTO_SKIP:
383
379
return pht(
384
380
'Automatic diff as part of commit; unit tests not applicable.');
385
-
case DifferentialUnitStatus::UNIT_POSTPONED:
386
-
return pht('Unit Tests Postponed');
387
381
}
388
382
return pht('Unknown');
389
383
}
-1
src/applications/harbormaster/view/HarbormasterUnitPropertyView.php
-1
src/applications/harbormaster/view/HarbormasterUnitPropertyView.php
···
88
88
ArcanistUnitTestResult::RESULT_FAIL => pht('Failed'),
89
89
ArcanistUnitTestResult::RESULT_UNSOUND => pht('Unsound'),
90
90
ArcanistUnitTestResult::RESULT_SKIP => pht('Skipped'),
91
-
ArcanistUnitTestResult::RESULT_POSTPONED => pht('Postponed'),
92
91
ArcanistUnitTestResult::RESULT_PASS => pht('Passed'),
93
92
);
94
93
$result = idx($names, $result, $result);