Page MenuHomePhabricator
Files F13189128

D19391.diff
No OneTemporary
Actions

D19391.diff
View Options

diff --git a/src/applications/diffusion/controller/DiffusionBlameController.php b/src/applications/diffusion/controller/DiffusionBlameController.php
--- a/src/applications/diffusion/controller/DiffusionBlameController.php
+++ b/src/applications/diffusion/controller/DiffusionBlameController.php
@@ -80,7 +80,6 @@
$handles = $viewer->loadHandles($handle_phids);
-
$map = array();
$epochs = array();
foreach ($identifiers as $identifier) {
@@ -106,9 +105,21 @@
),
$skip_icon);
- $commit = $commits[$identifier];
+ // We may not have a commit object for a given identifier if the commit
+ // has not imported yet.
+
+ // At time of writing, this can also happen if a line was part of the
+ // initial import: blame produces a "^abc123" identifier in Git, which
+ // doesn't correspond to a real commit.
+
+ $commit = idx($commits, $identifier);
+
+ $author_phid = null;
+
+ if ($commit) {
+ $author_phid = $commit->getAuthorPHID();
+ }
- $author_phid = $commit->getAuthorPHID();
if (!$author_phid && $revision) {
$author_phid = $revision->getAuthorPHID();
}
@@ -141,18 +152,22 @@
'meta' => $author_meta,
));
- $commit_link = javelin_tag(
- 'a',
- array(
- 'href' => $commit->getURI(),
- 'sigil' => 'has-tooltip',
- 'meta' => array(
- 'tip' => $this->renderCommitTooltip($commit, $handles),
- 'align' => 'E',
- 'size' => 600,
+ if ($commit) {
+ $commit_link = javelin_tag(
+ 'a',
+ array(
+ 'href' => $commit->getURI(),
+ 'sigil' => 'has-tooltip',
+ 'meta' => array(
+ 'tip' => $this->renderCommitTooltip($commit, $handles),
+ 'align' => 'E',
+ 'size' => 600,
+ ),
),
- ),
- $commit->getLocalName());
+ $commit->getLocalName());
+ } else {
+ $commit_link = null;
+ }
$info = array(
$author_link,
@@ -180,7 +195,12 @@
);
}
- $epoch = $commit->getEpoch();
+ if ($commit) {
+ $epoch = $commit->getEpoch();
+ } else {
+ $epoch = 0;
+ }
+
$epochs[] = $epoch;
$data = array(

File Metadata

Mime Type
text/plain
Expires
Sun, May 12, 5:44 AM (3 w, 19 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6290197
Default Alt Text
D19391.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility