@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 "DifferentialConflictsField" custom field
Summary: Ref T11114. This is a pure paring field and now entirely handled by `DifferentialConflictsCommitMessageField`.
Test Plan: Grepped for removed class name.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T11114
Differential Revision: https://secure.phabricator.com/D17073
-47
-2
src/__phutil_library_map__.php
-2
src/__phutil_library_map__.php
···
389
389
'DifferentialCommitsField' => 'applications/differential/customfield/DifferentialCommitsField.php',
390
390
'DifferentialConduitAPIMethod' => 'applications/differential/conduit/DifferentialConduitAPIMethod.php',
391
391
'DifferentialConflictsCommitMessageField' => 'applications/differential/field/DifferentialConflictsCommitMessageField.php',
392
-
'DifferentialConflictsField' => 'applications/differential/customfield/DifferentialConflictsField.php',
393
392
'DifferentialController' => 'applications/differential/controller/DifferentialController.php',
394
393
'DifferentialCoreCustomField' => 'applications/differential/customfield/DifferentialCoreCustomField.php',
395
394
'DifferentialCreateCommentConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php',
···
5034
5033
'DifferentialCommitsField' => 'DifferentialCustomField',
5035
5034
'DifferentialConduitAPIMethod' => 'ConduitAPIMethod',
5036
5035
'DifferentialConflictsCommitMessageField' => 'DifferentialCommitMessageField',
5037
-
'DifferentialConflictsField' => 'DifferentialCustomField',
5038
5036
'DifferentialController' => 'PhabricatorController',
5039
5037
'DifferentialCoreCustomField' => 'DifferentialCustomField',
5040
5038
'DifferentialCreateCommentConduitAPIMethod' => 'DifferentialConduitAPIMethod',
-45
src/applications/differential/customfield/DifferentialConflictsField.php
-45
src/applications/differential/customfield/DifferentialConflictsField.php
···
1
-
<?php
2
-
3
-
/**
4
-
* This field doesn't do anything, it just parses the "Conflicts:" field which
5
-
* `git` can insert after a merge, so we don't squish the field value into
6
-
* some other field.
7
-
*/
8
-
final class DifferentialConflictsField
9
-
extends DifferentialCustomField {
10
-
11
-
public function getFieldKey() {
12
-
return 'differential:conflicts';
13
-
}
14
-
15
-
public function getFieldKeyForConduit() {
16
-
return 'conflicts';
17
-
}
18
-
19
-
public function getFieldName() {
20
-
return pht('Conflicts');
21
-
}
22
-
23
-
public function getFieldDescription() {
24
-
return pht(
25
-
'Parses the "%s" field which Git can inject into commit messages.',
26
-
'Conflicts');
27
-
}
28
-
29
-
public function canDisableField() {
30
-
return false;
31
-
}
32
-
33
-
public function shouldAppearInCommitMessage() {
34
-
return true;
35
-
}
36
-
37
-
public function shouldAllowEditInCommitMessage() {
38
-
return false;
39
-
}
40
-
41
-
public function renderCommitMessageValue(array $handles) {
42
-
return null;
43
-
}
44
-
45
-
}