gitweb: Add support for hash_parent_base parameter for blobdiffs
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>
Jakub Narebski committed
Aug 24, 2006 at 23:53 UTC
420e92f255982564a782b6ea8cd3c522f48c7d12
1 file changed
+27
-10
gitweb/gitweb.perl
+27
-10
@@ -211,6 +211,13 @@ if (defined $hash_base) {
211
}
212
}
213
214
+our $hash_parent_base = $cgi->param('hpb');
215
+if (defined $hash_parent_base) {
216
+ if (!validate_input($hash_parent_base)) {
217
+ die_error(undef, "Invalid hash parent base parameter");
218
+ }
219
+}
220
+
221
our $page = $cgi->param('pg');
222
if (defined $page) {
223
if ($page =~ m/[^0-9]$/) {
@@ -270,13 +277,14 @@ sub href(%) {
277
my %params = @_;
278
279
my @mapping = (
273
- action => "a",
280
project => "p",
281
+ action => "a",
282
file_name => "f",
283
file_parent => "fp",
284
hash => "h",
285
hash_parent => "hp",
286
hash_base => "hb",
287
+ hash_parent_base => "hpb",
288
page => "pg",
289
searchtext => "s",
290
);
@@ -1543,8 +1551,10 @@ sub git_difftree_body {
1551
}
1552
print "<td>";
1553
if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
1546
- print $cgi->a({-href => href(action=>"blobdiff", hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
1547
- hash_base=>$hash, file_name=>$diff{'file'}),
1554
+ print $cgi->a({-href => href(action=>"blobdiff",
1555
+ hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
1556
+ hash_base=>$hash, hash_parent_base=>$parent,
1557
+ file_name=>$diff{'file'}),
1558
-class => "list"}, esc_html($diff{'file'}));
1559
} else { # only mode changed
1560
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
@@ -1559,8 +1569,10 @@ sub git_difftree_body {
1569
"blob");
1570
if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
1571
print " | " .
1562
- $cgi->a({-href => href(action=>"blobdiff", hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
1563
- hash_base=>$hash, file_name=>$diff{'file'})},
1572
+ $cgi->a({-href => href(action=>"blobdiff",
1573
+ hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
1574
+ hash_base=>$hash, hash_parent_base=>$parent,
1575
+ file_name=>$diff{'file'})},
1576
"diff");
1577
}
1578
print " | " .
@@ -1592,8 +1604,9 @@ sub git_difftree_body {
1604
"blob");
1605
if ($diff{'to_id'} ne $diff{'from_id'}) {
1606
print " | " .
1595
- $cgi->a({-href => href(action=>"blobdiff", hash_base=>$hash,
1607
+ $cgi->a({-href => href(action=>"blobdiff",
1608
hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
1609
+ hash_base=>$hash, hash_parent_base=>$parent,
1610
file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
1611
"diff");
1612
}
@@ -1793,8 +1806,10 @@ sub git_history_body {
1806
if (defined $blob_current && defined $blob_parent &&
1807
$blob_current ne $blob_parent) {
1808
print " | " .
1796
- $cgi->a({-href => href(action=>"blobdiff", hash=>$blob_current, hash_parent=>$blob_parent,
1797
- hash_base=>$commit, file_name=>$file_name)},
1809
+ $cgi->a({-href => href(action=>"blobdiff",
1810
+ hash=>$blob_current, hash_parent=>$blob_parent,
1811
+ hash_base=>$hash_base, hash_parent_base=>$commit,
1812
+ file_name=>$file_name)},
1813
"diff to current");
1814
}
1815
}
@@ -2751,7 +2766,9 @@ sub git_blobdiff {
2766
if (defined $hash_base && (my %co = parse_commit($hash_base))) {
2767
my $formats_nav =
2768
$cgi->a({-href => href(action=>"blobdiff_plain",
2754
- hash=>$hash, hash_parent=>$hash_parent)},
2769
+ hash=>$hash, hash_parent=>$hash_parent,
2770
+ hash_base=>$hash_base, hash_parent_base=>$hash_parent_base,
2771
+ file_name=>$file_name, file_parent=>$file_parent)},
2772
"plain");
2773
git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
2774
git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
@@ -2765,7 +2782,7 @@ HTML
2782
print "<div class=\"page_body\">\n" .
2783
"<div class=\"diff_info\">blob:" .
2784
$cgi->a({-href => href(action=>"blob", hash=>$hash_parent,
2768
- hash_base=>$hash_base, file_name=>($file_parent || $file_name))},
2785
+ hash_base=>$hash_parent_base, file_name=>($file_parent || $file_name))},
2786
$hash_parent) .
2787
" -> blob:" .
2788
$cgi->a({-href => href(action=>"blob", hash=>$hash,