mirror of
https://we.phorge.it/source/phorge.git
synced 2025-01-11 15:21:03 +01:00
Add a "USERS" section to audit emails listing commit authors and committers
Summary: Fixes T5872. This won't show up in the initial email until T4896 is further along. Test Plan: ``` RECIPIENTS discoball (Disco Ball) BODY epriestley added a comment. ffkn USERS epriestley (Author) COMMIT http://local.aphront.com:8080/rPOEMS165b6c54f487 ``` Reviewers: btrahan Reviewed By: btrahan Subscribers: epriestley Maniphest Tasks: T5872 Differential Revision: https://secure.phabricator.com/D10266
This commit is contained in:
parent
40a4eeec77
commit
cebbca9e08
1 changed files with 43 additions and 0 deletions
|
@ -428,6 +428,49 @@ final class PhabricatorAuditEditor
|
||||||
$this->renderInlineCommentsForMail($object, $inlines));
|
$this->renderInlineCommentsForMail($object, $inlines));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Reload the commit to pull commit data.
|
||||||
|
$commit = id(new DiffusionCommitQuery())
|
||||||
|
->setViewer($this->requireActor())
|
||||||
|
->withIDs(array($object->getID()))
|
||||||
|
->needCommitData(true)
|
||||||
|
->executeOne();
|
||||||
|
$data = $commit->getCommitData();
|
||||||
|
|
||||||
|
$user_phids = array();
|
||||||
|
|
||||||
|
$author_phid = $commit->getAuthorPHID();
|
||||||
|
if ($author_phid) {
|
||||||
|
$user_phids[$commit->getAuthorPHID()][] = pht('Author');
|
||||||
|
}
|
||||||
|
|
||||||
|
$committer_phid = $data->getCommitDetail('committerPHID');
|
||||||
|
if ($committer_phid && ($committer_phid != $author_phid)) {
|
||||||
|
$user_phids[$committer_phid][] = pht('Committer');
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: It would be nice to show pusher here too, but that information
|
||||||
|
// is a little tricky to get at right now.
|
||||||
|
|
||||||
|
if ($user_phids) {
|
||||||
|
$handle_phids = array_keys($user_phids);
|
||||||
|
$handles = id(new PhabricatorHandleQuery())
|
||||||
|
->setViewer($this->requireActor())
|
||||||
|
->withPHIDs($handle_phids)
|
||||||
|
->execute();
|
||||||
|
|
||||||
|
$user_info = array();
|
||||||
|
foreach ($user_phids as $phid => $roles) {
|
||||||
|
$user_info[] = pht(
|
||||||
|
'%s (%s)',
|
||||||
|
$handles[$phid]->getName(),
|
||||||
|
implode(', ', $roles));
|
||||||
|
}
|
||||||
|
|
||||||
|
$body->addTextSection(
|
||||||
|
pht('USERS'),
|
||||||
|
implode("\n", $user_info));
|
||||||
|
}
|
||||||
|
|
||||||
$monogram = $object->getRepository()->formatCommitName(
|
$monogram = $object->getRepository()->formatCommitName(
|
||||||
$object->getCommitIdentifier());
|
$object->getCommitIdentifier());
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue