v031

[Gitweb] / gitweb.pl

diff --git a/gitweb.pl b/gitweb.pl
index 504c1fb16884914675e2419d5d83661e7d7a3e45040e3e8846be86472c235bdb..7820d7dfedd38868c912cb0887a23e93a455393d7e66b7fdd95b376ffc7c96a3 100755 (executable)
--- a/gitweb.pl
+++ b/gitweb.pl
@@ -2,7 +2,7 @@
 
 # gitweb.pl - simple web interface to track changes in git repositories
 #
 
 # gitweb.pl - simple web interface to track changes in git repositories
 #

-# Version 016
+# Version 031

 #
 # (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>


@@ -14,52 +14,59 @@ use warnings;
 use CGI qw(:standard :escapeHTML);
 use CGI::Carp qw(fatalsToBrowser);
 
 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 $cgi = new CGI;

+
+my $projectroot =      "/home/kay/public_html";
+my $defaultprojects =  ".";
+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 $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//;
+my $view_back = 1;

 
 # get values from url
 
 # get values from url

-if ($url_parm =~ m#/([^/]+)/commit/([0-9a-fA-F]+)$#) {
+if ($my_url_parm =~ m#/+(.+)/+commit/+([0-9a-fA-F]+)$#) {

        $project = $1;
        $action = "commit";
        $hash = $2;
        $project = $1;
        $action = "commit";
        $hash = $2;

-} elsif ($url_parm =~ m#/([^/]+)/treediff/([0-9a-fA-F]+)$#) {
+} elsif ($my_url_parm =~ m#/+(.+)/+commitdiff/+([0-9a-fA-F]+)$#) {

        $project = $1;
        $project = $1;

-       $action = "treediff";
+       $action = "commitdiff";

        $hash = $2;
        $hash = $2;

-} elsif ($url_parm =~ m#/([^/]+)/diff/([0-9a-fA-F]+)/([0-9a-fA-F]+)$#) {
+} elsif ($my_url_parm =~ m#/+(.+)/+blobdiff/+([0-9a-fA-F]+)/([0-9a-fA-F]+)$#) {

        $project = $1;
        $project = $1;

-       $action = "diff";
+       $action = "blobdiff";

        $hash = $2;
        $hash_parent = $3;
        $hash = $2;
        $hash_parent = $3;

-} elsif ($url_parm =~ m#/([^/]+)/blob/([0-9a-fA-F]+)$#) {
+} elsif ($my_url_parm =~ m#/+(.+)/+blob/+([0-9a-fA-F]+)$#) {

        $project = $1;
        $action = "blob";
        $hash = $2;
        $project = $1;
        $action = "blob";
        $hash = $2;

-} elsif ($url_parm =~ m#/([^/]+)/tree/([0-9a-fA-F]+)$#) {
+} elsif ($my_url_parm =~ m#/+(.+)/+tree/+([0-9a-fA-F]+)$#) {

        $project = $1;
        $action = "tree";
        $hash = $2;
        $project = $1;
        $action = "tree";
        $hash = $2;

-} elsif ($url_parm =~ m#/([^/]+)/log/([0-9]+)$#) {
+} elsif ($my_url_parm =~ m#/+(.+)/+log/+([0-9]+)$#) {

        $project = $1;
        $action = "log";
        $view_back = $2;
        $project = $1;
        $action = "log";
        $view_back = $2;

-} elsif ($url_parm =~ m#/([^/]+)/log$#) {
+} elsif ($my_url_parm =~ m#/+(.+)/+log$#) {

        $project = $1;
        $action = "log";
        $view_back = 1;
        $project = $1;
        $action = "log";
        $view_back = 1;

-} elsif ($url_parm =~ m#/git-logo.png$#) {
-       print $cgi->header(-type => 'image/png');
+} 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".
        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".


@@ -74,27 +81,25 @@ if ($url_parm =~ m#/([^/]+)/commit/([0-9a-fA-F]+)$#) {
                "\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;
                "\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#/([^/]+)$#) {
+} elsif ($my_url_parm =~ m#/(.+)$#) {

        $project = $1;
        $action = "log";
        $view_back = 1;
 }
 
 # sanitize input
        $project = $1;
        $action = "log";
        $view_back = 1;
 }
 
 # sanitize input

