gitweb: Show project descriptions with utf-8 characters in project list correctly
[gitweb.git] / gitweb / gitweb.cgi
index ea21fbe88a9455c80fd88f4f510fd928638b68e5..673db1f6398f9e2d986cc9a4b8485ccfef0440c1 100755 (executable)
@@ -16,34 +16,56 @@ use Encode;
 use Fcntl ':mode';
 binmode STDOUT, ':utf8';
 
-my $cgi = new CGI;
-my $version =          "267";
-my $my_url =           $cgi->url();
-my $my_uri =           $cgi->url(-absolute => 1);
-my $rss_link =         "";
+our $cgi = new CGI;
+our $version = "267";
+our $my_url = $cgi->url();
+our $my_uri = $cgi->url(-absolute => 1);
+our $rss_link = "";
+
+# core git executable to use
+# this can just be "git" if your webserver has a sensible PATH
+our $GIT = "/usr/bin/git";
 
 # absolute fs-path which will be prepended to the project path
-#my $projectroot =     "/pub/scm";
-my $projectroot =      "/home/kay/public_html/pub/scm";
+#our $projectroot = "/pub/scm";
+our $projectroot = "/home/kay/public_html/pub/scm";
 
-# location of the git-core binaries
-my $gitbin =           "/usr/bin";
+# version of the core git binary
+our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
 
 # location for temporary files needed for diffs
-my $git_temp =         "/tmp/gitweb";
+our $git_temp = "/tmp/gitweb";
+if (! -d $git_temp) {
+       mkdir($git_temp, 0700) || die_error("Couldn't mkdir $git_temp");
+}
 
 # target of the home link on top of all pages
-my $home_link =                $my_uri;
+our $home_link = $my_uri;
+
+# name of your site or organization to appear in page titles
+# replace this with something more descriptive for clearer bookmarks
+our $site_name = $ENV{'SERVER_NAME'} || "Untitled";
 
 # html text to include at home page
-my $home_text =                "indextext.html";
+our $home_text = "indextext.html";
+
+# URI of default stylesheet
+our $stylesheet = "gitweb.css";
 
 # source of projects list
-#my $projects_list =   $projectroot;
-my $projects_list =    "index/index.aux";
+#our $projects_list = $projectroot;
+our $projects_list = "index/index.aux";
+
+# default blob_plain mimetype and default charset for text/plain blob
+our $default_blob_plain_mimetype = 'text/plain';
+our $default_text_plain_charset  = undef;
+
+# file to use for guessing MIME types before trying /etc/mime.types
+# (relative to the current git repository)
+our $mimetypes_file = undef;
 
 # input validation and dispatch
