gitweb: do not give blame link unconditionally in diff-tree view
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
744d0ac33a
commit
2b2a8c78ea
@ -2012,7 +2012,7 @@ sub git_print_tree_entry {
|
|||||||
|
|
||||||
sub git_difftree_body {
|
sub git_difftree_body {
|
||||||
my ($difftree, $hash, $parent) = @_;
|
my ($difftree, $hash, $parent) = @_;
|
||||||
|
my ($have_blame) = gitweb_check_feature('blame');
|
||||||
print "<div class=\"list_head\">\n";
|
print "<div class=\"list_head\">\n";
|
||||||
if ($#{$difftree} > 10) {
|
if ($#{$difftree} > 10) {
|
||||||
print(($#{$difftree} + 1) . " files changed:\n");
|
print(($#{$difftree} + 1) . " files changed:\n");
|
||||||
@ -2085,9 +2085,13 @@ sub git_difftree_body {
|
|||||||
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
|
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
|
||||||
hash_base=>$parent, file_name=>$diff{'file'})},
|
hash_base=>$parent, file_name=>$diff{'file'})},
|
||||||
"blob") . " | ";
|
"blob") . " | ";
|
||||||
print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
|
if ($have_blame) {
|
||||||
file_name=>$diff{'file'})},
|
print $cgi->a({-href =>
|
||||||
"blame") . " | ";
|
href(action=>"blame",
|
||||||
|
hash_base=>$parent,
|
||||||
|
file_name=>$diff{'file'})},
|
||||||
|
"blame") . " | ";
|
||||||
|
}
|
||||||
print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
|
print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
|
||||||
file_name=>$diff{'file'})},
|
file_name=>$diff{'file'})},
|
||||||
"history");
|
"history");
|
||||||
@ -2133,9 +2137,12 @@ sub git_difftree_body {
|
|||||||
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
|
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
|
||||||
hash_base=>$hash, file_name=>$diff{'file'})},
|
hash_base=>$hash, file_name=>$diff{'file'})},
|
||||||
"blob") . " | ";
|
"blob") . " | ";
|
||||||
print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
|
if ($have_blame) {
|
||||||
file_name=>$diff{'file'})},
|
print $cgi->a({-href => href(action=>"blame",
|
||||||
"blame") . " | ";
|
hash_base=>$hash,
|
||||||
|
file_name=>$diff{'file'})},
|
||||||
|
"blame") . " | ";
|
||||||
|
}
|
||||||
print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
|
print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
|
||||||
file_name=>$diff{'file'})},
|
file_name=>$diff{'file'})},
|
||||||
"history");
|
"history");
|
||||||
@ -2176,9 +2183,12 @@ sub git_difftree_body {
|
|||||||
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
|
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
|
||||||
hash_base=>$parent, file_name=>$diff{'from_file'})},
|
hash_base=>$parent, file_name=>$diff{'from_file'})},
|
||||||
"blob") . " | ";
|
"blob") . " | ";
|
||||||
print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
|
if ($have_blame) {
|
||||||
file_name=>$diff{'from_file'})},
|
print $cgi->a({-href => href(action=>"blame",
|
||||||
"blame") . " | ";
|
hash_base=>$hash,
|
||||||
|
file_name=>$diff{'to_file'})},
|
||||||
|
"blame") . " | ";
|
||||||
|
}
|
||||||
print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
|
print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
|
||||||
file_name=>$diff{'from_file'})},
|
file_name=>$diff{'from_file'})},
|
||||||
"history");
|
"history");
|
||||||
|
Loading…
Reference in New Issue
Block a user