-$hash =~ s/[^0-9a-fA-F]//g;
-$hash_parent =~ s/[^0-9a-fA-F]//g;
-$project =~ s/[^0-9a-zA-Z\-\._]//g;
+$project =~ s#\/\.+##g;

 
 

-my $projectroot = "$gitroot/$project";
-$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/.git/objects";
+$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/.git/objects";

 
 

-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 <<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 <<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="$my_uri/$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; }


@@ -106,8 +111,10 @@ 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.shortlog { padding:8px; background-color: #D9D8D1; font-weight:bold; }
+               div.title { padding:8px; background-color: #D9D8D1; font-weight:bold; }
+               div.title a { color:#000000; text-decoration:none; }
+               div.title a:hover { color:#880000; text-decoration:underline; }
+               div.title a:visited { color:#000000; }

                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; }


@@ -122,16 +129,20 @@ print <<EOF;
                a:hover { color:#880000; }
                a:visited { color:#880000; }
                a:active { color:#880000; }
                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=\"$myself/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=\"$my_uri/git-logo.png\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/></a>";
+       if ($defaultprojects ne "") {
+               print $cgi->a({-href => "$my_uri"}, "projects") . " / ";
+       }

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

-               print " / " . $cgi->a({-href => "$myself/$project/log"}, $project);
+               print $cgi->a({-href => "$my_uri/$project/log"}, $project);

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


@@ -139,60 +150,99 @@ EOF
        print "</div>\n";
 }
 
        print "</div>\n";
 }
 

-sub git_footer {
-       print "</div>";
-       print $cgi->end_html();
+sub git_footer_html {
+       print "</div>\n";
+       print "</body>\n</html>";

 }
 
 }
 

-sub git_diff {
-       my $old_name = shift || "/dev/null";
-       my $new_name = shift || "/dev/null";
-       my $old = shift;
-       my $new = shift;
+sub git_head {
+       open my $fd, "$projectroot/$project/.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/^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;
+       $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;
                close $fd2;
                close $fd;

-               $tmp_old = "$gittmp/$old";
-               $old_label = "a/$old_name";
+               $from_label = "a/$from_name";

        }
 
        # create tmp to-file
        }
 
        # 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;
                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;
+       open my $fd, "-|", "/usr/bin/diff", "-L", $from_label, "-L", $to_label, "-u", "-p", $from_tmp, $to_tmp;

        print "<span style =\"color: #000099;\">===== ";
        print "<span style =\"color: #000099;\">===== ";

-       if ($old ne "") {
-               print $cgi->a({-href => "$myself/$project/blob/$old"}, $old);
+       if ($from ne "") {
+               print $cgi->a({-href => "$my_uri/$project/blob/$from"}, $from);

        } else {
        } else {

-               print $old_name;
+               print $from_name;

        }
        print " vs ";
        }
        print " vs ";

-       if ($new ne "") {
-               print $cgi->a({-href => "$myself/$project/blob/$new"}, $new);
+       if ($to ne "") {
+               print $cgi->a({-href => "$my_uri/$project/blob/$to"}, $to);

        } else {
        } else {

-               print $new_name;
+               print $to_name;

        }
        print " =====</span>\n";
        while (my $line = <$fd>) {
        }
        print " =====</span>\n";
        while (my $line = <$fd>) {


@@ -204,34 +254,49 @@ sub git_diff {
                print '</span>' if $char eq '+' or $char eq '-' or $char eq '@';
        }
        close $fd;
                print '</span>' 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 .= 'd' } else { $modestr .= '-' };
+       for (my $i = 0; $i < 3; $i++) {
+               if ($perms & 0400) { $modestr .= 'r' } else { $modestr .= '-' };
+               if ($perms & 0200) { $modestr .= 'w' } else { $modestr .= '-' };
+               if ($perms & 0100) { $modestr .= 'x' } else { $modestr .= '-' };
+               $perms <<= 3;
+       }
+       return $modestr;
+}
+
+# show list of default projects

 if ($project eq "") {
 if ($project eq "") {

-       opendir(my $fd, $gitroot);
+       opendir(my $fd, "$projectroot/$defaultprojects");

        my (@path) = grep(!/^\./, readdir($fd));
        closedir($fd);
        my (@path) = grep(!/^\./, readdir($fd));
        closedir($fd);

-       git_header();
-       print "<br/><br/><div class=\"main\">\n";
+       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/$line/log"}, $line) . "<br/>\n";
+               if (-e "$projectroot/$defaultprojects/$line/.git/HEAD") {
+                       print $cgi->a({-href => "$my_uri/$defaultprojects/$line/log"}, $line) . "<br/>\n";

                }
        }
                }
        }

-       print "<br/></div>";
-       git_footer();
-       exit;
-}
-
-if ($action eq "") {
-       print $cgi->redirect("$myself/$project/log/$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;


@@ -241,101 +306,67 @@ 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'
                $line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
        print "<pre>\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") {
                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/$project/blob/$t_hash"}, $t_name) . "\n";

                } elsif ($t_type eq "tree") {
                } 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/$project/tree/$t_hash"}, $t_name) . "\n";

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

-       print "<br/></div>";
-       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 "<br/>";
+       git_footer_html();
+} elsif ($action eq "log" || $action eq "rss") {
+       open my $fd, "-|", "$gitbin/rev-list", git_head();

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

-       git_header();
-       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";
-       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 . "<br/>";
-               while (my $line = <$fd>) {
-                               chomp($line);
-                               if ($line =~ m/signed-off-by:/i) {
-                                       $comment .= '<div class="signed_off">' . escapeHTML($line) . "<br/></div>\n";
-                               } else {
-                                       $comment .= escapeHTML($line) . "<br/>\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 "<div class=\"head2\">\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") . "<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> " . $my_url . "/$project/log</link>\n".
+                     "<description>$project log</description>\n".
+                     "<language>en</language>\n";
+       }
+
+       for (my $i = 0; $i <= $#revtree; $i++) {
+               my $commit = $revtree[$i];
+
+               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;


@@ -356,57 +387,106 @@ 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\">" . $cgi->a({-href => "$myself/$project/commit/$commit"}, $shortlog) . "</td>";
-               print "</tr>\n";
-               print "<tr>\n";
-               print "<td class=\"head3\">";
-               print $cgi->a({-href => "$myself/$project/treediff/$commit"}, "view diff") . "<br/>\n";
-               print $cgi->a({-href => "$myself/$project/commit/$commit"}, "view commit") . "<br/>\n";
-               print $cgi->a({-href => "$myself/$project/tree/$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 => "$my_uri/$project/commit/$commit"}, $co{'title'}) . "</td>";
+                       print "</tr>\n";
+                       print "<tr>\n";
+                       print "<td class=\"head3\">";
+                       print $cgi->a({-href => "$my_uri/$project/commit/$commit"}, "view commit") . "<br/>\n";
+                       print $cgi->a({-href => "$my_uri/$project/commitdiff/$commit"}, "view diff") . "<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 "</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|acked)-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 >= 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 "<item>\n\t<title>";
+                       printf("%s %02d, %02d:%02d - ", $months[$mon], $mday, $hour, $min);
+                       print escapeHTML($co{'title'}) . "</title>\n";
+                       print "\t<link> " . $my_url . "/$project/commit/$commit</link>\n";
+                       print "\t<description>";
+                       my $comment = $co{'comment'};
+                       foreach my $line (@$comment) {
+                               print escapeHTML($line) . "\n";
+                       }
+                       print "\t</description>\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();
-} 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 "</table>\n";
+               git_footer_html();
+       } elsif ($action eq "rss") {
+               print "</channel></rss>";

        }
        }

-       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);
+       open my $fd, "-|", "$gitbin/diff-tree", "-r", $co{'parent'}, $hash;

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

-       git_header();
-       print "<div class=\"main\">\n";
-       print "view " . $cgi->a({-href => "$myself/$project/treediff/$hash"}, "diff") . "<br/><br/><br/>\n";
-       print "<div class=\"shortlog\">$shortlog<br/></div>\n";
+       git_header_html();
+       print "<div class=\"head2\"> view\n";
+       print $cgi->a({-href => "$my_uri/$project/commit/$hash"}, "commit") . " | ";
+       print $cgi->a({-href => "$my_uri/$project/commitdiff/$hash"}, "diff");
+       print "</div><br/><br/>\n";
+       print "<div class=\"title\">" . $cgi->a({-href => "$my_uri/$project/commitdiff/$hash"}, $co{'title'}) . "<br/></div>\n";
+       print "<table cellspacing=\"0\" class=\"log\">\n";
+       print "<tr>\n";
+       print "<td class=\"head2\">";
+       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;$hash<br/>\n";
+       print "tree &nbsp; &nbsp; &nbsp;" . $cgi->a({-href => "$my_uri/$project/tree/$co{'tree'}"}, $co{'tree'}) . "<br/>\n";
+       my $parents  = $co{'parents'};
+       foreach my $par (@$parents) {
+               print "parent &nbsp; &nbsp;" . $cgi->a({-href => "$my_uri/$project/tree/$par"}, $par) . "<br/>\n";
+       }
+       print "</td>";
+       print "</tr>\n";
+       print "<tr>\n";
+       print "<td>\n";
+       my $comment = $co{'comment'};
+       foreach my $line (@$comment) {
+               if ($line =~ m/(signed-off|acked)-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";
+       print "</table>";
+

        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'


@@ -417,52 +497,44 @@ if ($action eq "blob") {
                my $type = $3;
                my $id = $4;
                my $file = $5;
                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 "+") {
                if ($type eq "blob") {
                        if ($op eq "+") {

-                               print "added\t" . $cgi->a({-href => "$myself/$project/blob/$id"}, $file) . "\n";
+                               print "added\t$modestr " . $cgi->a({-href => "$my_uri/$project/blob/$id"}, $file) . "\n";

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

-                               print "removed\t" . $cgi->a({-href => "$myself/$project/blob/$id"}, $file) . "\n";
+                               print "removed\t$modestr " . $cgi->a({-href => "$my_uri/$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/diff/$old/$new"}, $file) . "\n";
+                               print "changed\t$modestr " . $cgi->a({-href => "$my_uri/$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, $hash_parent, $hash, $hash_parent);
+       git_diff_html($hash, $hash_parent, $hash, $hash_parent);

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

-       print "<br/></div>";
-       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 "<br/>";
+       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;
 
        my (@difftree) = map { chomp; $_ } <$fd>;
        close $fd;
 

-       git_header();
-       print "<div class=\"main\">\n";
-       print "view " . $cgi->a({-href => "$myself/$project/commit/$hash"}, "commit") . "<br/><br/><br/>\n";
-       print "<div class=\"shortlog\">$shortlog<br/></div>\n";
+       git_header_html();
+       print "<div class=\"head2\"> view\n";
+       print $cgi->a({-href => "$my_uri/$project/commit/$hash"}, "commit") . " | ";
+       print $cgi->a({-href => "$my_uri/$project/commitdiff/$hash"}, "diff");
+       print "</div><br/><br/>\n";
+       print "<div class=\"title\">" . $cgi->a({-href => "$my_uri/$project/commit/$hash"}, $co{'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'


@@ -474,22 +546,16 @@ if ($action eq "blob") {
                my $file = $5;
                if ($type eq "blob") {
                        if ($op eq "+") {
                my $file = $5;
                if ($type eq "blob") {
                        if ($op eq "+") {

-                               git_diff("", $file, "", $id);
+                               git_diff_html("", $file, "", $id);

                        } elsif ($op eq "-") {
                        } 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]+)/;
                        } 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 "</pre>\n";
                        }
                }
        }
        print "</pre>\n";

-       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();

 }
 }