update the test files to have a diff

[Gitweb] / gitweb.cgi

diff --git a/gitweb.cgi b/gitweb.cgi
index 66e53dcd31f0b7b411d7147bfbac77923ceeef651afb0771d73f397e48cc74b1..b5b66c0f9a32ccf56b4d7c2e8ddb54fb461e076a8ddfcda7fcc0e41dcec141c4 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -1,68 +1,74 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

-# gitweb.pl - simple web interface to track changes in git repositories
+# gitweb - simple web interface to track changes in git repositories

 #
 # (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 program is licensed under the GPL v2, or a later version
+# This program is licensed under the GPLv2

 
 use strict;
 use warnings;
 
 use strict;
 use warnings;

-use CGI qw(:standard :escapeHTML);
+use CGI qw(:standard :escapeHTML -nosticky);
+use CGI::Util qw(unescape);

 use CGI::Carp qw(fatalsToBrowser);
 use Fcntl ':mode';
 
 my $cgi = new CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use Fcntl ':mode';
 
 my $cgi = new CGI;

-my $version =          "136";
+my $version =          "248";

 my $my_url =           $cgi->url();
 my $my_uri =           $cgi->url(-absolute => 1);
 my $rss_link = "";
 
 # absolute fs-path which will be prepended to the project path
 my $my_url =           $cgi->url();
 my $my_uri =           $cgi->url(-absolute => 1);
 my $rss_link = "";
 
 # absolute fs-path which will be prepended to the project path

-my $projectroot =      "/pub/scm";
+#my $projectroot =     "/pub/scm";
+my $projectroot = "/home/kay/public_html/pub/scm";

 
 # location of the git-core binaries
 my $gitbin =           "/usr/bin";
 
 # location for temporary files needed for diffs
 
 # location of the git-core binaries
 my $gitbin =           "/usr/bin";
 
 # location for temporary files needed for diffs

-my $gittmp =           "/tmp/gitweb";
+my $git_temp =         "/tmp/gitweb";

 
 # target of the home link on top of all pages
 
 # target of the home link on top of all pages

-#my $home_link =               $my_uri;
-my $home_link =                "/git";
+my $home_link =                $my_uri;

 
 # html text to include at home page
 my $home_text =                "indextext.html";
 
 # source of projects list
 #my $projects_list = $projectroot;
 
 # html text to include at home page
 my $home_text =                "indextext.html";
 
 # source of projects list
 #my $projects_list = $projectroot;

-my $projects_list = "index/index.txt";
+my $projects_list = "index/index.aux";

 
 # input validation and dispatch
 my $action = $cgi->param('a');
 if (defined $action) {
 
 # input validation and dispatch
 my $action = $cgi->param('a');
 if (defined $action) {

-       if ($action =~ m/[^0-9a-zA-Z\.\-]+/) {
+       if ($action =~ m/[^0-9a-zA-Z\.\-_]/) {

                undef $action;
                die_error(undef, "Invalid action parameter.");
        }
        if ($action eq "git-logo.png") {
                git_logo();
                exit;
                undef $action;
                die_error(undef, "Invalid action parameter.");
        }
        if ($action eq "git-logo.png") {
                git_logo();
                exit;

+       } elsif ($action eq "opml") {
+               git_opml();
+               exit;
+       }
+}
+
+my $order = $cgi->param('o');
+if (defined $order) {
+       if ($order =~ m/[^0-9a-zA-Z_]/) {
+               undef $order;
+               die_error(undef, "Invalid order parameter.");

        }
        }

-} else {
-       $action = "log";

 }
 
 my $project = $cgi->param('p');
 if (defined $project) {
 }
 
 my $project = $cgi->param('p');
 if (defined $project) {

-       if ($project =~ m/(^|\/)(|\.|\.\.)($|\/)/) {
-               undef $project;
-               die_error(undef, "Non-canonical project parameter.");
-       }
-       if ($project =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~]/) {
-               undef $project;
-               die_error(undef, "Invalid character in project parameter.");
+       $project = validate_input($project);
+       if (!defined($project)) {
+               die_error(undef, "Invalid project parameter.");

        }
        if (!(-d "$projectroot/$project")) {
                undef $project;
        }
        if (!(-d "$projectroot/$project")) {
                undef $project;


@@ -73,53 +79,91 @@ if (defined $project) {
                die_error(undef, "No such project.");
        }
        $rss_link = "<link rel=\"alternate\" title=\"$project log\" href=\"$my_uri?p=$project;a=rss\" type=\"application/rss+xml\"/>";
                die_error(undef, "No such project.");
        }
        $rss_link = "<link rel=\"alternate\" title=\"$project log\" href=\"$my_uri?p=$project;a=rss\" type=\"application/rss+xml\"/>";

-       $ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects";
+       $ENV{'GIT_DIR'} = "$projectroot/$project";

 } else {
 } else {

-       git_project_list($projects_list);
+       git_project_list();

        exit;
 }
 
 my $file_name = $cgi->param('f');
 if (defined $file_name) {
        exit;
 }
 
 my $file_name = $cgi->param('f');
 if (defined $file_name) {

-       if ($file_name =~ m/(^|\/)(|\.|\.\.)($|\/)/) {
-               undef $file_name;
-               die_error(undef, "Non-canonical file parameter.");
-       }
-       if ($file_name =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~\:\!]/) {
-               undef $file_name;
-               die_error(undef, "Invalid character in file parameter.");
+       $file_name = validate_input($file_name);
+       if (!defined($file_name)) {
+               die_error(undef, "Invalid file parameter.");

        }
 }
 
 my $hash = $cgi->param('h');
        }
 }
 
 my $hash = $cgi->param('h');

-if (defined $hash && !($hash =~ m/^[0-9a-fA-F]{40}$/)) {
-       undef $hash;
-       die_error(undef, "Invalid hash parameter.");
+if (defined $hash) {
+       $hash = validate_input($hash);
+       if (!defined($hash)) {
+               die_error(undef, "Invalid hash parameter.");
+       }

 }
 
 my $hash_parent = $cgi->param('hp');
 }
 
 my $hash_parent = $cgi->param('hp');

-if (defined $hash_parent && !($hash_parent =~ m/^[0-9a-fA-F]{40}$/)) {
-       undef $hash_parent;
-       die_error(undef, "Invalid hash_parent parameter.");
+if (defined $hash_parent) {
+       $hash_parent = validate_input($hash_parent);
+       if (!defined($hash_parent)) {
+               die_error(undef, "Invalid hash parent parameter.");
+       }

 }
 
 my $hash_base = $cgi->param('hb');
 }
 
 my $hash_base = $cgi->param('hb');

-if (defined $hash_base && !($hash_base =~ m/^[0-9a-fA-F]{40}$/)) {
-       undef $hash_base;
-       die_error(undef, "Invalid parent hash parameter.");
+if (defined $hash_base) {
+       $hash_base = validate_input($hash_base);
+       if (!defined($hash_base)) {
+               die_error(undef, "Invalid hash base parameter.");
+       }
+}
+
+my $page = $cgi->param('pg');
+if (defined $page) {
+       if ($page =~ m/[^0-9]$/) {
+               undef $page;
+               die_error(undef, "Invalid page parameter.");
+       }

 }
 
 }
 

-my $time_back = $cgi->param('t');
-if (defined $time_back) {
-       if ($time_back =~ m/^[^0-9]+$/) {
-               undef $time_back;
-               die_error(undef, "Invalid time parameter.");
+my $searchtext = $cgi->param('s');
+if (defined $searchtext) {
+       if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
+               undef $searchtext;
+               die_error(undef, "Invalid search parameter.");

        }
        }

+       $searchtext = quotemeta $searchtext;

 }
 
 }
 

-if ($action eq "blob") {
+sub validate_input {
+       my $input = shift;
+
+       if ($input =~ m/^[0-9a-fA-F]{40}$/) {
+               return $input;
+       }
+       if ($input =~ m/(^|\/)(|\.|\.\.)($|\/)/) {
+               return undef;
+       }
+       if ($input =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~]/) {
+               return undef;
+       }
+       return $input;
+}
+
+if (!defined $action || $action eq "summary") {
+       git_summary();
+       exit;
+} elsif ($action eq "heads") {
+       git_heads();
+       exit;
+} elsif ($action eq "tags") {
+       git_tags();
+       exit;
+} elsif ($action eq "blob") {

        git_blob();
        exit;
        git_blob();
        exit;

+} elsif ($action eq "blob_plain") {
+       git_blob_plain();
+       exit;

 } elsif ($action eq "tree") {
        git_tree();
        exit;
 } elsif ($action eq "tree") {
        git_tree();
        exit;


@@ -135,12 +179,27 @@ if ($action eq "blob") {
 } elsif ($action eq "blobdiff") {
        git_blobdiff();
        exit;
 } elsif ($action eq "blobdiff") {
        git_blobdiff();
        exit;

+} elsif ($action eq "blobdiff_plain") {
+       git_blobdiff_plain();
+       exit;

 } elsif ($action eq "commitdiff") {
        git_commitdiff();
        exit;
 } elsif ($action eq "commitdiff") {
        git_commitdiff();
        exit;

+} elsif ($action eq "commitdiff_plain") {
+       git_commitdiff_plain();
+       exit;

 } elsif ($action eq "history") {
        git_history();
        exit;
 } elsif ($action eq "history") {
        git_history();
        exit;

+} elsif ($action eq "search") {
+       git_search();
+       exit;
+} elsif ($action eq "shortlog") {
+       git_shortlog();
+       exit;
+} elsif ($action eq "tag") {
+       git_tag();
+       exit;

 } else {
        undef $action;
        die_error(undef, "Unknown action.");
 } else {
        undef $action;
        die_error(undef, "Unknown action.");


@@ -149,6 +208,7 @@ if ($action eq "blob") {
 
 sub git_header_html {
        my $status = shift || "200 OK";
 
 sub git_header_html {
        my $status = shift || "200 OK";

+       my $expires = shift;

 
        my $title = "git";
        if (defined $project) {
 
        my $title = "git";
        if (defined $project) {


@@ -157,13 +217,15 @@ sub git_header_html {
                        $title .= "/$action";
                }
        }
                        $title .= "/$action";
                }
        }

-       print $cgi->header(-type=>'text/html',  -charset => 'utf-8', -status=> $status);
+       print $cgi->header(-type=>'text/html',  -charset => 'utf-8', -status=> $status, -expires => $expires);

        print <<EOF;
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
 <!-- git web interface v$version, (C) 2005, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke <ch\@gierke.de> -->
 <head>
        print <<EOF;
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
 <!-- git web interface v$version, (C) 2005, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke <ch\@gierke.de> -->
 <head>

+<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+<meta name="robots" content="index, nofollow"/>

 <title>$title</title>
 $rss_link
 <style type="text/css">
 <title>$title</title>
 $rss_link
 <style type="text/css">


@@ -171,11 +233,11 @@ body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d
 a { color:#0000cc; }
 a:hover, a:visited, a:active { color:#880000; }
 div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
 a { color:#0000cc; }
 a:hover, a:visited, a:active { color:#880000; }
 div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }

-div.page_header a:visited { color:#0000cc; }
+div.page_header a:visited, a.header { color:#0000cc; }

 div.page_header a:hover { color:#880000; }
 div.page_nav { padding:8px; }
 div.page_nav a:visited { color:#0000cc; }
 div.page_header a:hover { color:#880000; }
 div.page_nav { padding:8px; }
 div.page_nav a:visited { color:#0000cc; }

-div.page_path { font-weight:bold; padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px}
+div.page_path { padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px}

 div.page_footer { height:17px; padding:4px 8px; background-color: #d9d8d1; }
 div.page_footer_text { float:left; color:#555555; font-style:italic; }
 div.page_body { padding:8px; }
 div.page_footer { height:17px; padding:4px 8px; background-color: #d9d8d1; }
 div.page_footer_text { float:left; color:#555555; font-style:italic; }
 div.page_body { padding:8px; }


@@ -184,32 +246,34 @@ div.title, a.title {
        font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
 }
 a.title:hover { background-color: #d9d8d1; }
        font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
 }
 a.title:hover { background-color: #d9d8d1; }

-div.title_text { padding:6px 8px; border: solid #d9d8d1; border-width:0px 0px 1px; }
+div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; }

 div.log_body { padding:8px 8px 8px 150px; }
 div.log_body { padding:8px 8px 8px 150px; }

-span.log_age { position:relative; float:left; width:142px; font-style:italic; }
+span.age { position:relative; float:left; width:142px; font-style:italic; }

 div.log_link {
 div.log_link {

+       padding:0px 8px;

        font-size:10px; font-family:sans-serif; font-style:normal;
        font-size:10px; font-family:sans-serif; font-style:normal;

-       position:relative; float:left; width:142px;
-}
-div.list { display:block; padding:4px 8px 2px; font-weight:bold; }
-div.list_head {
-       display:block; padding:6px 6px 4px; border:solid #d9d8d1;
-       border-width:0px 0px 1px; font-style:italic;
-}
-div.list a { text-decoration:none; color:#000000; }
-div.list a:hover { color:#880000; }
-div.link {
-       padding:4px 8px 6px; border:solid #d9d8d1; border-width:0px 0px 1px;
-       font-family:sans-serif; font-size:10px;
+       position:relative; float:left; width:136px;

 }
 }

-td { padding:5px 15px 0px 0px; font-size:12px; }
-th { padding-right:10px; font-size:12px; text-align:left; }
-td.link { font-family:sans-serif; font-size:10px; }
-td.pre { font-family:monospace; font-size:12px; white-space:pre; padding:2px 15px 0px 0px; }
+div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; }
+a.list { text-decoration:none; color:#000000; }
+a.list:hover { text-decoration:underline; color:#880000; }
+a.text { text-decoration:none; color:#0000cc; }
+a.text:visited { text-decoration:none; color:#880000; }
+a.text:hover { text-decoration:underline; color:#880000; }
+table { padding:8px 4px; }
+th { padding:2px 5px; font-size:12px; text-align:left; }
+tr.light:hover { background-color:#edece6; }
+tr.dark { background-color:#f6f6f0; }
+tr.dark:hover { background-color:#edece6; }
+td { padding:2px 5px; font-size:12px; vertical-align:top; }
+td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }

 div.pre { font-family:monospace; font-size:12px; white-space:pre; }
 div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
 div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }
 div.pre { font-family:monospace; font-size:12px; white-space:pre; }
 div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
 div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }

-a.rss_logo { float:right; padding:3px 0px; width:35px; line-height:10px;
+div.search { margin:4px 8px; position:absolute; top:56px; right:12px }
+a.linenr { color:#999999; text-decoration:none }
+a.rss_logo {
+       float:right; padding:3px 0px; width:35px; line-height:10px;

        border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
        color:#ffffff; background-color:#ff6600;
        font-weight:bold; font-family:sans-serif; font-size:10px;
        border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
        color:#ffffff; background-color:#ff6600;
        font-weight:bold; font-family:sans-serif; font-size:10px;


@@ -221,14 +285,35 @@ a.rss_logo:hover { background-color:#ee5500; }
 <body>
 EOF
        print "<div class=\"page_header\">\n" .
 <body>
 EOF
        print "<div class=\"page_header\">\n" .

-             "<a href=\"http://kernel.org/pub/software/scm/git/docs/\">" .
-             "<img src=\"$my_uri?a=git-logo.png\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/></a>";
+             "<a href=\"http://www.kernel.org/pub/software/scm/git/docs/\" title=\"git documentation\">" .
+             "<img src=\"$my_uri?a=git-logo.png\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/>" .
+             "</a>\n";

        print $cgi->a({-href => $home_link}, "projects") . " / ";
        if (defined $project) {
        print $cgi->a({-href => $home_link}, "projects") . " / ";
        if (defined $project) {

-               print $cgi->a({-href => "$my_uri?p=$project;a=log"}, escapeHTML($project));
+               print $cgi->a({-href => "$my_uri?p=$project;a=summary"}, escapeHTML($project));

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

+               print "\n";
+               if (!defined $searchtext) {
+                       $searchtext = "";
+               }
+               my $search_hash;
+               if (defined $hash) {
+                       $search_hash = $hash;
+               } else {
+                       $search_hash  = "HEAD";
+               }
+               $cgi->param("a", "search");
+               $cgi->param("h", $search_hash);
+               print $cgi->startform(-method => "get", -action => "$my_uri") .
+                     "<div class=\"search\">\n" .
+                     $cgi->hidden(-name => "p") . "\n" .
+                     $cgi->hidden(-name => "a") . "\n" .
+                     $cgi->hidden(-name => "h") . "\n" .
+                     $cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
+                     "</div>" .
+                     $cgi->end_form() . "\n";

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


@@ -241,6 +326,8 @@ sub git_footer_html {
                        print "<div class=\"page_footer_text\">" . escapeHTML($descr) . "</div>\n";
                }
                print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "rss_logo"}, "RSS") . "\n";
                        print "<div class=\"page_footer_text\">" . escapeHTML($descr) . "</div>\n";
                }
                print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "rss_logo"}, "RSS") . "\n";

+       } else {
+               print $cgi->a({-href => "$my_uri?a=opml", -class => "rss_logo"}, "OPML") . "\n";

        }
        print "</div>\n" .
              "</body>\n" .
        }
        print "</div>\n" .
              "</body>\n" .


@@ -253,9 +340,10 @@ sub die_error {
 
        git_header_html($status);
        print "<div class=\"page_body\">\n" .
 
        git_header_html($status);
        print "<div class=\"page_body\">\n" .

-             "<br/><br/>\n";
-       print "$status - $error\n";
-       print "<br/></div>\n";
+             "<br/><br/>\n" .
+             "$status - $error\n" .
+             "<br/>\n" .
+             "</div>\n";

        git_footer_html();
        exit;
 }
        git_footer_html();
        exit;
 }


@@ -263,56 +351,138 @@ sub die_error {
 sub git_get_type {
        my $hash = shift;
 
 sub git_get_type {
        my $hash = shift;
 

-       open my $fd, "-|", "$gitbin/git-cat-file -t $hash" || return;
+       open my $fd, "-|", "$gitbin/git-cat-file -t $hash" or return;

        my $type = <$fd>;
        my $type = <$fd>;

-       close $fd;
+       close $fd or return;

        chomp $type;
        return $type;
 }
 
        chomp $type;
        return $type;
 }
 

-sub git_read_head {
+sub git_read_hash {

        my $path = shift;
 
        my $path = shift;
 

-       open my $fd, "$projectroot/$path/HEAD" || return undef;
+       open my $fd, "$projectroot/$path" or return undef;

        my $head = <$fd>;
        close $fd;
        chomp $head;
        if ($head =~ m/^[0-9a-fA-F]{40}$/) {
                return $head;
        my $head = <$fd>;
        close $fd;
        chomp $head;
        if ($head =~ m/^[0-9a-fA-F]{40}$/) {
                return $head;

-       } else {
-               return undef;

        }
 }
 
 sub git_read_description {
        my $path = shift;
 
        }
 }
 
 sub git_read_description {
        my $path = shift;
 

-       open my $fd, "$projectroot/$path/description" || return undef;
+       open my $fd, "$projectroot/$path/description" or return undef;

        my $descr = <$fd>;
        close $fd;
        chomp $descr;
        return $descr;
 }
 
        my $descr = <$fd>;
        close $fd;
        chomp $descr;
        return $descr;
 }
 

+sub git_read_tag {
+       my $tag_id = shift;
+       my %tag;
+       my @comment;
+
+       open my $fd, "-|", "$gitbin/git-cat-file tag $tag_id" or return;
+       $tag{'id'} = $tag_id;
+       while (my $line = <$fd>) {
+               chomp $line;
+               if ($line =~ m/^object ([0-9a-fA-F]{40})$/) {
+                       $tag{'object'} = $1;
+               } elsif ($line =~ m/^type (.+)$/) {
+                       $tag{'type'} = $1;
+               } elsif ($line =~ m/^tag (.+)$/) {
+                       $tag{'name'} = $1;
+               } elsif ($line =~ m/^tagger (.*) ([0-9]+) (.*)$/) {
+                       $tag{'author'} = $1;
+                       $tag{'epoch'} = $2;
+                       $tag{'tz'} = $3;
+               } elsif ($line =~ m/--BEGIN/) {
+                       push @comment, $line;
+                       last;
+               } elsif ($line eq "") {
+                       last;
+               }
+       }
+       push @comment, <$fd>;
+       $tag{'comment'} = \@comment;
+       close $fd or return;
+       if (!defined $tag{'name'}) {
+               return
+       };
+       return %tag
+}
+
+sub age_string {
+       my $age = shift;
+       my $age_str;
+
+       if ($age > 60*60*24*365*2) {
+               $age_str = (int $age/60/60/24/365);
+               $age_str .= " years ago";
+       } elsif ($age > 60*60*24*(365/12)*2) {
+               $age_str = int $age/60/60/24/(365/12);
+               $age_str .= " months ago";
+       } elsif ($age > 60*60*24*7*2) {
+               $age_str = int $age/60/60/24/7;
+               $age_str .= " weeks ago";
+       } elsif ($age > 60*60*24*2) {
+               $age_str = int $age/60/60/24;
+               $age_str .= " days ago";
+       } elsif ($age > 60*60*2) {
+               $age_str = int $age/60/60;
+               $age_str .= " hours ago";
+       } elsif ($age > 60*2) {
+               $age_str = int $age/60;
+               $age_str .= " min ago";
+       } elsif ($age > 2) {
+               $age_str = int $age;
+               $age_str .= " sec ago";
+       } else {
+               $age_str .= " right now";
+       }
+       return $age_str;
+}
+

 sub git_read_commit {
 sub git_read_commit {

-       my $commit = shift;
+       my $commit_id = shift;
+       my $commit_text = shift;
+
+       my @commit_lines;

        my %co;
        my %co;

-       my @parents;

 
 

-       open my $fd, "-|", "$gitbin/git-cat-file commit $commit" || return;
-       while (my $line = <$fd>) {
+       if (defined $commit_text) {
+               @commit_lines = @$commit_text;
+       } else {
+               $/ = "\0";
+               open my $fd, "-|", "$gitbin/git-rev-list --header --parents --max-count=1 $commit_id" or return;
+               @commit_lines = split '\n', <$fd>;
+               close $fd or return;
+               $/ = "\n";
+               pop @commit_lines;
+       }
+       my $header = shift @commit_lines;
+       if (!($header =~ m/^[0-9a-fA-F]{40}/)) {
+               return;
+       }
+       ($co{'id'}, my @parents) = split ' ', $header;
+       $co{'parents'} = \@parents;
+       $co{'parent'} = $parents[0];
+       while (my $line = shift @commit_lines) {

                last if $line eq "\n";
                last if $line eq "\n";

-               chomp $line;
-               if ($line =~ m/^tree (.*)$/) {
+               if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {

                        $co{'tree'} = $1;
                        $co{'tree'} = $1;

-               } elsif ($line =~ m/^parent (.*)$/) {
-                       push @parents, $1;

                } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
                        $co{'author'} = $1;
                        $co{'author_epoch'} = $2;
                        $co{'author_tz'} = $3;
                } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
                        $co{'author'} = $1;
                        $co{'author_epoch'} = $2;
                        $co{'author_tz'} = $3;

-                       $co{'author_name'} = $co{'author'};
-                       $co{'author_name'} =~ s/ <.*//;
+                       if ($co{'author'} =~ m/^([^<]+) </) {
+                               $co{'author_name'} = $1;
+                       } else {
+                               $co{'author_name'} = $co{'author'};
+                       }

                } elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) {
                        $co{'committer'} = $1;
                        $co{'committer_epoch'} = $2;
                } elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) {
                        $co{'committer'} = $1;
                        $co{'committer_epoch'} = $2;


@@ -321,54 +491,60 @@ sub git_read_commit {
                        $co{'committer_name'} =~ s/ <.*//;
                }
        }
                        $co{'committer_name'} =~ s/ <.*//;
                }
        }

-       $co{'parents'} = \@parents;
-       $co{'parent'} = $parents[0];
-       my (@comment) = map { chomp; $_ } <$fd>;
-       $co{'comment'} = \@comment;
-       $comment[0] =~ m/^(.{0,60}[^ ]*)/;
-       $co{'title'} = $1;
-       if ($comment[0] ne $co{'title'}) {
-               $co{'title'} .= " [...]";
-       }
-       close $fd || return;

        if (!defined $co{'tree'}) {
        if (!defined $co{'tree'}) {

-               return undef
+               return;

        };
 
        };
 

+       foreach my $title (@commit_lines) {
+               if ($title ne "") {
+                       $co{'title'} = chop_str($title, 80, 5);
+                       # remove leading stuff of merges to make the interesting part visible
+                       if (length($title) > 50) {
+                               $title =~ s/^Automatic //;
+                               $title =~ s/^merge (of|with) /Merge ... /i;
+                               if (length($title) > 50) {
+                                       $title =~ s/(http|rsync):\/\///;
+                               }
+                               if (length($title) > 50) {
+                                       $title =~ s/(master|www|rsync)\.//;
+                               }
+                               if (length($title) > 50) {
+                                       $title =~ s/kernel.org:?//;
+                               }
+                               if (length($title) > 50) {
+                                       $title =~ s/\/pub\/scm//;
+                               }
+                       }
+                       $co{'title_short'} = chop_str($title, 50, 5);
+                       last;
+               }
+       }
+       # remove added spaces
+       foreach my $line (@commit_lines) {
+               $line =~ s/^    //;
+       }
+       $co{'comment'} = \@commit_lines;
+

        my $age = time - $co{'committer_epoch'};
        $co{'age'} = $age;
        my $age = time - $co{'committer_epoch'};
        $co{'age'} = $age;

-       if ($age > 60*60*24*365*2) {
-               $co{'age_string'} = (int $age/60/60/24/365);
-               $co{'age_string'} .= " years ago";
-       } elsif ($age > 60*60*24*365/12*2) {
-               $co{'age_string'} = int $age/60/60/24/365/12;
-               $co{'age_string'} .= " months ago";
-       } elsif ($age > 60*60*24*7*2) {
-               $co{'age_string'} = int $age/60/60/24/7;
-               $co{'age_string'} .= " weeks ago";
-       } elsif ($age > 60*60*24*2) {
-               $co{'age_string'} = int $age/60/60/24;
-               $co{'age_string'} .= " days ago";
-       } elsif ($age > 60*60*2) {
-               $co{'age_string'} = int $age/60/60;
-               $co{'age_string'} .= " hours ago";
-       } elsif ($age > 60*2) {
-               $co{'age_string'} = int $age/60;
-               $co{'age_string'} .= " minutes ago";
-       } elsif ($age > 2) {
-               $co{'age_string'} = int $age;
-               $co{'age_string'} .= " seconds ago";
+       $co{'age_string'} = age_string($age);
+       my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($co{'committer_epoch'});
+       if ($age > 60*60*24*7*2) {
+               $co{'age_string_date'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon+1, $mday;
+               $co{'age_string_age'} = $co{'age_string'};

        } else {
        } else {

-               $co{'age_string'} .= " right now";
+               $co{'age_string_date'} = $co{'age_string'};
+               $co{'age_string_age'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon+1, $mday;

        }
        return %co;
 }
 
        }
        return %co;
 }
 

-sub git_diff_html {
+sub git_diff_print {

        my $from = shift;
        my $from_name = shift;
        my $to = shift;
        my $to_name = shift;
        my $from = shift;
        my $from_name = shift;
        my $to = shift;
        my $to_name = shift;

+       my $format = shift || "html";

 
        my $from_tmp = "/dev/null";
        my $to_tmp = "/dev/null";
 
        my $from_tmp = "/dev/null";
        my $to_tmp = "/dev/null";


@@ -376,7 +552,7 @@ sub git_diff_html {
 
        # create tmp from-file
        if (defined $from) {
 
        # create tmp from-file
        if (defined $from) {

-               $from_tmp = "$gittmp/gitweb_" . $$ . "_from";
+               $from_tmp = "$git_temp/gitweb_" . $$ . "_from";

                open my $fd2, "> $from_tmp";
                open my $fd, "-|", "$gitbin/git-cat-file blob $from";
                my @file = <$fd>;
                open my $fd2, "> $from_tmp";
                open my $fd, "-|", "$gitbin/git-cat-file blob $from";
                my @file = <$fd>;


@@ -387,7 +563,7 @@ sub git_diff_html {
 
        # create tmp to-file
        if (defined $to) {
 
        # create tmp to-file
        if (defined $to) {

-               $to_tmp = "$gittmp/gitweb_" . $$ . "_to";
+               $to_tmp = "$git_temp/gitweb_" . $$ . "_to";

                open my $fd2, "> $to_tmp";
                open my $fd, "-|", "$gitbin/git-cat-file blob $to";
                my @file = <$fd>;
                open my $fd2, "> $to_tmp";
                open my $fd, "-|", "$gitbin/git-cat-file blob $to";
                my @file = <$fd>;


@@ -397,21 +573,33 @@ sub git_diff_html {
        }
 
        open my $fd, "-|", "/usr/bin/diff -u -p -L $from_name -L $to_name $from_tmp $to_tmp";
        }
 
        open my $fd, "-|", "/usr/bin/diff -u -p -L $from_name -L $to_name $from_tmp $to_tmp";

-       while (my $line = <$fd>) {
-               chomp($line);
-               my $char = substr($line, 0, 1);
-               my $color = "";
-               if ($char eq '+') {
-                       $color = " style=\"color:#008800;\"";
-               } elsif ($char eq '-') {
-                       $color = " style=\"color:#cc0000;\"";
-               } elsif ($char eq '@') {
-                       $color = " style=\"color:#990099;\"";
-               } elsif ($char eq '\\') {
-                       # skip errors
-                       next;
+       if ($format eq "plain") {
+               undef $/;
+               print <$fd>;
+               $/ = "\n";
+       } else {
+               while (my $line = <$fd>) {
+                       chomp($line);
+                       my $char = substr($line, 0, 1);
+                       my $color = "";
+                       if ($char eq '+') {
+                               $color = " style=\"color:#008800;\"";
+                       } elsif ($char eq "-") {
+                               $color = " style=\"color:#cc0000;\"";
+                       } elsif ($char eq "@") {
+                               $color = " style=\"color:#990099;\"";
+                       } elsif ($char eq "\\") {
+                               # skip errors
+                               next;
+                       }
+                       while ((my $pos = index($line, "\t")) != -1) {
+                               if (my $count = (8 - (($pos-1) % 8))) {
+                                       my $spaces = ' ' x $count;
+                                       $line =~ s/\t/$spaces/;
+                               }
+                       }
+                       print "<div class=\"pre\"$color>" . escapeHTML($line) . "</div>\n";

                }
                }

-               print "<div class=\"pre\"$color>" . escapeHTML($line) . "</div>\n";

        }
        close $fd;
 
        }
        close $fd;
 


@@ -442,6 +630,22 @@ sub mode_str {
        }
 }
 
        }
 }
 

+sub chop_str {
+       my $str = shift;
+       my $len = shift;
+       my $add_len = shift || 10;
+
+       # allow only $len chars, but don't cut a word if it would fit in $add_len
+       # if it doesn't fit, cut it if it's still longer than the dots we would add
+       $str =~ m/^(.{0,$len}[^ \/\-_:\.@]{0,$add_len})(.*)/;
+       my $body = $1;
+       my $tail = $2;
+       if (length($tail) > 4) {
+               $tail = " ...";
+       }
+       return "$body$tail";
+}
+

 sub file_type {
        my $mode = oct shift;
 
 sub file_type {
        my $mode = oct shift;
 


@@ -456,6 +660,21 @@ sub file_type {
        }
 }
 
        }
 }
 

+sub format_log_line_html {
+       my $line = shift;
+
+       $line = escapeHTML($line);
+       $line =~ s/ /&nbsp;/g;
+       if ($line =~ m/([0-9a-fA-F]{40})/) {
+               my $hash_text = $1;
+               if (git_get_type($hash_text) eq "commit") {
+                       my $link = $cgi->a({-class => "text", -href => "$my_uri?p=$project;a=commit;h=$hash_text"}, $hash_text);
+                       $line =~ s/$hash_text/$link/;
+               }
+       }
+       return $line;
+}
+

 sub date_str {
        my $epoch = shift;
        my $tz = shift || "-0000";
 sub date_str {
        my $epoch = shift;
        my $tz = shift || "-0000";


@@ -513,14 +732,13 @@ sub get_file_owner {
        return $owner;
 }
 
        return $owner;
 }
 

-sub git_project_list {
-       my $project_list = shift;
+sub git_read_projects {

        my @list;
 
        my @list;
 

-       if (-d $project_list) {
+       if (-d $projects_list) {

                # search in directory
                # search in directory

-               my $dir = $project_list;
-               opendir my $dh, $dir || return undef;
+               my $dir = $projects_list;
+               opendir my $dh, $dir or return undef;

                while (my $dir = readdir($dh)) {
                        if (-e "$projectroot/$dir/HEAD") {
                                my $pr = {
                while (my $dir = readdir($dh)) {
                        if (-e "$projectroot/$dir/HEAD") {
                                my $pr = {


@@ -530,14 +748,17 @@ sub git_project_list {
                        }
                }
                closedir($dh);
                        }
                }
                closedir($dh);

-       } elsif (-e $project_list) {
-               # read from file
-               # 'git/git.git:Linus Torvalds'
-               # 'linux/hotplug/udev.git'
-               open my $fd , $project_list || return undef;
+       } elsif (-f $projects_list) {
+               # read from file(url-encoded):
+               # 'git%2Fgit.git Linus+Torvalds'
+               # 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
+               # 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
+               open my $fd , $projects_list or return undef;

                while (my $line = <$fd>) {
                        chomp $line;
                while (my $line = <$fd>) {
                        chomp $line;

-                       my ($path, $owner) = split ':', $line;
+                       my ($path, $owner) = split ' ', $line;
+                       $path = unescape($path);
+                       $owner = unescape($owner);

                        if (!defined $path) {
                                next;
                        }
                        if (!defined $path) {
                                next;
                        }


@@ -551,76 +772,493 @@ sub git_project_list {
                }
                close $fd;
        }
                }
                close $fd;
        }

+       @list = sort {$a->{'path'} cmp $b->{'path'}} @list;
+       return @list;
+}

 
 

+sub git_project_list {
+       my @list = git_read_projects();
+       my @projects;

        if (!@list) {
                die_error(undef, "No project found.");
        }
        if (!@list) {
                die_error(undef, "No project found.");
        }

-       @list = sort {$a->{'path'} cmp $b->{'path'}} @list;
-
+       foreach my $pr (@list) {
+               my $head = git_read_hash("$pr->{'path'}/HEAD");
+               if (!defined $head) {
+                       next;
+               }
+               $ENV{'GIT_DIR'} = "$projectroot/$pr->{'path'}";
+               my %co = git_read_commit($head);
+               if (!%co) {
+                       next;
+               }
+               $pr->{'commit'} = \%co;
+               if (!defined $pr->{'descr'}) {
+                       my $descr = git_read_description($pr->{'path'}) || "";
+                       $pr->{'descr'} = chop_str($descr, 25, 5);
+               }
+               if (!defined $pr->{'owner'}) {
+                       $pr->{'owner'} = get_file_owner("$projectroot/$pr->{'path'}") || "";
+               }
+               push @projects, $pr;
+       }

        git_header_html();
        if (-f $home_text) {
                print "<div class=\"index_include\">\n";
        git_header_html();
        if (-f $home_text) {
                print "<div class=\"index_include\">\n";

-               open my $fd, $home_text;
+               open (my $fd, $home_text);

                print <$fd>;
                close $fd;
                print "</div>\n";
        }
                print <$fd>;
                close $fd;
                print "</div>\n";
        }

-       print "<div class=\"page_body\"><br/>\n" .
-             "<table cellspacing=\"0\">\n" .
-             "<tr>\n" .
-             "<th>Project</th>\n" .
-             "<th>Description</th>\n" .
-             "<th>Owner</th>\n" .
-             "<th>last change</th>\n" .
+       print "<table cellspacing=\"0\">\n" .
+             "<tr>\n";
+       if (!defined($order) || (defined($order) && ($order eq "project"))) {
+               @projects = sort {$a->{'path'} cmp $b->{'path'}} @projects;
+               print "<th>Project</th>\n";
+       } else {
+               print "<th>" . $cgi->a({-class => "header", -href => "$my_uri?o=project"}, "Project") . "</th>\n";
+       }
+       if (defined($order) && ($order eq "descr")) {
+               @projects = sort {$a->{'descr'} cmp $b->{'descr'}} @projects;
+               print "<th>Description</th>\n";
+       } else {
+               print "<th>" . $cgi->a({-class => "header", -href => "$my_uri?o=descr"}, "Description") . "</th>\n";
+       }
+       if (defined($order) && ($order eq "owner")) {
+               @projects = sort {$a->{'owner'} cmp $b->{'owner'}} @projects;
+               print "<th>Owner</th>\n";
+       } else {
+               print "<th>" . $cgi->a({-class => "header", -href => "$my_uri?o=owner"}, "Owner") . "</th>\n";
+       }
+       if (defined($order) && ($order eq "age")) {
+               @projects = sort {$a->{'commit'}{'age'} <=> $b->{'commit'}{'age'}} @projects;
+               print "<th>Last Change</th>\n";
+       } else {
+               print "<th>" . $cgi->a({-class => "header", -href => "$my_uri?o=age"}, "Last Change") . "</th>\n";
+       }
+       print "<th></th>\n" .

              "</tr>\n";
              "</tr>\n";

-       foreach my $pr (@list) {
-               my %proj = %$pr;
-               my $head = git_read_head($proj{'path'});
-               if (!defined $head) {
+       my $alternate = 0;
+       foreach my $pr (@projects) {
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               print "<td>" . $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=summary", -class => "list"}, escapeHTML($pr->{'path'})) . "</td>\n" .
+                     "<td>$pr->{'descr'}</td>\n" .
+                     "<td><i>" . chop_str($pr->{'owner'}, 15) . "</i></td>\n";
+               my $colored_age;
+               if ($pr->{'commit'}{'age'} < 60*60*2) {
+                       $colored_age = "<span style =\"color: #009900;\"><b><i>$pr->{'commit'}{'age_string'}</i></b></span>";
+               } elsif ($pr->{'commit'}{'age'} < 60*60*24*2) {
+                       $colored_age = "<span style =\"color: #009900;\"><i>$pr->{'commit'}{'age_string'}</i></span>";
+               } else {
+                       $colored_age = "<i>$pr->{'commit'}{'age_string'}</i>";
+               }
+               print "<td>$colored_age</td>\n" .
+                     "<td class=\"link\">" .
+                     $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=summary"}, "summary") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=shortlog"}, "shortlog") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=log"}, "log") .
+                     "</td>\n" .
+                     "</tr>\n";
+       }
+       print "</table>\n";
+       git_footer_html();
+}
+
+sub git_read_refs {
+       my $ref_dir = shift;
+       my @reflist;
+
+       my @refs;
+       opendir my $dh, "$projectroot/$project/$ref_dir";
+       while (my $dir = readdir($dh)) {
+               if ($dir =~ m/^\./) {

                        next;
                }
                        next;
                }

-               $ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$proj{'path'}/objects";
-               my %co = git_read_commit($head);
-               if (!%co) {
+               if (-d "$projectroot/$project/$ref_dir/$dir") {
+                       opendir my $dh2, "$projectroot/$project/$ref_dir/$dir";
+                       my @subdirs = grep !m/^\./, readdir $dh2;
+                       closedir($dh2);
+                       foreach my $subdir (@subdirs) {
+                               push @refs, "$dir/$subdir"
+                       }

                        next;
                }
                        next;
                }

-               my $descr = git_read_description($proj{'path'}) || "";
-               # get directory owner if not already specified
-               if (!defined $proj{'owner'}) {
-                       $proj{'owner'} = get_file_owner("$projectroot/$proj{'path'}") || "";
+               push @refs, $dir;
+       }
+       closedir($dh);
+       foreach my $ref_file (@refs) {
+               my $ref_id = git_read_hash("$project/$ref_dir/$ref_file");
+               my $type = git_get_type($ref_id) || next;
+               my %ref_item;
+               my %co;
+               $ref_item{'type'} = $type;
+               $ref_item{'id'} = $ref_id;
+               $ref_item{'epoch'} = 0;
+               $ref_item{'age'} = "unknown";
+               if ($type eq "tag") {
+                       my %tag = git_read_tag($ref_id);
+                       $ref_item{'comment'} = $tag{'comment'};
+                       if ($tag{'type'} eq "commit") {
+                               %co = git_read_commit($tag{'object'});
+                               $ref_item{'epoch'} = $co{'committer_epoch'};
+                               $ref_item{'age'} = $co{'age_string'};
+                       } elsif (defined($tag{'epoch'})) {
+                               my $age = time - $tag{'epoch'};
+                               $ref_item{'epoch'} = $tag{'epoch'};
+                               $ref_item{'age'} = age_string($age);
+                       }
+                       $ref_item{'reftype'} = $tag{'type'};
+                       $ref_item{'name'} = $tag{'name'};
+                       $ref_item{'refid'} = $tag{'object'};
+               } elsif ($type eq "commit"){
+                       %co = git_read_commit($ref_id);
+                       $ref_item{'reftype'} = "commit";
+                       $ref_item{'name'} = $ref_file;
+                       $ref_item{'title'} = $co{'title'};
+                       $ref_item{'refid'} = $ref_id;
+                       $ref_item{'epoch'} = $co{'committer_epoch'};
+                       $ref_item{'age'} = $co{'age_string'};

                }
                }

-               print "<tr>\n" .
-                     "<td>" . $cgi->a({-href => "$my_uri?p=" . $proj{'path'} . ";a=log"}, escapeHTML($proj{'path'})) . "</td>\n" .
-                     "<td>$descr</td>\n" .
-                     "<td><i>$proj{'owner'}</i></td>\n";
-               if ($co{'age'} < 60*60*2) {
-                       print "<td><span style =\"color: #009900;\"><b><i>$co{'age_string'}</i></b></span></td>\n";
-               } elsif ($co{'age'} < 60*60*24*2) {
-                       print "<td><span style =\"color: #009900;\"><i>$co{'age_string'}</i></span></td>\n";
+
+               push @reflist, \%ref_item;
+       }
+       # sort tags by age
+       @reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist;
+       return \@reflist;
+}
+
+sub git_summary {
+       my $descr = git_read_description($project) || "none";
+       my $head = git_read_hash("$project/HEAD");
+       my %co = git_read_commit($head);
+       my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
+
+       my $owner;
+       if (-f $projects_list) {
+               open (my $fd , $projects_list);
+               while (my $line = <$fd>) {
+                       chomp $line;
+                       my ($pr, $ow) = split ' ', $line;
+                       $pr = unescape($pr);
+                       $ow = unescape($ow);
+                       if ($pr eq $project) {
+                               $owner = $ow;
+                               last;
+                       }
+               }
+               close $fd;
+       }
+       if (!defined $owner) {
+               $owner = get_file_owner("$projectroot/$project");
+       }
+
+       git_header_html();
+       print "<div class=\"page_nav\">\n" .
+             "summary".
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$head"}, "commit") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$head"}, "commitdiff") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree"}, "tree") .
+             "<br/><br/>\n" .
+             "</div>\n";
+       print "<div class=\"title\">&nbsp;</div>\n";
+       print "<table cellspacing=\"0\">\n" .
+             "<tr><td>description</td><td>" . escapeHTML($descr) . "</td></tr>\n" .
+             "<tr><td>owner</td><td>$owner</td></tr>\n" .
+             "<tr><td>last change</td><td>$cd{'rfc2822'}</td></tr>\n" .
+             "</table>\n";
+       open my $fd, "-|", "$gitbin/git-rev-list --max-count=17 " . git_read_hash("$project/HEAD") or die_error(undef, "Open failed.");
+       my (@revlist) = map { chomp; $_ } <$fd>;
+       close $fd;
+       print "<div>\n" .
+             $cgi->a({-href => "$my_uri?p=$project;a=shortlog", -class => "title"}, "shortlog") .
+             "</div>\n";
+       my $i = 16;
+       print "<table cellspacing=\"0\">\n";
+       my $alternate = 0;
+       foreach my $commit (@revlist) {
+               my %co = git_read_commit($commit);
+               my %ad = date_str($co{'author_epoch'});
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";

                } else {
                } else {

-                       print "<td><i>$co{'age_string'}</i></td>\n";
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               if ($i-- > 0) {
+                       print "<td><i>$co{'age_string'}</i></td>\n" .
+                             "<td><i>" . escapeHTML(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
+                             "<td>";
+                       if (length($co{'title_short'}) < length($co{'title'})) {
+                               print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list", -title => "$co{'title'}"},
+                                     "<b>" . escapeHTML($co{'title_short'}) . "</b>");
+                       } else {
+                               print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"},
+                                     "<b>" . escapeHTML($co{'title'}) . "</b>");
+                       }
+                       print "</td>\n" .
+                             "<td class=\"link\">" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") .
+                             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") .
+                             "</td>\n" .
+                             "</tr>";
+               } else {
+                       print "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "...") . "</td>\n" .
+                       "</tr>";
+                       last;

                }
                }

-               print "</tr>\n";

        }
        }

-       print "</table>\n" .
+       print "</table\n>";
+
+       my $taglist = git_read_refs("refs/tags");
+       if (defined @$taglist) {
+               print "<div>\n" .
+                     $cgi->a({-href => "$my_uri?p=$project;a=tags", -class => "title"}, "tags") .
+                     "</div>\n";
+               my $i = 16;
+               print "<table cellspacing=\"0\">\n";
+               my $alternate = 0;
+               foreach my $entry (@$taglist) {
+                       my %tag = %$entry;
+                       my $comment_lines = $tag{'comment'};
+                       my $comment = shift @$comment_lines;
+                       if (defined($comment)) {
+                               $comment = chop_str($comment, 30, 5);
+                       }
+                       if ($alternate) {
+                               print "<tr class=\"dark\">\n";
+                       } else {
+                               print "<tr class=\"light\">\n";
+                       }
+                       $alternate ^= 1;
+                       if ($i-- > 0) {
+                               print "<td><i>$tag{'age'}</i></td>\n" .
+                                     "<td>" .
+                                     $cgi->a({-href => "$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}", -class => "list"},
+                                     "<b>" . escapeHTML($tag{'name'}) . "</b>") .
+                                     "</td>\n" .
+                                     "<td>";
+                               if (defined($comment)) {
+                                     print $cgi->a({-class => "list", -href => "$my_uri?p=$project;a=tag;h=$tag{'id'}"}, $comment);
+                               }
+                               print "</td>\n" .
+                                     "<td class=\"link\">";
+                               if ($tag{'type'} eq "tag") {
+                                     print $cgi->a({-href => "$my_uri?p=$project;a=tag;h=$tag{'id'}"}, "tag") . " | ";
+                               }
+                               print $cgi->a({-href => "$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}"}, $tag{'reftype'});
+                               if ($tag{'reftype'} eq "commit") {
+                                     print " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}"}, "shortlog") .
+                                           " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'refid'}"}, "log");
+                               }
+                               print "</td>\n" .
+                                     "</tr>";
+                       } else {
+                               print "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=tags"}, "...") . "</td>\n" .
+                               "</tr>";
+                               last;
+                       }
+               }
+               print "</table\n>";
+       }
+
+       my $headlist = git_read_refs("refs/heads");
+       if (defined @$headlist) {
+               print "<div>\n" .
+                     $cgi->a({-href => "$my_uri?p=$project;a=heads", -class => "title"}, "heads") .
+                     "</div>\n";
+               my $i = 16;
+               print "<table cellspacing=\"0\">\n";
+               my $alternate = 0;
+               foreach my $entry (@$headlist) {
+                       my %tag = %$entry;
+                       if ($alternate) {
+                               print "<tr class=\"dark\">\n";
+                       } else {
+                               print "<tr class=\"light\">\n";
+                       }
+                       $alternate ^= 1;
+                       if ($i-- > 0) {
+                               print "<td><i>$tag{'age'}</i></td>\n" .
+                                     "<td>" .
+                                     $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}", -class => "list"},
+                                     "<b>" . escapeHTML($tag{'name'}) . "</b>") .
+                                     "</td>\n" .
+                                     "<td class=\"link\">" .
+                                     $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}"}, "shortlog") .
+                                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'name'}"}, "log") .
+                                     "</td>\n" .
+                                     "</tr>";
+                       } else {
+                               print "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=heads"}, "...") . "</td>\n" .
+                               "</tr>";
+                               last;
+                       }
+               }
+               print "</table\n>";
+       }
+       git_footer_html();
+}
+
+sub git_tag {
+       my $head = git_read_hash("$project/HEAD");
+       git_header_html();
+       print "<div class=\"page_nav\">\n" .
+             $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$head"}, "commit") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$head"}, "commitdiff") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;hb=$head"}, "tree") . "<br/>\n" .
+             "<br/>\n" .
+             "</div>\n";
+       my %tag = git_read_tag($hash);
+       print "<div>\n" .
+             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($tag{'name'})) . "\n" .
+             "</div>\n";
+       print "<div class=\"title_text\">\n" .
+             "<table cellspacing=\"0\">\n" .
+             "<tr>\n" .
+             "<td>object</td>\n" .
+             "<td>" . $cgi->a({-class => "list", -href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'object'}"}, $tag{'object'}) . "</td>\n" .
+             "<td class=\"link\">" . $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'object'}"}, $tag{'type'}) . "</td>\n" .
+             "</tr>\n";
+       if (defined($tag{'author'})) {
+               my %ad = date_str($tag{'epoch'}, $tag{'tz'});
+               print "<tr><td>author</td><td>" . escapeHTML($tag{'author'}) . "</td></tr>\n";
+               print "<tr><td></td><td>" . $ad{'rfc2822'} . sprintf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}) . "</td></tr>\n";
+       }
+       print "</table>\n\n" .
+             "</div>\n";
+       print "<div class=\"page_body\">";
+       my $comment = $tag{'comment'};
+       foreach my $line (@$comment) {
+               print escapeHTML($line) . "<br/>\n";
+       }
+       print "</div>\n";
+       git_footer_html();
+}
+
+sub git_tags {
+       my $head = git_read_hash("$project/HEAD");
+       git_header_html();
+       print "<div class=\"page_nav\">\n" .
+             $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$head"}, "commit") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$head"}, "commitdiff") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;hb=$head"}, "tree") . "<br/>\n" .
+             "<br/>\n" .
+             "</div>\n";
+       my $taglist = git_read_refs("refs/tags");
+       print "<div>\n" .
+             $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, "&nbsp;") .
+             "</div>\n";
+       print "<table cellspacing=\"0\">\n";
+       my $alternate = 0;
+       if (defined @$taglist) {
+               foreach my $entry (@$taglist) {
+                       my %tag = %$entry;
+                       my $comment_lines = $tag{'comment'};
+                       my $comment = shift @$comment_lines;
+                       if (defined($comment)) {
+                               $comment = chop_str($comment, 30, 5);
+                       }
+                       if ($alternate) {
+                               print "<tr class=\"dark\">\n";
+                       } else {
+                               print "<tr class=\"light\">\n";
+                       }
+                       $alternate ^= 1;
+                       print "<td><i>$tag{'age'}</i></td>\n" .
+                             "<td>" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}", -class => "list"},
+                             "<b>" . escapeHTML($tag{'name'}) . "</b>") .
+                             "</td>\n" .
+                             "<td>";
+                       if (defined($comment)) {
+                             print $cgi->a({-class => "list", -href => "$my_uri?p=$project;a=tag;h=$tag{'id'}"}, $comment);
+                       }
+                       print "</td>\n" .
+                             "<td class=\"link\">";
+                       if ($tag{'type'} eq "tag") {
+                             print $cgi->a({-href => "$my_uri?p=$project;a=tag;h=$tag{'id'}"}, "tag") . " | ";
+                       }
+                       print $cgi->a({-href => "$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}"}, $tag{'reftype'});
+                       if ($tag{'reftype'} eq "commit") {
+                             print " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}"}, "shortlog") .
+                                   " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'refid'}"}, "log");
+                       }
+                       print "</td>\n" .
+                             "</tr>";
+               }
+       }
+       print "</table\n>";
+       git_footer_html();
+}
+
+sub git_heads {
+       my $head = git_read_hash("$project/HEAD");
+       git_header_html();
+       print "<div class=\"page_nav\">\n" .
+             $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$head"}, "commit") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$head"}, "commitdiff") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;hb=$head"}, "tree") . "<br/>\n" .

              "<br/>\n" .
              "</div>\n";
              "<br/>\n" .
              "</div>\n";

+       my $taglist = git_read_refs("refs/heads");
+       print "<div>\n" .
+             $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, "&nbsp;") .
+             "</div>\n";
+       print "<table cellspacing=\"0\">\n";
+       my $alternate = 0;
+       if (defined @$taglist) {
+               foreach my $entry (@$taglist) {
+                       my %tag = %$entry;
+                       if ($alternate) {
+                               print "<tr class=\"dark\">\n";
+                       } else {
+                               print "<tr class=\"light\">\n";
+                       }
+                       $alternate ^= 1;
+                       print "<td><i>$tag{'age'}</i></td>\n" .
+                             "<td>" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}", -class => "list"}, "<b>" . escapeHTML($tag{'name'}) . "</b>") .
+                             "</td>\n" .
+                             "<td class=\"link\">" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}"}, "shortlog") .
+                             " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'name'}"}, "log") .
+                             "</td>\n" .
+                             "</tr>";
+               }
+       }
+       print "</table\n>";

        git_footer_html();
 }
 
 sub git_get_hash_by_path {
        my $base = shift;
        git_footer_html();
 }
 
 sub git_get_hash_by_path {
        my $base = shift;

-       my $path = shift;
+       my $path = shift || return undef;

 
        my $tree = $base;
        my @parts = split '/', $path;
        while (my $part = shift @parts) {
 
        my $tree = $base;
        my @parts = split '/', $path;
        while (my $part = shift @parts) {

-               open my $fd, "-|", "$gitbin/git-ls-tree $tree" || die_error(undef, "Open git-ls-tree failed.");
+               open my $fd, "-|", "$gitbin/git-ls-tree $tree" or die_error(undef, "Open git-ls-tree failed.");

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

-               close $fd || return undef;
+               close $fd or return undef;

                foreach my $line (@entries) {
                        #'100644        blob    0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa        panic.c'
                foreach my $line (@entries) {
                        #'100644        blob    0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa        panic.c'

-                       $line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
+                       $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;

                        my $t_mode = $1;
                        my $t_type = $2;
                        my $t_hash = $3;
                        my $t_mode = $1;
                        my $t_type = $2;
                        my $t_hash = $3;


@@ -640,23 +1278,26 @@ sub git_get_hash_by_path {
 
 sub git_blob {
        if (!defined $hash && defined $file_name) {
 
 sub git_blob {
        if (!defined $hash && defined $file_name) {

-               my $base = $hash_base || git_read_head($project);
+               my $base = $hash_base || git_read_hash("$project/HEAD");

                $hash = git_get_hash_by_path($base, $file_name, "blob");
        }
                $hash = git_get_hash_by_path($base, $file_name, "blob");
        }

-       open my $fd, "-|", "$gitbin/git-cat-file blob $hash" || die_error(undef, "Open failed.");
-       my $base = $file_name || "";
+       open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or die_error(undef, "Open failed.");

        git_header_html();
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
                print "<div class=\"page_nav\">\n" .
        git_header_html();
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
                print "<div class=\"page_nav\">\n" .

-                     $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .
+                     $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .

                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") .
                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") .

-                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash_base"}, "tree");
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree") . "<br/>\n";

                if (defined $file_name) {
                if (defined $file_name) {

-                       print " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base;f=$file_name"}, "history");
+                       print $cgi->a({-href => "$my_uri?p=$project;a=blob_plain;h=$hash;f=$file_name"}, "plain") . "<br/>\n";
+               } else {
+                       print $cgi->a({-href => "$my_uri?p=$project;a=blob_plain;h=$hash"}, "plain") . "<br/>\n";

                }
                }

-               print "<br/><br/>\n" .
-                     "</div>\n";
-               print "<div>" .
+               print "</div>\n".
+                      "<div>" .

                      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base", -class => "title"}, escapeHTML($co{'title'})) .
                      "</div>\n";
        } else {
                      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base", -class => "title"}, escapeHTML($co{'title'})) .
                      "</div>\n";
        } else {


@@ -665,33 +1306,53 @@ sub git_blob {
                      "<div class=\"title\">$hash</div>\n";
        }
        if (defined $file_name) {
                      "<div class=\"title\">$hash</div>\n";
        }
        if (defined $file_name) {

-               print "<div class=\"page_path\">/$file_name</div>\n";
+               print "<div class=\"page_path\"><b>$file_name</b></div>\n";

        }
        print "<div class=\"page_body\">\n";
        my $nr;
        while (my $line = <$fd>) {
                chomp $line;
                $nr++;
        }
        print "<div class=\"page_body\">\n";
        my $nr;
        while (my $line = <$fd>) {
                chomp $line;
                $nr++;

-               print "<div class=\"pre\">";
-               printf "<span style=\"color:#999999;\">%4i</span>", $nr;
-               print " " .escapeHTML($line) . "</div>\n";
+               while ((my $pos = index($line, "\t")) != -1) {
+                       if (my $count = (8 - ($pos % 8))) {
+                               my $spaces = ' ' x $count;
+                               $line =~ s/\t/$spaces/;
+                       }
+               }
+               printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n", $nr, $nr, $nr, escapeHTML($line);

        }
        }

-       close $fd || print "Reading blob failed.\n";
+       close $fd or print "Reading blob failed.\n";

        print "</div>";
        git_footer_html();
 }
 
        print "</div>";
        git_footer_html();
 }
 

+sub git_blob_plain {
+       my $save_as = "$hash.txt";
+       if (defined $file_name) {
+               $save_as = $file_name;
+       }
+       print $cgi->header(-type => "text/plain", -charset => 'utf-8', '-content-disposition' => "inline; filename=\"$save_as\"");
+       open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or return;
+       undef $/;
+       print <$fd>;
+       $/ = "\n";
+       close $fd;
+}
+

 sub git_tree {
        if (!defined $hash) {
 sub git_tree {
        if (!defined $hash) {

-               $hash = git_read_head($project);
+               $hash = git_read_hash("$project/HEAD");

                if (defined $file_name) {
                if (defined $file_name) {

-                       my $base = $hash_base || git_read_head($project);
+                       my $base = $hash_base || git_read_hash("$project/HEAD");

                        $hash = git_get_hash_by_path($base, $file_name, "tree");
                }
                        $hash = git_get_hash_by_path($base, $file_name, "tree");
                }

+               if (!defined $hash_base) {
+                       $hash_base = git_read_hash("$project/HEAD");
+               }

        }
        }

-       open my $fd, "-|", "$gitbin/git-ls-tree $hash" || die_error(undef, "Open git-ls-tree failed.");
+       open my $fd, "-|", "$gitbin/git-ls-tree $hash" or die_error(undef, "Open git-ls-tree failed.");

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

-       close $fd || die_error(undef, "Reading tree failed.");
+       close $fd or die_error(undef, "Reading tree failed.");

 
        git_header_html();
        my $base_key = "";
 
        git_header_html();
        my $base_key = "";


@@ -700,9 +1361,12 @@ sub git_tree {
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
                $base_key = ";hb=$hash_base";
                print "<div class=\"page_nav\">\n" .
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
                $base_key = ";hb=$hash_base";
                print "<div class=\"page_nav\">\n" .

-                     $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") . " | " .
-                     $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") . " | " .
-                     $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash_base"}, "tree") .
+                     $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash_base"}, "shortlog") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash_base"}, "log") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") .
+                     " | tree" .

                      "<br/><br/>\n" .
                      "</div>\n";
                print "<div>\n" .
                      "<br/><br/>\n" .
                      "</div>\n";
                print "<div>\n" .


@@ -715,31 +1379,42 @@ sub git_tree {
        }
        if (defined $file_name) {
                $base = "$file_name/";
        }
        if (defined $file_name) {
                $base = "$file_name/";

-               print "<div class=\"page_path\">/$file_name</div>\n";
+               print "<div class=\"page_path\"><b>/$file_name</b></div>\n";

        } else {
        } else {

-               print "<div class=\"page_path\">/</div>\n";
+               print "<div class=\"page_path\"><b>/</b></div>\n";

        }
        print "<div class=\"page_body\">\n";
        print "<table cellspacing=\"0\">\n";
        }
        print "<div class=\"page_body\">\n";
        print "<table cellspacing=\"0\">\n";

+       my $alternate = 0;

        foreach my $line (@entries) {
                #'100644        blob    0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa        panic.c'
        foreach my $line (@entries) {
                #'100644        blob    0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa        panic.c'

-               $line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
+               $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;

                my $t_mode = $1;
                my $t_type = $2;
                my $t_hash = $3;
                my $t_name = $4;
                $file_key = ";f=$base$t_name";
                my $t_mode = $1;
                my $t_type = $2;
                my $t_hash = $3;
                my $t_name = $4;
                $file_key = ";f=$base$t_name";

-               print "<tr>\n" .
-                     "<td class=\"pre\">" . mode_str($t_mode) . "</td>\n";
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               print "<td style=\"font-family:monospace\">" . mode_str($t_mode) . "</td>\n";

                if ($t_type eq "blob") {
                if ($t_type eq "blob") {

-                       print "<td class=\"pre\">$t_name</td>\n";
-                       print "<td class=\"link\">" .
+                       print "<td class=\"list\">" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash" . $base_key . $file_key, -class => "list"}, $t_name) .
+                             "</td>\n" .
+                             "<td class=\"link\">" .

                              $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash" . $base_key . $file_key}, "blob") .
                              " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base" . $file_key}, "history") .
                              "</td>\n";
                } elsif ($t_type eq "tree") {
                              $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash" . $base_key . $file_key}, "blob") .
                              " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base" . $file_key}, "history") .
                              "</td>\n";
                } elsif ($t_type eq "tree") {

-                       print "<td class=\"pre\">" .
+                       print "<td class=\"list\">" .

                              $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash" . $base_key . $file_key}, $t_name) .
                              $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash" . $base_key . $file_key}, $t_name) .

+                             "</td>\n" .
+                             "<td class=\"link\">" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash" . $base_key . $file_key}, "tree") .

                              "</td>\n";
                }
                print "</tr>\n";
                              "</td>\n";
                }
                print "</tr>\n";


@@ -750,72 +1425,150 @@ sub git_tree {
 }
 
 sub git_rss {
 }
 
 sub git_rss {

-       open my $fd, "-|", "$gitbin/git-rev-list --max-count=20 " . git_read_head($project) || die_error(undef, "Open failed.");
+       # http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
+       open my $fd, "-|", "$gitbin/git-rev-list --max-count=150 " . git_read_hash("$project/HEAD") or die_error(undef, "Open failed.");

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

-       close $fd || die_error(undef, "Reading rev-list failed.");
-
+       close $fd or die_error(undef, "Reading rev-list failed.");

        print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
        print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".
        print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
        print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".

-             "<rss version=\"0.91\">\n";
+             "<rss version=\"2.0\" xmlns:content=\"http://purl.org/rss/1.0/modules/content/\">\n";

        print "<channel>\n";
        print "<title>$project</title>\n".
        print "<channel>\n";
        print "<title>$project</title>\n".

-             "<link> " . $my_url . "/$project/log</link>\n".
+             "<link>" . escapeHTML("$my_url?p=$project;a=summary") . "</link>\n".

              "<description>$project log</description>\n".
              "<language>en</language>\n";
 
              "<description>$project log</description>\n".
              "<language>en</language>\n";
 

-       foreach my $commit (@revlist) {
+       for (my $i = 0; $i <= $#revlist; $i++) {
+               my $commit = $revlist[$i];

                my %co = git_read_commit($commit);
                my %co = git_read_commit($commit);

-               my %ad = date_str($co{'author_epoch'});
+               # we read 150, we always show 30 and the ones more recent than 48 hours
+               if (($i >= 20) && ((time - $co{'committer_epoch'}) > 48*60*60)) {
+                       last;
+               }
+               my %cd = date_str($co{'committer_epoch'});
+               open $fd, "-|", "$gitbin/git-diff-tree -r $co{'parent'} $co{'id'}" or next;
+               my @difftree = map { chomp; $_ } <$fd>;
+               close $fd or next;

                print "<item>\n" .
                print "<item>\n" .

-                     "\t<title>" . sprintf("%d %s %02d:%02d", $ad{'mday'}, $ad{'month'}, $ad{'hour'}, $ad{'minute'}) . " - " . escapeHTML($co{'title'}) . "</title>\n" .
-                     "\t<link> " . $my_url . "?p=$project;a=commit;h=$commit</link>\n" .
-                     "\t<description>";
+                     "<title>" .
+                     sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . escapeHTML($co{'title'}) .
+                     "</title>\n" .
+                     "<author>" . escapeHTML($co{'author'}) . "</author>\n" .
+                     "<pubDate>$cd{'rfc2822'}</pubDate>\n" .
+                     "<guid isPermaLink=\"true\">" . escapeHTML("$my_url?p=$project;a=commit;h=$commit") . "</guid>\n" .
+                     "<link>" . escapeHTML("$my_url?p=$project;a=commit;h=$commit") . "</link>\n" .
+                     "<description>" . escapeHTML($co{'title'}) . "</description>\n" .
+                     "<content:encoded>" .
+                     "<![CDATA[\n";

                my $comment = $co{'comment'};
                foreach my $line (@$comment) {
                my $comment = $co{'comment'};
                foreach my $line (@$comment) {

-                       print escapeHTML($line) . "<br/>\n";
+                       print "$line<br/>\n";

                }
                }

-               print "\t</description>\n" .
+               print "<br/>\n";
+               foreach my $line (@difftree) {
+                       if (!($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)([0-9]{0,3})\t(.*)$/)) {
+                               next;
+                       }
+                       my $file = $7;
+                       print "$file<br/>\n";
+               }
+               print "]]>\n" .
+                     "</content:encoded>\n" .

                      "</item>\n";
        }
        print "</channel></rss>";
 }
 
                      "</item>\n";
        }
        print "</channel></rss>";
 }
 

