X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/b211dc6fd79d1ce30c052b9ac833828f5644d2de567a75fa14e299b3a9e97d07..5aa0e133c3464758c4bf550ef4dfea466b31ddf9855c295140a6d5007d33060a:/gitweb.pl diff --git a/gitweb.pl b/gitweb.pl index ecd62f8..719c4ae 100755 --- a/gitweb.pl +++ b/gitweb.pl @@ -2,7 +2,7 @@ # gitweb.pl - simple web interface to track changes in git repositories # -# Version 014 +# Version 042 # # (C) 2005, Kay Sievers # (C) 2005, Christian Gierke @@ -14,86 +14,44 @@ use warnings; use CGI qw(:standard :escapeHTML); use CGI::Carp qw(fatalsToBrowser); -my $gitbin = "/home/kay/bin/git"; # path to the git executables -my $gitroot = "/home/kay/public_html"; # path to the git repositories -my $gittmp = "/tmp"; # temporary files location - my $cgi = new CGI; -my $project = ""; -my $action = ""; -my $hash = ""; -my $hash_parent = ""; -my $view_back; -my $myself = $cgi->url(-absolute => 1); -my $url_path = $cgi->url(-path => 1); -# get values from url -if ($url_path =~ m#/([^/]+)/commit/([0-9a-fA-F]+)$#) { - $project = $1; - $action = "commit"; - $hash = $2; -} elsif ($url_path =~ m#/([^/]+)/treediff/([0-9a-fA-F]+)$#) { - $project = $1; - $action = "treediff"; - $hash = $2; -} elsif ($url_path =~ m#/([^/]+)/diff/([0-9a-fA-F]+)/([0-9a-fA-F]+)$#) { - $project = $1; - $action = "diff"; - $hash = $2; - $hash_parent = $3; -} elsif ($url_path =~ m#/([^/]+)/blob/([0-9a-fA-F]+)$#) { - $project = $1; - $action = "blob"; - $hash = $2; -} elsif ($url_path =~ m#/([^/]+)/tree/([0-9a-fA-F]+)$#) { - $project = $1; - $action = "tree"; - $hash = $2; -} elsif ($url_path =~ m#/([^/]+)/log/([0-9]+)$#) { - $project = $1; - $action = "log"; - $view_back = $2; -} elsif ($url_path =~ m#/([^/]+)/log$#) { - $project = $1; - $action = "log"; - $view_back = 1; -} elsif ($url_path =~ m#/git-logo.png$#) { - print $cgi->header(-type => 'image/png'); - 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; -} +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 $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') || 1; +$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/.git/objects"; # sanitize input +$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; -$project =~ s/[^0-9a-zA-Z\-\._]//g; - -my $projectroot = "$gitroot/$project"; -$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/.git/objects"; +$time_back =~ s/[^0-9]+//g; -sub git_header { - print $cgi->header(-type => 'text/html; charset: utf-8'); +sub git_header_html { + print $cgi->header(-type => 'text/html', -charset => 'utf-8'); print < git - $project $action + EOF print "
\n"; print "
"; - print "\"git\""; - print $cgi->a({-href => "$myself"}, "projects"); + print "" . + "\"git\""; + if ($defaultprojects ne "") { + print $cgi->a({-href => "$my_uri"}, "projects") . " / "; + } if ($project ne "") { - print " / " . $cgi->a({-href => "$myself/$project/log"}, $project); + print $cgi->a({-href => "$my_uri?p=$project;a=log"}, $project); } if ($action ne "") { print " / $action"; @@ -137,199 +98,268 @@ EOF print "
\n"; } -sub git_footer { - print "
"; - print $cgi->end_html(); +sub git_footer_html { + print "\n"; + print "\n"; } -sub git_diff { - my $old_name = shift || "/dev/null"; - my $new_name = shift || "/dev/null"; - my $old = shift; - my $new = shift; +sub git_head { + my $path = shift; + open my $fd, "$projectroot/$path/.git/HEAD"; + my $head = <$fd>; + close $fd; + chomp $head; + return $head; +} - my $tmp_old = "/dev/null"; - my $tmp_new = "/dev/null"; - my $old_label = "/dev/null"; - my $new_label = "/dev/null"; +sub git_commit { + my $commit = shift; + my %co; + my @parents; - # create temp from-file - if ($old ne "") { - open my $fd2, "> $gittmp/$old"; - open my $fd, "-|", "$gitbin/cat-file", "blob", $old; - while (my $line = <$fd>) { - print $fd2 $line; + open my $fd, "-|", "$gitbin/cat-file", "commit", $commit; + while (my $line = <$fd>) { + chomp($line); + last if $line eq ""; + if ($line =~ m/^tree (.*)$/) { + $co{'tree'} = $1; + } elsif ($line =~ m/^parent (.*)$/) { + push @parents, $1; + } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) { + $co{'author'} = $1; + $co{'author_time_epoch'} = $2; + $co{'author_timezone'} = $3; + $co{'author_name'} = $co{'author'}; + $co{'author_name'} =~ s/ <.*//; + } elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) { + $co{'committer'} = $1; + $co{'committer_time_epoch'} = $2; + $co{'committer_timezone'} = $3; + $co{'committer_name'} = $co{'committer'}; + $co{'committer_name'} =~ s/ <.*//; } + } + $co{'parents'} = \@parents; + $co{'parent'} = $parents[0]; + my (@comment) = map { chomp; $_ } <$fd>; + $co{'comment'} = \@comment; + $co{'title'} = $comment[0]; + close $fd; + return %co; +} + +sub git_diff_html { + my $from_name = shift || "/dev/null"; + my $to_name = shift || "/dev/null"; + my $from = shift; + my $to = shift; + + my $from_tmp = "/dev/null"; + my $to_tmp = "/dev/null"; + my $from_label = "/dev/null"; + my $to_label = "/dev/null"; + my $pid = $$; + + # create temp from-file + if ($from ne "") { + $from_tmp = "$gittmp/gitweb_" . $$ . "_from"; + open my $fd2, "> $from_tmp"; + open my $fd, "-|", "$gitbin/cat-file", "blob", $from; + my @file = <$fd>; + print $fd2 @file; close $fd2; close $fd; - $tmp_old = "$gittmp/$old"; - $old_label = "a/$old_name"; + $from_label = "a/$from_name"; } # create tmp to-file - if ($new ne "") { - open my $fd2, "> $gittmp/$new"; - open my $fd, "-|", "$gitbin/cat-file", "blob", $new; - while (my $line = <$fd>) { - print $fd2 $line; - } + if ($to ne "") { + $to_tmp = "$gittmp/gitweb_" . $$ . "_to"; + open my $fd2, "> $to_tmp"; + open my $fd, "-|", "$gitbin/cat-file", "blob", $to; + my @file = <$fd>; + print $fd2 @file; close $fd2; close $fd; - $tmp_new = "$gittmp/$new"; - $new_label = "b/$new_name"; + $to_label = "b/$to_name"; } - open my $fd, "-|", "/usr/bin/diff", "-L", $old_label, "-L", $new_label, "-u", "-p", $tmp_old, $tmp_new; - print '
===== '; - if ($old ne "") { - print $cgi->a({-href => "$myself/$project/blob/$old"}, $old); + open my $fd, "-|", "/usr/bin/diff", "-L", $from_label, "-L", $to_label, "-u", "-p", $from_tmp, $to_tmp; + print "===== "; + if ($from ne "") { + print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from"}, $from); } else { - print $old_name; + print $from_name; } print " vs "; - if ($new ne "") { - print $cgi->a({-href => "$myself/$project/blob/$new"}, $new); + if ($to ne "") { + print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to"}, $to); } else { - print $new_name; + print $to_name; } - print ' =====
'; + 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 '@'; + print '' if $char eq '+' or $char eq '-' or $char eq '@'; } close $fd; - unlink("$gittmp/$new"); - unlink("$gittmp/$old"); + + if ($from ne "") { + unlink("$from_tmp"); + } + if ($to ne "") { + unlink("$to_tmp"); + } +} + +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{'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{'rfc2822_local'} = sprintf "%s, %d %s %4d %02d:%02d:%02d %s", $days[$wday], $mday, $months[$mon], 1900+$year, $hour ,$min, $sec, $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, $gitroot); - my (@path) = grep(!/^\./, readdir($fd)); + opendir(my $fd, "$projectroot/$defaultprojects"); + my (@path) = sort grep(!/^\./, readdir($fd)); closedir($fd); - git_header(); - print "

\n"; + git_header_html(); + print "
\n"; + print "

\n"; foreach my $line (@path) { - if (-e "$gitroot/$line/.git/HEAD") { - print $cgi->a({-href => "$myself/$line/log"}, $line) . "
\n"; + if (-e "$projectroot/$defaultprojects/$line/.git/HEAD") { + print $cgi->a({-href => "$my_uri?p=$defaultprojects/$line;a=log"}, "$defaultprojects/$line") . "
\n"; } } - print "
"; - git_footer(); - exit; -} - -if ($action eq "") { - print $cgi->redirect("$myself/$project/log/$view_back"); + print "

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

\n"; + git_header_html(); + print "

\n"; print "
\n";
 	open my $fd, "-|", "$gitbin/cat-file", "blob", $hash;
 	my $nr;
 	while (my $line = <$fd>) {
 		$nr++;
-		print "$nr\t" . escapeHTML($line);;
+		printf "%3i\t%s", $nr, escapeHTML($line);;
 	}
 	close $fd;
 	print "
\n"; - print "
"; - git_footer(); + print "
"; + git_footer_html(); } elsif ($action eq "tree") { if ($hash eq "") { - open my $fd, "$projectroot/.git/HEAD"; - my $head = <$fd>; - chomp $head; - close $fd; - $hash = $head; + $hash = git_head($project); } open my $fd, "-|", "$gitbin/ls-tree", $hash; my (@entries) = map { chomp; $_ } <$fd>; close $fd; - git_header(); - print "

\n"; + git_header_html(); + 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 => "$myself/$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 => "$myself/$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 "
"; - git_footer(); -} elsif ($action eq "log") { - open my $fd, "$projectroot/.git/HEAD"; - my $head = <$fd>; - chomp $head; - close $fd; - open $fd, "-|", "$gitbin/rev-tree", $head; + print "
"; + git_footer_html(); +} elsif ($action eq "log" || $action eq "rss") { + open my $fd, "-|", "$gitbin/rev-list", git_head($project); my (@revtree) = map { chomp; $_ } <$fd>; close $fd; - git_header(); - print "
\n"; - print "view "; - print $cgi->a({-href => "$myself/$project/log"}, "last day") . " | "; - print $cgi->a({-href => "$myself/$project/log/7"}, "week") . " | "; - print $cgi->a({-href => "$myself/$project/log/31"}, "month") . " | "; - print $cgi->a({-href => "$myself/$project/log/365"}, "year") . " | "; - print $cgi->a({-href => "$myself/$project/log/0"}, "all") . "
\n"; - print "

\n"; - print "
\n"; - print "\n"; - foreach my $rev (reverse sort @revtree) { - # '1114106118 755e3010ee10dadf42a8a80770e1b115fb038d9b:1 2af17b4854036a1c2ec6c101d93c8dd1ed80d24e:1' - last if !($rev =~ m/^([0-9]+) ([0-9a-fA-F]+).* ([0-9a-fA-F]+)/); - my $time = $1; - my $commit = $2; - my $parent = $3; - my @parents; - my ($author, $author_time, $author_timezone); - my ($committer, $committer_time, $committer_timezone); - my $tree; - my $comment; - my $shortlog; - open my $fd, "-|", "$gitbin/cat-file", "commit", $commit; - while (my $line = <$fd>) { - chomp($line); - last if $line eq ""; - if ($line =~ m/^tree (.*)$/) { - $tree = $1; - } elsif ($line =~ m/^parent (.*)$/) { - push @parents, $1; - } elsif ($line =~ m/^committer (.*>) ([0-9]+) (.*)$/) { - $committer = $1; - $committer_time = $2; - $committer_timezone = $3; - } elsif ($line =~ m/^author (.*>) ([0-9]+) (.*)$/) { - $author = $1; - $author_time = $2; - $author_timezone = $3; - } - } - $shortlog = <$fd>; - $shortlog = escapeHTML($shortlog); - $comment = $shortlog . "
"; - while (my $line = <$fd>) { - chomp($line); - $comment .= escapeHTML($line) . "
\n"; - } - close $fd; - my $age = time-$committer_time; - last if ($view_back > 0 && $age > $view_back*60*60*24); + if ($action eq "log") { + git_header_html(); + print "
\n"; + print "view "; + print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last day") . " | "; + print $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | "; + print $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | "; + print $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | "; + print $cgi->a({-href => "$my_uri?p=$project;a=log;t=0"}, "all") . "
\n"; + print "

