Page MenuHomePhabricator
Files F13185633

D17262.diff
No OneTemporary
Actions

D17262.diff
View Options

diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -375,35 +375,26 @@
private function createAuditRequestTransactionFromCommitMessage(
PhabricatorRepositoryCommit $commit) {
+ $actor = $this->getActor();
$data = $commit->getCommitData();
$message = $data->getCommitMessage();
- $matches = null;
- if (!preg_match('/^Auditors?:\s*(.*)$/im', $message, $matches)) {
- return array();
- }
-
- $phids = id(new PhabricatorObjectListQuery())
- ->setViewer($this->getActor())
- ->setAllowPartialResults(true)
- ->setAllowedTypes(
- array(
- PhabricatorPeopleUserPHIDType::TYPECONST,
- PhabricatorProjectProjectPHIDType::TYPECONST,
- ))
- ->setObjectList($matches[1])
- ->execute();
+ $result = DifferentialCommitMessageParser::newStandardParser($actor)
+ ->setRaiseMissingFieldErrors(false)
+ ->parseFields($message);
+ $field_key = DifferentialAuditorsCommitMessageField::FIELDKEY;
+ $phids = idx($result, $field_key, null);
if (!$phids) {
return array();
}
- foreach ($phids as $phid) {
- $this->addAuditReason($phid, pht('Requested by Author'));
- }
return id(new PhabricatorAuditTransaction())
- ->setTransactionType(PhabricatorAuditActionConstants::ADD_AUDITORS)
- ->setNewValue(array_fuse($phids));
+ ->setTransactionType(DiffusionCommitAuditorsTransaction::TRANSACTIONTYPE)
+ ->setNewValue(
+ array(
+ '+' => array_fuse($phids),
+ ));
}
protected function sortTransactions(array $xactions) {
diff --git a/src/applications/differential/field/DifferentialAuditorsCommitMessageField.php b/src/applications/differential/field/DifferentialAuditorsCommitMessageField.php
--- a/src/applications/differential/field/DifferentialAuditorsCommitMessageField.php
+++ b/src/applications/differential/field/DifferentialAuditorsCommitMessageField.php
@@ -15,6 +15,7 @@
array(
PhabricatorPeopleUserPHIDType::TYPECONST,
PhabricatorProjectProjectPHIDType::TYPECONST,
+ PhabricatorOwnersPackagePHIDType::TYPECONST,
));
}
diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
@@ -1588,6 +1588,26 @@
),
),
+ '%s added %s auditor(s): %s.' => array(
+ array(
+ '%s added an auditor: %3$s.',
+ '%s added auditors: %3$s.',
+ ),
+ ),
+
+ '%s removed %s auditor(s): %s.' => array(
+ array(
+ '%s removed an auditor: %3$s.',
+ '%s removed auditors: %3$s.',
+ ),
+ ),
+
+ '%s edited %s auditor(s), removed %s: %s; added %s: %s.' => array(
+ array(
+ '%s edited auditors, removed: %4$s; added: %6$s.',
+ ),
+ ),
+
);
}

File Metadata

Mime Type
text/plain
Expires
Sun, May 12, 3:05 AM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6287658
Default Alt Text
D17262.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility