v088
[gitweb.git] / gitweb.cgi
index fa2ba70aadc9d3dd30f1d80452fb8b04cb072338..1e8565a8a7d0abf47da688c2cdb4258c627e4c5f 100755 (executable)
@@ -14,121 +14,133 @@ use CGI::Carp qw(fatalsToBrowser);
 
 my $cgi = new CGI;
 
-my $version =          "080";
+# !! This devel-version uses a modified git-rev-list binary !!
+# The git changes are expected to show up upstream soon.
+
+# begin config
 my $projectroot =      "/pub/scm";
+$projectroot = "/home/kay/public_html/pub/scm";
 my $home_link =                "/git";
+$home_link =           "/~kay/git";
 my $gitbin =           "/usr/bin";
 my $gittmp =           "/tmp/gitweb";
 my $logo_link =                "/pub/software/scm/cogito";
+$logo_link =           "/~kay/pub/software/scm/cogito";
+# end config
+
+my $version =          "088-devel";
 my $my_url =           $cgi->url();
 my $my_uri =           $cgi->url(-absolute => 1);
+my $rss_link = "";
 
-# remove #
-my $projectroot =      "/home/kay/public_html/pub/scm";
-my $home_link =                "/~kay/git";
-my $logo_link =                "/~kay/pub/software/scm/cogito";
-# remove #
-
-mkdir($gittmp, 0700);
 my $project = $cgi->param('p');
