Page MenuHomePhabricator
Files F15466947

D12703.id30499.diff
No OneTemporary
Actions

D12703.id30499.diff
View Options

diff --git a/src/applications/differential/controller/DifferentialChangesetViewController.php b/src/applications/differential/controller/DifferentialChangesetViewController.php
--- a/src/applications/differential/controller/DifferentialChangesetViewController.php
+++ b/src/applications/differential/controller/DifferentialChangesetViewController.php
@@ -193,7 +193,11 @@
->setViewer($viewer)
->withRevisionPHIDs(array($revision->getPHID()));
$inlines = $query->execute();
- $inlines = $query->adjustInlinesForChangesets($inlines, $old, $new);
+ $inlines = $query->adjustInlinesForChangesets(
+ $inlines,
+ $old,
+ $new,
+ $revision);
} else {
$inlines = array();
}
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -178,7 +178,11 @@
->setViewer($user)
->withRevisionPHIDs(array($revision->getPHID()));
$inlines = $query->execute();
- $inlines = $query->adjustInlinesForChangesets($inlines, $old, $new);
+ $inlines = $query->adjustInlinesForChangesets(
+ $inlines,
+ $old,
+ $new,
+ $revision);
$visible_changesets = array();
foreach ($inlines as $inline) {
diff --git a/src/applications/differential/query/DifferentialInlineCommentQuery.php b/src/applications/differential/query/DifferentialInlineCommentQuery.php
--- a/src/applications/differential/query/DifferentialInlineCommentQuery.php
+++ b/src/applications/differential/query/DifferentialInlineCommentQuery.php
@@ -140,7 +140,8 @@
public function adjustInlinesForChangesets(
array $inlines,
array $old,
- array $new) {
+ array $new,
+ DifferentialRevision $revision) {
assert_instances_of($inlines, 'DifferentialInlineComment');
assert_instances_of($old, 'DifferentialChangeset');
@@ -302,6 +303,11 @@
// If we found a changeset to port this comment to, bring it forward
// or backward and mark it.
if ($target_id) {
+ $diff_id = $changeset->getDiffID();
+ $inline_id = $inline->getID();
+ $revision_id = $revision->getID();
+ $href = "/D{$revision_id}?id={$diff_id}#inline-{$inline_id}";
+
$inline
->makeEphemeral(true)
->setChangesetID($target_id)
@@ -309,6 +315,7 @@
array(
'new' => $is_new,
'reason' => $reason,
+ 'href' => $href,
));
$results[] = $inline;
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -531,7 +531,8 @@
$query->adjustInlinesForChangesets(
$inlines,
array_select_keys($changesets, $old_ids),
- array_select_keys($changesets, $new_ids));
+ array_select_keys($changesets, $new_ids),
+ $this);
return $timeline
->setChangesets($changesets)

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 4, 11:04 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7387469
Default Alt Text
D12703.id30499.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility