archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Display author of last manual diff in summary and test plan comments

Browse Source 
Summary:
D2550 is not compatible with D2540.
Example: D2559.

Test Plan: Display commandeered revision.

Reviewers: nh

Reviewed By: nh

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D2567
This commit is contained in:
vrana
2012-05-24 14:21:50 -07:00
parent 0e3aeab1b3
commit 0da0632242
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
View File

@@ -58,13 +58,15 @@ final class DifferentialRevisionViewController extends DifferentialController {
}
}
foreach ($diffs as $diff) {
if ($diff->getCreationMethod() != 'commit') {
$last_manual = $diff;
}
}
$target_manual = $target;
if (!$target_id) {
foreach ($diffs as $diff) {
if ($diff->getCreationMethod() != 'commit') {
$target_manual = $diff;
}
}
$target_manual = $last_manual;
}
$diffs = mpull($diffs, null, 'getID');
@@ -85,7 +87,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
$comments = $revision->loadComments();
$comments = array_merge(
$this->getImplicitComments($revision),
$this->getImplicitComments($revision, $last_manual),
$comments);
$all_changesets = $changesets;
@@ -362,9 +364,9 @@ final class DifferentialRevisionViewController extends DifferentialController {
));
}
private function getImplicitComments(DifferentialRevision $revision) {
$diff = $revision->loadActiveDiff();
private function getImplicitComments(
DifferentialRevision $revision,
DifferentialDiff $diff) {
$template = new DifferentialComment();
$template->setAuthorPHID($diff->getAuthorPHID());