Skip to content

Commit cb45ad6

Browse files
author
vrana
committed
Revive essential commit details
Summary: Deleted by D3977. Test Plan: ./reparse.php --message Reviewers: epriestley, edward Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4090
1 parent 86470e7 commit cb45ad6

File tree

2 files changed

+33
-19
lines changed

2 files changed

+33
-19
lines changed

src/applications/diffusion/controller/DiffusionCommitController.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,8 @@ private function getCommitProperties(
370370
}
371371

372372
$reviewer_phid = $data->getCommitDetail('reviewerPHID');
373-
$reviewer_name = $data->getCommitDetail('reviewerName');
374373
if ($reviewer_phid) {
375374
$props['Reviewer'] = $handles[$reviewer_phid]->renderLink();
376-
} else if ($reviewer_name) {
377-
$props['Reviewer'] = phutil_escape_html($reviewer_name);
378375
}
379376

380377
$committer = $data->getCommitDetail('committer');

src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,34 @@ final protected function updateCommitData($author, $message,
3434
$data->getCommitDetail('authorPHID'));
3535
$data->setCommitDetail('authorPHID', $author_phid);
3636

37+
$user = new PhabricatorUser();
38+
if ($author_phid) {
39+
$user = $user->loadOneWhere(
40+
'phid = %s',
41+
$author_phid);
42+
}
43+
44+
$call = new ConduitCall(
45+
'differential.parsecommitmessage',
46+
array(
47+
'corpus' => $message,
48+
'partial' => true,
49+
));
50+
$call->setUser($user);
51+
$result = $call->execute();
52+
53+
$field_values = $result['fields'];
54+
55+
if (!empty($field_values['reviewedByPHIDs'])) {
56+
$data->setCommitDetail(
57+
'reviewerPHID',
58+
reset($field_values['reviewedByPHIDs']));
59+
}
60+
61+
$data->setCommitDetail(
62+
'differential.revisionID',
63+
idx($field_values, 'revisionID'));
64+
3765
$committer_phid = $this->lookupUser(
3866
$commit,
3967
$data->getCommitDetail('committer'),
@@ -81,6 +109,10 @@ final protected function updateCommitData($author, $message,
81109

82110
$revision = id(new DifferentialRevision())->load($revision_id);
83111
if ($revision) {
112+
$data->setCommitDetail(
113+
'differential.revisionPHID',
114+
$revision->getPHID());
115+
84116
$revision->loadRelationships();
85117
queryfx(
86118
$conn_w,
@@ -150,22 +182,7 @@ final protected function updateCommitData($author, $message,
150182
$lock->unlock();
151183
}
152184

153-
if ($should_autoclose && $author_phid) {
154-
$user = id(new PhabricatorUser())->loadOneWhere(
155-
'phid = %s',
156-
$author_phid);
157-
158-
$call = new ConduitCall(
159-
'differential.parsecommitmessage',
160-
array(
161-
'corpus' => $message,
162-
'partial' => true,
163-
));
164-
$call->setUser($user);
165-
$result = $call->execute();
166-
167-
$field_values = $result['fields'];
168-
185+
if ($should_autoclose) {
169186
$fields = DifferentialFieldSelector::newSelector()
170187
->getFieldSpecifications();
171188
foreach ($fields as $key => $field) {

0 commit comments

Comments
 (0)