X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/dfdf0b0fd5969cf3a58b35594431f741a40edc914c5a4e98cbcfbf249195bec8..db79b42ac5009b4e58fa8900f06deb001326ad8dc8c5183b50cb83a1f53c2181:/gitweb.pl diff --git a/gitweb.pl b/gitweb.pl index bac325d..fba2830 100755 --- a/gitweb.pl +++ b/gitweb.pl @@ -2,8 +2,6 @@ # gitweb.pl - simple web interface to track changes in git repositories # -# Version 027 -# # (C) 2005, Kay Sievers # (C) 2005, Christian Gierke # @@ -16,81 +14,33 @@ use CGI::Carp qw(fatalsToBrowser); my $cgi = new CGI; -my $projectroot = "/home/kay/public_html"; -my $defaultprojects = "."; +my $version = "049"; +my $projectroot = "/"; +my $defaultprojects = "home/kay/public_html"; my $gitbin = "/home/kay/bin/git"; my $gittmp = "/tmp"; my $my_url = $cgi->url(); my $my_uri = $cgi->url(-absolute => 1); -my $my_url_parm = $cgi->url(-path => 1); -$my_url_parm =~ s/.*$my_uri//; - -my $project = ""; -my $action = ""; -my $hash = ""; -my $hash_parent = ""; -my $view_back = 1; -# get values from url -if ($my_url_parm =~ m#/(.+)/commit/([0-9a-fA-F]+)$#) { - $project = $1; - $action = "commit"; - $hash = $2; -} elsif ($my_url_parm =~ m#/(.+)/commitdiff/([0-9a-fA-F]+)$#) { - $project = $1; - $action = "commitdiff"; - $hash = $2; -} elsif ($my_url_parm =~ m#/(.+)/blobdiff/([0-9a-fA-F]+)/([0-9a-fA-F]+)$#) { - $project = $1; - $action = "blobdiff"; - $hash = $2; - $hash_parent = $3; -} elsif ($my_url_parm =~ m#/(.+)/blob/([0-9a-fA-F]+)$#) { - $project = $1; - $action = "blob"; - $hash = $2; -} elsif ($my_url_parm =~ m#/(.+)/tree/([0-9a-fA-F]+)$#) { - $project = $1; - $action = "tree"; - $hash = $2; -} elsif ($my_url_parm =~ m#/(.+)/log/([0-9]+)$#) { - $project = $1; - $action = "log"; - $view_back = $2; -} elsif ($my_url_parm =~ m#/(.+)/log$#) { - $project = $1; - $action = "log"; - $view_back = 1; -} elsif ($my_url_parm =~ m#/(.+)/rss$#) { - $project = $1; - $action = "rss"; - $view_back = 1; -} elsif ($my_url_parm =~ m#/git-logo.png$#) { - print $cgi->header(-type => 'image/png', -expires => '+1d'); - print "\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104\122". - "\000\000\000\110\000\000\000\033\004\003\000\000\000\055\331\324". - "\055\000\000\000\030\120\114\124\105\377\377\377\140\140\135\260". - "\257\252\000\200\000\316\315\307\300\000\000\350\350\346\367\367". - "\366\225\014\247\107\000\000\000\163\111\104\101\124\050\317\143". - "\110\147\040\004\112\134\030\012\010\052\142\123\141\040\002\010". - "\015\151\105\254\241\241\001\060\014\223\140\066\046\122\221\261". - "\001\021\326\341\125\144\154\154\314\154\154\014\242\014\160\052". - "\142\006\052\301\142\035\263\001\002\123\244\010\350\000\003\030". - "\046\126\021\324\341\040\227\033\340\264\016\065\044\161\051\202". - "\231\060\270\223\012\021\271\105\210\301\215\240\242\104\041\006". - "\047\101\202\100\205\301\105\211\040\160\001\000\244\075\041\305". - "\022\034\232\376\000\000\000\000\111\105\116\104\256\102\140\202"; - exit; -} elsif ($my_url_parm =~ m#/(.+)$#) { - $project = $1; - $action = "log"; - $view_back = 1; +my $project = $cgi->param('p'); +my $action = $cgi->param('a'); +my $hash = $cgi->param('h'); +my $hash_parent = $cgi->param('hp'); +my $time_back = $cgi->param('t'); +if (!(defined($time_back))) { + $time_back = 1; } +$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/.git/objects"; # sanitize input -$project =~ s#\/\.+##g; - -$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/.git/objects"; +$action =~ s/[^0-9a-zA-Z\.\-]//g; +$project =~ s/\/\.//g; +$project =~ s/^\/+//g; +$project =~ s/\/+$//g; +$project =~ s/|//g; +$hash =~ s/[^0-9a-fA-F]//g; +$hash_parent =~ s/[^0-9a-fA-F]//g; +$time_back =~ s/[^0-9]+//g; sub git_header_html { print $cgi->header(-type => 'text/html', -charset => 'utf-8'); @@ -99,50 +49,46 @@ print < git - $project $action - + EOF - print "
\n"; - print "
"; - print "" . - "\"git\""; + print "
\n" . + "" . + "\"git\""; if ($defaultprojects ne "") { print $cgi->a({-href => "$my_uri"}, "projects") . " / "; } if ($project ne "") { - print $cgi->a({-href => "$my_uri/$project/log"}, $project); + print $cgi->a({-href => "$my_uri?p=$project;a=log"}, $project); } if ($action ne "") { print " / $action"; @@ -151,12 +97,18 @@ EOF } sub git_footer_html { + print "
"; + print "
version $version
"; + if ($project ne '') { + print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "xml_logo"}, "XML") . "\n"; + } print "
"; - print $cgi->end_html(); + print "\n"; } sub git_head { - open my $fd, "$projectroot/$project/.git/HEAD"; + my $path = shift; + open my $fd, "$projectroot/$path/.git/HEAD"; my $head = <$fd>; close $fd; chomp $head; @@ -168,7 +120,7 @@ sub git_commit { my %co; my @parents; - open my $fd, "-|", "$gitbin/cat-file", "commit", $commit; + open my $fd, "-|", "$gitbin/cat-file commit $commit"; while (my $line = <$fd>) { chomp($line); last if $line eq ""; @@ -176,14 +128,18 @@ sub git_commit { $co{'tree'} = $1; } elsif ($line =~ m/^parent (.*)$/) { push @parents, $1; - } elsif ($line =~ m/^committer (.*>) ([0-9]+) (.*)$/) { - $co{'committer'} = $1; - $co{'committer_time'} = $2; - $co{'committer_timezone'} = $3; - } elsif ($line =~ m/^author (.*>) ([0-9]+) (.*)$/) { + } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) { $co{'author'} = $1; - $co{'author_time'} = $2; - $co{'author_timezone'} = $3; + $co{'author_epoch'} = $2; + $co{'author_tz'} = $3; + $co{'author_name'} = $co{'author'}; + $co{'author_name'} =~ s/ <.*//; + } elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) { + $co{'committer'} = $1; + $co{'committer_epoch'} = $2; + $co{'committer_tz'} = $3; + $co{'committer_name'} = $co{'committer'}; + $co{'committer_name'} =~ s/ <.*//; } } $co{'parents'} = \@parents; @@ -207,11 +163,11 @@ sub git_diff_html { my $to_label = "/dev/null"; my $pid = $$; - # create temp from-file + # create tmp from-file if ($from ne "") { $from_tmp = "$gittmp/gitweb_" . $$ . "_from"; open my $fd2, "> $from_tmp"; - open my $fd, "-|", "$gitbin/cat-file", "blob", $from; + open my $fd, "-|", "$gitbin/cat-file blob $from"; my @file = <$fd>; print $fd2 @file; close $fd2; @@ -223,7 +179,7 @@ sub git_diff_html { if ($to ne "") { $to_tmp = "$gittmp/gitweb_" . $$ . "_to"; open my $fd2, "> $to_tmp"; - open my $fd, "-|", "$gitbin/cat-file", "blob", $to; + open my $fd, "-|", "$gitbin/cat-file blob $to"; my @file = <$fd>; print $fd2 @file; close $fd2; @@ -231,25 +187,25 @@ sub git_diff_html { $to_label = "b/$to_name"; } - open my $fd, "-|", "/usr/bin/diff", "-L", $from_label, "-L", $to_label, "-u", "-p", $from_tmp, $to_tmp; - print "===== "; + open my $fd, "-|", "/usr/bin/diff -u -p -L $from_label -L $to_label $from_tmp $to_tmp"; + print "===== "; if ($from ne "") { - print $cgi->a({-href => "$my_uri/$project/blob/$from"}, $from); + print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from"}, $from); } else { print $from_name; } print " vs "; if ($to ne "") { - print $cgi->a({-href => "$my_uri/$project/blob/$to"}, $to); + print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to"}, $to); } else { print $to_name; } print " =====\n"; while (my $line = <$fd>) { my $char = substr($line,0,1); - print '' if $char eq '+'; - print '' if $char eq '-'; - print '' if $char eq '@'; + print '' if $char eq '+'; + print '' if $char eq '-'; + print '' if $char eq '@'; print escapeHTML($line); print '' if $char eq '+' or $char eq '-' or $char eq '@'; } @@ -263,79 +219,142 @@ sub git_diff_html { } } +sub mode_str { + my $perms = oct shift; + my $modestr; + if ($perms & 040000) { + $modestr .= 'drwxrwxr-x'; + } else { + # git cares only about the executable bit + if ($perms & 0100) { + $modestr .= '-rwxrwxr-x'; + } else { + $modestr .= '-rw-rw-r--'; + }; + } + return $modestr; +} + +sub date_str { + my $epoch = shift; + my $tz = shift || "-0000"; + + my %date; + my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); + my @days = ("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"); + my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($epoch); + $date{'hour'} = $hour; + $date{'minute'} = $min; + $date{'mday'} = $mday; + $date{'day'} = $days[$wday]; + $date{'month'} = $months[$mon]; + $date{'rfc2822'} = sprintf "%s, %d %s %4d %02d:%02d:%02d +0000", $days[$wday], $mday, $months[$mon], 1900+$year, $hour ,$min, $sec; + $date{'mday-time'} = sprintf "%d %s %02d:%02d", $mday, $months[$mon], $hour ,$min; + + $tz =~ m/((-|\+)[0-9][0-9])([0-9][0-9])/; + my $local = $epoch + (($1 + ($2/60)) * 3600); + ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($local); + $date{'hour_local'} = $hour; + $date{'minute_local'} = $min; + $date{'tz_local'} = $tz; + return %date; +} + +if ($action eq "git-logo.png") { + print $cgi->header(-type => 'image/png', -expires => '+1d'); + print "\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104\122". + "\000\000\000\110\000\000\000\033\004\003\000\000\000\055\331\324". + "\055\000\000\000\030\120\114\124\105\377\377\377\140\140\135\260". + "\257\252\000\200\000\316\315\307\300\000\000\350\350\346\367\367". + "\366\225\014\247\107\000\000\000\163\111\104\101\124\050\317\143". + "\110\147\040\004\112\134\030\012\010\052\142\123\141\040\002\010". + "\015\151\105\254\241\241\001\060\014\223\140\066\046\122\221\261". + "\001\021\326\341\125\144\154\154\314\154\154\014\242\014\160\052". + "\142\006\052\301\142\035\263\001\002\123\244\010\350\000\003\030". + "\046\126\021\324\341\040\227\033\340\264\016\065\044\161\051\202". + "\231\060\270\223\012\021\271\105\210\301\215\240\242\104\041\006". + "\047\101\202\100\205\301\105\211\040\160\001\000\244\075\041\305". + "\022\034\232\376\000\000\000\000\111\105\116\104\256\102\140\202"; + exit; +} + +# show list of default projects if ($project eq "") { opendir(my $fd, "$projectroot/$defaultprojects"); - my (@path) = grep(!/^\./, readdir($fd)); + my (@path) = sort grep(!/^\./, readdir($fd)); closedir($fd); git_header_html(); - print "
\n"; + print "
\n"; print "

\n"; foreach my $line (@path) { if (-e "$projectroot/$defaultprojects/$line/.git/HEAD") { - print $cgi->a({-href => "$my_uri/$defaultprojects/$line/log"}, $line) . "
\n"; + print $cgi->a({-href => "$my_uri?p=$defaultprojects/$line;a=log"}, "$defaultprojects/$line") . "
\n"; } } - print "

"; + print "
"; git_footer_html(); exit; } +if ($action eq "") { + $action = "log"; +} + if ($action eq "blob") { git_header_html(); - print "

\n"; - print "
\n";
-	open my $fd, "-|", "$gitbin/cat-file", "blob", $hash;
+	print "


\n";
+	open my $fd, "-|", "$gitbin/cat-file blob $hash";
 	my $nr;
 	while (my $line = <$fd>) {
 		$nr++;
-		print "$nr\t" . escapeHTML($line);;
+		printf "%4i\t%s", $nr, escapeHTML($line);;
 	}
 	close $fd;
-	print "
\n";
-	print "
";
+	print "

\n"; + print "
"; git_footer_html(); } elsif ($action eq "tree") { if ($hash eq "") { - $hash = git_head(); + $hash = git_head($project); } - open my $fd, "-|", "$gitbin/ls-tree", $hash; + open my $fd, "-|", "$gitbin/ls-tree $hash"; my (@entries) = map { chomp; $_ } <$fd>; close $fd; git_header_html(); - print "

\n"; - print "
\n";
+	print "
\n";
+	print "
\n";
 	foreach my $line (@entries) {
 		#'100644	blob	0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa	panic.c'
 		$line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
+		my $t_mode = $1;
 		my $t_type = $2;
 		my $t_hash = $3;
 		my $t_name = $4;
 		if ($t_type eq "blob") {
-			print "BLOB\t" . $cgi->a({-href => "$my_uri/$project/blob/$3"}, $4) . "\n";
+			print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash"}, $t_name) . "\n";
 		} elsif ($t_type eq "tree") {
-			print "TREE\t" . $cgi->a({-href => "$my_uri/$project/tree/$3"}, $4) . "\n";
+			print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash"}, $t_name) . "\n";
 		}
 	}
 	print "
\n";
-	print "
";
+	print "
";
 	git_footer_html();
 } elsif ($action eq "log" || $action eq "rss") {
-	open my $fd, "-|", "$gitbin/rev-list", git_head();
+	open my $fd, "-|", "$gitbin/rev-list " . git_head($project);
 	my (@revtree) = map { chomp; $_ } <$fd>;
 	close $fd;
 
 	if ($action eq "log") {
 		git_header_html();
-		print "
\n";
+		print "
\n";
 		print "view  ";
-		print $cgi->a({-href => "$my_uri/$project/log"}, "last day") . " | ";
-		print $cgi->a({-href => "$my_uri/$project/log/7"}, "week") . " | ";
-		print $cgi->a({-href => "$my_uri/$project/log/31"}, "month") . " | ";
-		print $cgi->a({-href => "$my_uri/$project/log/365"}, "year") . " | ";
-		print $cgi->a({-href => "$my_uri/$project/log/0"}, "all") . "
\n";
-		print "

\n";
-		print "
\n";
-		print "\n";
+		print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last day") . " | \n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | \n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | \n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | \n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=log;t=0"}, "all") . "
\n";
+		print "

\n" .
+		      "\n";
 	} elsif ($action eq "rss") {
 		print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
 		print "\n".
@@ -349,9 +368,9 @@ if ($action eq "blob") {
 
 	for (my $i = 0; $i <= $#revtree; $i++) {
 		my $commit = $revtree[$i];
-
 		my %co = git_commit($commit);
-		my $age = time - $co{'committer_time'};
+		my %ad = date_str($co{'author_epoch'});
+		my $age = time - $co{'committer_epoch'};
 		my $age_string;
 		if ($age > 60*60*24*365*2) {
 			$age_string = int $age/60/60/24/365;
@@ -373,105 +392,94 @@ if ($action eq "blob") {
 			$age_string .= " minutes ago";
 		}
 		if ($action eq "log") {
-			if ($view_back > 0 && $age > $view_back*60*60*24) {
+		if ($time_back > 0 && $age > $time_back*60*60*24) {
 				if ($i == 0) {
-					print "\n";
-					print "\n";
-					print "\n";
+					print "
 Last change $age_string.

\n";
 				}
 				last;
 			}
-			print "\n";
-			print "\n";
-			print "";
-			print "\n";
-			print "\n";
-			print "\n";
-			print "";
-			print "\n";
-			print "\n";
-			print "\n";
-			print "";
-			print "\n";
+			print "

\n" .
+			      "\n";
 		} elsif ($action eq "rss") {
 			last if ($i >= 20);
-			my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday) = gmtime($co{'author_time'});
-			my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
-			print "\n\t";
-			printf("%s %02d, %02d:%02d - ", $months[$mon], $mday, $hour, $min);
-			print escapeHTML($co{'title'}) . "\n";
-			print "\t " . $my_url . "/$project/commit/$commit\n";
-			print "\t";
+			print "\n" .
+			      "\t" . sprintf("%d %s %02d:%02d", $ad{'mday'}, $ad{'month'}, $ad{'hour'}, $ad{'min'}) . " - " . escapeHTML($co{'title'}) . "\n" .
+			      "\t " . $my_url . "?p=$project;a==commit;h=$commit\n" .
+			      "\t";
 			my $comment = $co{'comment'};
 			foreach my $line (@$comment) {
 				print escapeHTML($line) . "\n";
 			}
-			print "\t\n";
-			print "\n";
+			print "\t\n" .
+			      "\n";
 		}
 	}
 	if ($action eq "log") {
-		print "
 Last change $age_string. 
" . $age_string . "" . $cgi->a({-href => "$my_uri/$project/commit/$commit"}, $co{'title'}) . "
";
-			print $cgi->a({-href => "$my_uri/$project/commit/$commit"}, "view commit") . "
\n";
-			print $cgi->a({-href => "$my_uri/$project/commitdiff/$commit"}, "view diff") . "
\n";
-			print "		\n";
-			print "author    " . escapeHTML($co{'author'}) . " [" . gmtime($co{'author_time'}) . " " . $co{'author_timezone'} . "]
\n";
-			print "committer " . escapeHTML($co{'committer'}) . " [" . gmtime($co{'committer_time'}) . " " . $co{'committer_timezone'} . "]
\n";
-			print "
\n";
+			print "\n";
+			print "
\n" .
+			      "
\n" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "view commit") . "
\n" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "view diff") . "
\n" .
+			      "
\n" .
+			      escapeHTML($co{'author_name'}) .  " [" . $ad{'rfc2822'} . "]
\n" .
+			      "
\n" .
+			      "
\n";
 			my $comment = $co{'comment'};
 			foreach my $line (@$comment) {
-				if ($line =~ m/signed-off-by:/i) {
+				if ($line =~ m/^(signed-off|acked)-by:/i) {
 					print '
' . escapeHTML($line) . "
\n";
 				} else {
 					print escapeHTML($line) . "
\n";
 				}
 			}
-			print "

\n";
-			print "
\n";
 		git_footer_html();
 	} elsif ($action eq "rss") {
 		print "";
 	}
 } elsif ($action eq "commit") {
 	my %co = git_commit($hash);
-	open my $fd, "-|", "$gitbin/diff-tree", "-r", $co{'parent'}, $hash;
+	my %ad = date_str($co{'author_epoch'}, $co{'author_tz'});
+	my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
+	open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash";
 	my (@difftree) = map { chomp; $_ } <$fd>;
 	close $fd;
 
 	git_header_html();
-	print "
 view\n";
-	print $cgi->a({-href => "$my_uri/$project/commit/$hash"}, "commit") . " | ";
-	print $cgi->a({-href => "$my_uri/$project/commitdiff/$hash"}, "diff");
-	print "


\n";
-	print "
" . $cgi->a({-href => "$my_uri/$project/commitdiff/$hash"}, $co{'title'}) . "
\n";
-	print "\n";
-	print "\n";
-	print "";
-	print "\n";
-	print "\n";
-	print "";
-	print "\n";
-	print "
";
-	print "author    " . escapeHTML($co{'author'}) . " [" . gmtime($co{'author_time'}) . " " . $co{'author_timezone'} . "]
\n";
-	print "committer " . escapeHTML($co{'committer'}) . " [" . gmtime($co{'committer_time'}) . " " . $co{'committer_timezone'} . "]
\n";
-	print "commit    $hash
\n";
-	print "tree      " . $cgi->a({-href => "$my_uri/$project/tree/$co{'tree'}"}, $co{'tree'}) . "
\n";
+	print "
 view\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | \n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diff") . "\n" .
+	      "

\n";
+	print "$co{'title'}\n";
+	print "
\n";
+	print "author      " . escapeHTML($co{'author'}) . "
\n";
+	print "author-time " . $ad{'rfc2822'};
+	if ($ad{'hour_local'} < 6) { print ""; }
+	printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
+	if ($ad{'hour_local'} < 6 ) { print ""; }
+	print "
\n";
+	print "committer   " . escapeHTML($co{'committer'}) . "
\n";
+	print "commit-time " . $ad{'rfc2822'};
+	printf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'});
+	print "
\n";
+	print "commit      $hash
\n";
+	print "tree        " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'}"}, $co{'tree'}) . "
\n";
 	my $parents  = $co{'parents'};
 	foreach my $par (@$parents) {
-		print "parent    " . $cgi->a({-href => "$my_uri/$project/tree/$par"}, $par) . "
\n";
+		print "parent      " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "
\n";
 	}
-	print "
\n";
+	print "\n";
+	print "
\n";
 	my $comment = $co{'comment'};
 	foreach my $line (@$comment) {
-		if ($line =~ m/signed-off-by:/i) {
+		if ($line =~ m/(signed-off|acked)-by:/i) {
 			print '
' . escapeHTML($line) . "
\n";
 		} else {
 			print escapeHTML($line) . "
\n";
 		}
 	}
 	print "

\n";
-	print "
";
-
 	print "
\n";
 	foreach my $line (@difftree) {
 		# '*100644->100644	blob	9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596	net/ipv4/route.c'
@@ -482,43 +490,46 @@ if ($action eq "blob") {
 		my $type = $3;
 		my $id = $4;
 		my $file = $5;
+		$mode =~ m/^([0-7]{6})/;
+		my $modestr = mode_str($1);
 		if ($type eq "blob") {
 			if ($op eq "+") {
-				print "added\t" . $cgi->a({-href => "$my_uri/$project/blob/$id"}, $file) . "\n";
+				print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$id"}, $file) . " (new)\n";
 			} elsif ($op eq "-") {
-				print "removed\t" . $cgi->a({-href => "$my_uri/$project/blob/$id"}, $file) . "\n";
+				print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;hp=$id"}, $file) . " (removed)\n";
 			} elsif ($op eq "*") {
 				$id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
-				my $old = $1;
-				my $new = $2;
-				print "changed\t" . $cgi->a({-href => "$my_uri/$project/blobdiff/$old/$new"}, $file) . "\n";
+				my $from = $1;
+				my $to = $2;
+				print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to;hp=$from"}, $file) . "\n";
 			}
 		}
 	}
-	print "
\n";
-	print "
";
+	print "
\n" . + "
"; git_footer_html(); } elsif ($action eq "blobdiff") { git_header_html(); - print "

\n"; - print "
\n";
-	git_diff_html($hash, $hash_parent, $hash, $hash_parent);
-	print "
\n"; - print "
"; + print "


\n" . + "
\n";
+	git_diff_html($hash_parent, $hash, $hash_parent, $hash);
+	print "
\n" . + "
"; git_footer_html(); } elsif ($action eq "commitdiff") { my %co = git_commit($hash); - open my $fd, "-|", "$gitbin/diff-tree", "-r", $co{'parent'}, $hash; + open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash"; my (@difftree) = map { chomp; $_ } <$fd>; close $fd; git_header_html(); - print "
view\n"; - print $cgi->a({-href => "$my_uri/$project/commit/$hash"}, "commit") . " | "; - print $cgi->a({-href => "$my_uri/$project/commitdiff/$hash"}, "diff"); - print "


\n"; - print "
" . $cgi->a({-href => "$my_uri/$project/commit/$hash"}, $co{'title'}) . "
\n"; - print "
\n";
+	print "
 view\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | \n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diff") . "\n" .
+	      "

\n";
+	print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "log_title"}, $co{'title'}) ."\n";
+	print "
\n" .
+	      "
\n";
 	foreach my $line (@difftree) {
 		# '*100644->100644	blob	8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154	Makefile'
 		$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
@@ -538,7 +549,14 @@ if ($action eq "blob") {
 			}
 		}
 	}
-	print "
\n";
-	print "
";
+	print "
\n"; + print "
"; + git_footer_html(); +} else { + git_header_html(); + print "
\n" . + "

\n"; + print "unknown action\n"; + print "
\n"; git_footer_html(); }