-sub git_log {
-       my $head = git_read_head($project);
-       my $limit_option = "";
-       if (!defined $time_back) {
-               $limit_option = "--max-count=10";
-       } elsif ($time_back > 0) {
-               my $date = time - $time_back*24*60*60;
-               $limit_option = "--max-age=$date";
-       }
-       open my $fd, "-|", "$gitbin/git-rev-list $limit_option $head" || die_error(undef, "Open failed.");
-       my (@revlist) = map { chomp; $_ } <$fd>;
-       close $fd || die_error(undef, "Reading rev-list failed.");
+sub git_opml {
+       my @list = git_read_projects();

 
 

+       print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
+       print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".
+             "<opml version=\"1.0\">\n".
+             "<head>".
+             "  <title>Git OPML Export</title>\n".
+             "</head>\n".
+             "<body>\n".
+             "<outline text=\"git RSS feeds\">\n";
+
+       foreach my $pr (@list) {
+               my %proj = %$pr;
+               my $head = git_read_hash("$proj{'path'}/HEAD");
+               if (!defined $head) {
+                       next;
+               }
+               $ENV{'GIT_DIR'} = "$projectroot/$proj{'path'}";
+               my %co = git_read_commit($head);
+               if (!%co) {
+                       next;
+               }
+
+               my $path = escapeHTML(chop_str($proj{'path'}, 25, 5));
+               my $rss =  "$my_url?p=$proj{'path'};a=rss";
+               my $html =  "$my_url?p=$proj{'path'};a=summary";
+               print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n";
+       }
+       print "</outline>\n".
+             "</body>\n".
+             "</opml>\n";
+}
+
+sub git_log {
+       my $head = git_read_hash("$project/HEAD");
+       if (!defined $hash) {
+               $hash = $head;
+       }
+       if (!defined $page) {
+               $page = 0;
+       }

        git_header_html();
        print "<div class=\"page_nav\">\n";
        git_header_html();
        print "<div class=\"page_nav\">\n";

-       print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last 10") . " | " .
-             $cgi->a({-href => "$my_uri?p=$project;a=log;t=1"}, "day") . " | " .
-             $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | " .
-             $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | " .
-             $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | " .
-             $cgi->a({-href => "$my_uri?p=$project;a=log;t=0"}, "all") . "<br/>\n";
-       print "<br/><br/>\n" .
-             "</div>\n";
+       print $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash"}, "shortlog") .
+             " | log" .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash;hb=$hash"}, "tree") . "<br/>\n";
+
+       my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
+       open my $fd, "-|", "$gitbin/git-rev-list $limit $hash" or die_error(undef, "Open failed.");
+       my (@revlist) = map { chomp; $_ } <$fd>;
+       close $fd;

 
 

+       if ($hash ne $head || $page) {
+               print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "HEAD");
+       } else {
+               print "HEAD";
+       }
+       if ($page > 0) {
+               print " &sdot; " .
+               $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash;pg=" . ($page-1), -accesskey => "p", -title => "Alt-p"}, "prev");
+       } else {
+               print " &sdot; prev";
+       }
+       if ($#revlist >= (100 * ($page+1)-1)) {
+               print " &sdot; " .
+               $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash;pg=" . ($page+1), -accesskey => "n", -title => "Alt-n"}, "next");
+       } else {
+               print " &sdot; next";
+       }
+       print "<br/>\n" .
+             "</div>\n";

        if (!@revlist) {
        if (!@revlist) {

-               my %co = git_read_commit($head);
-               print "<div class=\"page_body\"> Last change " . $co{'age_string'} . ".<br/><br/></div>\n";
+               print "<div>\n" .
+                     $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, "&nbsp;") .
+                     "</div>\n";
+               my %co = git_read_commit($hash);
+               print "<div class=\"page_body\"> Last change $co{'age_string'}.<br/><br/></div>\n";

        }
        }

-
-       foreach my $commit (@revlist) {
+       for (my $i = ($page * 100); $i <= $#revlist; $i++) {
+               my $commit = $revlist[$i];

                my %co = git_read_commit($commit);
                next if !%co;
                my %ad = date_str($co{'author_epoch'});
                print "<div>\n" .
                      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "title"},
                my %co = git_read_commit($commit);
                next if !%co;
                my %ad = date_str($co{'author_epoch'});
                print "<div>\n" .
                      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "title"},

-                     "<span class=\"log_age\">" . $co{'age_string'} . "</span>" . escapeHTML($co{'title'})) . "\n" .
+                     "<span class=\"age\">$co{'age_string'}</span>" . escapeHTML($co{'title'})) . "\n" .

                      "</div>\n";
                print "<div class=\"title_text\">\n" .
                      "<div class=\"log_link\">\n" .
                      "</div>\n";
                print "<div class=\"title_text\">\n" .
                      "<div class=\"log_link\">\n" .


@@ -823,13 +1576,13 @@ sub git_log {
                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") .
                      "<br/>\n" .
                      "</div>\n" .
                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") .
                      "<br/>\n" .
                      "</div>\n" .

-                     "<i>" . escapeHTML($co{'author_name'}) .  " [" . $ad{'rfc2822'} . "]</i><br/>\n" .
+                     "<i>" . escapeHTML($co{'author_name'}) .  " [$ad{'rfc2822'}]</i><br/>\n" .

                      "</div>\n" .
                      "<div class=\"log_body\">\n";
                my $comment = $co{'comment'};
                my $empty = 0;
                foreach my $line (@$comment) {
                      "</div>\n" .
                      "<div class=\"log_body\">\n";
                my $comment = $co{'comment'};
                my $empty = 0;
                foreach my $line (@$comment) {

-                       if ($line =~ m/^(signed[ \-]off[\-]by[ :]|acked[\-]by[ \:]|cc[ :])/i) {
+                       if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {

                                next;
                        }
                        if ($line eq "") {
                                next;
                        }
                        if ($line eq "") {


@@ -840,7 +1593,7 @@ sub git_log {
                        } else {
                                $empty = 0;
                        }
                        } else {
                                $empty = 0;
                        }

-                       print escapeHTML($line) . "<br/>\n";
+                       print format_log_line_html($line) . "<br/>\n";

                }
                if (!$empty) {
                        print "<br/>\n";
                }
                if (!$empty) {
                        print "<br/>\n";


@@ -859,23 +1612,31 @@ sub git_commit {
        my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
 
        my @difftree;
        my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
 
        my @difftree;

-       if (defined $co{'parent'}) {
-               open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash" || die_error(undef, "Open failed.");
-               @difftree = map { chomp; $_ } <$fd>;
-               close $fd || die_error(undef, "Reading diff-tree failed.");
-       } else {
-               # fake git-diff-tree output for initial revision
-               open my $fd, "-|", "$gitbin/git-ls-tree -r $hash" || die_error(undef, "Open failed.");
-               @difftree = map { chomp;  "+" . $_ } <$fd>;
-               close $fd || die_error(undef, "Reading ls-tree failed.");
+       my $root = "";
+       my $parent = $co{'parent'};
+       if (!defined $parent) {
+               $root = " --root";
+               $parent = "";

        }
        }

-       git_header_html();
+       open my $fd, "-|", "$gitbin/git-diff-tree -r -M $root $parent $hash" or die_error(undef, "Open failed.");
+       @difftree = map { chomp; $_ } <$fd>;
+       close $fd or die_error(undef, "Reading diff-tree failed.");
+
+       # non-textual hash id's can be cached
+       my $expires;
+       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               $expires = "+1d";
+       }
+       git_header_html(undef, $expires);

        print "<div class=\"page_nav\">\n" .
        print "<div class=\"page_nav\">\n" .

-             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit");
+             $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash"}, "shortlog") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash"}, "log") .
+             " | commit";

        if (defined $co{'parent'}) {
                print " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff");
        }
        if (defined $co{'parent'}) {
                print " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff");
        }

