From: Junio C Hamano <junkio@cox.net>
Date: Sun, 13 Aug 2006 02:24:15 +0000 (-0700)
Subject: Merge branch 'jn/web'
X-Git-Tag: v1.4.3-rc1~274
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6295ac347acab0f100bc143effd28d3b0bbff739?ds=inline;hp=-c

Merge branch 'jn/web'
---

6295ac347acab0f100bc143effd28d3b0bbff739
diff --combined gitweb/gitweb.perl
index ae13e3e701,ddf593a5bf..626fcc9201
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -1003,7 -1003,7 +1003,7 @@@ sub git_get_paging_nav 
  	if ($page > 0) {
  		$paging_nav .= " &sdot; " .
  			$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action;h=$hash;pg=" . ($page-1)),
- 							 -accesskey => "p", -title => "Alt-p"}, "prev");
+ 			         -accesskey => "p", -title => "Alt-p"}, "prev");
  	} else {
  		$paging_nav .= " &sdot; prev";
  	}
@@@ -1011,7 -1011,7 +1011,7 @@@
  	if ($nrevs >= (100 * ($page+1)-1)) {
  		$paging_nav .= " &sdot; " .
  			$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action;h=$hash;pg=" . ($page+1)),
- 							 -accesskey => "n", -title => "Alt-n"}, "next");
+ 			         -accesskey => "n", -title => "Alt-n"}, "next");
  	} else {
  		$paging_nav .= " &sdot; next";
  	}
@@@ -1498,7 -1498,7 +1498,7 @@@ sub git_blame2 
  	git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
  	git_header_div('commit', esc_html($co{'title'}), $hash_base);
  	git_print_page_path($file_name, $ftype);
 -	my @rev_color = (qw(light dark));
 +	my @rev_color = (qw(light2 dark2));
  	my $num_colors = scalar(@rev_color);
  	my $current_color = 0;
  	my $last_rev;
@@@ -1844,9 -1844,9 +1844,9 @@@ sub git_log 
  		next if !%co;
  		my %ad = date_str($co{'author_epoch'});
  		git_header_div('commit',
- 									 "<span class=\"age\">$co{'age_string'}</span>" .
- 									 esc_html($co{'title'}) . $ref,
- 									 $commit);
+ 		               "<span class=\"age\">$co{'age_string'}</span>" .
+ 		               esc_html($co{'title'}) . $ref,
+ 		               $commit);
  		print "<div class=\"title_text\">\n" .
  		      "<div class=\"log_link\">\n" .
  		      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .
@@@ -1911,8 -1911,8 +1911,8 @@@ sub git_commit 
  	}
  	git_header_html(undef, $expires);
  	git_page_nav('commit', defined $co{'parent'} ? '' : 'commitdiff',
- 							 $hash, $co{'tree'}, $hash,
- 							 $formats_nav);
+ 	             $hash, $co{'tree'}, $hash,
+ 	             $formats_nav);
  
  	if (defined $co{'parent'}) {
  		git_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);
@@@ -2015,11 -2015,11 +2015,11 @@@
  			      "<td class=\"link\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, "blob") . "</td>\n";
  		} elsif ($status eq "D") {
  			print "<td>" .
 -			      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$file"), -class => "list"}, esc_html($file)) . "</td>\n" .
 +			      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$parent;f=$file"), -class => "list"}, esc_html($file)) . "</td>\n" .
  			      "<td><span class=\"file_status deleted\">[deleted " . file_type($from_mode). "]</span></td>\n" .
  			      "<td class=\"link\">" .
 -			      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, "blob") .
 -			      " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;hb=$hash;f=$file")}, "history") .
 +			      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$parent;f=$file")}, "blob") .
 +			      " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;hb=$parent;f=$file")}, "history") .
  			      "</td>\n"
  		} elsif ($status eq "M" || $status eq "T") {
  			my $mode_chnge = "";
@@@ -2061,7 -2061,7 +2061,7 @@@
  			print "<td>" .
  			      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file"), -class => "list"}, esc_html($to_file)) . "</td>\n" .
  			      "<td><span class=\"file_status moved\">[moved from " .
 -			      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$from_file"), -class => "list"}, esc_html($from_file)) .
 +			      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$parent;f=$from_file"), -class => "list"}, esc_html($from_file)) .
  			      " with " . (int $similarity) . "% similarity$mode_chng]</span></td>\n" .
  			      "<td class=\"link\">" .
  			      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file")}, "blob");
@@@ -2177,17 -2177,15 +2177,17 @@@ sub git_commitdiff 
  			git_diff_print(undef, "/dev/null", $to_id, "b/$file");
  		} elsif ($status eq "D") {
  			print "<div class=\"diff_info\">" . file_type($from_mode) . ":" .
 -			      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, $from_id) . "(deleted)" .
 +			      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash_parent;f=$file")}, $from_id) . "(deleted)" .
  			      "</div>\n";
  			git_diff_print($from_id, "a/$file", undef, "/dev/null");
  		} elsif ($status eq "M") {
  			if ($from_id ne $to_id) {
  				print "<div class=\"diff_info\">" .
 -				      file_type($from_mode) . ":" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, $from_id) .
 +				      file_type($from_mode) . ":" .
 +				      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash_parent;f=$file")}, $from_id) .
  				      " -> " .
 -				      file_type($to_mode) . ":" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, $to_id);
 +				      file_type($to_mode) . ":" .
 +				      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, $to_id);
  				print "</div>\n";
  				git_diff_print($from_id, "a/$file",  $to_id, "b/$file");
  			}