mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: Add support for hash_parent_base parameter for blobdiffs

Browse Source 
Add support for hash_parent_base in input validation part and in
href() function.  Add proper hash_parent_base to all calls to blobdiff
and blobdiff_plain action URLs. Use hash_parent_base as hash_base for
blobs of hash_parent.

To be used in future rewrite of git_blobdiff and git_blobdiff_plain.

While at it, move project before action in ordering CGI parameters in
href().

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jakub Narebski
2006-08-24 23:53:54 +02:00
committed by Junio C Hamano
parent edf735abfa
commit 420e92f255
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gitweb/gitweb.perl
View File

@ -211,6 +211,13 @@ if (defined $hash_base) {
} }
} }
our $hash_parent_base = $cgi->param('hpb');
if (defined $hash_parent_base) {
if (!validate_input($hash_parent_base)) {
die_error(undef, "Invalid hash parent base parameter");
}
}
our $page = $cgi->param('pg'); our $page = $cgi->param('pg');
if (defined $page) { if (defined $page) {
if ($page =~ m/[^0-9]$/) { if ($page =~ m/[^0-9]$/) {
@ -270,13 +277,14 @@ sub href(%) {
my %params = @_; my %params = @_;
my @mapping = ( my @mapping = (
action => "a",
project => "p", project => "p",
action => "a",
file_name => "f", file_name => "f",
file_parent => "fp", file_parent => "fp",
hash => "h", hash => "h",
hash_parent => "hp", hash_parent => "hp",
hash_base => "hb", hash_base => "hb",
hash_parent_base => "hpb",
page => "pg", page => "pg",
searchtext => "s", searchtext => "s",
); );
@ -1543,8 +1551,10 @@ sub git_difftree_body {
} }
print "<td>"; print "<td>";
if ($diff{'to_id'} ne $diff{'from_id'}) { # modified if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
print $cgi->a({-href => href(action=>"blobdiff", hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'}, print $cgi->a({-href => href(action=>"blobdiff",
hash_base=>$hash, file_name=>$diff{'file'}), hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
hash_base=>$hash, hash_parent_base=>$parent,
file_name=>$diff{'file'}),
-class => "list"}, esc_html($diff{'file'})); -class => "list"}, esc_html($diff{'file'}));
} else { # only mode changed } else { # only mode changed
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'}, print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
@ -1559,8 +1569,10 @@ sub git_difftree_body {
"blob"); "blob");
if ($diff{'to_id'} ne $diff{'from_id'}) { # modified if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
print " | " . print " | " .
$cgi->a({-href => href(action=>"blobdiff", hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'}, $cgi->a({-href => href(action=>"blobdiff",
hash_base=>$hash, file_name=>$diff{'file'})}, hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
hash_base=>$hash, hash_parent_base=>$parent,
file_name=>$diff{'file'})},
"diff"); "diff");
} }
print " | " . print " | " .
@ -1592,8 +1604,9 @@ sub git_difftree_body {
"blob"); "blob");
if ($diff{'to_id'} ne $diff{'from_id'}) { if ($diff{'to_id'} ne $diff{'from_id'}) {
print " | " . print " | " .
$cgi->a({-href => href(action=>"blobdiff", hash_base=>$hash, $cgi->a({-href => href(action=>"blobdiff",
hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'}, hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
hash_base=>$hash, hash_parent_base=>$parent,
file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})}, file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
"diff"); "diff");
} }
@ -1793,8 +1806,10 @@ sub git_history_body {
if (defined $blob_current && defined $blob_parent && if (defined $blob_current && defined $blob_parent &&
$blob_current ne $blob_parent) { $blob_current ne $blob_parent) {
print " | " . print " | " .
$cgi->a({-href => href(action=>"blobdiff", hash=>$blob_current, hash_parent=>$blob_parent, $cgi->a({-href => href(action=>"blobdiff",
hash_base=>$commit, file_name=>$file_name)}, hash=>$blob_current, hash_parent=>$blob_parent,
hash_base=>$hash_base, hash_parent_base=>$commit,
file_name=>$file_name)},
"diff to current"); "diff to current");
} }
} }
@ -2751,7 +2766,9 @@ sub git_blobdiff {
if (defined $hash_base && (my %co = parse_commit($hash_base))) { if (defined $hash_base && (my %co = parse_commit($hash_base))) {
my $formats_nav = my $formats_nav =
$cgi->a({-href => href(action=>"blobdiff_plain", $cgi->a({-href => href(action=>"blobdiff_plain",
hash=>$hash, hash_parent=>$hash_parent)}, hash=>$hash, hash_parent=>$hash_parent,
hash_base=>$hash_base, hash_parent_base=>$hash_parent_base,
file_name=>$file_name, file_parent=>$file_parent)},
"plain"); "plain");
git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav); git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
git_print_header_div('commit', esc_html($co{'title'}), $hash_base); git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
@ -2765,7 +2782,7 @@ HTML
print "<div class=\"page_body\">\n" . print "<div class=\"page_body\">\n" .
"<div class=\"diff_info\">blob:" . "<div class=\"diff_info\">blob:" .
$cgi->a({-href => href(action=>"blob", hash=>$hash_parent, $cgi->a({-href => href(action=>"blob", hash=>$hash_parent,
hash_base=>$hash_base, file_name=>($file_parent || $file_name))}, hash_base=>$hash_parent_base, file_name=>($file_parent || $file_name))},
$hash_parent) . $hash_parent) .
" -> blob:" . " -> blob:" .
$cgi->a({-href => href(action=>"blob", hash=>$hash, $cgi->a({-href => href(action=>"blob", hash=>$hash,