-my $action = $cgi->param('a');
+our $action = $cgi->param('a');
 if (defined $action) {
        if ($action =~ m/[^0-9a-zA-Z\.\-_]/) {
                undef $action;
@@ -58,7 +80,7 @@ if (defined $action) {
        }
 }
 
-my $order = $cgi->param('o');
+our $order = $cgi->param('o');
 if (defined $order) {
        if ($order =~ m/[^0-9a-zA-Z_]/) {
                undef $order;
@@ -66,8 +88,9 @@ if (defined $order) {
        }
 }
 
-my $project = $cgi->param('p');
+our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
 if (defined $project) {
+       $project =~ s|^/||; $project =~ s|/$||;
        $project = validate_input($project);
        if (!defined($project)) {
                die_error(undef, "Invalid project parameter.");
@@ -81,14 +104,14 @@ if (defined $project) {
                die_error(undef, "No such project.");
        }
        $rss_link = "<link rel=\"alternate\" title=\"" . esc_param($project) . " log\" href=\"" .
-                   "$my_uri?" . esc_param("p=$project;a=rss") . "\" type=\"application/rss+xml\"/>";
+                   "$my_uri?" . esc_param("p=$project;a=rss") . "\" type=\"application/rss+xml\"/>";
        $ENV{'GIT_DIR'} = "$projectroot/$project";
 } else {
        git_project_list();
        exit;
 }
 
-my $file_name = $cgi->param('f');
+our $file_name = $cgi->param('f');
 if (defined $file_name) {
        $file_name = validate_input($file_name);
        if (!defined($file_name)) {
@@ -96,7 +119,7 @@ if (defined $file_name) {
        }
 }
 
-my $hash = $cgi->param('h');
+our $hash = $cgi->param('h');
 if (defined $hash) {
        $hash = validate_input($hash);
        if (!defined($hash)) {
@@ -104,7 +127,7 @@ if (defined $hash) {
        }
 }
 
-my $hash_parent = $cgi->param('hp');
+our $hash_parent = $cgi->param('hp');
 if (defined $hash_parent) {
        $hash_parent = validate_input($hash_parent);
        if (!defined($hash_parent)) {
@@ -112,7 +135,7 @@ if (defined $hash_parent) {
        }
 }
 
-my $hash_base = $cgi->param('hb');
+our $hash_base = $cgi->param('hb');
 if (defined $hash_base) {
        $hash_base = validate_input($hash_base);
        if (!defined($hash_base)) {
@@ -120,7 +143,7 @@ if (defined $hash_base) {
        }
 }
 
-my $page = $cgi->param('pg');
+our $page = $cgi->param('pg');
 if (defined $page) {
        if ($page =~ m/[^0-9]$/) {
                undef $page;
@@ -128,7 +151,7 @@ if (defined $page) {
        }
 }
 
-my $searchtext = $cgi->param('s');
+our $searchtext = $cgi->param('s');
 if (defined $searchtext) {
        if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
                undef $searchtext;
@@ -203,6 +226,9 @@ if (!defined $action || $action eq "summary") {
 } elsif ($action eq "tag") {
        git_tag();
        exit;
+} elsif ($action eq "blame") {
+       git_blame2();
+       exit;
 } else {
        undef $action;
        die_error(undef, "Unknown action.");
@@ -224,6 +250,7 @@ sub esc_html {
        my $str = shift;
        $str = decode("utf8", $str, Encode::FB_DEFAULT);
        $str = escapeHTML($str);
+       $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
        return $str;
 }
 
@@ -237,88 +264,59 @@ sub unquote {
        return $str;
 }
 
+# CSS class for given age value (in seconds)
+sub age_class {
+       my $age = shift;
+
+       if ($age < 60*60*2) {
+               return "age0";
+       } elsif ($age < 60*60*24*2) {
+               return "age1";
+       } else {
+               return "age2";
+       }
+}
+
 sub git_header_html {
        my $status = shift || "200 OK";
        my $expires = shift;
 
-       my $title = "git";
+       my $title = "$site_name git";
        if (defined $project) {
                $title .= " - $project";
                if (defined $action) {
                        $title .= "/$action";
+                       if (defined $file_name) {
+                               $title .= " - $file_name";
+                               if ($action eq "tree" && $file_name !~ m|/$|) {
+                                       $title .= "/";
+                               }
+                       }
                }
        }
-       print $cgi->header(-type=>'text/html',  -charset => 'utf-8', -status=> $status, -expires => $expires);
+       my $content_type;
+       # require explicit support from the UA if we are to send the page as
+       # 'application/xhtml+xml', otherwise send it as plain old 'text/html'.
+       # we have to do this because MSIE sometimes globs '*/*', pretending to
+       # support xhtml+xml but choking when it gets what it asked for.
+       if ($cgi->http('HTTP_ACCEPT') =~ m/(,|;|\s|^)application\/xhtml\+xml(,|;|\s|$)/ && $cgi->Accept('application/xhtml+xml') != 0) {
+               $content_type = 'application/xhtml+xml';
+       } else {
+               $content_type = 'text/html';
+       }
+       print $cgi->header(-type=>$content_type, -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-2006, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke -->
+<!-- git core binaries version $git_version -->
 <head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+<meta http-equiv="content-type" content="$content_type; charset=utf-8"/>
 <meta name="robots" content="index, nofollow"/>
 <title>$title</title>
+<link rel="stylesheet" type="text/css" href="$stylesheet"/>
 $rss_link
-<style type="text/css">
-body {
-       font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px;
-       margin:10px; background-color:#ffffff; color:#000000;
-}
-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, 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_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.title, a.title {
-       display:block; padding:6px 8px;
-       font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
-}
-a.title:hover { background-color: #d9d8d1; }
-div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; }
-div.log_body { padding:8px 8px 8px 150px; }
-span.age { position:relative; float:left; width:142px; font-style:italic; }
-div.log_link {
-       padding:0px 8px;
-       font-size:10px; font-family:sans-serif; font-style:normal;
-       position:relative; float:left; width:136px;
-}
-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.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;
-       text-align:center; text-decoration:none;
-}
-a.rss_logo:hover { background-color:#ee5500; }
-span.tag {
-       padding:0px 4px; font-size:10px; font-weight:normal;
-       background-color:#ffffaa; border:1px solid; border-color:#ffffcc #ffee00 #ffee00 #ffffcc;
-}
-</style>
 </head>
 <body>
 EOF
@@ -337,10 +335,12 @@ EOF
                        $searchtext = "";
                }
                my $search_hash;
-               if (defined $hash) {
+               if (defined $hash_base) {
+                       $search_hash = $hash_base;
+               } elsif (defined $hash) {
                        $search_hash = $hash;
                } else {
-                       $search_hash  = "HEAD";
+                       $search_hash = "HEAD";
                }
                $cgi->param("a", "search");
                $cgi->param("h", $search_hash);
@@ -374,7 +374,7 @@ sub git_footer_html {
 
 sub die_error {
        my $status = shift || "403 Forbidden";
-       my $error = shift || "Malformed query, file missing or permission denied"; 
+       my $error = shift || "Malformed query, file missing or permission denied";
 
        git_header_html($status);
        print "<div class=\"page_body\">\n" .
@@ -386,10 +386,44 @@ sub die_error {
        exit;
 }
 
+sub git_page_nav {
+       my ($current, $suppress, $head, $treehead, $treebase, $extra) = @_;
+       $extra = '' if !defined $extra; # pager or formats
+
+       my @navs = qw(summary shortlog log commit commitdiff tree);
+       if ($suppress) {
+               @navs = grep { $_ ne $suppress } @navs;
+       }
+
+       my %arg = map { $_, ''} @navs;
+       if (defined $head) {
+               for (qw(commit commitdiff)) {
+                       $arg{$_} = ";h=$head";
+               }
+               if ($current =~ m/^(tree | log | shortlog | commit | commitdiff | search)$/x) {
+                       for (qw(shortlog log)) {
+                               $arg{$_} = ";h=$head";
+                       }
+               }
+       }
+       $arg{tree} .= ";h=$treehead" if defined $treehead;
+       $arg{tree} .= ";hb=$treebase" if defined $treebase;
+
+       print "<div class=\"page_nav\">\n" .
+               (join " | ",
+                map { $_ eq $current
+                                        ? $_
+                                        : $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$_$arg{$_}")}, "$_")
+                                }
+                @navs);
+       print "<br/>$extra<br/>\n" .
+             "</div>\n";
+}
+
 sub git_get_type {
        my $hash = shift;
 
-       open my $fd, "-|", "$gitbin/git-cat-file -t $hash" or return;
+       open my $fd, "-|", $GIT, "cat-file", '-t', $hash or return;
        my $type = <$fd>;
        close $fd or return;
        chomp $type;
@@ -401,7 +435,7 @@ sub git_read_head {
        my $oENV = $ENV{'GIT_DIR'};
        my $retval = undef;
        $ENV{'GIT_DIR'} = "$projectroot/$project";
-       if (open my $fd, "-|", "$gitbin/git-rev-parse", "--verify", "HEAD") {
+       if (open my $fd, "-|", $GIT, "rev-parse", "--verify", "HEAD") {
                my $head = <$fd>;
                close $fd;
                if (defined $head && $head =~ /^([0-9a-fA-F]{40})$/) {
@@ -441,7 +475,7 @@ sub git_read_tag {
        my %tag;
        my @comment;
 
-       open my $fd, "-|", "$gitbin/git-cat-file tag $tag_id" or return;
+       open my $fd, "-|", $GIT, "cat-file", "tag", $tag_id or return;
        $tag{'id'} = $tag_id;
        while (my $line = <$fd>) {
                chomp $line;
@@ -513,7 +547,7 @@ sub git_read_commit {
                @commit_lines = @$commit_text;
        } else {
                $/ = "\0";
-               open my $fd, "-|", "$gitbin/git-rev-list --header --parents --max-count=1 $commit_id" or return;
+               open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", "--max-count=1", $commit_id or return;
                @commit_lines = split '\n', <$fd>;
                close $fd or return;
                $/ = "\n";
@@ -611,7 +645,7 @@ sub git_diff_print {
        if (defined $from) {
                $from_tmp = "$git_temp/gitweb_" . $$ . "_from";
                open my $fd2, "> $from_tmp";
-               open my $fd, "-|", "$gitbin/git-cat-file blob $from";
+               open my $fd, "-|", $GIT, "cat-file", "blob", $from;
                my @file = <$fd>;
                print $fd2 @file;
                close $fd2;
@@ -622,7 +656,7 @@ sub git_diff_print {
        if (defined $to) {
                $to_tmp = "$git_temp/gitweb_" . $$ . "_to";
                open my $fd2, "> $to_tmp";
-               open my $fd, "-|", "$gitbin/git-cat-file blob $to";
+               open my $fd, "-|", $GIT, "cat-file", "blob", $to;
                my @file = <$fd>;
                print $fd2 @file;
                close $fd2;
@@ -636,15 +670,15 @@ sub git_diff_print {
                $/ = "\n";
        } else {
                while (my $line = <$fd>) {
-                       chomp($line);
+                       chomp $line;
                        my $char = substr($line, 0, 1);
-                       my $color = "";
+                       my $diff_class = "";
                        if ($char eq '+') {
-                               $color = " style=\"color:#008800;\"";
+                               $diff_class = " add";
                        } elsif ($char eq "-") {
-                               $color = " style=\"color:#cc0000;\"";
+                               $diff_class = " rem";
                        } elsif ($char eq "@") {
-                               $color = " style=\"color:#990099;\"";
+                               $diff_class = " chunk_header";
                        } elsif ($char eq "\\") {
                                # skip errors
                                next;
@@ -655,7 +689,7 @@ sub git_diff_print {
                                        $line =~ s/\t/$spaces/;
                                }
                        }
-                       print "<div class=\"pre\"$color>" . esc_html($line) . "</div>\n";
+                       print "<div class=\"diff$diff_class\">" . esc_html($line) . "</div>\n";
                }
        }
        close $fd;
@@ -796,7 +830,7 @@ sub git_read_projects {
        if (-d $projects_list) {
                # search in directory
                my $dir = $projects_list;
-               opendir my $dh, $dir or return undef;
+               opendir my ($dh), $dir or return undef;
                while (my $dir = readdir($dh)) {
                        if (-e "$projectroot/$dir/HEAD") {
                                my $pr = {
@@ -811,7 +845,7 @@ sub git_read_projects {
                # '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;
+               open my ($fd), $projects_list or return undef;
                while (my $line = <$fd>) {
                        chomp $line;
                        my ($path, $owner) = split ' ', $line;
@@ -834,6 +868,25 @@ sub git_read_projects {
        return @list;
 }
 
+sub git_get_project_config {
+       my $key = shift;
+
+       return unless ($key);
+       $key =~ s/^gitweb\.//;
+       return if ($key =~ m/\W/);
+
+       my $val = qx($GIT repo-config --get gitweb.$key);
+       return ($val);
+}
+
+sub git_get_project_config_bool {
+       my $val = git_get_project_config (@_);
+       if ($val and $val =~ m/true|yes|on/) {
+               return (1);
+       }
+       return; # implicit false
+}
+
 sub git_project_list {
        my @list = git_read_projects();
        my @projects;
@@ -868,7 +921,7 @@ sub git_project_list {
                close $fd;
                print "</div>\n";
        }
-       print "<table cellspacing=\"0\">\n" .
+       print "<table class=\"project_list\">\n" .
              "<tr>\n";
        if (!defined($order) || (defined($order) && ($order eq "project"))) {
                @projects = sort {$a->{'path'} cmp $b->{'path'}} @projects;
@@ -905,17 +958,9 @@ sub git_project_list {
                }
                $alternate ^= 1;
                print "<td>" . $cgi->a({-href => "$my_uri?" . esc_param("p=$pr->{'path'};a=summary"), -class => "list"}, esc_html($pr->{'path'})) . "</td>\n" .
-                     "<td>$pr->{'descr'}</td>\n" .
+                     "<td>" . esc_html($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" .
+               print "<td class=\"". age_class($pr->{'commit'}{'age'}) . "\">" . $pr->{'commit'}{'age_string'} . "</td>\n" .
                      "<td class=\"link\">" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$pr->{'path'};a=summary")}, "summary") .
                      " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$pr->{'path'};a=shortlog")}, "shortlog") .
@@ -934,7 +979,7 @@ sub read_info_ref {
        # c39ae07f393806ccf406ef966e9a15afc43cc36a      refs/tags/v2.6.11^{}
        open my $fd, "$projectroot/$project/info/refs" or return;
        while (my $line = <$fd>) {
-               chomp($line);
+               chomp $line;
                if ($line =~ m/^([0-9a-fA-F]{40})\t.*$type\/([^\^]+)/) {
                        if (defined $refs{$1}) {
                                $refs{$1} .= " / $2";
@@ -1037,23 +1082,16 @@ sub git_summary {
 
        my $refs = read_info_ref();
        git_header_html();
-       print "<div class=\"page_nav\">\n" .
-             "summary".
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "shortlog") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "log") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$head")}, "commit") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$head")}, "commitdiff") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree")}, "tree") .
-             "<br/><br/>\n" .
-             "</div>\n";
+       git_page_nav('summary','', $head);
        print "<div class=\"title\">&nbsp;</div>\n";
        print "<table cellspacing=\"0\">\n" .
              "<tr><td>description</td><td>" . esc_html($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_head($project) or die_error(undef, "Open failed.");
-       my (@revlist) = map { chomp; $_ } <$fd>;
+       open my $fd, "-|", $GIT, "rev-list", "--max-count=17", git_read_head($project)
+               or die_error(undef, "Open git-rev-list failed.");
+       my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
        print "<div>\n" .
              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog"), -class => "title"}, "shortlog") .
@@ -1080,7 +1118,7 @@ sub git_summary {
                              "<td>";
                        if (length($co{'title_short'}) < length($co{'title'})) {
                                print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list", -title => "$co{'title'}"},
-                                     "<b>" . esc_html($co{'title_short'}) . "$ref</b>");
+                                     "<b>" . esc_html($co{'title_short'}) . "$ref</b>");
                        } else {
                                print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"},
                                      "<b>" . esc_html($co{'title'}) . "$ref</b>");
@@ -1128,17 +1166,17 @@ sub git_summary {
                                      "</td>\n" .
                                      "<td>";
                                if (defined($comment)) {
-                                     print $cgi->a({-class => "list", -href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, $comment);
+                                       print $cgi->a({-class => "list", -href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, esc_html($comment));
                                }
                                print "</td>\n" .
                                      "<td class=\"link\">";
                                if ($tag{'type'} eq "tag") {
-                                     print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | ";
+                                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | ";
                                }
                                print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'});
                                if ($tag{'reftype'} eq "commit") {
-                                     print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
-                                           " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log");
+                                       print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
+                                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log");
                                }
                                print "</td>\n" .
                                      "</tr>";
@@ -1189,18 +1227,24 @@ sub git_summary {
        git_footer_html();
 }
 
+sub git_print_page_path {
+       my $name = shift;
+       my $type = shift;
+
+       if (!defined $name) {
+               print "<div class=\"page_path\"><b>/</b></div>\n";
+       } elsif ($type =~ "blob") {
+               print "<div class=\"page_path\"><b>" .
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;f=$file_name")}, esc_html($name)) . "</b><br/></div>\n";
+       } else {
+               print "<div class=\"page_path\"><b>" . esc_html($name) . "</b><br/></div>\n";
+       }
+}
+
 sub git_tag {
        my $head = git_read_head($project);
        git_header_html();
-       print "<div class=\"page_nav\">\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "shortlog") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "log") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$head")}, "commit") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$head")}, "commitdiff") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;hb=$head")}, "tree") . "<br/>\n" .
-             "<br/>\n" .
-             "</div>\n";
+       git_page_nav('','', $head,undef,$head);
        my %tag = git_read_tag($hash);
        print "<div>\n" .
              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($tag{'name'})) . "\n" .
@@ -1228,18 +1272,164 @@ sub git_tag {
        git_footer_html();
 }
 
+sub git_blame2 {
+       my $fd;
+       my $ftype;
+       die_error(undef, "Permission denied.") if (!git_get_project_config_bool ('blame'));
+       die_error('404 Not Found', "File name not defined") if (!$file_name);
+       $hash_base ||= git_read_head($project);
+       die_error(undef, "Reading commit failed") unless ($hash_base);
+       my %co = git_read_commit($hash_base)
+               or die_error(undef, "Reading commit failed");
+       if (!defined $hash) {
+               $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
+                       or die_error(undef, "Error looking up file");
+       }
+       $ftype = git_get_type($hash);
+       if ($ftype !~ "blob") {
+               die_error("400 Bad Request", "object is not a blob");
+       }
+       open ($fd, "-|", $GIT, "blame", '-l', $file_name, $hash_base)
+               or die_error(undef, "Open git-blame failed.");
+       git_header_html();
+       my $formats_nav =
+               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
+               " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;f=$file_name")}, "head");
+       git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
+       print "<div>" .
+             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
+             "</div>\n";
+       git_print_page_path($file_name, $ftype);
+       my @rev_color = (qw(light dark));
+       my $num_colors = scalar(@rev_color);
+       my $current_color = 0;
+       my $last_rev;
+       print "<div class=\"page_body\">\n";
+       print "<table class=\"blame\">\n";
+       print "<tr><th>Commit</th><th>Line</th><th>Data</th></tr>\n";
+       while (<$fd>) {
+               /^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
+               my $full_rev = $1;
+               my $rev = substr($full_rev, 0, 8);
+               my $lineno = $2;
+               my $data = $3;
+
+               if (!defined $last_rev) {
+                       $last_rev = $full_rev;
+               } elsif ($last_rev ne $full_rev) {
+                       $last_rev = $full_rev;
+                       $current_color = ++$current_color % $num_colors;
+               }
+               print "<tr class=\"$rev_color[$current_color]\">\n";
+               print "<td class=\"sha1\">" .
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$full_rev;f=$file_name")}, esc_html($rev)) . "</td>\n";
+               print "<td class=\"linenr\"><a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" . esc_html($lineno) . "</a></td>\n";
+               print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
+               print "</tr>\n";
+       }
+       print "</table>\n";
+       print "</div>";
+       close $fd or print "Reading blob failed\n";
+       git_footer_html();
+}
+
+sub git_blame {
+       my $fd;
+       die_error('403 Permission denied', "Permission denied.") if (!git_get_project_config_bool ('blame'));
+       die_error('404 Not Found', "What file will it be, master?") if (!$file_name);
+       $hash_base ||= git_read_head($project);
+       die_error(undef, "Reading commit failed.") unless ($hash_base);
+       my %co = git_read_commit($hash_base)
+               or die_error(undef, "Reading commit failed.");
+       if (!defined $hash) {
+               $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
+                       or die_error(undef, "Error lookup file.");
+       }
+       open ($fd, "-|", $GIT, "annotate", '-l', '-t', '-r', $file_name, $hash_base)
+               or die_error(undef, "Open git-annotate failed.");
+       git_header_html();
+       my $formats_nav =
+               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
+               " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;f=$file_name")}, "head");
+       git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
+       print "<div>" .
+             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
+             "</div>\n";
+       git_print_page_path($file_name);
+       print "<div class=\"page_body\">\n";
+       print <<HTML;
+<table class="blame">
+  <tr>
+    <th>Commit</th>
+    <th>Age</th>
+    <th>Author</th>
+    <th>Line</th>
+    <th>Data</th>
+  </tr>
+HTML
+       my @line_class = (qw(light dark));
+       my $line_class_len = scalar (@line_class);
+       my $line_class_num = $#line_class;
+       while (my $line = <$fd>) {
+               my $long_rev;
+               my $short_rev;
+               my $author;
+               my $time;
+               my $lineno;
+               my $data;
+               my $age;
+               my $age_str;
+               my $age_class;
+
+               chomp $line;
+               $line_class_num = ($line_class_num + 1) % $line_class_len;
+
+               if ($line =~ m/^([0-9a-fA-F]{40})\t\(\s*([^\t]+)\t(\d+) \+\d\d\d\d\t(\d+)\)(.*)$/) {
+                       $long_rev = $1;
+                       $author   = $2;
+                       $time     = $3;
+                       $lineno   = $4;
+                       $data     = $5;
+               } else {
+                       print qq(  <tr><td colspan="5" class="error">Unable to parse: $line</td></tr>\n);
+                       next;
+               }
+               $short_rev  = substr ($long_rev, 0, 8);
+               $age        = time () - $time;
+               $age_str    = age_string ($age);
+               $age_str    =~ s/ /&nbsp;/g;
+               $age_class  = age_class($age);
+               $author     = esc_html ($author);
+               $author     =~ s/ /&nbsp;/g;
+               # escape tabs
+               while ((my $pos = index($data, "\t")) != -1) {
+                       if (my $count = (8 - ($pos % 8))) {
+                               my $spaces = ' ' x $count;
+                               $data =~ s/\t/$spaces/;
+                       }
+               }
+               $data = esc_html ($data);
+
+               print <<HTML;
+  <tr class="$line_class[$line_class_num]">
+    <td class="sha1"><a href="$my_uri?${\esc_param ("p=$project;a=commit;h=$long_rev")}" class="text">$short_rev..</a></td>
+    <td class="$age_class">$age_str</td>
+    <td>$author</td>
+    <td class="linenr"><a id="$lineno" href="#$lineno" class="linenr">$lineno</a></td>
+    <td class="pre">$data</td>
+  </tr>
+HTML
+       } # while (my $line = <$fd>)
+       print "</table>\n\n";
+       close $fd or print "Reading blob failed.\n";
+       print "</div>";
+       git_footer_html();
+}
+
 sub git_tags {
        my $head = git_read_head($project);
        git_header_html();
-       print "<div class=\"page_nav\">\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "shortlog") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "log") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$head")}, "commit") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$head")}, "commitdiff") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;hb=$head")}, "tree") . "<br/>\n" .
-             "<br/>\n" .
-             "</div>\n";
+       git_page_nav('','', $head,undef,$head);
        my $taglist = git_read_refs("refs/tags");
        print "<div>\n" .
              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
@@ -1267,17 +1457,17 @@ sub git_tags {
                              "</td>\n" .
                              "<td>";
                        if (defined($comment)) {
-                             print $cgi->a({-class => "list", -href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, $comment);
+                               print $cgi->a({-class => "list", -href => "$my_uri?" . esc_param("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?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | ";
+                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | ";
                        }
                        print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'});
                        if ($tag{'reftype'} eq "commit") {
-                             print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
-                                   " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log");
+                               print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") .
+                                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$tag{'refid'}")}, "log");
                        }
                        print "</td>\n" .
                              "</tr>";
@@ -1290,15 +1480,7 @@ sub git_tags {
 sub git_heads {
        my $head = git_read_head($project);
        git_header_html();
-       print "<div class=\"page_nav\">\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "shortlog") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "log") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$head")}, "commit") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$head")}, "commitdiff") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;hb=$head")}, "tree") . "<br/>\n" .
-             "<br/>\n" .
-             "</div>\n";
+       git_page_nav('','', $head,undef,$head);
        my $taglist = git_read_refs("refs/heads");
        print "<div>\n" .
              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
@@ -1334,54 +1516,145 @@ sub git_get_hash_by_path {
        my $path = shift || return undef;
 
        my $tree = $base;
-       my @parts = split '/', $path;
-       while (my $part = shift @parts) {
-               open my $fd, "-|", "$gitbin/git-ls-tree $tree" or die_error(undef, "Open git-ls-tree failed.");
-               my (@entries) = map { chomp; $_ } <$fd>;
-               close $fd or return undef;
-               foreach my $line (@entries) {
-                       #'100644        blob    0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa        panic.c'
-                       $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 = validate_input(unquote($4));
-                       if ($t_name eq $part) {
-                               if (!(@parts)) {
-                                       return $t_hash;
-                               }
-                               if ($t_type eq "tree") {
-                                       $tree = $t_hash;
-                               }
-                               last;
-                       }
+
+       open my $fd, "-|", $GIT, "ls-tree", $base, "--", $path
+               or die_error(undef, "Open git-ls-tree failed.");
+       my $line = <$fd>;
+       close $fd or return undef;
+
+       #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
+       $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
+       return $3;
+}
+
+sub mimetype_guess_file {
+       my $filename = shift;
+       my $mimemap = shift;
+       -r $mimemap or return undef;
+
+       my %mimemap;
+       open(MIME, $mimemap) or return undef;
+       while (<MIME>) {
+               my ($mime, $exts) = split(/\t+/);
+               my @exts = split(/\s+/, $exts);
+               foreach my $ext (@exts) {
+                       $mimemap{$ext} = $mime;
+               }
+       }
+       close(MIME);
+
+       $filename =~ /\.(.*?)$/;
+       return $mimemap{$1};
+}
+
+sub mimetype_guess {
+       my $filename = shift;
+       my $mime;
+       $filename =~ /\./ or return undef;
+
+       if ($mimetypes_file) {
+               my $file = $mimetypes_file;
+               #$file =~ m#^/# or $file = "$projectroot/$path/$file";
+               $mime = mimetype_guess_file($filename, $file);
+       }
+       $mime ||= mimetype_guess_file($filename, '/etc/mime.types');
+       return $mime;
+}
+
+sub git_blob_plain_mimetype {
+       my $fd = shift;
+       my $filename = shift;
+
+       if ($filename) {
+               my $mime = mimetype_guess($filename);
+               $mime and return $mime;
+       }
+
+       # just in case
+       return $default_blob_plain_mimetype unless $fd;
+
+       if (-T $fd) {
+               return 'text/plain' .
+                      ($default_text_plain_charset ? '; charset='.$default_text_plain_charset : '');
+       } elsif (! $filename) {
+               return 'application/octet-stream';
+       } elsif ($filename =~ m/\.png$/i) {
+               return 'image/png';
+       } elsif ($filename =~ m/\.gif$/i) {
+               return 'image/gif';
+       } elsif ($filename =~ m/\.jpe?g$/i) {
+               return 'image/jpeg';
+       } else {
+               return 'application/octet-stream';
+       }
+}
+
+sub git_blob_plain {
+       if (!defined $hash) {
+               if (defined $file_name) {
+                       my $base = $hash_base || git_read_head($project);
+                       $hash = git_get_hash_by_path($base, $file_name, "blob")
+                               or die_error(undef, "Error lookup file.");
+               } else {
+                       die_error(undef, "No file name defined.");
                }
        }
+       my $type = shift;
+       open my $fd, "-|", $GIT, "cat-file", "blob", $hash
+               or die_error("Couldn't cat $file_name, $hash");
+
+       $type ||= git_blob_plain_mimetype($fd, $file_name);
+
+       # save as filename, even when no $file_name is given
+       my $save_as = "$hash";
+       if (defined $file_name) {
+               $save_as = $file_name;
+       } elsif ($type =~ m/^text\//) {
+               $save_as .= '.txt';
+       }
+
+       print $cgi->header(-type => "$type", '-content-disposition' => "inline; filename=\"$save_as\"");
+       undef $/;
+       binmode STDOUT, ':raw';
+       print <$fd>;
+       binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
+       $/ = "\n";
+       close $fd;
 }
 
 sub git_blob {
-       if (!defined $hash && defined $file_name) {
-               my $base = $hash_base || git_read_head($project);
-               $hash = git_get_hash_by_path($base, $file_name, "blob") || die_error(undef, "Error lookup file.");
+       if (!defined $hash) {
+               if (defined $file_name) {
+                       my $base = $hash_base || git_read_head($project);
+                       $hash = git_get_hash_by_path($base, $file_name, "blob")
+                               or die_error(undef, "Error lookup file.");
+               } else {
+                       die_error(undef, "No file name defined.");
+               }
+       }
+       my $have_blame = git_get_project_config_bool ('blame');
+       open my $fd, "-|", $GIT, "cat-file", "blob", $hash
+               or die_error(undef, "Couldn't cat $file_name, $hash.");
+       my $mimetype = git_blob_plain_mimetype($fd, $file_name);
+       if ($mimetype !~ m/^text\//) {
+               close $fd;
+               return git_blob_plain($mimetype);
        }
-       open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or die_error(undef, "Open failed.");
        git_header_html();
+       my $formats_nav = '';
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
-               print "<div class=\"page_nav\">\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "shortlog") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "log") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base")}, "commit") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash_base")}, "commitdiff") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash_base")}, "tree") . "<br/>\n";
                if (defined $file_name) {
-                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash;f=$file_name")}, "plain") .
-                       " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;hb=HEAD;f=$file_name")}, "head") . "<br/>\n";
+                       if ($have_blame) {
+                               $formats_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;h=$hash;hb=$hash_base;f=$file_name")}, "blame") . " | ";
+                       }
+                       $formats_nav .=
+                               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash;f=$file_name")}, "plain") .
+                               " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;hb=HEAD;f=$file_name")}, "head");
                } else {
-                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash")}, "plain") . "<br/>\n";
+                       $formats_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash")}, "plain");
                }
-               print "</div>\n".
-                      "<div>" .
+               git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
+               print "<div>" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
                      "</div>\n";
        } else {
@@ -1389,9 +1662,7 @@ sub git_blob {
                      "<br/><br/></div>\n" .
                      "<div class=\"title\">$hash</div>\n";
        }
-       if (defined $file_name) {
-               print "<div class=\"page_path\"><b>" . esc_html($file_name) . "</b></div>\n";
-       }
+       git_print_page_path($file_name, "blob");
        print "<div class=\"page_body\">\n";
        my $nr;
        while (my $line = <$fd>) {
@@ -1410,19 +1681,6 @@ sub git_blob {
        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) {
                $hash = git_read_head($project);
@@ -1435,8 +1693,9 @@ sub git_tree {
                }
        }
        $/ = "\0";
-       open my $fd, "-|", "$gitbin/git-ls-tree -z $hash" or die_error(undef, "Open git-ls-tree failed.");
-       chomp (my (@entries) = <$fd>);
+       open my $fd, "-|", $GIT, "ls-tree", '-z', $hash
+               or die_error(undef, "Open git-ls-tree failed.");
+       my @entries = map { chomp; $_ } <$fd>;
        close $fd or die_error(undef, "Reading tree failed.");
        $/ = "\n";
 
@@ -1450,15 +1709,7 @@ sub git_tree {
        my $base = "";
        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?" . esc_param("p=$project;a=summary")}, "summary") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash_base")}, "shortlog") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash_base")}, "log") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base")}, "commit") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash_base")}, "commitdiff") .
-                     " | tree" .
-                     "<br/><br/>\n" .
-                     "</div>\n";
+               git_page_nav('tree','', $hash_base);
                print "<div>\n" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'}) . $ref) . "\n" .
                      "</div>\n";
@@ -1469,10 +1720,8 @@ sub git_tree {
        }
        if (defined $file_name) {
                $base = esc_html("$file_name/");
-               print "<div class=\"page_path\"><b>/" . esc_html($file_name) . "</b></div>\n";
-       } else {
-               print "<div class=\"page_path\"><b>/</b></div>\n";
        }
+       git_print_page_path($file_name);
        print "<div class=\"page_body\">\n";
        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
@@ -1489,14 +1738,16 @@ sub git_tree {
                        print "<tr class=\"light\">\n";
                }
                $alternate ^= 1;
-               print "<td style=\"font-family:monospace\">" . mode_str($t_mode) . "</td>\n";
+               print "<td class=\"mode\">" . mode_str($t_mode) . "</td>\n";
                if ($t_type eq "blob") {
                        print "<td class=\"list\">" .
                              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$t_hash$base_key;f=$base$t_name"), -class => "list"}, esc_html($t_name)) .
                              "</td>\n" .
                              "<td class=\"link\">" .
                              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$t_hash$base_key;f=$base$t_name")}, "blob") .
-                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;h=$hash_base;f=$base$t_name")}, "history") .
+#                            " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;h=$t_hash$base_key;f=$base$t_name")}, "blame") .
+                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;h=$t_hash;hb=$hash_base;f=$base$t_name")}, "history") .
+                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$t_hash;f=$base$t_name")}, "raw") .
                              "</td>\n";
                } elsif ($t_type eq "tree") {
                        print "<td class=\"list\">" .
@@ -1504,6 +1755,7 @@ sub git_tree {
                              "</td>\n" .
                              "<td class=\"link\">" .
                              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$t_hash$base_key;f=$base$t_name")}, "tree") .
+                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;hb=$hash_base;f=$base$t_name")}, "history") .
                              "</td>\n";
                }
                print "</tr>\n";
@@ -1515,8 +1767,9 @@ sub git_tree {
 
 sub git_rss {
        # http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
-       open my $fd, "-|", "$gitbin/git-rev-list --max-count=150 " . git_read_head($project) or die_error(undef, "Open failed.");
-       my (@revlist) = map { chomp; $_ } <$fd>;
+       open my $fd, "-|", $GIT, "rev-list", "--max-count=150", git_read_head($project)
+               or die_error(undef, "Open git-rev-list failed.");
+       my @revlist = map { chomp; $_ } <$fd>;
        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".
@@ -1535,7 +1788,7 @@ sub git_rss {
                        last;
                }
                my %cd = date_str($co{'committer_epoch'});
-               open $fd, "-|", "$gitbin/git-diff-tree -r $co{'parent'} $co{'id'}" or next;
+               open $fd, "-|", $GIT, "diff-tree", '-r', $co{'parent'}, $co{'id'} or next;
                my @difftree = map { chomp; $_ } <$fd>;
                close $fd or next;
                print "<item>\n" .
@@ -1577,7 +1830,7 @@ sub git_opml {
        print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".
              "<opml version=\"1.0\">\n".
              "<head>".
-             "  <title>Git OPML Export</title>\n".
+             "  <title>$site_name Git OPML Export</title>\n".
              "</head>\n".
              "<body>\n".
              "<outline text=\"git RSS feeds\">\n";
@@ -1595,8 +1848,8 @@ sub git_opml {
                }
 
                my $path = esc_html(chop_str($proj{'path'}, 25, 5));
-               my $rss  "$my_url?p=$proj{'path'};a=rss";
-               my $html =  "$my_url?p=$proj{'path'};a=summary";
+               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".
@@ -1613,39 +1866,35 @@ sub git_log {
                $page = 0;
        }
        my $refs = read_info_ref();
-       git_header_html();
-       print "<div class=\"page_nav\">\n";
-       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash")}, "shortlog") .
-             " | log" .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash")}, "commit") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash")}, "commitdiff") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("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>;
+       open my $fd, "-|", $GIT, "rev-list", $limit, $hash
+               or die_error(undef, "Open git-rev-list failed.");
+       my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
 
+       my $paging_nav = '';
        if ($hash ne $head || $page) {
-               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "HEAD");
+               $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "HEAD");
        } else {
-               print "HEAD";
+               $paging_nav .= "HEAD";
        }
        if ($page > 0) {
-               print " &sdot; " .
-               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev");
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev");
        } else {
-               print " &sdot; prev";
+               $paging_nav .= " &sdot; prev";
        }
        if ($#revlist >= (100 * ($page+1)-1)) {
-               print " &sdot; " .
-               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next");
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next");
        } else {
-               print " &sdot; next";
+               $paging_nav .= " &sdot; next";
        }
-       print "<br/>\n" .
-             "</div>\n";
+
+       git_header_html();
+       git_page_nav('log','', $hash,undef,undef, $paging_nav);
+
        if (!@revlist) {
                print "<div>\n" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
@@ -1707,16 +1956,14 @@ sub git_commit {
        my %ad = date_str($co{'author_epoch'}, $co{'author_tz'});
        my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
 
-       my @difftree;
-       my $root = "";
        my $parent = $co{'parent'};
        if (!defined $parent) {
-               $root = " --root";
-               $parent = "";
+               $parent = "--root";
        }
-       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.");
+       open my $fd, "-|", $GIT, "diff-tree", '-r', '-M', $parent, $hash
+               or die_error(undef, "Open git-diff-tree failed.");
+       my @difftree = map { chomp; $_ } <$fd>;
+       close $fd or die_error(undef, "Reading git-diff-tree failed.");
 
        # non-textual hash id's can be cached
        my $expires;
@@ -1729,16 +1976,15 @@ sub git_commit {
                $ref = " <span class=\"tag\">" . esc_html($refs->{$co{'id'}}) . "</span>";
        }
        git_header_html(undef, $expires);
-       print "<div class=\"page_nav\">\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash")}, "shortlog") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash")}, "log") .
-             " | commit";
-       if (defined $co{'parent'}) {
-               print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash")}, "commitdiff");
+       my $formats_nav = '';
+       if (defined $file_name && defined $co{'parent'}) {
+               my $parent = $co{'parent'};
+               $formats_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;hb=$parent;f=$file_name")}, "blame");
        }
-       print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . "\n" .
-             "<br/><br/></div>\n";
+       git_page_nav('commit', defined $co{'parent'} ? '' : 'commitdiff',
+                                                        $hash, $co{'tree'}, $hash,
+                                                        $formats_nav);
+
        if (defined $co{'parent'}) {
                print "<div>\n" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash"), -class => "title"}, esc_html($co{'title'}) . $ref) . "\n" .
@@ -1754,7 +2000,7 @@ sub git_commit {
              "<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'});
+               printf(" (<span class=\"atnight\">%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'});
        }
@@ -1762,27 +2008,27 @@ sub git_commit {
              "</tr>\n";
        print "<tr><td>committer</td><td>" . esc_html($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\">$co{'id'}</td></tr>\n";
+       print "<tr><td>commit</td><td class=\"sha1\">$co{'id'}</td></tr>\n";
        print "<tr>" .
              "<td>tree</td>" .
-             "<td style=\"font-family:monospace\">" .
+             "<td class=\"sha1\">" .
              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash"), class => "list"}, $co{'tree'}) .
              "</td>" .
              "<td class=\"link\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") .
              "</td>" .
              "</tr>\n";
-       my $parents  = $co{'parents'};
+       my $parents = $co{'parents'};
        foreach my $par (@$parents) {
                print "<tr>" .
                      "<td>parent</td>" .
-                     "<td style=\"font-family:monospace\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$par"), class => "list"}, $par) . "</td>" .
+                     "<td class=\"sha1\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$par"), class => "list"}, $par) . "</td>" .
                      "<td class=\"link\">" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$par")}, "commit") .
                      " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash;hp=$par")}, "commitdiff") .
                      "</td>" .
                      "</tr>\n";
        }