-       print " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash"}, "tree") . "\n" .
+       print " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") . "\n" .

              "<br/><br/></div>\n";
        if (defined $co{'parent'}) {
                print "<div>\n" .
              "<br/><br/></div>\n";
        if (defined $co{'parent'}) {
                print "<div>\n" .


@@ -883,28 +1644,42 @@ sub git_commit {
                      "</div>\n";
        } else {
                print "<div>\n" .
                      "</div>\n";
        } else {
                print "<div>\n" .

-                     $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
+                     $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .

                      "</div>\n";
        }
        print "<div class=\"title_text\">\n" .
              "<table cellspacing=\"0\">\n";
        print "<tr><td>author</td><td>" . escapeHTML($co{'author'}) . "</td></tr>\n".
                      "</div>\n";
        }
        print "<div class=\"title_text\">\n" .
              "<table cellspacing=\"0\">\n";
        print "<tr><td>author</td><td>" . escapeHTML($co{'author'}) . "</td></tr>\n".

-             "<tr><td></td><td> " . $ad{'rfc2822'};
+             "<tr>" .
+             "<td></td><td> $ad{'rfc2822'}";

        if ($ad{'hour_local'} < 6) {
                printf(" (<span style=\"color: #cc0000;\">%02d:%02d</span> %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
        } else {
                printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
        }
        if ($ad{'hour_local'} < 6) {
                printf(" (<span style=\"color: #cc0000;\">%02d:%02d</span> %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
        } else {
                printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
        }

-       print "</td></tr>\n";
+       print "</td>" .
+             "</tr>\n";

        print "<tr><td>committer</td><td>" . escapeHTML($co{'committer'}) . "</td></tr>\n";
        print "<tr><td>committer</td><td>" . escapeHTML($co{'committer'}) . "</td></tr>\n";

-       print "<tr><td></td><td> " . $cd{'rfc2822'} . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "</td></tr>\n";
-       print "<tr><td>commit</td><td style=\"font-family: monospace;\">$hash</td></tr>\n";
-       print "<tr><td>tree</td><td style=\"font-family: monospace;\">" .
-             $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=" . $hash}, $co{'tree'}) . "</td></tr>\n";
+       print "<tr><td></td><td> $cd{'rfc2822'}" . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "</td></tr>\n";
+       print "<tr><td>commit</td><td style=\"font-family:monospace\">$co{'id'}</td></tr>\n";
+       print "<tr>" .
+             "<td>tree</td>" .
+             "<td style=\"font-family:monospace\">" .
+             $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash", class => "list"}, $co{'tree'}) .
+             "</td>" .
+             "<td class=\"link\">" . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") .
+             "</td>" .
+             "</tr>\n";

        my $parents  = $co{'parents'};
        foreach my $par (@$parents) {
        my $parents  = $co{'parents'};
        foreach my $par (@$parents) {

-               print "<tr><td>parent</td><td style=\"font-family: monospace;\">" .
-                     $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "</td></tr>\n";
+               print "<tr>" .
+                     "<td>parent</td>" .
+                     "<td style=\"font-family:monospace\">" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par", class => "list"}, $par) . "</td>" .
+                     "<td class=\"link\">" .
+                     $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, "commit") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash;hp=$par"}, "commitdiff") .
+                     "</td>" .
+                     "</tr>\n";

        }
        print "</table>". 
              "</div>\n";
        }
        print "</table>". 
              "</div>\n";


@@ -922,12 +1697,12 @@ sub git_commit {
                } else {
                        $empty = 0;
                }
                } else {
                        $empty = 0;
                }

-               if ($line =~ m/^(signed[ \-]off[\-]by[ :]|acked[\-]by[ \:]|cc[ :])/i) {
+               if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {

                        $signed = 1;
                        print "<span style=\"color: #888888\">" . escapeHTML($line) . "</span><br/>\n";
                } else {
                        $signed = 0;
                        $signed = 1;
                        print "<span style=\"color: #888888\">" . escapeHTML($line) . "</span><br/>\n";
                } else {
                        $signed = 0;

-                       print escapeHTML($line) . "<br/>\n";
+                       print format_log_line_html($line) . "<br/>\n";

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


@@ -936,96 +1711,112 @@ sub git_commit {
                print(($#difftree + 1) . " files changed:\n");
        }
        print "</div>\n";
                print(($#difftree + 1) . " files changed:\n");
        }
        print "</div>\n";

+       print "<table cellspacing=\"0\">\n";
+       my $alternate = 0;

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

-               # '*100644->100644      blob    9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596      net/ipv4/route.c'
-               # '+100644      blob    4a83ab6cd565d21ab0385bac6643826b83c2fcd4        arch/arm/lib/bitops.h'
-               # '*100664->100644      blob    b1a8e3dd5556b61dd771d32307c6ee5d7150fa43->b1a8e3dd5556b61dd771d32307c6ee5d7150fa43      show-files.c'
-               # '*100664->100644      blob    d08e895238bac36d8220586fdc28c27e1a7a76d3->d08e895238bac36d8220586fdc28c27e1a7a76d3      update-cache.c'
-               $line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
-               my $op = $1;
-               my $mode = $2;
-               my $type = $3;
-               my $id = $4;
-               my $file = $5;
-               if ($type eq "blob") {
-                       if ($op eq "+") {
-                               my $mode_chng = "";
-                               if (S_ISREG(oct $mode)) {
-                                       $mode_chng = sprintf(" with mode: %04o", (oct $mode) & 0777);
+               # ':100644 100644 03b218260e99b78c6df0ed378e59ed9205ccc96d 3b93d5e7cc7f7dd4ebed13a5cc1a4ad976fc94d8 M      ls-files.c'
+               # ':100644 100644 7f9281985086971d3877aca27704f2aaf9c448ce bc190ebc71bbd923f2b728e505408f5e54bd073a M      rev-tree.c'
+               if (!($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)([0-9]{0,3})\t(.*)$/)) {
+                       next;
+               }
+               my $from_mode = $1;
+               my $to_mode = $2;
+               my $from_id = $3;
+               my $to_id = $4;
+               my $status = $5;
+               my $similarity = $6;
+               my $file = $7;
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               if ($status eq "A") {
+                       my $mode_chng = "";
+                       if (S_ISREG(oct $to_mode)) {
+                               $mode_chng = sprintf(" with mode: %04o", (oct $to_mode) & 0777);
+                       }
+                       print "<td>" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file", -class => "list"}, escapeHTML($file)) . "</td>\n" .
+                             "<td><span style=\"color: #008000;\">[new " . file_type($to_mode) . "$mode_chng]</span></td>\n" .
+                             "<td class=\"link\">" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, "blob") . "</td>\n";
+               } elsif ($status eq "D") {
+                       print "<td>" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file", -class => "list"}, escapeHTML($file)) . "</td>\n" .
+                             "<td><span style=\"color: #c00000;\">[deleted " . file_type($from_mode). "]</span></td>\n" .
+                             "<td class=\"link\">" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file"}, "blob") .
+                             " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") .
+                             "</td>\n"
+               } elsif ($status eq "M" || $status eq "T") {
+                       my $mode_chnge = "";
+                       if ($from_mode != $to_mode) {
+                               $mode_chnge = " <span style=\"color: #777777;\">[changed";
+                               if (((oct $from_mode) & S_IFMT) != ((oct $to_mode) & S_IFMT)) {
+                                       $mode_chnge .= " from " . file_type($from_mode) . " to " . file_type($to_mode);

                                }
                                }

-                               print "<div class=\"list\">\n" .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"},
-                                     escapeHTML($file) . " <span style=\"color: #008000;\">[new " . file_type($mode) . $mode_chng . "]</span>") . "\n" .
-                                     "</div>\n";
-                               print "<div class=\"link\">\n" .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "blob") . "\n" .
-                                     "</div>\n";
-                       } elsif ($op eq "-") {
-                               print "<div class=\"list\">\n" .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"},
-                                     escapeHTML($file) .  " <span style=\"color: #c00000;\">[deleted " . file_type($mode) . "]</span>") . "\n" .
-                                     "</div>";
-                               print "<div class=\"link\">\n" .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "blob") . " | " .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "\n" .
-                                     "</div>\n";
-                       } elsif ($op eq "*") {
-                               $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
-                               my $from_id = $1;
-                               my $to_id = $2;
-                               $mode =~ m/^([0-7]{6})->([0-7]{6})$/;
-                               my $from_mode = $1;
-                               my $to_mode = $2;
-                               my $mode_chnge = "";
-                               if ($from_mode != $to_mode) {
-                                       $mode_chnge = " <span style=\"color: #888888;\">[changed";
-                                       if (((oct $from_mode) & S_IFMT) != ((oct $to_mode) & S_IFMT)) {
-                                               $mode_chnge .= " from " . file_type($from_mode) . " to " . file_type($to_mode);
-                                       }
-                                       if (((oct $from_mode) & 0777) != ((oct $to_mode) & 0777)) {
-                                               if (S_ISREG($from_mode) && S_ISREG($to_mode)) {
-                                                       $mode_chnge .= sprintf(" mode: %04o->%04o", (oct $from_mode) & 0777, (oct $to_mode) & 0777);
-                                               } elsif (S_ISREG($to_mode)) {
-                                                       $mode_chnge .= sprintf(" mode: %04o", (oct $to_mode) & 0777);
-                                               }
+                               if (((oct $from_mode) & 0777) != ((oct $to_mode) & 0777)) {
+                                       if (S_ISREG($from_mode) && S_ISREG($to_mode)) {
+                                               $mode_chnge .= sprintf(" mode: %04o->%04o", (oct $from_mode) & 0777, (oct $to_mode) & 0777);
+                                       } elsif (S_ISREG($to_mode)) {
+                                               $mode_chnge .= sprintf(" mode: %04o", (oct $to_mode) & 0777);

                                        }
                                        }

-                                       $mode_chnge .= "]</span>\n";

                                }
                                }

-                               print "<div class=\"list\">\n";
-                               if ($to_id ne $from_id) {
-                                       print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file"},
-                                             escapeHTML($file) . $mode_chnge) . "\n" .
-                                             "</div>\n";
-                               } else {
-                                       print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"},
-                                             escapeHTML($file) . $mode_chnge) . "\n" .
-                                             "</div>\n";
-                               }
-                               print "<div class=\"link\">\n";
-                               if ($to_id ne $from_id) {
-                                       print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file"}, "diff") . " | ";
-                               }
-                               print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, "blob") . " | " .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "\n" .
-                                     "</div>\n";
+                               $mode_chnge .= "]</span>\n";
+                       }
+                       print "<td>";
+                       if ($to_id ne $from_id) {
+                               print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file", -class => "list"}, escapeHTML($file));
+                       } else {
+                               print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file", -class => "list"}, escapeHTML($file));

                        }
                        }

+                       print "</td>\n" .
+                             "<td>$mode_chnge</td>\n" .
+                             "<td class=\"link\">";
+                       print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, "blob");
+                       if ($to_id ne $from_id) {
+                               print " | " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file"}, "diff");
+                       }
+                       print " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "\n";
+                       print "</td>\n";
+               } elsif ($status eq "R") {
+                       my ($from_file, $to_file) = split "\t", $file;
+                       my $mode_chng = "";
+                       if ($from_mode != $to_mode) {
+                               $mode_chng = sprintf(", mode: %04o", (oct $to_mode) & 0777);
+                       }
+                       print "<td>" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file", -class => "list"}, escapeHTML($to_file)) . "</td>\n" .
+                             "<td><span style=\"color: #777777;\">[moved from " .
+                             $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$from_file", -class => "list"}, escapeHTML($from_file)) .
+                             " with " . (int $similarity) . "% similarity$mode_chng]</span></td>\n" .
+                             "<td class=\"link\">" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file"}, "blob");
+                       if ($to_id ne $from_id) {
+                               print " | " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$to_file"}, "diff");
+                       }
+                       print "</td>\n";

                }
                }

+               print "</tr>\n";

        }
        }

+       print "</table>\n";

        git_footer_html();
 }
 
 sub git_blobdiff {
        git_footer_html();
 }
 
 sub git_blobdiff {

-       mkdir($gittmp, 0700);
+       mkdir($git_temp, 0700);

        git_header_html();
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
                print "<div class=\"page_nav\">\n" .
        git_header_html();
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
                print "<div class=\"page_nav\">\n" .

-                     $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .
+                     $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .

                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") .
                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") .

-                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash_base"}, "tree");
-                       if (defined $file_name) {
-                               print " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base;f=$file_name"}, "history");
-                       }
-               print "<br/><br/>\n" .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree") .
+                     "<br/>\n";
+               print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff_plain;h=$hash;hp=$hash_parent"}, "plain") .

                      "</div>\n";
                print "<div>\n" .
                      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
                      "</div>\n";
                print "<div>\n" .
                      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base", -class => "title"}, escapeHTML($co{'title'})) . "\n" .


@@ -1036,9 +1827,7 @@ sub git_blobdiff {
                      "<div class=\"title\">$hash vs $hash_parent</div>\n";
        }
        if (defined $file_name) {
                      "<div class=\"title\">$hash vs $hash_parent</div>\n";
        }
        if (defined $file_name) {

-               print "<div class=\"page_path\">\n" .
-                     "/$file_name\n" .
-                     "</div>\n";
+               print "<div class=\"page_path\"><b>/$file_name</b></div>\n";

        }
        print "<div class=\"page_body\">\n" .
              "<div class=\"diff_info\">blob:" .
        }
        print "<div class=\"page_body\">\n" .
              "<div class=\"diff_info\">blob:" .


@@ -1046,65 +1835,101 @@ sub git_blobdiff {
              " -> blob:" .
              $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name"}, $hash) .
              "</div>\n";
              " -> blob:" .
              $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name"}, $hash) .
              "</div>\n";

-       git_diff_html($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash);
+       git_diff_print($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash);

        print "</div>";
        git_footer_html();
 }
 
        print "</div>";
        git_footer_html();
 }
 

+sub git_blobdiff_plain {
+       mkdir($git_temp, 0700);
+       print $cgi->header(-type => "text/plain", -charset => 'utf-8');
+       git_diff_print($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash, "plain");
+}
+

 sub git_commitdiff {
 sub git_commitdiff {

-       mkdir($gittmp, 0700);
+       mkdir($git_temp, 0700);

        my %co = git_read_commit($hash);
        if (!%co) {
                die_error(undef, "Unknown commit object.");
        }
        my %co = git_read_commit($hash);
        if (!%co) {
                die_error(undef, "Unknown commit object.");
        }

-       open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash" || die_error(undef, "Open failed.");
+       if (!defined $hash_parent) {
+               $hash_parent = $co{'parent'};
+       }
+       open my $fd, "-|", "$gitbin/git-diff-tree -r $hash_parent $hash" or die_error(undef, "Open failed.");

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

-       close $fd || die_error(undef, "Reading diff-tree failed.");
+       close $fd or die_error(undef, "Reading diff-tree failed.");

 
 

-       git_header_html();
+       # non-textual hash id's can be cached
+       my $expires;
+       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               $expires = "+1d";
+       }
+       git_header_html(undef, $expires);

        print "<div class=\"page_nav\">\n" .
        print "<div class=\"page_nav\">\n" .

-             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | \n" .
-             $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff") . " | \n" .
-             $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" .  $co{'tree'} . ";hb=$hash"}, "tree") . "\n" .
-             "<br/><br/></div>\n";
+             $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash"}, "shortlog") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash"}, "log") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") .
+             " | commitdiff" .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") . "<br/>\n";
+       print $cgi->a({-href => "$my_uri?p=$project;a=commitdiff_plain;h=$hash;hp=$hash_parent"}, "plain") . "\n" .
+             "</div>\n";

        print "<div>\n" .
              $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
              "</div>\n";
        print "<div class=\"page_body\">\n";
        print "<div>\n" .
              $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
              "</div>\n";
        print "<div class=\"page_body\">\n";

+       my $comment = $co{'comment'};
+       my $empty = 0;
+       my $signed = 0;
+       my @log = @$comment;
+       # remove first and empty lines after that
+       shift @log;
+       while (defined $log[0] && $log[0] eq "") {
+               shift @log;
+       }
+       foreach my $line (@log) {
+               if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
+                       next;
+               }
+               if ($line eq "") {
+                       if ($empty) {
+                               next;
+                       }
+                       $empty = 1;
+               } else {
+                       $empty = 0;
+               }
+               print format_log_line_html($line) . "<br/>\n";
+       }
+       print "<br/>\n";

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

-               # '*100644->100644      blob    8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154      Makefile'
-               $line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
-               my $op = $1;
-               my $mode = $2;
-               my $type = $3;
-               my $id = $4;
-               my $file = $5;
-               if ($type eq "blob") {
-                       if ($op eq "+") {
-                               print "<div class=\"diff_info\">" .  file_type($mode) . ":" .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, $id) . "(new)" .
-                                     "</div>\n";
-                               git_diff_html(undef, "/dev/null", $id, "b/$file");
-                       } elsif ($op eq "-") {
-                               print "<div class=\"diff_info\">" . file_type($mode) . ":" .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, $id) . "(deleted)" .
-                                     "</div>\n";
-                               git_diff_html($id, "a/$file", undef, "/dev/null");
-                       } elsif ($op eq "*") {
-                               $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
-                               my $from_id = $1;
-                               my $to_id = $2;
-                               $mode =~ m/([0-7]+)->([0-7]+)/;
-                               my $from_mode = $1;
-                               my $to_mode = $2;
-                               if ($from_id ne $to_id) {
-                                       print "<div class=\"diff_info\">" .
-                                             file_type($from_mode) . ":" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file"}, $from_id) .
-                                             " -> " .
-                                             file_type($to_mode) . ":" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, $to_id);
-                                       print "</div>\n";
-                                       git_diff_html($from_id, "a/$file",  $to_id, "b/$file");
-                               }
+               # ':100644 100644 03b218260e99b78c6df0ed378e59ed9205ccc96d 3b93d5e7cc7f7dd4ebed13a5cc1a4ad976fc94d8 M      ls-files.c'
+               # ':100644 100644 7f9281985086971d3877aca27704f2aaf9c448ce bc190ebc71bbd923f2b728e505408f5e54bd073a M      rev-tree.c'
+               $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/;
+               my $from_mode = $1;
+               my $to_mode = $2;
+               my $from_id = $3;
+               my $to_id = $4;
+               my $status = $5;
+               my $file = $6;
+               if ($status eq "A") {
+                       print "<div class=\"diff_info\">" .  file_type($to_mode) . ":" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, $to_id) . "(new)" .
+                             "</div>\n";
+                       git_diff_print(undef, "/dev/null", $to_id, "b/$file");
+               } elsif ($status eq "D") {
+                       print "<div class=\"diff_info\">" . file_type($from_mode) . ":" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file"}, $from_id) . "(deleted)" .
+                             "</div>\n";
+                       git_diff_print($from_id, "a/$file", undef, "/dev/null");
+               } elsif ($status eq "M") {
+                       if ($from_id ne $to_id) {
+                               print "<div class=\"diff_info\">" .
+                                     file_type($from_mode) . ":" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file"}, $from_id) .
+                                     " -> " .
+                                     file_type($to_mode) . ":" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, $to_id);
+                               print "</div>\n";
+                               git_diff_print($from_id, "a/$file",  $to_id, "b/$file");

                        }
                }
        }
                        }
                }
        }


@@ -1113,9 +1938,69 @@ sub git_commitdiff {
        git_footer_html();
 }
 
        git_footer_html();
 }
 