-my $action = $cgi->param('a');
-my $hash = $cgi->param('h');
-my $hash_parent = $cgi->param('hp');
-my $file_name = $cgi->param('f');
-my $time_back = $cgi->param('t');
-$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects";
-
-# validate input
 if (defined($project)) {
        if ($project =~ /(^|\/)(|\.|\.\.)($|\/)/) {
+               $project = "";
                die_error("", "Invalid project parameter.");
        }
        if (!(-d "$projectroot/$project")) {
+               $project = "";
                die_error("", "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";
 }
+
+my $file_name = $cgi->param('f');
 if (defined($file_name) && $file_name =~ /(^|\/)(|\.|\.\.)($|\/)/) {
+       $file_name = "";
        die_error("", "Invalid file parameter.");
 }
-if (defined($action) && !$action =~ m/^[0-9a-zA-Z\.\-]+$/) {
+
+my $action = $cgi->param('a');
+if (defined($action) && $action =~ m/[^0-9a-zA-Z\.\-]+$/) {
+       $action = "";
        die_error("", "Invalid action parameter.");
 }
+
+my $hash = $cgi->param('h');
 if (defined($hash) && !($hash =~ m/^[0-9a-fA-F]{40}$/)) {
+       $hash = "";
        die_error("", "Invalid hash parameter.");
 }
+
+my $hash_parent = $cgi->param('hp');
 if (defined($hash_parent) && !($hash_parent =~ m/^[0-9a-fA-F]{40}$/)) {
+       $hash_parent = "";
        die_error("", "Invalid parent hash parameter.");
 }
+
+my $time_back = $cgi->param('t');
 if (defined($time_back) && !($time_back =~ m/^[0-9]+$/)) {
+       $time_back = "";
        die_error("", "Invalid time parameter.");
 }
 
+mkdir($gittmp, 0700);
+
 sub git_header_html {
        my $status = shift || "200 OK";
 
        print $cgi->header(-type=>'text/html',  -charset => 'utf-8', -status=> $status);
        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>
+<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>
-       <title>git - $project $action</title>
-       <link rel="alternate" title="$project log" href="$my_uri?p=$project;a=rss" type="application/rss+xml"/>
-       <style type="text/css">
-       body { font-family: sans-serif; font-size: 12px; margin:0px; }
-       a { color:#0000cc; }
-       a:hover { color:#880000; }
-       a:visited { color:#880000; }
-       a:active { color:#880000; }
-       div.page_header {
-               margin:15px 25px 0px; height:25px; padding:8px;
-               font-size:18px; font-weight:bold; background-color:#d9d8d1;
-       }
-       div.page_header a:visited { color:#0000cc; }
-       div.page_header a:hover { color:#880000; }
-       div.page_nav { margin:0px 25px; padding:8px; border:solid #d9d8d1; border-width:0px 1px; }
-       div.page_nav a:visited { color:#0000cc; }
-       div.page_footer {
-               margin:0px 25px 15px; height:17px; padding:4px; padding-left:8px;
-               background-color: #d9d8d1;
-       }
-       div.page_footer_text { float:left; color:#888888; font-size:10px;}
-       div.page_body { margin:0px 25px; padding:8px; border:solid #d9d8d1; border-width:0px 1px; }
-       div.title {
-               display:block; margin:0px 25px; padding:8px;
-               font-weight:bold; background-color:#d9d8d1; color:#000000;
-       }
-       a.title {
-               display:block; margin:0px 25px; padding:6px 8px;
-               font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
-       }
-       a.title:hover { background-color: #d9d8d1; }
-       div.title2 {
-               margin:0px 25px; padding:6px 8px;
-               border: solid #d9d8d1; border-width:0px 1px 1px; 
-       }
-       div.log_body {
-               margin:0px 25px; padding:8px; padding-left:150px;
-               border:solid #d9d8d1; border-width:0px 1px;
-       }
-       span.log_age { position:relative; float:left; width:142px; font-style:italic; }
-       div.log_link { font-size:10px; font-family:sans-serif; font-style:normal; position:relative; float:left; width:142px; }
-       div.list {
-               display:block; margin:0px 25px; padding:4px 6px 0px; border:solid #d9d8d1; border-width:1px 1px 0px;
-               font-weight:bold; 
-       }
-       div.list a { text-decoration:none; color:#000000; }
-       div.list a:hover { color:#880000; }
-       div.link { margin:0px 25px; padding:0px 6px; border:solid #d9d8d1; border-width:0px 1px; font-family:sans-serif; font-size:10px; }
-       td.key { padding-right:10px;  }
-       a.xml_logo { float:right; border:1px solid;
-               line-height:15px;
-               border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e; width:35px;
-               color:#ffffff; background-color:#ff6600;
-               font-weight:bold; font-family:sans-serif; text-align:center;
-               font-size:10px; display:block; text-decoration:none;
-       }
-       a.xml_logo:hover { background-color:#ee5500; }
-       </style>
+<title>git - $project</title>
+$rss_link
+<style type="text/css">
+body { font-family: sans-serif; font-size: 12px; margin:0px; }
+a { color:#0000cc; }
+a:hover { color:#880000; }
+a:visited { color:#880000; }
+a:active { color:#880000; }
+div.page_header {
+       margin:15px 25px 0px; height:25px; padding:8px;
+       font-size:18px; font-weight:bold; background-color:#d9d8d1;
+}
+div.page_header a:visited { color:#0000cc; }
+div.page_header a:hover { color:#880000; }
+div.page_nav { margin:0px 25px; padding:8px; border:solid #d9d8d1; border-width:0px 1px; }
+div.page_nav a:visited { color:#0000cc; }
+div.page_footer { margin:0px 25px 15px; height:17px; padding:4px; padding-left:8px; background-color: #d9d8d1; }
+div.page_footer_text { float:left; color:#555555; font-style:italic; }
+div.page_body { margin:0px 25px; padding:8px; border:solid #d9d8d1; border-width:0px 1px; }
+div.title, a.title {
+       display:block; margin:0px 25px; padding:6px 8px;
+       font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
+}
+a.title:hover { background-color: #d9d8d1; }
+div.title_text { margin:0px 25px; padding:6px 8px; border: solid #d9d8d1; border-width:0px 1px 1px; }
+div.log_body { margin:0px 25px; padding:8px; padding-left:150px; border:solid #d9d8d1; border-width:0px 1px; }
+span.log_age { position:relative; float:left; width:142px; font-style:italic; }
+div.log_link { font-size:10px; font-family:sans-serif; font-style:normal; position:relative; float:left; width:142px; }
+div.list {
+       display:block; margin:0px 25px; padding:4px 6px 2px; border:solid #d9d8d1; border-width:1px 1px 0px;
+       font-weight:bold;
+}
+div.list_head {
+       display:block; margin:0px 25px; padding:4px 6px 4px; border:solid #d9d8d1; border-width:1px 1px 0px;
+       font-style:italic;
+}
+div.list a { text-decoration:none; color:#000000; }
+div.list a:hover { color:#880000; }
+div.link {
+       margin:0px 25px; padding:0px 6px 8px; border:solid #d9d8d1; border-width:0px 1px;
+       font-family:sans-serif; font-size:10px;
+}
+td.key { padding-right:10px;  }
+a.xml_logo { float:right; border:1px solid;
+       line-height:15px;
+       border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e; width:35px;
+       color:#ffffff; background-color:#ff6600;
+       font-weight:bold; font-family:sans-serif; text-align:center;
+       font-size:10px; display:block; text-decoration:none;
+}
+a.xml_logo:hover { background-color:#ee5500; }
+</style>
 </head>
 <body>
 EOF
@@ -146,13 +158,18 @@ EOF
 }
 
 sub git_footer_html {
-       print "<div class=\"page_footer\">";
-       print "<div class=\"page_footer_text\">version $version</div>";
-       if ($project ne '') {
-               print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "xml_logo"}, "XML") . "\n";
+       print "<div class=\"page_footer\">\n";
+       if ($project ne "") {
+               if (-e "$projectroot/$project/description") {
+                       open(my $fd, "$projectroot/$project/description");
+                       my $descr = <$fd>;
+                       print "<div class=\"page_footer_text\">" . escapeHTML($descr) . "</div>\n";
+                       close $fd;
+               }
+               print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "xml_logo"}, "RSS") . "\n";
        }
-       print "</div>" .
-             "</body>" .
+       print "</div>\n" .
+             "</body>\n" .
              "</html>";
 }
 
@@ -160,12 +177,10 @@ sub die_error {
        my $status = shift || "403 Forbidden";
        my $error = shift || "Malformed query, file missing or permission denied"; 
 
-       $project = "";
-       $action = "";
        git_header_html($status);
        print "<div class=\"page_body\">\n" .
              "<br/><br/>\n";
-       print "$error\n";
+       print "$status - $error\n";
        print "<br/></div>\n";
        git_footer_html();
        exit 0;
@@ -173,7 +188,7 @@ sub die_error {
 
 sub git_head {
        my $path = shift;
-       open(my $fd, "$projectroot/$path/HEAD") || die_error("", "Invalid project directory.");;
+       open(my $fd, "$projectroot/$path/HEAD") || die_error("", "Invalid project directory.");
        my $head = <$fd>;
        close $fd;
        chomp $head;
@@ -341,8 +356,8 @@ sub date_str {
        $date{'rfc2822'} = sprintf "%s, %d %s %4d %02d:%02d:%02d +0000", $days[$wday], $mday, $months[$mon], 1900+$year, $hour ,$min, $sec;
        $date{'mday-time'} = sprintf "%d %s %02d:%02d", $mday, $months[$mon], $hour ,$min;
 
-       $tz =~ m/((-|\+)[0-9][0-9])([0-9][0-9])/;
-       my $local = $epoch + (($1 + ($2/60)) * 3600);
+       $tz =~ m/^([+\-][0-9][0-9])([0-9][0-9])$/;
+       my $local = $epoch + ((int $1 + ($2/60)) * 3600);
        ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($local);
        $date{'hour_local'} = $hour;
        $date{'minute_local'} = $min;
@@ -350,7 +365,7 @@ sub date_str {
        return %date;
 }
 
-if ($action eq "git-logo.png") {
+if (defined($action) && $action eq "git-logo.png") {
        print $cgi->header(-type => 'image/png', -expires => '+1d');
        print   "\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104\122".
                "\000\000\000\110\000\000\000\033\004\003\000\000\000\055\331\324".
@@ -407,12 +422,13 @@ if ($action eq "blob") {
 
        git_header_html();
        my %co = git_commit($hash);
-       if (defined(%co)) {
+       if (%co) {
                print "<div class=\"page_nav\"> view\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"}, "diffs") . " | \n" .
-                     $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") . "\n" .
-                     "<br/><br/></div>\n";
+                     $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | " .
+                     $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diffs") . " | " .
+                     $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$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";
@@ -439,93 +455,104 @@ if ($action eq "blob") {
        print "</pre>\n";
        print "<br/></div>";
        git_footer_html();
-} elsif ($action eq "log" || $action eq "rss") {
-       open my $fd, "-|", "$gitbin/git-rev-list " . git_head($project);
+} elsif ($action eq "rss") {
+       open my $fd, "-|", "$gitbin/git-rev-list --max-count=20 " . git_head($project);
        my (@revlist) = map { chomp; $_ } <$fd>;
        close $fd;
 
-       if ($action eq "log") {
-               git_header_html();
-               print "<div class=\"page_nav\">\n";
-               print "view  ";
-               print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last day") . " | \n" .
-                     $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | \n" .
-                     $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | \n" .
-                     $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | \n" .
-                     $cgi->a({-href => "$my_uri?p=$project;a=log;t=0"}, "all") . "<br/>\n";
-               print "<br/><br/>\n" .
-                     "</div>\n";
-       } elsif ($action eq "rss") {
-               print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
-               print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".
-                     "<rss version=\"0.91\">\n";
-               print "<channel>\n";
-               print "<title>$project</title>\n".
-                     "<link> " . $my_url . "/$project/log</link>\n".
-                     "<description>$project log</description>\n".
-                     "<language>en</language>\n";
-       }
-
-       for (my $i = 0; $i <= $#revlist; $i++) {
-               my $commit = $revlist[$i];
+       print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
+       print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".
+             "<rss version=\"0.91\">\n";
+       print "<channel>\n";
+       print "<title>$project</title>\n".
+             "<link> " . $my_url . "/$project/log</link>\n".
+             "<description>$project log</description>\n".
+             "<language>en</language>\n";
+
+       foreach my $commit (@revlist) {
                my %co = git_commit($commit);
                my %ad = date_str($co{'author_epoch'});
-               if ($action eq "log") {
-               if ($time_back > 0 && $co{'age'} > $time_back*60*60*24) {
-                               if ($i == 0) {
-                                       print "<div class=\"page_body\"> Last change " . $co{'age_string'} . ".<br/><br/></div>\n";
-                               }
-                               last;
-                       }
-                       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" .
-                             "</div>\n";
-                       print "<div class=\"title2\">\n" .
-                             "<div class=\"log_link\">\n" .
-                             "view " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " .
-                             $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "diff") . "<br/>\n" .
-                             "</div>\n" .
-                             "<i>" . escapeHTML($co{'author_name'}) .  " [" . $ad{'rfc2822'} . "]</i><br/>\n" .
-                             "</div>\n" .
-                             "<div class=\"log_body\">\n";
-                       my $comment = $co{'comment'};
-                       foreach my $line (@$comment) {
-                               last if ($line =~ m/^(signed-off|acked)-by:/i);
-                               print escapeHTML($line) . "<br/>\n";
-                       }
-                       print "<br/>\n" .
-                             "</div>\n";
-               } elsif ($action eq "rss") {
-                       last if ($i >= 20);
-                       print "<item>\n" .
-                             "\t<title>" . sprintf("%d %s %02d:%02d", $ad{'mday'}, $ad{'month'}, $ad{'hour'}, $ad{'min'}) . " - " . escapeHTML($co{'title'}) . "</title>\n" .
-                             "\t<link> " . $my_url . "?p=$project;a=commit;h=$commit</link>\n" .
-                             "\t<description>";
-                       my $comment = $co{'comment'};
-                       foreach my $line (@$comment) {
-                               print escapeHTML($line) . "\n";
-                       }
-                       print "\t</description>\n" .
-                             "</item>\n";
+               print "<item>\n" .
+                     "\t<title>" . sprintf("%d %s %02d:%02d", $ad{'mday'}, $ad{'month'}, $ad{'hour'}, $ad{'min'}) . " - " . escapeHTML($co{'title'}) . "</title>\n" .
+                     "\t<link> " . $my_url . "?p=$project;a=commit;h=$commit</link>\n" .
+                     "\t<description>";
+               my $comment = $co{'comment'};
+               foreach my $line (@$comment) {
+                       print escapeHTML($line) . "<br/>\n";
                }
+               print "\t</description>\n" .
+                     "</item>\n";
+       }
+       print "</channel></rss>";
+} elsif ($action eq "log") {
+       my $date = 0;
+       if ($time_back > 0) {
+               $date = time - $time_back*24*60*60;
        }
-       if ($action eq "log") {
-               git_footer_html();
-       } elsif ($action eq "rss") {
-               print "</channel></rss>";
+       my $head = git_head($project);
+       open my $fd, "-|", "$gitbin/git-rev-list --max-age=$date $head";
+       my (@revlist) = map { chomp; $_ } <$fd>;
+       close $fd;
+
+       git_header_html();
+       print "<div class=\"page_nav\">\n";
+       print "view  ";
+       print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last 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";
+
+       if (!(@revlist)) {
+               my %co = git_commit($head);
+               print "<div class=\"page_body\"> Last change " . $co{'age_string'} . ".<br/><br/></div>\n";
+       }
+
+       foreach my $commit (@revlist) {
+               my %co = git_commit($commit);
+               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" .
+                     "</div>\n";
+               print "<div class=\"title_text\">\n" .
+                     "<div class=\"log_link\">\n" .
+                     "view " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " .
+                     $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "diff") . "<br/>\n" .
+                     "</div>\n" .
+                     "<i>" . escapeHTML($co{'author_name'}) .  " [" . $ad{'rfc2822'} . "]</i><br/>\n" .
+                     "</div>\n" .
+                     "<div class=\"log_body\">\n";
+               my $comment = $co{'comment'};
+               foreach my $line (@$comment) {
+                       last if ($line =~ m/^(signed-off|acked)-by:/i);
+                               print escapeHTML($line) . "<br/>\n";
+               }
+               print "<br/>\n" .
+                     "</div>\n";
        }
+       git_footer_html();
 } elsif ($action eq "commit") {
        my %co = git_commit($hash);
-       if (!defined(%co)) {
+       if (!%co) {
                die_error("", "Unknown commit object.");
        }
        my %ad = date_str($co{'author_epoch'}, $co{'author_tz'});
        my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
-       open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash";
-       my (@difftree) = map { chomp; $_ } <$fd>;
-       close $fd;
 
+       my @difftree;
+       if (defined($co{'parent'})) {
+               open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash";
+               @difftree = map { chomp; $_ } <$fd>;
+               close $fd;
+       } else {
+               # fake git-diff-tree output for initial revision
+               open my $fd, "-|", "$gitbin/git-ls-tree -r $hash";
+               @difftree = map { chomp;  "+" . $_ } <$fd>;
+               close $fd;
+       }
        git_header_html();
        print "<div class=\"page_nav\"> view\n" .
              $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | \n" .
@@ -535,7 +562,7 @@ if ($action eq "blob") {
        print "<div>\n" .
              $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
              "</div>\n";
-       print "<div class=\"title2\">\n" .
+       print "<div class=\"title_text\">\n" .
              "<table cellspacing=\"0\">";
        print "<tr><td class=\"key\">author</td><td>" . escapeHTML($co{'author'}) . "</td><tr><td></td><td>" .
              " " . $ad{'rfc2822'};
@@ -568,6 +595,9 @@ if ($action eq "blob") {
                }
        }
        print "</div>\n";
+       if ($#difftree > 10) {
+               print "<div class=\"list_head\">" . ($#difftree + 1) . " files changed:<br/></div>\n";
+       }
        foreach my $line (@difftree) {
                # '*100644->100644      blob    9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596      net/ipv4/route.c'
                # '+100644      blob    4a83ab6cd565d21ab0385bac6643826b83c2fcd4        arch/arm/lib/bitops.h'
@@ -588,7 +618,7 @@ if ($action eq "blob") {
                                      "</div>";
                                print "<div class=\"link\">\n" .
                                      "view " .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . "<br/><br/>\n" .
+                                     $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . "<br/>\n" .
                                      "</div>\n";
                        } elsif ($op eq "-") {
                                print "<div class=\"list\">\n" .
@@ -598,7 +628,7 @@ if ($action eq "blob") {
                                print "<div class=\"link\">\n" .
                                      "view " .
                                      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . " | " .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "<br/><br/>\n" .
+                                     $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "<br/>\n" .
                                      "</div>\n";
                        } elsif ($op eq "*") {
                                $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
@@ -611,17 +641,23 @@ if ($action eq "blob") {
                                if ($from_mode != $to_mode) {
                                        $mode_chnge = " <span style=\"color: #888888;\"> [chmod $mode]</span>\n";
                                }
-                               print "<div class=\"list\">\n" .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id"},
-                                     escapeHTML($file) . $mode_chnge) . "\n" .
-                                     "</div>\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"},
+                                             escapeHTML($file) . $mode_chnge) . "\n" .
+                                             "</div>\n";
+                               } else {
+                                       print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id"},
+                                             escapeHTML($file) . $mode_chnge) . "\n" .
+                                             "</div>\n";
+                               }
                                print "<div class=\"link\">\n" .
                                      "view ";
                                if ($to_id ne $from_id) {
                                        print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id"}, "diff") . " | ";
                                }
                                print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id"}, "file") . " | " .
-                                     $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "<br/><br/>\n" .
+                                     $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "<br/>\n" .
                                      "</div>\n";
                        }
                }
@@ -640,7 +676,7 @@ if ($action eq "blob") {
        git_footer_html();
 } elsif ($action eq "commitdiff") {
        my %co = git_commit($hash);
-       if (!defined(%co)) {
+       if (!%co) {
                die_error("", "Unknown commit object.");
        }
        open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash";
@@ -728,5 +764,6 @@ if ($action eq "blob") {
        }
        git_footer_html();
 } else {
-       die_error("", "unknown action");
+       $action = "";
+       die_error("", "Unknown action.");
 }