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

Highlighting blame is broken if there is an unavailable commit

Browse source 
Test Plan: .../PhotoSnowlift.js?view=blame

Reviewers: jungejason

Reviewed By: jungejason

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D2165
This commit is contained in:
vrana 2012-04-08 23:08:26 -07:00
parent 7451c1f6c9
commit aa0d0396a6
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/applications/diffusion/controller/file/DiffusionBrowseFileController.php
View file

@ -250,7 +250,7 @@ final class DiffusionBrowseFileController extends DiffusionController {
$selected) {
if ($blame_dict) {
$epoch_list = ipull($blame_dict, 'epoch');
$epoch_list = ipull(ifilter($blame_dict, 'epoch'), 'epoch');
$epoch_min = min($epoch_list);
$epoch_max = max($epoch_list);
$epoch_range = ($epoch_max - $epoch_min) + 1;
@ -298,27 +298,30 @@ final class DiffusionBrowseFileController extends DiffusionController {
} else {
$blame = $blame_dict[$rev];
$color_ratio = ($blame['epoch'] - $epoch_min) / $epoch_range;
if (!isset($blame['epoch'])) {
$color = '#ffd'; // Render as warning.
} else {
$color_ratio = ($blame['epoch'] - $epoch_min) / $epoch_range;
$color_value = 0xF6 * (1.0 - $color_ratio);
$color = sprintf(
'#%02x%02x%02x',
$color_value,
0xF6,
$color_value);
}
$color_value = 0xF6 * (1.0 - $color_ratio);
$color = sprintf(
'#%02x%02x%02x',
$color_value,
0xF6,
$color_value);
$display_line['epoch'] = $blame['epoch'];
$display_line['epoch'] = idx($blame, 'epoch');
$display_line['color'] = $color;
$display_line['commit'] = $rev;
if (isset($blame_dict[$rev]['handle'])) {
$author_link = $blame_dict[$rev]['handle']->renderLink();
if (isset($blame['handle'])) {
$author_link = $blame['handle']->renderLink();
} else {
$author_link = phutil_render_tag(
'span',
array(
),
phutil_escape_html($blame_dict[$rev]['author']));
phutil_escape_html($blame['author']));
}
$display_line['author'] = $author_link;

3
src/applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php
View file

@ -59,8 +59,7 @@ abstract class DiffusionFileContentQuery extends DiffusionQuery {
list($rev_id, $author, $text) = $line;
$rev_id = $rev_list[$k];
if (!isset($blame_dict[$rev_id]) &&
!isset($blame_dict[$rev_id]['author'] )) {
if (!isset($blame_dict[$rev_id])) {
$blame_dict[$rev_id]['author'] = $author;
}
}