-       print "</table>". 
+       print "</table>".
              "</div>\n";
        print "<div class=\"page_body\">\n";
        my $comment = $co{'comment'};
@@ -1800,7 +2046,7 @@ sub git_commit {
                }
                if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
                        $signed = 1;
-                       print "<span style=\"color: #888888\">" . esc_html($line) . "</span><br/>\n";
+                       print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
                } else {
                        $signed = 0;
                        print format_log_line_html($line) . "<br/>\n";
@@ -1812,7 +2058,7 @@ sub git_commit {
                print(($#difftree + 1) . " files changed:\n");
        }
        print "</div>\n";
-       print "<table cellspacing=\"0\">\n";
+       print "<table class=\"diff_tree\">\n";
        my $alternate = 0;
        foreach my $line (@difftree) {
                # ':100644 100644 03b218260e99b78c6df0ed378e59ed9205ccc96d 3b93d5e7cc7f7dd4ebed13a5cc1a4ad976fc94d8 M      ls-files.c'
@@ -1840,20 +2086,20 @@ sub git_commit {
                        }
                        print "<td>" .
                              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$file"), -class => "list"}, esc_html($file)) . "</td>\n" .
-                             "<td><span style=\"color: #008000;\">[new " . file_type($to_mode) . "$mode_chng]</span></td>\n" .
+                             "<td><span class=\"file_status new\">[new " . file_type($to_mode) . "$mode_chng]</span></td>\n" .
                              "<td class=\"link\">" . $cgi->a({-href => "$my_uri?" . esc_param("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?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$file"), -class => "list"}, esc_html($file)) . "</td>\n" .
-                             "<td><span style=\"color: #c00000;\">[deleted " . file_type($from_mode). "]</span></td>\n" .
+                             "<td><span class=\"file_status deleted\">[deleted " . file_type($from_mode). "]</span></td>\n" .
                              "<td class=\"link\">" .
                              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, "blob") .
-                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;h=$hash;f=$file")}, "history") .
+                             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;hb=$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";
+                               $mode_chnge = " <span class=\"file_status mode_chnge\">[changed";
                                if (((oct $from_mode) & S_IFMT) != ((oct $to_mode) & S_IFMT)) {
                                        $mode_chnge .= " from " . file_type($from_mode) . " to " . file_type($to_mode);
                                }
@@ -1879,7 +2125,7 @@ sub git_commit {
                        if ($to_id ne $from_id) {
                                print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file")}, "diff");
                        }
-                       print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;h=$hash;f=$file")}, "history") . "\n";
+                       print " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=history;hb=$hash;f=$file")}, "history") . "\n";
                        print "</td>\n";
                } elsif ($status eq "R") {
                        my ($from_file, $to_file) = split "\t", $file;
@@ -1889,7 +2135,7 @@ sub git_commit {
                        }
                        print "<td>" .
                              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file"), -class => "list"}, esc_html($to_file)) . "</td>\n" .
-                             "<td><span style=\"color: #777777;\">[moved from " .
+                             "<td><span class=\"file_status moved\">[moved from " .
                              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$from_id;hb=$hash;f=$from_file"), -class => "list"}, esc_html($from_file)) .
                              " with " . (int $similarity) . "% similarity$mode_chng]</span></td>\n" .
                              "<td class=\"link\">" .
@@ -1909,16 +2155,9 @@ sub git_blobdiff {
        mkdir($git_temp, 0700);
        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?" . esc_param("p=$project;a=summary")}, "summary") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "shortlog") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "log") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base")}, "commit") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash_base")}, "commitdiff") .
