gitweb: Finish restoring "blob" links in git_difftree_body
This finishes work started by commit 4777b0141a
"gitweb: Restore object-named links in item lists"
by Petr Baudis. It brings back rest of "blob" links in difftree-raw
like part of "commit" and "commitdiff" views, namely in
git_difftree_body subroutine.
Now the td.link table cell has the following links:
* link to diff ("blobdiff" view) in "commit" view, if applicable
(there is no link to uninteresting creation/deletion diff), or
link to patch anchor in "commitdiff" view.
* link to current version of file ("blob" view), with the obvious
exception of file deletion, where it is link to the parent
version.
* link to "blame" view, if it is enabled, and file was not just
created (i.e. it has any history).
* link to history of the file ("history" view), again with sole
exception of the case of new file.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
af6feeb229
commit
897d1d2e2a
@ -2092,7 +2092,11 @@ sub git_difftree_body {
|
|||||||
# link to patch
|
# link to patch
|
||||||
$patchno++;
|
$patchno++;
|
||||||
print $cgi->a({-href => "#patch$patchno"}, "patch");
|
print $cgi->a({-href => "#patch$patchno"}, "patch");
|
||||||
|
print " | ";
|
||||||
}
|
}
|
||||||
|
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
|
||||||
|
hash_base=>$hash, file_name=>$diff{'file'})},
|
||||||
|
"blob") . " | ";
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
|
|
||||||
} elsif ($diff{'status'} eq "D") { # deleted
|
} elsif ($diff{'status'} eq "D") { # deleted
|
||||||
@ -2112,13 +2116,11 @@ 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") . " | ";
|
||||||
if ($have_blame) {
|
if ($have_blame) {
|
||||||
print $cgi->a({-href =>
|
print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
|
||||||
href(action=>"blame",
|
file_name=>$diff{'file'})},
|
||||||
hash_base=>$parent,
|
"blame") . " | ";
|
||||||
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'})},
|
||||||
@ -2163,13 +2165,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") . " | ";
|
||||||
if ($have_blame) {
|
if ($have_blame) {
|
||||||
print $cgi->a({-href => href(action=>"blame",
|
print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
|
||||||
hash_base=>$hash,
|
file_name=>$diff{'file'})},
|
||||||
file_name=>$diff{'file'})},
|
"blame") . " | ";
|
||||||
"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'})},
|
||||||
@ -2208,17 +2209,16 @@ sub git_difftree_body {
|
|||||||
"diff") .
|
"diff") .
|
||||||
" | ";
|
" | ";
|
||||||
}
|
}
|
||||||
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
|
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
|
||||||
hash_base=>$parent, file_name=>$diff{'from_file'})},
|
hash_base=>$parent, file_name=>$diff{'to_file'})},
|
||||||
"blob") . " | ";
|
"blob") . " | ";
|
||||||
if ($have_blame) {
|
if ($have_blame) {
|
||||||
print $cgi->a({-href => href(action=>"blame",
|
print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
|
||||||
hash_base=>$hash,
|
file_name=>$diff{'to_file'})},
|
||||||
file_name=>$diff{'to_file'})},
|
"blame") . " | ";
|
||||||
"blame") . " | ";
|
|
||||||
}
|
}
|
||||||
print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
|
print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
|
||||||
file_name=>$diff{'from_file'})},
|
file_name=>$diff{'to_file'})},
|
||||||
"history");
|
"history");
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user