v021

[Gitweb] / gitweb.pl

diff --git a/gitweb.pl b/gitweb.pl
index f385225445ece052cdbe8d0b0f63538286ca6044972e3c9bd13c076239f5a68b..c52c549b6622dade7dc6356d836ff45b1856744473131ee2222ac9e6c9c7a003 100755 (executable)
--- a/gitweb.pl
+++ b/gitweb.pl
@@ -1,39 +1,103 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

-# This file is licensed under the GPL v2, or a later version
+# gitweb.pl - simple web interface to track changes in git repositories
+#
+# Version 021
+#

 # (C) 2005, Kay Sievers <kay.sievers@vrfy.org>
 # (C) 2005, Christian Gierke <ch@gierke.de>
 # (C) 2005, Kay Sievers <kay.sievers@vrfy.org>
 # (C) 2005, Christian Gierke <ch@gierke.de>

+#
+# This file is licensed under the GPL v2, or a later version

 
 use strict;
 use warnings;
 use CGI qw(:standard :escapeHTML);
 use CGI::Carp qw(fatalsToBrowser);
 
 
 use strict;
 use warnings;
 use CGI qw(:standard :escapeHTML);
 use CGI::Carp qw(fatalsToBrowser);
 

+my $projectroot =      "/home/kay/public_html";
+my $defaultprojects =  ".";
+my $gitbin =           "/home/kay/bin/git";
+my $gittmp =           "/tmp";
+

 my $cgi = new CGI;
 my $cgi = new CGI;

-my $gitbin = "/home/kay/bin/git";
-my $gitroot = "/home/kay/public_html";
-my $gittmp = "/tmp";
-my $myself = $cgi->url(-relative => 1);
+my $project = "";
+my $action = "";
+my $hash = "";
+my $hash_parent = "";
+my $view_back;
+my $myself = $cgi->url(-absolute => 1);
+my $url_parm = $cgi->url(-path => 1);
+$url_parm =~ s/.*$myself//;
+
+# get values from url
+if ($url_parm =~ m#/(.+)/commit/([0-9a-fA-F]+)$#) {
+       $project = $1;
+       $action = "commit";
+       $hash = $2;
+} elsif ($url_parm =~ m#/(.+)/commitdiff/([0-9a-fA-F]+)$#) {
+       $project = $1;
+       $action = "commitdiff";
+       $hash = $2;
+} elsif ($url_parm =~ m#/(.+)/blobdiff/([0-9a-fA-F]+)/([0-9a-fA-F]+)$#) {
+       $project = $1;
+       $action = "blobdiff";
+       $hash = $2;
+       $hash_parent = $3;
+} elsif ($url_parm =~ m#/(.+)/blob/([0-9a-fA-F]+)$#) {
+       $project = $1;
+       $action = "blob";
+       $hash = $2;
+} elsif ($url_parm =~ m#/(.+)/tree/([0-9a-fA-F]+)$#) {
+       $project = $1;
+       $action = "tree";
+       $hash = $2;
+} elsif ($url_parm =~ m#/(.+)/log/([0-9]+)$#) {
+       $project = $1;
+       $action = "log";
+       $view_back = $2;
+} elsif ($url_parm =~ m#/(.+)/log$#) {
+       $project = $1;
+       $action = "log";
+       $view_back = 1;
+} elsif ($url_parm =~ m#/(.+)/rss$#) {
+       $project = $1;
+       $action = "rss";
+       $view_back = 1;
+} elsif ($url_parm =~ 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;
+} elsif ($url_parm =~ m#/(.+)$#) {
+       $project = $1;
+       $action = "log";
+       $view_back = 1;
+}

 
 

-my $project = $cgi->param("project") || "";
-my $action = $cgi->param("action") || "";
-my $hash = $cgi->param("hash") || "";
-my $parent = $cgi->param("parent") || "";
-my $view_back = $cgi->param("view_back") || 60*60*24;
-my $projectroot = "$gitroot/$project";
-$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/.git/objects";
+# sanitize input
+$project =~ s#\/\.+##g;

 
 