-                     " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash_base")}, "tree") .
-                     "<br/>\n";
-               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blobdiff_plain;h=$hash;hp=$hash_parent")}, "plain") .
-                     "</div>\n";
+               my $formats_nav =
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blobdiff_plain;h=$hash;hp=$hash_parent")}, "plain");
+               git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                print "<div>\n" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) . "\n" .
                      "</div>\n";
@@ -1927,9 +2166,7 @@ sub git_blobdiff {
                      "<br/><br/></div>\n" .
                      "<div class=\"title\">$hash vs $hash_parent</div>\n";
        }
-       if (defined $file_name) {
-               print "<div class=\"page_path\"><b>/" . esc_html($file_name) . "</b></div>\n";
-       }
+       git_print_page_path($file_name, "blob");
        print "<div class=\"page_body\">\n" .
              "<div class=\"diff_info\">blob:" .
              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash_parent;hb=$hash_base;f=$file_name")}, $hash_parent) .
@@ -1956,8 +2193,9 @@ sub git_commitdiff {
        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>;
+       open my $fd, "-|", $GIT, "diff-tree", '-r', $hash_parent, $hash
+               or die_error(undef, "Open git-diff-tree failed.");
+       my @difftree = map { chomp; $_ } <$fd>;
        close $fd or die_error(undef, "Reading diff-tree failed.");
 
        # non-textual hash id's can be cached
@@ -1971,15 +2209,9 @@ sub git_commitdiff {
                $ref = " <span class=\"tag\">" . esc_html($refs->{$co{'id'}}) . "</span>";
        }
        git_header_html(undef, $expires);
-       print "<div class=\"page_nav\">\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash")}, "shortlog") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash")}, "log") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash")}, "commit") .
-             " | commitdiff" .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . "<br/>\n";
-       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff_plain;h=$hash;hp=$hash_parent")}, "plain") . "\n" .
-             "</div>\n";
+       my $formats_nav =
+               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff_plain;h=$hash;hp=$hash_parent")}, "plain");
+       git_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
        print "<div>\n" .
              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'}) . $ref) . "\n" .
              "</div>\n";
@@ -2019,7 +2251,7 @@ sub git_commitdiff {
                my $status = $5;
                my $file = validate_input(unquote($6));
                if ($status eq "A") {
-                       print "<div class=\"diff_info\">" .  file_type($to_mode) . ":" .
+                       print "<div class=\"diff_info\">" . file_type($to_mode) . ":" .
                              $cgi->a({-href => "$my_uri?" . esc_param("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");
@@ -2046,15 +2278,16 @@ sub git_commitdiff {
 
 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>;
+       open my $fd, "-|", $GIT, "diff-tree", '-r', $hash_parent, $hash
+               or die_error(undef, "Open git-diff-tree 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 $refs = read_info_ref("tags");
-       open $fd, "-|", "$gitbin/git-rev-list HEAD";
-       chomp (my (@commits) = <$fd>);
+       open $fd, "-|", $GIT, "rev-list", "HEAD";
+       my @commits = map { chomp; $_ } <$fd>;
        close $fd;
        foreach my $commit (@commits) {
                if (defined $refs->{$commit}) {
@@ -2073,7 +2306,7 @@ sub git_commitdiff_plain {
              "Date: $ad{'rfc2822'} ($ad{'tz_local'})\n".
              "Subject: $co{'title'}\n";
        if (defined $tagname) {
-             print "X-Git-Tag: $tagname\n";
+               print "X-Git-Tag: $tagname\n";
        }
        print "X-Git-Url: $my_url?p=$project;a=commitdiff;h=$hash\n" .
              "\n";
@@ -2100,39 +2333,35 @@ sub git_commitdiff_plain {
 }
 
 sub git_history {
-       if (!defined $hash) {
-               $hash = git_read_head($project);
+       if (!defined $hash_base) {
+               $hash_base = git_read_head($project);
        }
-       my %co = git_read_commit($hash);
+       my $ftype;
+       my %co = git_read_commit($hash_base);
        if (!%co) {
                die_error(undef, "Unknown commit object.");
        }
        my $refs = read_info_ref();
        git_header_html();
-       print "<div class=\"page_nav\">\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "shortlog") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "log") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash")}, "commit") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash")}, "commitdiff") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") .
-             "<br/><br/>\n" .
-             "</div>\n";
+       git_page_nav('','', $hash_base,$co{'tree'},$hash_base);
        print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" .
+             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) . "\n" .
              "</div>\n";
-       print "<div class=\"page_path\"><b>/" . esc_html($file_name) . "</b><br/></div>\n";
+       if (!defined $hash && defined $file_name) {
+               $hash = git_get_hash_by_path($hash_base, $file_name);
+       }
+       if (defined $hash) {
+               $ftype = git_get_type($hash);
+       }
+       git_print_page_path($file_name, $ftype);
 
-       open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin -- \'$file_name\'";
-       my $commit;
+       open my $fd, "-|",
+               $GIT, "rev-list", "--full-history", $hash_base, "--", "\'$file_name\'";
        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        while (my $line = <$fd>) {
                if ($line =~ m/^([0-9a-fA-F]{40})/){
-                       $commit = $1;
-                       next;
-               }
-               if ($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/ && (defined $commit)) {
+                       my $commit = $1;
                        my %co = git_read_commit($commit);
                        if (!%co) {
                                next;
@@ -2155,7 +2384,7 @@ sub git_history {
                              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .
                              " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$commit")}, "commitdiff") .
                              " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;hb=$commit;f=$file_name")}, "blob");
-                       my $blob = git_get_hash_by_path($hash, $file_name);
+                       my $blob = git_get_hash_by_path($hash_base, $file_name);
                        my $blob_parent = git_get_hash_by_path($commit, $file_name);
                        if (defined $blob && defined $blob_parent && $blob ne $blob_parent) {
                                print " | " .
@@ -2164,7 +2393,6 @@ sub git_history {
                        }
                        print "</td>\n" .
                              "</tr>\n";
-                       undef $commit;
                }
        }
        print "</table>\n";
@@ -2198,15 +2426,7 @@ sub git_search {
                $pickaxe_search = 1;
        }
        git_header_html();
-       print "<div class=\"page_nav\">\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary;h=$hash")}, "summary") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "shortlog") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash")}, "log") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash")}, "commit") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash")}, "commitdiff") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") .
-             "<br/><br/>\n" .
-             "</div>\n";
+       git_page_nav('','', $hash,$co{'tree'},$hash);
 
        print "<div>\n" .
              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" .
@@ -2215,7 +2435,7 @@ sub git_search {
        my $alternate = 0;
        if ($commit_search) {
                $/ = "\0";
-               open my $fd, "-|", "$gitbin/git-rev-list --header --parents $hash" or next;
+               open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", $hash or next;
                while (my $commit_text = <$fd>) {
                        if (!grep m/$searchtext/i, $commit_text) {
                                next;
@@ -2249,7 +2469,7 @@ sub git_search {
                                        my $match = esc_html($2) || "";
                                        my $trail = esc_html($3) || "";
                                        $trail = chop_str($trail, 30, 10);
-                                       my $text = "$lead<span style=\"color:#e00000\">$match</span>$trail";
+                                       my $text = "$lead<span class=\"match\">$match</span>$trail";
                                        print chop_str($text, 80, 5) . "<br/>\n";
                                }
                        }
@@ -2265,7 +2485,7 @@ sub git_search {
 
        if ($pickaxe_search) {
                $/ = "\n";
-               open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin -S\'$searchtext\'";
+               open my $fd, "-|", "$GIT rev-list $hash | $GIT diff-tree -r --stdin -S\'$searchtext\'";
                undef %co;
                my @files;
                while (my $line = <$fd>) {
@@ -2298,7 +2518,7 @@ sub git_search {
                                        while (my $setref = shift @files) {
                                                my %set = %$setref;
                                                print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$set{'id'};hb=$co{'id'};f=$set{'file'}"), class => "list"},
-                                                     "<span style=\"color:#e00000\">" . esc_html($set{'file'}) . "</span>") .
+                                                     "<span class=\"match\">" . esc_html($set{'file'}) . "</span>") .
                                                      "<br/>\n";
                                        }
                                        print "</td>\n" .
@@ -2326,39 +2546,35 @@ sub git_shortlog {
                $page = 0;
        }
        my $refs = read_info_ref();
-       git_header_html();
-       print "<div class=\"page_nav\">\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
-             " | shortlog" .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash")}, "log") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash")}, "commit") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash")}, "commitdiff") .
-             " | " . $cgi->a({-href => "$my_uri?" . esc_param("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>;
+       open my $fd, "-|", $GIT, "rev-list", $limit, $hash
+               or die_error(undef, "Open git-rev-list failed.");
+       my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
 
+       my $paging_nav = '';
        if ($hash ne $head || $page) {
-               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "HEAD");
+               $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "HEAD");
        } else {
-               print "HEAD";
+               $paging_nav .= "HEAD";
        }
        if ($page > 0) {
-               print " &sdot; " .
-               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev");
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev");
        } else {
-               print " &sdot; prev";
+               $paging_nav .= " &sdot; prev";
        }
        if ($#revlist >= (100 * ($page+1)-1)) {
-               print " &sdot; " .
-               $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next");
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next");
        } else {
-               print " &sdot; next";
+               $paging_nav .= " &sdot; next";
        }
-       print "<br/>\n" .
-             "</div>\n";
+
+       git_header_html();
+       git_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);
+
        print "<div>\n" .
              $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
              "</div>\n";