X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/715264a8d08973c4bb33edab85c92412384cef6d4d005d11e3fed5ce48a76dbf..5ca6347a26ce3cd988a527f9624d3463e4850d568df6ea9b85d972fdd4bf4d5c:/gitweb.cgi

diff --git a/gitweb.cgi b/gitweb.cgi
index ca65695..0698b74 100755
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -15,7 +15,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use Fcntl ':mode';
 
 my $cgi = new CGI;
-my $version =		"225";
+my $version =		"234";
 my $my_url =		$cgi->url();
 my $my_uri =		$cgi->url(-absolute => 1);
 my $rss_link = "";
@@ -53,8 +53,6 @@ if (defined $action) {
 		git_opml();
 		exit;
 	}
-} else {
-	$action = "summary";
 }
 
 my $project = $cgi->param('p');
@@ -76,7 +74,7 @@ if (defined $project) {
 		die_error(undef, "No such project.");
 	}
 	$rss_link = "<link rel=\"alternate\" title=\"$project log\" href=\"$my_uri?p=$project;a=rss\" type=\"application/rss+xml\"/>";
-	$ENV{'GIT_OBJECT_DIRECTORY'} = "$projectroot/$project/objects";
+	$ENV{'GIT_DIR'} = "$projectroot/$project";
 } else {
 	git_project_list();
 	exit;
@@ -95,9 +93,26 @@ if (defined $file_name) {
 }
 
 my $hash = $cgi->param('h');
-if (defined $hash && !($hash =~ m/^[0-9a-fA-F]{40}$/)) {
-	undef $hash;
-	die_error(undef, "Invalid hash parameter.");
+if (defined $hash) {
+	if (!($hash =~ m/^[0-9a-fA-F]{40}$/)) {
+		if ($hash =~ m/(^|\/)(|\.|\.\.)($|\/)/) {
+			undef $hash;
+			die_error(undef, "Non-canonical hash parameter.");
+		}
+		if ($hash =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~\:\!]/) {
+			undef $hash;
+			die_error(undef, "Invalid character in hash parameter.");
+		}
+		# replace branch-name with hash
+		my $branchlist = git_read_refs("refs/heads");
+		foreach my $entry (@$branchlist) {
+			my %branch = %$entry;
+			if ($branch{'name'} eq $hash) {
+				$hash = $branch{'id'};
+				last;
+			}
+		}
+	}
 }
 
 my $hash_parent = $cgi->param('hp');
@@ -120,7 +135,6 @@ if (defined $page) {
 	}
 }
 
-
 my $searchtext = $cgi->param('s');
 if (defined $searchtext) {
 	if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
@@ -130,7 +144,7 @@ if (defined $searchtext) {
 	$searchtext = quotemeta $searchtext;
 }
 
-if ($action eq "summary") {
+if (!defined $action || $action eq "summary") {
 	git_summary();
 	exit;
 } elsif ($action eq "branches") {
@@ -466,11 +480,11 @@ sub git_read_commit {
 	}
 	my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($co{'committer_epoch'});
 	if ($age > 60*60*24*7*2) {
-		$co{'age_string_date'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon, $mday;
+		$co{'age_string_date'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon+1, $mday;
 		$co{'age_string_age'} = $co{'age_string'};
 	} else {
 		$co{'age_string_date'} = $co{'age_string'};
-		$co{'age_string_age'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon, $mday;
+		$co{'age_string_age'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon+1, $mday;
 	}
 	return %co;
 }
@@ -593,6 +607,21 @@ sub file_type {
 	}
 }
 
+sub format_log_line_html {
+	my $line = shift;
+
+	$line = escapeHTML($line);
+	$line =~ s/ /&nbsp;/g;
+	if ($line =~ m/([0-9a-fA-F]{40})/) {
+		my $hash_text = $1;
+		if (git_get_type($hash_text) eq "commit") {
+			my $link = $cgi->a({-class => "list", -href => "$my_uri?p=$project;a=commit;h=$hash_text"}, $hash_text);
+			$line =~ s/$hash_text/$link/;
+		}
+	}
+	return $line;
+}
+
 sub date_str {
 	my $epoch = shift;
 	my $tz = shift || "-0000";
@@ -722,7 +751,7 @@ sub git_project_list {
 		if (!defined $head) {
 			next;
 		}
-		$ENV{'GIT_OBJECT_DIRECTORY'} = "$projectroot/$proj{'path'}/objects";
+		$ENV{'GIT_DIR'} = "$projectroot/$proj{'path'}";
 		my %co = git_read_commit($head);
 		if (!%co) {
 			next;
@@ -766,8 +795,23 @@ sub git_read_refs {
 	my $ref_dir = shift;
 	my @reflist;
 
+	my @refs;
 	opendir my $dh, "$projectroot/$project/$ref_dir";
-	my @refs = grep !m/^\./, readdir $dh;
+	while (my $dir = readdir($dh)) {
+		if ($dir =~ m/^\./) {
+			next;
+		}
+		if (-d "$projectroot/$project/$ref_dir/$dir") {
+			opendir my $dh2, "$projectroot/$project/$ref_dir/$dir";
+			my @subdirs = grep !m/^\./, readdir $dh2;
+			closedir($dh2);
+			foreach my $subdir (@subdirs) {
+				push @refs, "$dir/$subdir"
+			}
+			next;
+		}
+		push @refs, $dir;
+	}
 	closedir($dh);
 	foreach my $ref_file (@refs) {
 		my $ref_id = git_read_hash("$project/$ref_dir/$ref_file");
@@ -936,12 +980,12 @@ sub git_summary {
 			if ($i-- > 0) {
 				print "<td><i>$tag{'age'}</i></td>\n" .
 				      "<td>" .
-				      $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'id'}", -class => "list"},
+				      $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}", -class => "list"},
 				      "<b>" . escapeHTML($tag{'name'}) . "</b>") .
 				      "</td>\n" .
 				      "<td class=\"link\">" .
-				      $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'id'}"}, "shortlog") .
-				      " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}"}, "log") .
+				      $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}"}, "shortlog") .
+				      " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'name'}"}, "log") .
 				      "</td>\n" .
 				      "</tr>";
 			} else {
@@ -984,13 +1028,13 @@ sub git_tags {
 			$alternate ^= 1;
 			print "<td><i>$tag{'age'}</i></td>\n" .
 			      "<td>" .
-			      $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}", -class => "list"},
+			      $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'id'}", -class => "list"},
 			      "<b>" . escapeHTML($tag{'name'}) . "</b>") .
 			      "</td>\n" .
 			      "<td class=\"link\">" .
 			      $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"}, $tag{'type'});
 			if ($tag{'type'} eq "commit") {
-			      print " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'id'}"}, "shortlog") .
+			      print " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}"}, "shortlog") .
 			            " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}"}, "log");
 			}
 			print "</td>\n" .
@@ -1030,11 +1074,11 @@ sub git_branches {
 			$alternate ^= 1;
 			print "<td><i>$tag{'age'}</i></td>\n" .
 			      "<td>" .
-			      $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}", -class => "list"}, "<b>" . escapeHTML($tag{'name'}) . "</b>") .
+			      $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}", -class => "list"}, "<b>" . escapeHTML($tag{'name'}) . "</b>") .
 			      "</td>\n" .
 			      "<td class=\"link\">" .
-			      $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'id'}"}, "shortog") .
-			      " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}"}, "log") .
+			      $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}"}, "shortlog") .
+			      " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'name'}"}, "log") .
 			      "</td>\n" .
 			      "</tr>";
 		}