-$hash =~ s/[^0-9a-fA-F]//g;
-$parent =~ s/[^0-9a-fA-F]//g;
-$project =~ s/[^0-9a-zA-Z\-\._]//g;
+$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/.git/objects";

 
 

-sub git_header {
+sub git_header_html {

        print $cgi->header(-type => 'text/html; charset: utf-8');
 print <<EOF;
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
 <head>
        <title>git - $project $action</title>
        print $cgi->header(-type => 'text/html; charset: utf-8');
 print <<EOF;
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
 <head>
        <title>git - $project $action</title>

+  <link rel="alternate" title="$project log" href="$myself/$project/rss" type="application/rss+xml">

        <style type="text/css">
                body { font-family: sans-serif; font-size: 12px; margin:25px; }
                div.body { border-width:1px; border-style:solid; border-color:#D9D8D1; }
        <style type="text/css">
                body { font-family: sans-serif; font-size: 12px; margin:25px; }
                div.body { border-width:1px; border-style:solid; border-color:#D9D8D1; }


@@ -45,7 +109,7 @@ print <<EOF;
                div.head2 a:visited { color:#0000cc; }
                div.head2 a:hover { color:#880000; }
                div.head2 a:active { color:#880000; }
                div.head2 a:visited { color:#0000cc; }
                div.head2 a:hover { color:#880000; }
                div.head2 a:active { color:#880000; }

-               div.main { padding:8px; font-family: sans-serif; font-size: 12px; }
+               div.title { padding:8px; background-color: #D9D8D1; font-weight:bold; }

                table { padding:0px; margin:0px; width:100%; }
                tr { vertical-align:top; }
                td { padding:8px; margin:0px; font-family: sans-serif; font-size: 12px; }
                table { padding:0px; margin:0px; width:100%; }
                tr { vertical-align:top; }
                td { padding:8px; margin:0px; font-family: sans-serif; font-size: 12px; }


@@ -55,25 +119,24 @@ print <<EOF;
                td.head1 a:visited { color:#000000; }
                td.head2 { background-color: #EDECE6; font-family: monospace; font-size:12px; }
                td.head3 { background-color: #EDECE6; font-size:10px; }
                td.head1 a:visited { color:#000000; }
                td.head2 { background-color: #EDECE6; font-family: monospace; font-size:12px; }
                td.head3 { background-color: #EDECE6; font-size:10px; }

-               div.add { color: #008800; }
-               div.subtract { color: #CC0000; }
-               div.diff_head { color: #000099; }
-               div.diff_head a:visited { color:#0000cc; }
-               div.diff_line { color: #990099; }
+               div.signed_off { color: #a9a8a1; }

                a { color:#0000cc; }
                a:hover { color:#880000; }
                a:visited { color:#880000; }
                a:active { color:#880000; }
                a { color:#0000cc; }
                a:hover { color:#880000; }
                a:visited { color:#880000; }
                a:active { color:#880000; }

+               pre { padding:8px; }

        </style>
 </head>
 <body>
 EOF
        print "<div class=\"body\">\n";
        print "<div class=\"head1\">";
        </style>
 </head>
 <body>
 EOF
        print "<div class=\"body\">\n";
        print "<div class=\"head1\">";

-       print "<a href=\"http://kernel.org/pub/software/scm/git/\"><img src=\"git_logo.png\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/></a>";
-       print $cgi->a({-href => "$myself"}, "projects");
+       print "<a href=\"http://kernel.org/pub/software/scm/git/\"><img src=\"$myself/git-logo.png\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/></a>";
+       if ($defaultprojects ne "") {
+               print $cgi->a({-href => "$myself"}, "projects") . " / ";
+       }

        if ($project ne "") {
        if ($project ne "") {

-               print " / " . $cgi->a({-href => "$myself?project=$project&action=log&view_back=" . 60*60*24}, $project);
+               print $cgi->a({-href => "$myself/$project/log"}, $project);

        }
        if ($action ne "") {
                print " / $action";
        }
        if ($action ne "") {
                print " / $action";


@@ -81,11 +144,50 @@ EOF
        print "</div>\n";
 }
 
        print "</div>\n";
 }
 

-sub git_footer {
+sub git_footer_html {

        print "</div>";
        print $cgi->end_html();
 }
 
        print "</div>";
        print $cgi->end_html();
 }
 

+sub git_head {
+       open my $fd, "$projectroot/$project/.git/HEAD";
+       my $head = <$fd>;
+       close $fd;
+       chomp $head;
+       return $head;
+}
+
+sub git_commit {
+       my $commit = shift;
+       my %co;
+       my @parents;
+
+       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/^committer (.*>) ([0-9]+) (.*)$/) {
+                       $co{'committer'} = $1;
+                       $co{'committer_time'} = $2;
+                       $co{'committer_timezone'} = $3;
+               } elsif ($line =~ m/^author (.*>) ([0-9]+) (.*)$/) {
+                       $co{'author'} = $1;
+                       $co{'author_time'} = $2;
+                       $co{'author_timezone'} = $3;
+               }
+       }
+       $co{'parents'} = \@parents;
+       my (@comment) = map { chomp; $_ } <$fd>;
+       $co{'comment'} = \@comment;
+       $co{'title'} = $comment[0];
+       close $fd;
+       return %co;
+}
+

 sub git_diff {
        my $old_name = shift || "/dev/null";
        my $new_name = shift || "/dev/null";
 sub git_diff {
        my $old_name = shift || "/dev/null";
        my $new_name = shift || "/dev/null";


@@ -120,30 +222,30 @@ sub git_diff {
                close $fd2;
                close $fd;
                $tmp_new = "$gittmp/$new";
                close $fd2;
                close $fd;
                $tmp_new = "$gittmp/$new";

-               $new_label = "a/$new_name";
+               $new_label = "b/$new_name";

        }
 
        open my $fd, "-|", "/usr/bin/diff", "-L", $old_label, "-L", $new_label, "-u", "-p", $tmp_old, $tmp_new;
        }
 
        open my $fd, "-|", "/usr/bin/diff", "-L", $old_label, "-L", $new_label, "-u", "-p", $tmp_old, $tmp_new;

-       print '<div class="diff_head">===== ';
+       print "<span style =\"color: #000099;\">===== ";

        if ($old ne "") {
        if ($old ne "") {

-               print $cgi->a({-href => "$myself?project=$project&action=blob&hash=$old"}, $old);
+               print $cgi->a({-href => "$myself/$project/blob/$old"}, $old);

        } else {
                print $old_name;
        }
        print " vs ";
        if ($new ne "") {
        } else {
                print $old_name;
        }
        print " vs ";
        if ($new ne "") {

-               print $cgi->a({-href => "$myself?project=$project&action=blob&hash=$new"}, $new);
+               print $cgi->a({-href => "$myself/$project/blob/$new"}, $new);

        } else {
                print $new_name;
        }
        } else {
                print $new_name;
        }

-       print ' =====</div>';
+       print " =====</span>\n";

        while (my $line = <$fd>) {
                my $char = substr($line,0,1);
        while (my $line = <$fd>) {
                my $char = substr($line,0,1);

-               print '<div class="add">' if $char eq '+';
-               print '<div class="subtract">' if $char eq '-';
-               print '<div class="diff_line">' if $char eq '@';
+               print '<span style ="color: #008800;">' if $char eq '+';
+               print '<span style ="color: #CC0000;">' if $char eq '-';
+               print '<span style ="color: #990099;">' if $char eq '@';

                print escapeHTML($line);
                print escapeHTML($line);

-               print '</div>' if $char eq '+' or $char eq '-' or $char eq '@';
+               print '</span>' if $char eq '+' or $char eq '-' or $char eq '@';

        }
        close $fd;
        unlink("$gittmp/$new");
        }
        close $fd;
        unlink("$gittmp/$new");


@@ -151,29 +253,25 @@ sub git_diff {
 }
 
 if ($project eq "") {
 }
 
 if ($project eq "") {

-       open my $fd, "-|", "ls", "-1", $gitroot;
-       my (@path) = map { chomp; $_ } <$fd>;
-       close $fd;
-       git_header();
-       print "<br/><br/><div class=\"main\">\n";
+       opendir(my $fd, "$projectroot/$defaultprojects");
+       my (@path) = grep(!/^\./, readdir($fd));
+       closedir($fd);
+       git_header_html();
+       print "<div class=\"head2\">\n";
+       print "<br/><br/>\n";

        foreach my $line (@path) {
        foreach my $line (@path) {

-               if (-e "$gitroot/$line/.git/HEAD") {
-                       print $cgi->a({-href => "$myself?project=$line"}, $line) . "<br/>\n";
+               if (-e "$projectroot/$defaultprojects/$line/.git/HEAD") {
+                       print $cgi->a({-href => "$myself/$defaultprojects/$line/log"}, $line) . "<br/>\n";

                }
        }
                }
        }

-       print "<br/></div>";
-       git_footer();
-       exit;
-}
-
-if ($action eq "") {
-       print $cgi->redirect("$myself?project=$project&action=log&view_back=$view_back");
+       print "</div><br/>";
+       git_footer_html();

        exit;
 }
 
 if ($action eq "blob") {
        exit;
 }
 
 if ($action eq "blob") {

-       git_header();
-       print "<br/><br/><div class=\"main\">\n";
+       git_header_html();
+       print "<br/><br/>\n";

        print "<pre>\n";
        open my $fd, "-|", "$gitbin/cat-file", "blob", $hash;
        my $nr;
        print "<pre>\n";
        open my $fd, "-|", "$gitbin/cat-file", "blob", $hash;
        my $nr;


@@ -183,21 +281,17 @@ if ($action eq "blob") {
        }
        close $fd;
        print "</pre>\n";
        }
        close $fd;
        print "</pre>\n";

-       print "<br/></div>";
-       git_footer();
+       print "<br/>";
+       git_footer_html();

 } elsif ($action eq "tree") {
        if ($hash eq "") {
 } 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();

        }
        open my $fd, "-|", "$gitbin/ls-tree", $hash;
        my (@entries) = map { chomp; $_ } <$fd>;
        close $fd;
        }
        open my $fd, "-|", "$gitbin/ls-tree", $hash;
        my (@entries) = map { chomp; $_ } <$fd>;
        close $fd;

-       git_header();
-       print "<br/><br/><div class=\"main\">\n";
+       git_header_html();
+       print "<br/><br/>\n";

        print "<pre>\n";
        foreach my $line (@entries) {
                #'100644        blob    0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa        panic.c'
        print "<pre>\n";
        foreach my $line (@entries) {
                #'100644        blob    0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa        panic.c'


@@ -206,80 +300,53 @@ if ($action eq "blob") {
                my $t_hash = $3;
                my $t_name = $4;
                if ($t_type eq "blob") {
                my $t_hash = $3;
                my $t_name = $4;
                if ($t_type eq "blob") {

-                       print "BLOB\t" . $cgi->a({-href => "$myself?project=$project&action=blob&hash=$3"}, $4) . "\n";
+                       print "BLOB\t" . $cgi->a({-href => "$myself/$project/blob/$3"}, $4) . "\n";

                } elsif ($t_type eq "tree") {
                } elsif ($t_type eq "tree") {

-                       print "TREE\t" . $cgi->a({-href => "$myself?project=$project&action=tree&hash=$3"}, $4) . "\n";
+                       print "TREE\t" . $cgi->a({-href => "$myself/$project/tree/$3"}, $4) . "\n";

                }
        }
        print "</pre>\n";
                }
        }
        print "</pre>\n";

-       print "<br/></div>";
-       git_footer();
-} elsif ($action eq "log" || $action eq "show_log" ) {
-       open my $fd, "$projectroot/.git/HEAD";
-       my $head = <$fd>;
-       chomp $head;
+       print "<br/>";
+       git_footer_html();
+} elsif ($action eq "log" || $action eq "rss") {
+       open my $fd, "-|", "$gitbin/rev-tree", git_head();
+       my (@revtree) = reverse sort map { chomp; $_ } <$fd>;

        close $fd;
        close $fd;

-       open $fd, "-|", "$gitbin/rev-tree", $head;
-       my (@revtree) = map { chomp; $_ } <$fd>;
-       close $fd;
-       git_header();
-       print "<div class=\"head2\">\n";
-       print "view  ";
-       print $cgi->a({-href => "$myself?project=$project&action=log&view_back=" . 60*60*24}, "last day") . " | ";
-       print $cgi->a({-href => "$myself?project=$project&action=log&view_back=" . 60*60*24*7}, "week") . " | ";
-       print $cgi->a({-href => "$myself?project=$project&action=log&view_back=" . 60*60*24*30}, "month") . " | ";
-       print $cgi->a({-href => "$myself?project=$project&action=log&view_back=" . 60*60*24*365}, "year") . " | ";
-       print $cgi->a({-href => "$myself?project=$project&action=log&view_back=-1"}, "all") . "<br/>\n";
-       print "<br/><br/>\n";
-       print "</div>\n";
-       print "<table cellspacing=\"0\" class=\"log\">\n";
-       foreach my $rev (reverse sort @revtree) {
+
+       if ($action eq "log") {
+               git_header_html();
+               print "<div class=\"head2\">\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") . "<br/>\n";
+               print "<br/><br/>\n";
+               print "</div>\n";
+               print "<table cellspacing=\"0\" class=\"log\">\n";
+       } elsif ($action eq "rss") {
+               print $cgi->header(-type => 'text/xml; charset: utf-8');
+               print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".
+                     "<rss version=\"0.91\">\n";
+               print "<channel>\n";
+               print "<title>$project</title>\n".
+                     "<link> " . $cgi->url() . "/$project/log</link>\n".
+                     "<description>$project log</description>\n".
+                     "<language>en</language>\n";
+       }
+
+       for (my $i = 0; $i <= $#revtree; $i++) {
+               my $rev = $revtree[$i];
+               #foreach my $rev (@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;
                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;
-               my $author_name;
-               my $author_time;
-               my $author_timezone;
-               my $committer;
-               my $committer_time;
-               my $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;
-                               $author =~ m/^(.*) </;
-                               $author_name = $1;
-                       }
-               }
-               $shortlog = <$fd>;
-               $shortlog = escapeHTML($shortlog);
-               $comment = $shortlog . "<br/>";
-               while (my $line = <$fd>) {
-                               chomp($line);
-                               $comment .= escapeHTML($line) . "<br/>\n";
-               }
-               close $fd;
-               my $age = time-$committer_time;
-               last if ($view_back > 0 && $age > $view_back);

 
 

+               my %co = git_commit($commit);
+               my $age = time - $co{'committer_time'};

                my $age_string;
                if ($age > 60*60*24*365*2) {
                        $age_string = int $age/60/60/24/365;
                my $age_string;
                if ($age > 60*60*24*365*2) {
                        $age_string = int $age/60/60/24/365;


@@ -300,42 +367,85 @@ if ($action eq "blob") {
                        $age_string = int $age/60;
                        $age_string .= " minutes ago";
                }
                        $age_string = int $age/60;
                        $age_string .= " minutes ago";
                }

-               print "<tr>\n";
-               print "<td class=\"head1\">" . $age_string . "</td>\n";
-               print "<td class=\"head1\"><a href=\"$myself?project=$project&amp;action=commit&amp;hash=$commit&amp;parent=$parent\">" . $shortlog . "</a></td>";
-               print "</tr>\n";
-               print "<tr>\n";
-               print "<td class=\"head3\">";
-               print $cgi->a({-href => "$myself?project=$project&action=diffs&hash=$commit&parent=$parent"}, "view diff") . "<br/>\n";
-               print $cgi->a({-href => "$myself?project=$project&action=commit&hash=$commit&parent=$parent"}, "view commit") . "<br/>\n";
-               print $cgi->a({-href => "$myself?project=$project&action=tree&hash=$tree"}, "view tree") . "<br/>\n";
-               print "</td>\n";
-               print "<td class=\"head2\">\n";
-               print "author &nbsp; &nbsp;" . escapeHTML($author) . " [" . gmtime($author_time) . " " . $author_timezone . "]<br/>\n";
-               print "committer " . escapeHTML($committer) . " [" . gmtime($committer_time) . " " . $committer_timezone . "]<br/>\n";
-               print "commit &nbsp; &nbsp;$commit<br/>\n";
-               print "tree &nbsp; &nbsp; &nbsp;$tree<br/>\n";
-               foreach my $par (@parents) {
-                       print "parent &nbsp; &nbsp;$par<br/>\n";
+               if ($action eq "log") {
+                       if ($view_back > 0 && $age > $view_back*60*60*24) {
+                               if ($i == 0) {
+                                       print "<tr>\n";
+                                       print "<td class=\"head1\"> Last change $age_string. </td>\n";
+                                       print "</tr>\n";
+                               }
+                               last;
+                       }
+                       print "<tr>\n";
+                       print "<td class=\"head1\">" . $age_string . "</td>\n";
+                       print "<td class=\"head1\">" . $cgi->a({-href => "$myself/$project/commit/$commit"}, $co{'title'}) . "</td>";
+                       print "</tr>\n";
+                       print "<tr>\n";
+                       print "<td class=\"head3\">";
+                       print $cgi->a({-href => "$myself/$project/commitdiff/$commit"}, "view diff") . "<br/>\n";
+                       print $cgi->a({-href => "$myself/$project/commit/$commit"}, "view commit") . "<br/>\n";
+                       print $cgi->a({-href => "$myself/$project/tree/$co{'tree'}"}, "view tree") . "<br/>\n";
+                       print "</td>\n";
+                       print "<td class=\"head2\">\n";
+                       print "author &nbsp; &nbsp;" . escapeHTML($co{'author'}) . " [" . gmtime($co{'author_time'}) . " " . $co{'author_timezone'} . "]<br/>\n";
+                       print "committer " . escapeHTML($co{'committer'}) . " [" . gmtime($co{'committer_time'}) . " " . $co{'committer_timezone'} . "]<br/>\n";
+                       print "commit &nbsp; &nbsp;$commit<br/>\n";
+                       print "tree &nbsp; &nbsp; &nbsp;$co{'tree'}<br/>\n";
+                       my $parents  = $co{'parents'};
+                       foreach my $par (@$parents) {
+                               print "parent &nbsp; &nbsp;$par<br/>\n";
+                       }
+                       print "</td>";
+                       print "</tr>\n";
+                       print "<tr>\n";
+                       print "<td></td>\n";
+                       print "<td>\n";
+                       my $comment = $co{'comment'};
+                       foreach my $line (@$comment) {
+                               if ($line =~ m/signed-off-by:/i) {
+                                       print '<div class="signed_off">' . escapeHTML($line) . "<br/></div>\n";
+                               } else {
+                                       print escapeHTML($line) . "<br/>\n";
+                               }
+                       }
+                       print "<br/><br/>\n";
+                       print "</td>";
+                       print "</tr>\n";
+               } elsif ($action eq "rss") {
+                       last if ($i >= 12);
+                       print "<item>\n\t<title>$age_string: " . escapeHTML($co{'title'}) . "</title>\n";
+                       print "\t<link> " . $cgi->url() . "/$project/commit/$commit</link>\n";
+                       print "</item>\n";

                }
                }

-               print "</td>";
-               print "</tr>\n";
-               print "<tr>\n";
-               print "<td></td>\n";
-               print "<td>\n";
-               print "$comment<br/><br/>\n";
-               print "</td>";
-               print "</tr>\n";

        }
        }

-       print "</table>\n";
-       git_footer();
+       if ($action eq "log") {
+               print "</table>\n";
+               git_footer_html();
+       } elsif ($action eq "rss") {
+               print "</channel></rss>";
+       }

 } elsif ($action eq "commit") {
 } elsif ($action eq "commit") {

-       open my $fd, "-|", "$gitbin/diff-tree", "-r", $parent, $hash;
+       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 $title = <$fd>;
+       $title = escapeHTML($title);
+       close $fd;
+
+       open $fd, "-|", "$gitbin/diff-tree", "-r", $parent, $hash;

        my (@difftree) = map { chomp; $_ } <$fd>;
        close $fd;
 
        my (@difftree) = map { chomp; $_ } <$fd>;
        close $fd;
 

-       git_header();
-       print "<br/><br/><div class=\"main\">\n";
+       git_header_html();
+       print "<div class=\"head2\">\n";
+       print "view " . $cgi->a({-href => "$myself/$project/commitdiff/$hash"}, "diff") . "</div><br/><br/>\n";
+       print "<div class=\"title\">$title<br/></div>\n";

        print "<pre>\n";
        foreach my $line (@difftree) {
                # '*100644->100644      blob    9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596      net/ipv4/route.c'
        print "<pre>\n";
        foreach my $line (@difftree) {
                # '*100644->100644      blob    9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596      net/ipv4/route.c'


@@ -348,35 +458,50 @@ if ($action eq "blob") {
                my $file = $5;
                if ($type eq "blob") {
                        if ($op eq "+") {
                my $file = $5;
                if ($type eq "blob") {
                        if ($op eq "+") {

-                               print "NEW\t" . $cgi->a({-href => "$myself?project=$project&action=blob&hash=$id"}, $file) . "\n";
+                               print "added\t" . $cgi->a({-href => "$myself/$project/blob/$id"}, $file) . "\n";

                        } elsif ($op eq "-") {
                        } elsif ($op eq "-") {

-                               print "DEL\t" . $cgi->a({-href => "$myself?project=$project&action=blob&hash=$id"}, $file) . "\n";
+                               print "removed\t" . $cgi->a({-href => "$myself/$project/blob/$id"}, $file) . "\n";

                        } elsif ($op eq "*") {
                                $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
                                my $old = $1;
                                my $new = $2;
                        } 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=$project&action=diff&hash=$old&parent=$new"}, $file) . "\n";
+                               print "changed\t" . $cgi->a({-href => "$myself/$project/blobdiff/$old/$new"}, $file) . "\n";

                        }
                }
        }
        print "</pre>\n";
                        }
                }
        }
        print "</pre>\n";

-       print "<br/></div>";
-       git_footer();
-} elsif ($action eq "diff") {
-       git_header();
-       print "<br/><br/><div class=\"main\">\n";
+       print "<br/>";
+       git_footer_html();
+} elsif ($action eq "blobdiff") {
+       git_header_html();
+       print "<br/><br/>\n";

        print "<pre>\n";
        print "<pre>\n";

-       git_diff($hash, $parent, $hash, $parent);
+       git_diff($hash, $hash_parent, $hash, $hash_parent);

        print "</pre>\n";
        print "</pre>\n";

-       print "<br/></div>";
-       git_footer();
-} elsif ($action eq "diffs") {
-       open my $fd, "-|", "$gitbin/diff-tree", "-r", $parent, $hash;
+       print "<br/>";
+       git_footer_html();
+} elsif ($action eq "commitdiff") {
+       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 $title = <$fd>;
+       $title = escapeHTML($title);
+       close $fd;
+
+       open $fd, "-|", "$gitbin/diff-tree", "-r", $parent, $hash;

        my (@difftree) = map { chomp; $_ } <$fd>;
        close $fd;
 
        my (@difftree) = map { chomp; $_ } <$fd>;
        close $fd;
 

-       git_header();
-       print "<br/><br/><div class=\"main\">\n";
+       git_header_html();
+       print "<div class=\"head2\">\n";
+       print "view " . $cgi->a({-href => "$myself/$project/commit/$hash"}, "commit") . "</div><br/><br/>\n";
+       print "<div class=\"title\">$title<br/></div>\n";

        print "<pre>\n";
        foreach my $line (@difftree) {
                # '*100644->100644      blob    8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154      Makefile'
        print "<pre>\n";
        foreach my $line (@difftree) {
                # '*100644->100644      blob    8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154      Makefile'


@@ -398,13 +523,6 @@ if ($action eq "blob") {
                }
        }
        print "</pre>\n";
                }
        }
        print "</pre>\n";

-       print "<br/></div>";
-       print "<br/></div>";
-       git_footer();
-} else {
-       git_header();
-       print "<br/><br/><div class=\"main\">\n";
-       print "unknown action\n";
-       print "<br/></div>";
-       git_footer();
+       print "<br/>";
+       git_footer_html();

 }
 }