mirror of
https://we.phorge.it/source/phorge.git
synced 2024-09-20 17:28:51 +02:00
Parse Conflicts field in commit message
Summary: Git adds it automatically. I don't like this solution much because there could be other unknown fields appended to the end of the commit message which will break parsing. Test Plan: Reparsed commit ending with: > Differential Revision: ... > Conflicts: ... Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4157
This commit is contained in:
parent
5cb0f47761
commit
40e3aadc76
3 changed files with 37 additions and 0 deletions
|
@ -236,6 +236,7 @@ phutil_register_library_map(array(
|
||||||
'DifferentialCommentPreviewController' => 'applications/differential/controller/DifferentialCommentPreviewController.php',
|
'DifferentialCommentPreviewController' => 'applications/differential/controller/DifferentialCommentPreviewController.php',
|
||||||
'DifferentialCommentSaveController' => 'applications/differential/controller/DifferentialCommentSaveController.php',
|
'DifferentialCommentSaveController' => 'applications/differential/controller/DifferentialCommentSaveController.php',
|
||||||
'DifferentialCommitsFieldSpecification' => 'applications/differential/field/specification/DifferentialCommitsFieldSpecification.php',
|
'DifferentialCommitsFieldSpecification' => 'applications/differential/field/specification/DifferentialCommitsFieldSpecification.php',
|
||||||
|
'DifferentialConflictsFieldSpecification' => 'applications/differential/field/specification/DifferentialConflictsFieldSpecification.php',
|
||||||
'DifferentialController' => 'applications/differential/controller/DifferentialController.php',
|
'DifferentialController' => 'applications/differential/controller/DifferentialController.php',
|
||||||
'DifferentialDAO' => 'applications/differential/storage/DifferentialDAO.php',
|
'DifferentialDAO' => 'applications/differential/storage/DifferentialDAO.php',
|
||||||
'DifferentialDateCreatedFieldSpecification' => 'applications/differential/field/specification/DifferentialDateCreatedFieldSpecification.php',
|
'DifferentialDateCreatedFieldSpecification' => 'applications/differential/field/specification/DifferentialDateCreatedFieldSpecification.php',
|
||||||
|
@ -1547,6 +1548,7 @@ phutil_register_library_map(array(
|
||||||
'DifferentialCommentPreviewController' => 'DifferentialController',
|
'DifferentialCommentPreviewController' => 'DifferentialController',
|
||||||
'DifferentialCommentSaveController' => 'DifferentialController',
|
'DifferentialCommentSaveController' => 'DifferentialController',
|
||||||
'DifferentialCommitsFieldSpecification' => 'DifferentialFieldSpecification',
|
'DifferentialCommitsFieldSpecification' => 'DifferentialFieldSpecification',
|
||||||
|
'DifferentialConflictsFieldSpecification' => 'DifferentialFieldSpecification',
|
||||||
'DifferentialController' => 'PhabricatorController',
|
'DifferentialController' => 'PhabricatorController',
|
||||||
'DifferentialDAO' => 'PhabricatorLiskDAO',
|
'DifferentialDAO' => 'PhabricatorLiskDAO',
|
||||||
'DifferentialDateCreatedFieldSpecification' => 'DifferentialFieldSpecification',
|
'DifferentialDateCreatedFieldSpecification' => 'DifferentialFieldSpecification',
|
||||||
|
|
|
@ -26,6 +26,7 @@ final class DifferentialDefaultFieldSelector
|
||||||
new DifferentialApplyPatchFieldSpecification(),
|
new DifferentialApplyPatchFieldSpecification(),
|
||||||
new DifferentialRevisionIDFieldSpecification(),
|
new DifferentialRevisionIDFieldSpecification(),
|
||||||
new DifferentialGitSVNIDFieldSpecification(),
|
new DifferentialGitSVNIDFieldSpecification(),
|
||||||
|
new DifferentialConflictsFieldSpecification(),
|
||||||
new DifferentialDateModifiedFieldSpecification(),
|
new DifferentialDateModifiedFieldSpecification(),
|
||||||
new DifferentialDateCreatedFieldSpecification(),
|
new DifferentialDateCreatedFieldSpecification(),
|
||||||
new DifferentialAuditorsFieldSpecification(),
|
new DifferentialAuditorsFieldSpecification(),
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
final class DifferentialConflictsFieldSpecification
|
||||||
|
extends DifferentialFieldSpecification {
|
||||||
|
|
||||||
|
public function shouldAppearOnCommitMessage() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function shouldAppearOnCommitMessageTemplate() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCommitMessageKey() {
|
||||||
|
return 'conflicts';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setValueFromParsedCommitMessage($value) {
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function renderLabelForCommitMessage() {
|
||||||
|
return 'Conflicts';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function renderValueForCommitMessage($is_edit) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function parseValueFromCommitMessage($value) {
|
||||||
|
return $value;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in a new issue