From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Sep 2009 05:09:53 +0000 (-0700)
Subject: Merge branch 'mr/gitweb-snapshot'
X-Git-Tag: v1.6.5-rc0~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/909beb860b98d51eeb26ff1f97bfad40ef7d5970?ds=inline;hp=-c

Merge branch 'mr/gitweb-snapshot'

* mr/gitweb-snapshot:
gitweb: add t9501 tests for checking HTTP status codes
gitweb: split test suite into library and tests
gitweb: improve snapshot error handling
---

909beb860b98d51eeb26ff1f97bfad40ef7d5970
diff --combined gitweb/gitweb.perl
index ff2d42abb9,b453ed0452..24b219310a
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -415,7 -415,7 +415,7 @@@ sub gitweb_get_feature 
  		@{$feature{$name}{'default'}});
  	if (!$override) { return @defaults; }
  	if (!defined $sub) {
 -		warn "feature $name is not overrideable";
 +		warn "feature $name is not overridable";
  		return @defaults;
  	}
  	return $sub->(@defaults);
@@@ -1524,10 -1524,10 +1524,10 @@@ sub format_subject_html 
  		$long =~ s/[[:cntrl:]]/?/g;
  		return $cgi->a({-href => $href, -class => "list subject",
  		                -title => to_utf8($long)},
 -		       esc_html($short) . $extra);
 +		       esc_html($short)) . $extra;
  	} else {
  		return $cgi->a({-href => $href, -class => "list subject"},
 -		       esc_html($long)  . $extra);
 +		       esc_html($long)) . $extra;
  	}
  }
  
@@@ -2584,7 -2584,7 +2584,7 @@@ sub parse_commit_text 
  		} elsif ((!defined $withparents) && ($line =~ m/^parent ([0-9a-fA-F]{40})$/)) {
  			push @parents, $1;
  		} elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
 -			$co{'author'} = $1;
 +			$co{'author'} = to_utf8($1);
  			$co{'author_epoch'} = $2;
  			$co{'author_tz'} = $3;
  			if ($co{'author'} =~ m/^([^<]+) <([^>]*)>/) {
@@@ -2594,9 -2594,10 +2594,9 @@@
  				$co{'author_name'} = $co{'author'};
  			}
  		} elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) {
 -			$co{'committer'} = $1;
 +			$co{'committer'} = to_utf8($1);
  			$co{'committer_epoch'} = $2;
  			$co{'committer_tz'} = $3;
 -			$co{'committer_name'} = $co{'committer'};
  			if ($co{'committer'} =~ m/^([^<]+) <([^>]*)>/) {
  				$co{'committer_name'}  = $1;
  				$co{'committer_email'} = $2;
@@@ -4814,7 -4815,7 +4814,7 @@@ sub git_blame 
  	git_print_page_path($file_name, $ftype, $hash_base);
  
  	# page body
 -	my @rev_color = qw(light2 dark2);
 +	my @rev_color = qw(light dark);
  	my $num_colors = scalar(@rev_color);
  	my $current_color = 0;
  	my %metainfo = ();
@@@ -4832,18 -4833,15 +4832,18 @@@ HTM
  		my ($full_rev, $orig_lineno, $lineno, $group_size) =
  		   ($line =~ /^([0-9a-f]{40}) (\d+) (\d+)(?: (\d+))?$/);
  		if (!exists $metainfo{$full_rev}) {
 -			$metainfo{$full_rev} = {};
 +			$metainfo{$full_rev} = { 'nprevious' => 0 };
  		}
  		my $meta = $metainfo{$full_rev};
  		my $data;
  		while ($data = <$fd>) {
  			chomp $data;
  			last if ($data =~ s/^\t//); # contents of line
 -			if ($data =~ /^(\S+) (.*)$/) {
 -				$meta->{$1} = $2;
 +			if ($data =~ /^(\S+)(?: (.*))?$/) {
 +				$meta->{$1} = $2 unless exists $meta->{$1};
 +			}
 +			if ($data =~ /^previous /) {
 +				$meta->{'nprevious'}++;
  			}
  		}
  		my $short_rev = substr($full_rev, 0, 8);
@@@ -4854,11 -4852,7 +4854,11 @@@
  		if ($group_size) {
  			$current_color = ($current_color + 1) % $num_colors;
  		}
 -		print "<tr id=\"l$lineno\" class=\"$rev_color[$current_color]\">\n";
 +		my $tr_class = $rev_color[$current_color];
 +		$tr_class .= ' boundary' if (exists $meta->{'boundary'});
 +		$tr_class .= ' no-previous' if ($meta->{'nprevious'} == 0);
 +		$tr_class .= ' multiple-previous' if ($meta->{'nprevious'} > 1);
 +		print "<tr id=\"l$lineno\" class=\"$tr_class\">\n";
  		if ($group_size) {
  			print "<td class=\"sha1\"";
  			print " title=\"". esc_html($author) . ", $date\"";
@@@ -4868,31 -4862,22 +4868,31 @@@
  			                             hash=>$full_rev,
  			                             file_name=>$file_name)},
  			              esc_html($short_rev));
 +			if ($group_size >= 2) {
 +				my @author_initials = ($author =~ /\b([[:upper:]])\B/g);
 +				if (@author_initials) {
 +					print "<br />" .
 +					      esc_html(join('', @author_initials));
 +					#           or join('.', ...)
 +				}
 +			}
  			print "</td>\n";
  		}
 -		my $parent_commit;
 -		if (!exists $meta->{'parent'}) {
 -			open (my $dd, "-|", git_cmd(), "rev-parse", "$full_rev^")
 -				or die_error(500, "Open git-rev-parse failed");
 -			$parent_commit = <$dd>;
 -			close $dd;
 -			chomp($parent_commit);
 -			$meta->{'parent'} = $parent_commit;
 -		} else {
 -			$parent_commit = $meta->{'parent'};
 +		# 'previous' <sha1 of parent commit> <filename at commit>
 +		if (exists $meta->{'previous'} &&
 +		    $meta->{'previous'} =~ /^([a-fA-F0-9]{40}) (.*)$/) {
 +			$meta->{'parent'} = $1;
 +			$meta->{'file_parent'} = unquote($2);
  		}
 +		my $linenr_commit =
 +			exists($meta->{'parent'}) ?
 +			$meta->{'parent'} : $full_rev;
 +		my $linenr_filename =
 +			exists($meta->{'file_parent'}) ?
 +			$meta->{'file_parent'} : unquote($meta->{'filename'});
  		my $blamed = href(action => 'blame',
 -		                  file_name => $meta->{'filename'},
 -		                  hash_base => $parent_commit);
 +		                  file_name => $linenr_filename,
 +		                  hash_base => $linenr_commit);
  		print "<td class=\"linenr\">";
  		print $cgi->a({ -href => "$blamed#l$orig_lineno",
  		                -class => "linenr" },
@@@ -5190,10 -5175,10 +5190,10 @@@ sub git_snapshot 
  		die_error(400, "Invalid snapshot format parameter");
  	} elsif (!exists($known_snapshot_formats{$format})) {
  		die_error(400, "Unknown snapshot format");
- 	} elsif (!grep($_ eq $format, @snapshot_fmts)) {
- 		die_error(403, "Unsupported snapshot format");
  	} elsif ($known_snapshot_formats{$format}{'disabled'}) {
  		die_error(403, "Snapshot format not allowed");
+ 	} elsif (!grep($_ eq $format, @snapshot_fmts)) {
+ 		die_error(403, "Unsupported snapshot format");
  	}
  
  	if (!defined $hash) {