\n"; + print "
\n"; + print "
\n"; + } elsif ($action eq "rss") { + print $cgi->header(-type => 'text/xml', -charset => 'utf-8'); + print "\n". + "\n"; + print "\n"; + print "$project\n". + " " . $my_url . "/$project/log\n". + "$project log\n". + "en\n"; + } + + for (my $i = 0; $i <= $#revtree; $i++) { + my $commit = $revtree[$i]; + my %co = git_commit($commit); + my %ad = date_str($co{'author_time_epoch'}); + my $age = time - $co{'committer_time_epoch'}; my $age_string; if ($age > 60*60*24*365*2) { $age_string = int $age/60/60/24/365; @@ -350,57 +380,106 @@ if ($action eq "blob") { $age_string = int $age/60; $age_string .= " minutes ago"; } - print "\n"; - print "\n"; - print ""; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; + } + last; + } + print "\n"; + print "\n"; + print ""; + print "\n"; + print "\n"; + print "\n"; + print ""; + print "\n"; + print "\n"; + print "\n"; + print ""; + print "\n"; + } elsif ($action eq "rss") { + last if ($i >= 20); + print "\n\t" . $ad{'mday-time'} . " - " . escapeHTML($co{'title'}) . "\n"; + print "\t " . $my_url . "/$project/commit/$commit\n"; + print "\t"; + my $comment = $co{'comment'}; + foreach my $line (@$comment) { + print escapeHTML($line) . "\n"; + } + print "\t\n"; + print "\n"; } - print ""; - print "\n"; - print "\n"; - print "\n"; - print ""; - print "\n"; } - print "
" . $age_string . "" . $cgi->a({-href => "$myself/$project/commit/$commit"}, $shortlog) . "
"; - print $cgi->a({-href => "$myself/$project/treediff/$commit"}, "view diff") . "
\n"; - print $cgi->a({-href => "$myself/$project/commit/$commit"}, "view commit") . "
\n"; - print $cgi->a({-href => "$myself/$project/tree/$tree"}, "view tree") . "
\n"; - print "		\n"; - print "author    " . escapeHTML($author) . " [" . gmtime($author_time) . " " . $author_timezone . "]
\n"; - print "committer " . escapeHTML($committer) . " [" . gmtime($committer_time) . " " . $committer_timezone . "]
\n"; - print "commit    $commit
\n"; - print "tree      $tree
\n"; - foreach my $par (@parents) { - print "parent    $par
\n"; + if ($action eq "log") { + if ($time_back > 0 && $age > $time_back*60*60*24) { + if ($i == 0) { + print "
Last change $age_string.
" . $age_string . "" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, $co{'title'}) . "
"; + print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "view commit") . "
\n"; + print $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "view diff") . "
\n"; + print "		\n"; + print escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]
\n"; + print "
\n"; + my $comment = $co{'comment'}; + foreach my $line (@$comment) { + if ($line =~ m/^(signed-off|acked)-by:/i) { + print '
' . escapeHTML($line) . "
\n"; + } else { + print escapeHTML($line) . "
\n"; + } + } + print "

\n"; + print "
\n"; - print "$comment

\n"; - print "
\n"; - git_footer(); -} elsif ($action eq "commit") { - my $parent = ""; - open my $fd, "-|", "$gitbin/cat-file", "commit", $hash; - while (my $line = <$fd>) { - chomp($line); - last if $line eq ""; - if ($line =~ m/^parent (.*)$/ && $parent eq "") { - $parent = $1; - } + if ($action eq "log") { + print "\n"; + git_footer_html(); + } elsif ($action eq "rss") { + print ""; } - my $shortlog = <$fd>; - $shortlog = escapeHTML($shortlog); - close $fd; - - open $fd, "-|", "$gitbin/diff-tree", "-r", $parent, $hash; +} elsif ($action eq "commit") { + my %co = git_commit($hash); + my %ad = date_str($co{'author_time_epoch'}, $co{'author_time_zone'}); + my %cd = date_str($co{'committer_time_epoch'}, $co{'committer_time_zone'}); + open my $fd, "-|", "$gitbin/diff-tree", "-r", $co{'parent'}, $hash; my (@difftree) = map { chomp; $_ } <$fd>; close $fd; - git_header(); - print "
\n"; - print "view " . $cgi->a({-href => "$myself/$project/treediff/$hash"}, "diff") . "


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


\n"; + print "
" . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, $co{'title'}) . "
\n"; + print "\n"; + print "\n"; + print ""; + print "\n"; + print "\n"; + print ""; + print "\n"; + print "
"; + print "author    " . escapeHTML($co{'author'}) . " [" . $ad{'rfc2822'} . "]
\n"; + if ($ad{'hour'} < 7 ) { print ""; } + print "localtime " . $ad{'rfc2822_local'} . "
\n"; + if ($ad{'hour'} < 7 ) { print ""; } + print "committer " . escapeHTML($co{'committer'}) . " [" . $cd{'rfc2822'} . "]
\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?p=$project;a=tree;h=$par"}, $par) . "
\n"; + } + print "
\n"; + my $comment = $co{'comment'}; + foreach my $line (@$comment) { + 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'
@@ -411,52 +490,44 @@ 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 "NEW\t" . $cgi->a({-href => "$myself/$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 "DEL\t" . $cgi->a({-href => "$myself/$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 => "$myself/$project/diff/$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 "
"; - git_footer(); -} elsif ($action eq "diff") { - git_header(); - print "

\n"; + print "
"; + git_footer_html(); +} elsif ($action eq "blobdiff") { + git_header_html(); + print "

\n"; print "
\n";
-	git_diff($hash, $hash_parent, $hash, $hash_parent);
+	git_diff_html($hash_parent, $hash, $hash_parent, $hash);
 	print "
\n"; - print "
"; - git_footer(); -} elsif ($action eq "treediff") { - my $parent = ""; - open my $fd, "-|", "$gitbin/cat-file", "commit", $hash; - while (my $line = <$fd>) { - chomp($line); - last if $line eq ""; - if ($line =~ m/^parent (.*)$/ && $parent eq "") { - $parent = $1; - } - } - my $shortlog = <$fd>; - $shortlog = escapeHTML($shortlog); - close $fd; - - open $fd, "-|", "$gitbin/diff-tree", "-r", $parent, $hash; + print "
"; + git_footer_html(); +} elsif ($action eq "commitdiff") { + my %co = git_commit($hash); + open my $fd, "-|", "$gitbin/diff-tree", "-r", $co{'parent'}, $hash; my (@difftree) = map { chomp; $_ } <$fd>; close $fd; - git_header(); - print "
\n"; - print "view " . $cgi->a({-href => "$myself/$project/commit/$hash"}, "commit") . "


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


\n"; + print "
" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, $co{'title'}) . "
\n"; print "
\n";
 	foreach my $line (@difftree) {
 		# '*100644->100644	blob	8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154	Makefile'
@@ -468,22 +539,22 @@ if ($action eq "blob") {
 		my $file = $5;
 		if ($type eq "blob") {
 			if ($op eq "+") {
-				git_diff("", $file, "", $id);
+				git_diff_html("", $file, "", $id);
 			} elsif ($op eq "-") {
-				git_diff($file, "", $id, "");
+				git_diff_html($file, "", $id, "");
 			} elsif ($op eq "*") {
 				$id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
-				git_diff($file, $file, $1, $2);
+				git_diff_html($file, $file, $1, $2);
 			}
 		}
 	}
 	print "
\n"; - print "
"; - git_footer(); + print "
"; + git_footer_html(); } else { - git_header(); - print "

\n"; - print "unknown action\n"; - print "
"; - git_footer(); + git_header_html(); + print "
\n"; + print "unknown action"; + print "


\n"; + git_footer_html(); }