revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-20 20:40:56 +01:00
Code Issues Releases Wiki Activity

Add "Author" and "Committer" fields to Herald pre-commit content hooks

Browse source 
Summary: Ref T4195. Adds "Author" and "Committer" fields.

Test Plan:
Created a rule using these fields:

{F90897}

...then pushed git, mercurial and svn commits and verified the correct values populated in the transcript:

{F90898}

Reviewers: btrahan

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T4195

Differential Revision: https://secure.phabricator.com/D7802
This commit is contained in:
epriestley 2013-12-19 11:05:31 -08:00
parent d667b12206
commit 134c8f5547
1 changed files with 54 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php
View file

@ -38,6 +38,8 @@ final class HeraldPreCommitContentAdapter extends HeraldAdapter {
return array_merge( return array_merge(
array( array(
self::FIELD_BODY, self::FIELD_BODY,
self::FIELD_AUTHOR,
self::FIELD_COMMITTER,
self::FIELD_DIFF_FILE, self::FIELD_DIFF_FILE,
self::FIELD_DIFF_CONTENT, self::FIELD_DIFF_CONTENT,
self::FIELD_DIFF_ADDED_CONTENT, self::FIELD_DIFF_ADDED_CONTENT,
@ -87,6 +89,10 @@ final class HeraldPreCommitContentAdapter extends HeraldAdapter {
switch ($field) { switch ($field) {
case self::FIELD_BODY: case self::FIELD_BODY:
return $this->getCommitRef()->getMessage(); return $this->getCommitRef()->getMessage();
case self::FIELD_AUTHOR:
return $this->getAuthorPHID();
case self::FIELD_COMMITTER:
return $this->getCommitterPHID();
case self::FIELD_DIFF_FILE: case self::FIELD_DIFF_FILE:
return $this->getDiffContent('name'); return $this->getDiffContent('name');
case self::FIELD_DIFF_CONTENT: case self::FIELD_DIFF_CONTENT:
@ -190,4 +196,52 @@ final class HeraldPreCommitContentAdapter extends HeraldAdapter {
return $this->commitRef; return $this->commitRef;
} }
private function getAuthorPHID() {
$repository = $this->hookEngine->getRepository();
$vcs = $repository->getVersionControlSystem();
switch ($vcs) {
case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
$ref = $this->getCommitRef();
$author = $ref->getAuthor();
if (!strlen($author)) {
return null;
}
return $this->lookupUser($author);
case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
// In Subversion, the pusher is always the author.
return $this->hookEngine->getViewer()->getPHID();
}
}
private function getCommitterPHID() {
$repository = $this->hookEngine->getRepository();
$vcs = $repository->getVersionControlSystem();
switch ($vcs) {
case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
// Here, if there's no committer, we're going to return the author
// instead.
$ref = $this->getCommitRef();
$committer = $ref->getCommitter();
if (!strlen($committer)) {
return $this->getAuthorPHID();
}
$phid = $this->lookupUser($committer);
if (!$phid) {
return $this->getAuthorPHID();
}
return $phid;
case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
// In Subversion, the pusher is always the committer.
return $this->hookEngine->getViewer()->getPHID();
}
}
private function lookupUser($author) {
return id(new DiffusionResolveUserQuery())
->withName($author)
->execute();
}
} }