revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-09 16:32:39 +01:00
Code Issues Releases Wiki Activity

add "author" information to conduit call

Browse source 
Summary: 'cuz we need it in arcanist for T479 to commit as author

Test Plan: verified the return value was correct in conduit

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T479

Differential Revision: https://secure.phabricator.com/D3917
This commit is contained in:
Bob Trahan 2012-11-09 13:33:58 -08:00
parent a316a0bbb3
commit 8ee6cbe1d4
3 changed files with 61 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
conf/default.conf.php
View file

@ -997,6 +997,17 @@ return array(
// interact with the revisions.
'differential.anonymous-access' => false,
// If you set this to true, revision author email address information will
// be exposed in Conduit. This is useful for Arcanist.
//
// For example, consider the "arc patch DX" workflow which needs to ask
// Differential for the revision DX. This data often should contain
// the author's email address, eg "George Washington
// <gwashinton@example.com>" when DX is a git or mercurial revision. If this
// option is false, Differential defaults to the best it can, something like
// "George Washington" or "gwashington".
'differential.expose-emails-prudently' => false,
// List of file regexps that should be treated as if they are generated by
// an automatic process, and thus get hidden by default in differential.
'differential.generated-paths' => array(

3
src/applications/conduit/method/differential/ConduitAPI_differential_getdiff_Method.php
View file

@ -64,7 +64,7 @@ final class ConduitAPI_differential_getdiff_Method extends ConduitAPIMethod {
$basic_dict = $diff->getDiffDict();
// for conduit calls, the basic dict is not enough
// we also need to include the arcanist project
// we also need to include the arcanist project and author information
$project = $diff->loadArcanistProject();
if ($project) {
$project_name = $project->getName();
@ -72,6 +72,7 @@ final class ConduitAPI_differential_getdiff_Method extends ConduitAPIMethod {
$project_name = null;
}
$basic_dict['projectName'] = $project_name;
$basic_dict['author'] = $diff->loadAuthorInformation();
return $basic_dict;
}

48
src/applications/differential/storage/DifferentialDiff.php
View file

@ -312,4 +312,52 @@ final class DifferentialDiff extends DifferentialDAO {
return $dict;
}
/**
* Figures out the right author information for a given diff based on the
* repository and Phabricator configuration settings.
*
* Git is particularly finicky as it requires author information to be in
* the format "George Washington <gwashington@example.com>" to
* consistently work. If the Phabricator instance isn't configured to
* expose emails prudently, then we are unable to get any author information
* for git.
*/
public function loadAuthorInformation() {
$author = id(new PhabricatorUser())
->loadOneWhere('phid = %s', $this->getAuthorPHID());
$use_emails =
PhabricatorEnv::getEnvConfig('differential.expose-emails-prudently',
false);
switch ($this->getSourceControlSystem()) {
case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
if (!$use_emails) {
$author_info = '';
} else {
$author_info = $this->getFullAuthorInfo($author);
}
break;
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
if (!$use_emails) {
$author_info = $author->getUsername();
} else {
$author_info = $this->getFullAuthorInfo($author);
}
break;
case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
default:
$author_info = $author->getUsername();
break;
}
return $author_info;
}
private function getFullAuthorInfo(PhabricatorUser $author) {
return sprintf('%s <%s>',
$author->getRealName(),
$author->loadPrimaryEmailAddress());
}
}