+sub git_commitdiff_plain {
+       mkdir($git_temp, 0700);
+       open my $fd, "-|", "$gitbin/git-diff-tree -r $hash_parent $hash" or die_error(undef, "Open failed.");
+       my (@difftree) = map { chomp; $_ } <$fd>;
+       close $fd or die_error(undef, "Reading diff-tree failed.");
+
+       # try to figure out the next tag after this commit
+       my $tagname;
+       my %taghash;
+       my $tags = git_read_refs("refs/tags");
+       foreach my $entry (@$tags) {
+               my %tag = %$entry;
+               $taghash{$tag{'refid'}} = $tag{'name'};
+       }
+       open $fd, "-|", "$gitbin/git-rev-list HEAD";
+       while (my $commit = <$fd>) {
+               chomp $commit;
+               if ($taghash{$commit}) {
+                       $tagname = $taghash{$commit};
+               }
+               if ($commit eq $hash) {
+                       last;
+               }
+       }
+       close $fd;
+
+       print $cgi->header(-type => "text/plain", -charset => 'utf-8', '-content-disposition' => "inline; filename=\"git-$hash.patch\"");
+       my %co = git_read_commit($hash);
+       my %ad = date_str($co{'author_epoch'}, $co{'author_tz'});
+       my $comment = $co{'comment'};
+       print "From: $co{'author'}\n" .
+             "Date: $ad{'rfc2822'} ($ad{'tz_local'})\n".
+             "Subject: $co{'title'}\n";
+       if (defined $tagname) {
+             print "X-Git-Tag: $tagname\n";
+       }
+       print "X-Git-Url: $my_url?p=$project;a=commitdiff;h=$hash\n" .
+             "\n";
+
+       foreach my $line (@$comment) {;
+               print "  $line\n";
+       }
+       print "---\n\n";
+
+       foreach my $line (@difftree) {
+               $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/;
+               my $from_id = $3;
+               my $to_id = $4;
+               my $status = $5;
+               my $file = $6;
+               if ($status eq "A") {
+                       git_diff_print(undef, "/dev/null", $to_id, "b/$file", "plain");
+               } elsif ($status eq "D") {
+                       git_diff_print($from_id, "a/$file", undef, "/dev/null", "plain");
+               } elsif ($status eq "M") {
+                       git_diff_print($from_id, "a/$file",  $to_id, "b/$file", "plain");
+               }
+       }
+}
+

 sub git_history {
        if (!defined $hash) {
 sub git_history {
        if (!defined $hash) {

-               $hash = git_read_head($project);
+               $hash = git_read_hash("$project/HEAD");

        }
        my %co = git_read_commit($hash);
        if (!%co) {
        }
        my %co = git_read_commit($hash);
        if (!%co) {


@@ -1123,52 +2008,289 @@ sub git_history {
        }
        git_header_html();
        print "<div class=\"page_nav\">\n" .
        }
        git_header_html();
        print "<div class=\"page_nav\">\n" .

-             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | " .
-             $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff") . " | " .
-             $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash"}, "tree") .
+             $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") .

              "<br/><br/>\n" .
              "</div>\n";
        print "<div>\n" .
              $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
              "</div>\n";
              "<br/><br/>\n" .
              "</div>\n";
        print "<div>\n" .
              $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
              "</div>\n";

-       print "<div class=\"page_path\">\n" .
-             "/$file_name<br/>\n";
-       print "</div>\n";
+       print "<div class=\"page_path\"><b>/$file_name</b><br/></div>\n";
+

        open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin $file_name";
        my $commit;
        open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin $file_name";
        my $commit;

+       print "<table cellspacing=\"0\">\n";
+       my $alternate = 0;

        while (my $line = <$fd>) {
        while (my $line = <$fd>) {

-               if ($line =~ m/^([0-9a-fA-F]{40}) /){
+               if ($line =~ m/^([0-9a-fA-F]{40})/){

                        $commit = $1;
                        next;
                }
                        $commit = $1;
                        next;
                }

-               if ($line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/ && (defined $commit)) {
-                       my $type = $3;
-                       my $file = $5;
-                       if ($file ne $file_name || $type ne "blob") {
-                               next;
-                       }
+               if ($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/ && (defined $commit)) {

                        my %co = git_read_commit($commit);
                        if (!%co) {
                                next;
                        }
                        my %co = git_read_commit($commit);
                        if (!%co) {
                                next;
                        }

-                       print "<div class=\"list\">\n" .
-                             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"},
-                             "<span class=\"log_age\">" . $co{'age_string'} . "</span>" . escapeHTML($co{'title'})) . "\n" .
-                             "</div>\n";
-                       print "<div class=\"link\">\n" .
+                       if ($alternate) {
+                               print "<tr class=\"dark\">\n";
+                       } else {
+                               print "<tr class=\"light\">\n";
+                       }
+                       $alternate ^= 1;
+                       print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
+                             "<td><i>" . escapeHTML(chop_str($co{'author_name'}, 15, 3)) . "</i></td>\n" .
+                             "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, "<b>" .
+                             escapeHTML(chop_str($co{'title'}, 50)) . "</b>") . "</td>\n" .
+                             "<td class=\"link\">" .

                              $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") .
                              $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") .

-                             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" .  $co{'tree'} . ";hb=$commit"}, "tree") .
-                             " | " . $cgi->a({-href => "$my_uri?p=$project;a=blob;hb=$commit;f=" . $file}, "blob");
+                             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") .
+                             " | " . $cgi->a({-href => "$my_uri?p=$project;a=blob;hb=$commit;f=$file_name"}, "blob");

                        my $blob = git_get_hash_by_path($hash, $file_name);
                        my $blob_parent = git_get_hash_by_path($commit, $file_name);
                        if (defined $blob && defined $blob_parent && $blob ne $blob_parent) {
                        my $blob = git_get_hash_by_path($hash, $file_name);
                        my $blob_parent = git_get_hash_by_path($commit, $file_name);
                        if (defined $blob && defined $blob_parent && $blob ne $blob_parent) {

-                               print " | " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$blob;hp=$blob_parent;hb=$commit;f=" . $file}, "diff");
+                               print " | " .
+                               $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$blob;hp=$blob_parent;hb=$commit;f=$file_name"},
+                               "diff to current");

                        }
                        }

-                       print "<br/>\n" .
-                             "</div>\n";
+                       print "</td>\n" .
+                             "</tr>\n";

                        undef $commit;
                }
        }
                        undef $commit;
                }
        }

+       print "</table>\n";
+       close $fd;
+       git_footer_html();
+}
+
+sub git_search {
+       if (!defined $searchtext) {
+               die_error("", "Text field empty.");
+       }
+       if (!defined $hash) {
+               $hash = git_read_hash("$project/HEAD");
+       }
+       my %co = git_read_commit($hash);
+       if (!%co) {
+               die_error(undef, "Unknown commit object.");
+       }
+       # pickaxe may take all resources of your box and run for several minutes
+       # with every query - so decide by yourself how public you make this feature :)
+       my $commit_search = 1;
+       my $author_search = 0;
+       my $committer_search = 0;
+       my $pickaxe_search = 0;
+       if ($searchtext =~ s/^author\\://i) {
+               $author_search = 1;
+       } elsif ($searchtext =~ s/^committer\\://i) {
+               $committer_search = 1;
+       } elsif ($searchtext =~ s/^pickaxe\\://i) {
+               $commit_search = 0;
+               $pickaxe_search = 1;
+       }
+       git_header_html();
+       print "<div class=\"page_nav\">\n" .
+             $cgi->a({-href => "$my_uri?p=$project;a=summary;h=$hash"}, "summary") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash"}, "log") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") .
+             "<br/><br/>\n" .
+             "</div>\n";
+
+       print "<div>\n" .
+             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
+             "</div>\n";
+       print "<table cellspacing=\"0\">\n";
+       my $alternate = 0;
+       if ($commit_search) {
+               $/ = "\0";
+               open my $fd, "-|", "$gitbin/git-rev-list --header --parents $hash" or next;
+               while (my $commit_text = <$fd>) {
+                       if (!grep m/$searchtext/i, $commit_text) {
+                               next;
+                       }
+                       if ($author_search && !grep m/\nauthor .*$searchtext/i, $commit_text) {
+                               next;
+                       }
+                       if ($committer_search && !grep m/\ncommitter .*$searchtext/i, $commit_text) {
+                               next;
+                       }
+                       my @commit_lines = split "\n", $commit_text;
+                       my %co = git_read_commit(undef, \@commit_lines);
+                       if (!%co) {
+                               next;
+                       }
+                       if ($alternate) {
+                               print "<tr class=\"dark\">\n";
+                       } else {
+                               print "<tr class=\"light\">\n";
+                       }
+                       $alternate ^= 1;
+                       print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
+                             "<td><i>" . escapeHTML(chop_str($co{'author_name'}, 15, 5)) . "</i></td>\n" .
+                             "<td>" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$co{'id'}", -class => "list"}, "<b>" . escapeHTML(chop_str($co{'title'}, 50)) . "</b><br/>");
+                       my $comment = $co{'comment'};
+                       foreach my $line (@$comment) {
+                               if ($line =~ m/^(.*)($searchtext)(.*)$/i) {
+                                       my $lead = escapeHTML($1) || "";
+                                       $lead = chop_str($lead, 30, 10);
+                                       my $match = escapeHTML($2) || "";
+                                       my $trail = escapeHTML($3) || "";
+                                       $trail = chop_str($trail, 30, 10);
+                                       my $text = "$lead<span style=\"color:#e00000\">$match</span>$trail";
+                                       print chop_str($text, 80, 5) . "<br/>\n";
+                               }
+                       }
+                       print "</td>\n" .
+                             "<td class=\"link\">" .
+                             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$co{'id'}"}, "commit") .
+                             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$co{'id'}"}, "tree");
+                       print "</td>\n" .
+                             "</tr>\n";
+               }
+               close $fd;
+       }
+
+       if ($pickaxe_search) {
+               $/ = "\n";
+               open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin -S$searchtext";
+               undef %co;
+               my @files;
+               while (my $line = <$fd>) {
+                       if (%co && $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/) {
+                               my %set;
+                               $set{'file'} = $6;
+                               $set{'from_id'} = $3;
+                               $set{'to_id'} = $4;
+                               $set{'id'} = $set{'to_id'};
+                               if ($set{'id'} =~ m/0{40}/) {
+                                       $set{'id'} = $set{'from_id'};
+                               }
+                               if ($set{'id'} =~ m/0{40}/) {
+                                       next;
+                               }
+                               push @files, \%set;
+                       } elsif ($line =~ m/^([0-9a-fA-F]{40})$/){
+                               if (%co) {
+                                       if ($alternate) {
+                                               print "<tr class=\"dark\">\n";
+                                       } else {
+                                               print "<tr class=\"light\">\n";
+                                       }
+                                       $alternate ^= 1;
+                                       print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
+                                             "<td><i>" . escapeHTML(chop_str($co{'author_name'}, 15, 5)) . "</i></td>\n" .
+                                             "<td>" .
+                                             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$co{'id'}", -class => "list"}, "<b>" .
+                                             escapeHTML(chop_str($co{'title'}, 50)) . "</b><br/>");
+                                       while (my $setref = shift @files) {
+                                               my %set = %$setref;
+                                               print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$set{'id'};hb=$co{'id'};f=$set{'file'}", class => "list"},
+                                                     "<span style=\"color:#e00000\">" . escapeHTML($set{'file'}) . "</span>") .
+                                                     "<br/>\n";
+                                       }
+                                       print "</td>\n" .
+                                             "<td class=\"link\">" .
+                                             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$co{'id'}"}, "commit") .
+                                             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$co{'id'}"}, "tree");
+                                       print "</td>\n" .
+                                             "</tr>\n";
+                               }
+                               %co = git_read_commit($1);
+                       }
+               }
+               close $fd;
+       }
+       print "</table>\n";
+       git_footer_html();
+}
+
+sub git_shortlog {
+       my $head = git_read_hash("$project/HEAD");
+       if (!defined $hash) {
+               $hash = $head;
+       }
+       if (!defined $page) {
+               $page = 0;
+       }
+       git_header_html();
+       print "<div class=\"page_nav\">\n" .
+             $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+             " | shortlog" .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash"}, "log") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff") .
+             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash;hb=$hash"}, "tree") . "<br/>\n";
+
+       my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
+       open my $fd, "-|", "$gitbin/git-rev-list $limit $hash" or die_error(undef, "Open failed.");
+       my (@revlist) = map { chomp; $_ } <$fd>;

        close $fd;
        close $fd;

+
+       if ($hash ne $head || $page) {
+               print $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "HEAD");
+       } else {
+               print "HEAD";
+       }
+       if ($page > 0) {
+               print " &sdot; " .
+               $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page-1), -accesskey => "p", -title => "Alt-p"}, "prev");
+       } else {
+               print " &sdot; prev";
+       }
+       if ($#revlist >= (100 * ($page+1)-1)) {
+               print " &sdot; " .
+               $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page+1), -accesskey => "n", -title => "Alt-n"}, "next");
+       } else {
+               print " &sdot; next";
+       }
+       print "<br/>\n" .
+             "</div>\n";
+       print "<div>\n" .
+             $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, "&nbsp;") .
+             "</div>\n";
+       print "<table cellspacing=\"0\">\n";
+       my $alternate = 0;
+       for (my $i = ($page * 100); $i <= $#revlist; $i++) {
+               my $commit = $revlist[$i];
+               my %co = git_read_commit($commit);
+               my %ad = date_str($co{'author_epoch'});
+               if ($alternate) {
+                       print "<tr class=\"dark\">\n";
+               } else {
+                       print "<tr class=\"light\">\n";
+               }
+               $alternate ^= 1;
+               print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
+                     "<td><i>" . escapeHTML(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
+                     "<td>";
+               if (length($co{'title_short'}) < length($co{'title'})) {
+                       print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list", -title => "$co{'title'}"},
+                             "<b>" . escapeHTML($co{'title_short'}) . "</b>");
+               } else {
+                       print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"},
+                             "<b>" . escapeHTML($co{'title_short'}) . "</b>");
+               }
+               print "</td>\n" .
+                     "<td class=\"link\">" .
+                     $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") .
+                     " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") .
+                     "</td>\n" .
+                     "</tr>";
+       }
+       if ($#revlist >= (100 * ($page+1)-1)) {
+               print "<tr>\n" .
+                     "<td>" .
+                     $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page+1), -title => "Alt-n"}, "next") .
+                     "</td>\n" .
+                     "</tr>\n";
+       }
+       print "</table\n>";

        git_footer_html();
 }
        git_footer_html();
 }