@matheusbsbs / matheus-bagliano / commits / 5c95fab017
Fork 0

gitweb: support for "fp" parameter.

The "fp" (file name parent) parameter was previously generated for blob diffs of renamed files. However, it was not used in any code. Now href() can generate "fp" parameters and they are used by the blobdiff code to show the correct file name. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Martin Waitz committed Aug 17, 2006 at 00:28 UTC 5c95fab017681f6ab21bf82c195bf0a3826fe014
1 file changed +11 -5
gitweb/gitweb.perl
+11 -5
@@ -119,6 +119,13 @@ if (defined $file_name) {
119 }
120 }
121
122 +our $file_parent = $cgi->param('fp');
123 +if (defined $file_parent) {
124 + if (!validate_input($file_parent)) {
125 + die_error(undef, "Invalid file parent parameter");
126 + }
127 +}
128 +
129 our $hash = $cgi->param('h');
130 if (defined $hash) {
131 if (!validate_input($hash)) {
@@ -192,6 +199,7 @@ sub href(%) {
199 action => "a",
200 project => "p",
201 file_name => "f",
202 + file_parent => "fp",
203 hash => "h",
204 hash_parent => "hp",
205 hash_base => "hb",
@@ -1287,8 +1295,7 @@ sub git_difftree_body {
1295 $cgi->a({-href => href(action=>"blob", hash=>$to_id, hash_base=>$hash, file_name=>$to_file)}, "blob");
1296 if ($to_id ne $from_id) {
1297 print " | " .
1290 - $cgi->a({-href => "$my_uri?" .
1291 - esc_param("p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$to_file;fp=$from_file")}, "diff");
1298 + $cgi->a({-href => href(action=>"blobdiff", hash=>$to_id, hash_parent=>$from_id, hash_base=>$hash, file_name=>$to_file, file_parent=>$from_file)}, "diff");
1299 }
1300 print "</td>\n";
1301
@@ -1309,8 +1316,7 @@ sub git_difftree_body {
1316 $cgi->a({-href => href(action=>"blob", hash=>$to_id, hash_base=>$hash, file_name=>$to_file)}, "blob");
1317 if ($to_id ne $from_id) {
1318 print " | " .
1312 - $cgi->a({-href => "$my_uri?" .
1313 - esc_param("p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$to_file;fp=$from_file")}, "diff");
1319 + $cgi->a({-href => href(action=>"blobdiff", hash=>$to_id, hash_parent=>$from_id, hash_base=>$hash, file_name=>$to_file, file_parent=>$from_file)}, "diff");
1320 }
1321 print "</td>\n";
1322 } # we should not encounter Unmerged (U) or Unknown (X) status
@@ -2304,7 +2310,7 @@ sub git_blobdiff {
2310 git_print_page_path($file_name, "blob");
2311 print "<div class=\"page_body\">\n" .
2312 "<div class=\"diff_info\">blob:" .
2307 - $cgi->a({-href => href(action=>"blob", hash=>$hash_parent, hash_base=>$hash_base, file_name=>$file_name)}, $hash_parent) .
2313 + $cgi->a({-href => href(action=>"blob", hash=>$hash_parent, hash_base=>$hash_base, file_name=>($file_parent || $file_name))}, $hash_parent) .
2314 " -> blob:" .
2315 $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)}, $hash) .
2316 "</div>\n";