@@ -1270,7 +1314,7 @@ sub git_opml {
 		if (!defined $head) {
 			next;
 		}
-		$ENV{'GIT_OBJECT_DIRECTORY'} = "$projectroot/$proj{'path'}/objects";
+		$ENV{'GIT_DIR'} = "$projectroot/$proj{'path'}";
 		my %co = git_read_commit($head);
 		if (!%co) {
 			next;
@@ -1366,7 +1410,7 @@ sub git_log {
 			} else {
 				$empty = 0;
 			}
-			print escapeHTML($line) . "<br/>\n";
+			print format_log_line_html($line) . "<br/>\n";
 		}
 		if (!$empty) {
 			print "<br/>\n";
@@ -1467,7 +1511,7 @@ sub git_commit {
 			print "<span style=\"color: #888888\">" . escapeHTML($line) . "</span><br/>\n";
 		} else {
 			$signed = 0;
-			print escapeHTML($line) . "<br/>\n";
+			print format_log_line_html($line) . "<br/>\n";
 		}
 	}
 	print "</div>\n";
@@ -1496,7 +1540,7 @@ sub git_commit {
 			print "<tr class=\"light\">\n";
 		}
 		$alternate ^= 1;
-		if ($status eq "N") {
+		if ($status eq "A") {
 			my $mode_chng = "";
 			if (S_ISREG(oct $to_mode)) {
 				$mode_chng = sprintf(" with mode: %04o", (oct $to_mode) & 0777);
@@ -1658,7 +1702,7 @@ sub git_commitdiff {
 		} else {
 			$empty = 0;
 		}
-		print escapeHTML($line) . "<br/>\n";
+		print format_log_line_html($line) . "<br/>\n";
 	}
 	print "<br/>\n";
 	foreach my $line (@difftree) {
@@ -1671,7 +1715,7 @@ sub git_commitdiff {
 		my $to_id = $4;
 		my $status = $5;
 		my $file = $6;
-		if ($status eq "N") {
+		if ($status eq "A") {
 			print "<div class=\"diff_info\">" .  file_type($to_mode) . ":" .
 			      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, $to_id) . "(new)" .
 			      "</div>\n";
@@ -1703,25 +1747,51 @@ sub git_commitdiff_plain {
 	my (@difftree) = map { chomp; $_ } <$fd>;
 	close $fd or die_error(undef, "Reading diff-tree failed.");
 
+	# try to figure out the next tag after this commit
+	my $tagname;
+	my %taghash;
+	my $tags = git_read_refs("refs/tags");
+	foreach my $entry (@$tags) {
+		my %tag = %$entry;
+		$taghash{$tag{'id'}} = $tag{'name'};
+	}
+	open $fd, "-|", "$gitbin/git-rev-list HEAD";
+	while (my $commit = <$fd>) {
+		chomp $commit;
+		if ($taghash{$commit}) {
+			$tagname = $taghash{$commit};
+		}
+		if ($commit eq $hash) {
+			last;
+		}
+	}
+	close $fd;
+
+	print $cgi->header(-type => "text/plain", -charset => 'utf-8');
 	my %co = git_read_commit($hash);
 	my %ad = date_str($co{'author_epoch'}, $co{'author_tz'});
-	print $cgi->header(-type => "text/plain", -charset => 'utf-8');
 	my $comment = $co{'comment'};
-	print "Author: $co{'author'}\n" .
+	print "From: $co{'author'}\n" .
 	      "Date: $ad{'rfc2822'} ($ad{'tz_local'})\n".
-	      "Source: $my_url?p=$project;a=commitdiff;h=$hash\n" .
+	      "Subject: $co{'title'}\n";
+	if (defined $tagname) {
+	      print "X-Git-Tag: $tagname\n";
+	}
+	print "X-Git-Url: $my_url?p=$project;a=commitdiff;h=$hash\n" .
 	      "\n";
+
 	foreach my $line (@$comment) {;
 		print "  $line\n";
 	}
-	print "\n";
+	print "---\n\n";
+
 	foreach my $line (@difftree) {
 		$line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/;
 		my $from_id = $3;
 		my $to_id = $4;
 		my $status = $5;
 		my $file = $6;
-		if ($status eq "N") {
+		if ($status eq "A") {
 			git_diff_print(undef, "/dev/null", $to_id, "b/$file", "plain");
 		} elsif ($status eq "D") {
 			git_diff_print($from_id, "a/$file", undef, "/dev/null", "plain");
@@ -1759,7 +1829,7 @@ sub git_history {
 	print "<table cellspacing=\"0\">\n";
 	my $alternate = 0;
 	while (my $line = <$fd>) {
-		if ($line =~ m/^([0-9a-fA-F]{40}) /){
+		if ($line =~ m/^([0-9a-fA-F]{40})/){
 			$commit = $1;
 			next;
 		}