#!/usr/bin/perl
-# This file is licensed under the GPL v2, or a later version
+# gitweb.pl - simple web interface to track changes in git repositories
+#
# (C) 2005, Kay Sievers <kay.sievers@vrfy.org>
# (C) 2005, Christian Gierke <ch@gierke.de>
+#
+# This file is licensed under the GPL v2, or a later version
use strict;
use warnings;
use CGI::Carp qw(fatalsToBrowser);
my $cgi = new CGI;
-my $gitbin = "/home/kay/bin";
-my $gitroot = "/home/kay/public_html";
-my $gittmp = "/tmp";
-my $myself = $cgi->url(-relative => 1);
-my $project = $cgi->param("project") || "";
-my $action = $cgi->param("action") || "";
-my $hash = $cgi->param("hash") || "";
-my $parent = $cgi->param("parent") || "";
-my $view_back = $cgi->param("view_back") || 60*60*24*2;
-my $projectroot = "$gitroot/$project";
-$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/.git/objects";
+my $version = "043";
+my $projectroot = "/";
+my $defaultprojects = "home/kay/public_html";
+my $gitbin = "/home/kay/bin/git";
+my $gittmp = "/tmp";
+my $my_url = $cgi->url();
+my $my_uri = $cgi->url(-absolute => 1);
+my $project = $cgi->param('p');
+my $action = $cgi->param('a');
+my $hash = $cgi->param('h');
+my $hash_parent = $cgi->param('hp');
+my $time_back = $cgi->param('t') || 1;
+$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/.git/objects";
+
+# sanitize input
+$action =~ s/[^0-9a-zA-Z\.\-]//g;
+$project =~ s/\/\.//g;
+$project =~ s/^\/+//g;
+$project =~ s/\/+$//g;
+$project =~ s/|//g;
$hash =~ s/[^0-9a-fA-F]//g;
-$parent =~ s/[^0-9a-fA-F]//g;
-$project =~ s/[^0-9a-zA-Z\-\._]//g;
+$hash_parent =~ s/[^0-9a-fA-F]//g;
+$time_back =~ s/[^0-9]+//g;
-sub header {
- print $cgi->header(-type => 'text/html; charset: utf-8');
+sub git_header_html {
+ print $cgi->header(-type => 'text/html', -charset => 'utf-8');
print <<EOF;
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
- <title>GIT</title>
+ <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:25px; }
- div.main { border-width:1px; border-style:solid; border-color:#D9D8D1; }
- div.head1 { font-size:20px; padding:8px; background-color: #D9D8D1; font-weight:bold; }
- div.head2 { padding:8px; }
- td { padding:8px; margin:0px; font-family: sans-serif; font-size: 12px; }
- td.head1 { background-color: #D9D8D1; font-weight:bold; }
- td.head2 { background-color: #EDECE6; font-family: monospace; font-size:12px; }
- table.log { padding:0px; margin:0px; width:100%; }
- tr { vertical-align:top; }
- a { color:#0000cc; }
- a:hover { color:#880000; }
- a:visited { color:#880000; }
- a:active { color:#880000; }
+ 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; clear:both; font-weight:bold; background-color: #D9D8D1; }
+ div.page_nav { margin:0px 25px; padding:8px; clear:both; border: solid #D9D8D1; border-width:0px 1px; }
+ div.page_footer { margin:0px 25px 15px; height:17px; padding:4px; padding-left:8px; clear:both; background-color: #D9D8D1; }
+ div.page_footer_text { float:left; color:#888888; font-size:10px;}
+ div.page_body { margin:0px 25px; padding:8px; clear:both; border: solid #D9D8D1; border-width:0px 1px; }
+ a.log_title { display:block; margin:0px 25px; padding:8px; clear:both; font-weight:bold; background-color: #D9D8D1; text-decoration:none; color:#000000; }
+ a.log_title:hover { background-color: #c9c8c1; }
+ a.xml_logo { float:right; border:1px solid; 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:11px; display:block; text-decoration:none; }
+ a.xml_logo:hover { background-color:#ee5500; }
+ div.log_head { margin:0px 25px; min-height: 30px; padding:8px; clear:both; border: solid #D9D8D1; border-width:0px 1px; font-family:monospace; background-color: #EDECE6; }
+ div.log_body { margin:0px 25px; padding:8px; padding-left:150px; clear:both; border: solid #D9D8D1; border-width:0px 1px; }
+ div.log_age { position:relative; float:left; width:142px; }
+ div.log_functions { font-size:10px; font-family:sans-serif; position:relative; float:left; width:142px; }
+ div.signed_off { color: #a9a8a1; }
</style>
</head>
<body>
EOF
+ print "<div class=\"page_header\">";
+ print "<a href=\"http://kernel.org/pub/software/scm/git/\">" .
+ "<img src=\"$my_uri?a=git-logo.png\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/></a>";
+ if ($defaultprojects ne "") {
+ print $cgi->a({-href => "$my_uri"}, "projects") . " / ";
+ }
if ($project ne "") {
- print "<div class=\"main\">\n";
- print "<div class=\"head1\">" . $project . "</div>\n";
- print "<div class=\"head2\">\n";
- print $cgi->a({-href => "$myself?project=$project&action=show_tree"}, "Browse Project") . "<br/>\n";
- print "Show Log ";
- print $cgi->a({-href => "$myself?project=$project&action=show_log&view_back=" . 60*60*24}, "day") . "\n";
- print $cgi->a({-href => "$myself?project=$project&action=show_log&view_back=" . 60*60*24*7}, "week") . "\n";
- print $cgi->a({-href => "$myself?project=$project&action=show_log&view_back=" . 60*60*24*30}, "month") . "\n";
- print $cgi->a({-href => "$myself?project=$project&action=show_log&view_back=" . 60*60*24*365}, "year") . "<br/>\n";
- print "</div>\n";
- print "<br/><br/>\n";
+ print $cgi->a({-href => "$my_uri?p=$project;a=log"}, $project);
+ }
+ if ($action ne "") {
+ print " / $action";
}
+ print "</div>\n";
}
-sub footer {
+sub git_footer_html {
+ print "<div class=\"page_footer\">";
+ print "<div class=\"page_footer_text\">version $version</div>";
+ if ($project ne '') {
+ print "<a href=\"$my_uri?p=$project;a=rss\" class=\"xml_logo\">XML</a>";
+ }
print "</div>";
- print $cgi->end_html();
+ print "</body>\n</html>";
}
-if ($project eq "") {
- open my $fd, "-|", "ls", "-1", $gitroot;
- my (@path) = map { chomp; $_ } <$fd>;
+sub git_head {
+ my $path = shift;
+ open my $fd, "$projectroot/$path/.git/HEAD";
+ my $head = <$fd>;
close $fd;
- header();
- print "Projects:<br/><br/>\n";
- foreach my $line (@path) {
- if (-e "$gitroot/$line/.git/HEAD") {
- print $cgi->a({-href => "$myself?project=$line"}, $line) . "<br/>\n";
+ chomp $head;
+ return $head;
+}
+
+sub git_commit {
+ my $commit = shift;
+ my %co;
+ my @parents;
+
+ open my $fd, "-|", "$gitbin/cat-file", "commit", $commit;
+ while (my $line = <$fd>) {
+ chomp($line);
+ last if $line eq "";
+ if ($line =~ m/^tree (.*)$/) {
+ $co{'tree'} = $1;
+ } elsif ($line =~ m/^parent (.*)$/) {
+ push @parents, $1;
+ } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
+ $co{'author'} = $1;
+ $co{'author_time_epoch'} = $2;
+ $co{'author_timezone'} = $3;
+ $co{'author_name'} = $co{'author'};
+ $co{'author_name'} =~ s/ <.*//;
+ } elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) {
+ $co{'committer'} = $1;
+ $co{'committer_time_epoch'} = $2;
+ $co{'committer_timezone'} = $3;
+ $co{'committer_name'} = $co{'committer'};
+ $co{'committer_name'} =~ s/ <.*//;
}
}
- footer();
+ $co{'parents'} = \@parents;
+ $co{'parent'} = $parents[0];
+ my (@comment) = map { chomp; $_ } <$fd>;
+ $co{'comment'} = \@comment;
+ $co{'title'} = $comment[0];
+ close $fd;
+ return %co;
+}
+
+sub git_diff_html {
+ my $from_name = shift || "/dev/null";
+ my $to_name = shift || "/dev/null";
+ my $from = shift;
+ my $to = shift;
+
+ my $from_tmp = "/dev/null";
+ my $to_tmp = "/dev/null";
+ my $from_label = "/dev/null";
+ my $to_label = "/dev/null";
+ my $pid = $$;
+
+ # create temp from-file
+ if ($from ne "") {
+ $from_tmp = "$gittmp/gitweb_" . $$ . "_from";
+ open my $fd2, "> $from_tmp";
+ open my $fd, "-|", "$gitbin/cat-file", "blob", $from;
+ my @file = <$fd>;
+ print $fd2 @file;
+ close $fd2;
+ close $fd;
+ $from_label = "a/$from_name";
+ }
+
+ # create tmp to-file
+ if ($to ne "") {
+ $to_tmp = "$gittmp/gitweb_" . $$ . "_to";
+ open my $fd2, "> $to_tmp";
+ open my $fd, "-|", "$gitbin/cat-file", "blob", $to;
+ my @file = <$fd>;
+ print $fd2 @file;
+ close $fd2;
+ close $fd;
+ $to_label = "b/$to_name";
+ }
+
+ open my $fd, "-|", "/usr/bin/diff", "-L", $from_label, "-L", $to_label, "-u", "-p", $from_tmp, $to_tmp;
+ print "<span style=\"color: #000099;\">===== ";
+ if ($from ne "") {
+ print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from"}, $from);
+ } else {
+ print $from_name;
+ }
+ print " vs ";
+ if ($to ne "") {
+ print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to"}, $to);
+ } else {
+ print $to_name;
+ }
+ print " =====</span>\n";
+ while (my $line = <$fd>) {
+ my $char = substr($line,0,1);
+ print '<span style="color: #008800;">' if $char eq '+';
+ print '<span style="color: #CC0000;">' if $char eq '-';
+ print '<span style="color: #990099;">' if $char eq '@';
+ print escapeHTML($line);
+ print '</span>' if $char eq '+' or $char eq '-' or $char eq '@';
+ }
+ close $fd;
+
+ if ($from ne "") {
+ unlink("$from_tmp");
+ }
+ if ($to ne "") {
+ unlink("$to_tmp");
+ }
+}
+
+sub mode_str {
+ my $perms = oct shift;
+ my $modestr;
+ if ($perms & 040000) {
+ $modestr .= 'drwxrwxr-x';
+ } else {
+ # git cares only about the executable bit
+ if ($perms & 0100) {
+ $modestr .= '-rwxrwxr-x';
+ } else {
+ $modestr .= '-rw-rw-r--';
+ };
+ }
+ return $modestr;
+}
+
+sub date_str {
+ my $epoch = shift;
+ my $tz = shift || "-0000";
+
+ my %date;
+ my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
+ my @days = ("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");
+ my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($epoch);
+ $date{'hour'} = $hour;
+ $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);
+ ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($local);
+ $date{'rfc2822_local'} = sprintf "%s, %d %s %4d %02d:%02d:%02d %s", $days[$wday], $mday, $months[$mon], 1900+$year, $hour ,$min, $sec, $tz;
+ return %date;
+}
+
+if ($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".
+ "\055\000\000\000\030\120\114\124\105\377\377\377\140\140\135\260".
+ "\257\252\000\200\000\316\315\307\300\000\000\350\350\346\367\367".
+ "\366\225\014\247\107\000\000\000\163\111\104\101\124\050\317\143".
+ "\110\147\040\004\112\134\030\012\010\052\142\123\141\040\002\010".
+ "\015\151\105\254\241\241\001\060\014\223\140\066\046\122\221\261".
+ "\001\021\326\341\125\144\154\154\314\154\154\014\242\014\160\052".
+ "\142\006\052\301\142\035\263\001\002\123\244\010\350\000\003\030".
+ "\046\126\021\324\341\040\227\033\340\264\016\065\044\161\051\202".
+ "\231\060\270\223\012\021\271\105\210\301\215\240\242\104\041\006".
+ "\047\101\202\100\205\301\105\211\040\160\001\000\244\075\041\305".
+ "\022\034\232\376\000\000\000\000\111\105\116\104\256\102\140\202";
exit;
}
-if ($action eq "") {
- print $cgi->redirect("$myself?project=$project&action=show_log&view_back=$view_back");
+# show list of default projects
+if ($project eq "") {
+ opendir(my $fd, "$projectroot/$defaultprojects");
+ my (@path) = sort grep(!/^\./, readdir($fd));
+ closedir($fd);
+ git_header_html();
+ print "<div class=\"page_body\">\n";
+ print "<br/><br/>\n";
+ foreach my $line (@path) {
+ if (-e "$projectroot/$defaultprojects/$line/.git/HEAD") {
+ print $cgi->a({-href => "$my_uri?p=$defaultprojects/$line;a=log"}, "$defaultprojects/$line") . "<br/>\n";
+ }
+ }
+ print "<br/></div>";
+ git_footer_html();
exit;
}
-if ($action eq "show_file") {
- header();
- print "<pre>\n";
+if ($action eq "blob") {
+ git_header_html();
+ print "<div class=\"page_body\"><pre><br/><br/>\n";
open my $fd, "-|", "$gitbin/cat-file", "blob", $hash;
my $nr;
while (my $line = <$fd>) {
$nr++;
- print "$nr\t" . escapeHTML($line);;
+ printf "<span style =\"color: #999999;\">%4i\t</span>%s", $nr, escapeHTML($line);;
}
close $fd;
- print "</pre>\n";
- footer();
-} elsif ($action eq "show_tree") {
+ print "<br/><br/></pre>\n";
+ print "</div>";
+ git_footer_html();
+} elsif ($action eq "tree") {
if ($hash eq "") {
- open my $fd, "$projectroot/.git/HEAD";
- my $head = <$fd>;
- chomp $head;
- close $fd;
-
- open $fd, "-|", "$gitbin/cat-file", "commit", $head;
- my $tree = <$fd>;
- chomp $tree;
- $tree =~ s/tree //;
- close $fd;
- $hash = $tree;
+ $hash = git_head($project);
}
open my $fd, "-|", "$gitbin/ls-tree", $hash;
my (@entries) = map { chomp; $_ } <$fd>;
close $fd;
- header();
- print "<pre>\n";
+ git_header_html();
+ print "<div class=\"page_body\">\n";
+ print "<br/><pre>\n";
foreach my $line (@entries) {
+ #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c'
$line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
+ my $t_mode = $1;
my $t_type = $2;
my $t_hash = $3;
my $t_name = $4;
if ($t_type eq "blob") {
- print "FILE\t" . $cgi->a({-href => "$myself?project=$project&action=show_file&hash=$3"}, $4) . "\n";
+ print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash"}, $t_name) . "\n";
} elsif ($t_type eq "tree") {
- print "DIR\t" . $cgi->a({-href => "$myself?project=$project&action=show_tree&hash=$3"}, $4) . "\n";
+ print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash"}, $t_name) . "\n";
}
}
print "</pre>\n";
- footer();
-} elsif ($action eq "show_log") {
- open my $fd, "$projectroot/.git/HEAD";
- my $head = <$fd>;
- chomp $head;
- close $fd;
- open my $fd, "-|", "$gitbin/rev-tree", $head;
+ print "<br/></div>";
+ git_footer_html();
+} elsif ($action eq "log" || $action eq "rss") {
+ open my $fd, "-|", "$gitbin/rev-list", git_head($project);
my (@revtree) = map { chomp; $_ } <$fd>;
close $fd;
- header();
- print "<table cellspacing=\"0\" class=\"log\">\n";
- foreach my $rev (reverse sort @revtree) {
- if (!($rev =~ m/^([0-9]+) ([0-9a-fA-F]+).* ([0-9a-fA-F]+)/)) {
- last;
- }
- my $time = $1;
- my $commit = $2;
- my $parent = $3;
- my @parents;
- my $author;
- my $author_name;
- my $author_time;
- my $author_timezone;
- my $committer;
- my $committer_time;
- my $committer_timezone;
- my $tree;
- my $comment;
- my $shortlog;
- open my $fd, "-|", "$gitbin/cat-file", "commit", $commit;
- while (my $line = <$fd>) {
- chomp($line);
- if ($line eq "") {
- last;
- }
- if ($line =~ m/^tree (.*)$/) {
- $tree = $1;
- } elsif ($line =~ m/^parent (.*)$/) {
- push @parents, $1;
- } elsif ($line =~ m/^committer (.*>) ([0-9]+) (.*)$/) {
- $committer = $1;
- $committer_time = $2;
- $committer_timezone = $3;
- } elsif ($line =~ m/^author (.*>) ([0-9]+) (.*)$/) {
- $author = $1;
- $author_time = $2;
- $author_timezone = $3;
- $author =~ m/^(.*) </;
- $author_name = $1;
- }
- }
- $shortlog = <$fd>;
- $shortlog = escapeHTML($shortlog);
- $comment = $shortlog . "<br/>";
- while (my $line = <$fd>) {
- chomp($line);
- $comment .= escapeHTML($line) . "<br/>\n";
- }
- close $fd;
- my $age = time-$author_time;
- if ($view_back > 0 && $age > $view_back) {
- last;
- }
+ 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") . " | ";
+ print $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | ";
+ print $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | ";
+ print $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | ";
+ print $cgi->a({-href => "$my_uri?p=$project;a=log;t=0"}, "all") . "<br/>\n";
+ print "<br/><br/>\n";
+ print "</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 <= $#revtree; $i++) {
+ my $commit = $revtree[$i];
+ my %co = git_commit($commit);
+ my %ad = date_str($co{'author_time_epoch'});
+ my $age = time - $co{'committer_time_epoch'};
my $age_string;
if ($age > 60*60*24*365*2) {
$age_string = int $age/60/60/24/365;
$age_string = int $age/60;
$age_string .= " minutes ago";
}
- print "<tr>\n";
- print "<td class=\"head1\">" . $age_string . "</td>\n";
- print "<td class=\"head1\"><a href=\"$myself?project=$project&action=show_cset&hash=$commit&parent=$parent\">" . $shortlog . "</a></td>";
- print "</tr>\n";
- print "<tr>\n";
- print "<td class=\"head2\"></td>\n";
- print "<td class=\"head2\">\n";
- print "author " . escapeHTML($author) . " [" . gmtime($author_time) . " " . $author_timezone . "]<br/>\n";
- print "committer " . escapeHTML($committer) . " [" . gmtime($committer_time) . " " . $committer_timezone . "]<br/>\n";
- print "commit <a href=\"$myself?project=$project&action=show_cset&hash=$commit&parent=$parent\">$commit</a><br/>\n";
- print "tree <a href=\"$myself?project=$project&action=show_tree&hash=$tree\">$tree</a><br/>\n";
- foreach my $par (@parents) {
- print "parent $par<br/>\n";
+ if ($action eq "log") {
+ if ($time_back > 0 && $age > $time_back*60*60*24) {
+ if ($i == 0) {
+ print "<div class=\"page_body\"> Last change $age_string.<br/><br/></div>\n";
+ }
+ last;
+ }
+ print "<a href=\"$my_uri?p=$project;a=commit;h=$commit\" class=\"log_title\">";
+ print "<div class=\"log_age\">" . $age_string . "</div>\n";
+ print $co{'title'};
+ print "</a>\n";
+ print "<div class=\"log_head\">\n";
+ print "<div class=\"log_functions\">";
+ print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "view commit") . "<br/>\n";
+ print $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "view diff") . "<br/>\n";
+ print "</div>\n";
+ print escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]<br/>\n";
+ print "</div>";
+ print "<div class=\"log_body\">\n";
+ my $comment = $co{'comment'};
+ foreach my $line (@$comment) {
+ if ($line =~ m/^(signed-off|acked)-by:/i) {
+ print '<div class="signed_off">' . escapeHTML($line) . "<br/></div>\n";
+ } else {
+ print escapeHTML($line) . "<br/>\n";
+ }
+ }
+ print "<br/><br/>\n";
+ print "</div>";
+ } elsif ($action eq "rss") {
+ last if ($i >= 20);
+ print "<item>\n\t<title>" . $ad{'mday-time'} . " - " . escapeHTML($co{'title'}) . "</title>\n";
+ print "\t<link> " . $my_url . "/$project/commit/$commit</link>\n";
+ print "\t<description>";
+ my $comment = $co{'comment'};
+ foreach my $line (@$comment) {
+ print escapeHTML($line) . "\n";
+ }
+ print "\t</description>\n";
+ print "</item>\n";
}
- print "</td>";
- print "</tr>\n";
- print "<tr>\n";
- print "<td></td>\n";
- print "<td>\n";
- print "$comment<br/><br/>\n";
- print "</td>";
- print "</tr>\n";
}
- print "</table>\n";
- footer();
-} elsif ($action eq "show_cset") {
- open my $fd, "-|", "$gitbin/cat-file", "commit", $hash;
- my $tree = <$fd>;
- chomp $tree;
- $tree =~ s/tree //;
- close $fd;
-
- open my $fd, "-|", "$gitbin/cat-file", "commit", $parent;
- my $parent_tree = <$fd>;
- chomp $parent_tree;
- $parent_tree =~ s/tree //;
- close $fd;
-
- open my $fd, "-|", "$gitbin/diff-tree", "-r", $parent_tree, $tree;
+ if ($action eq "log") {
+ git_footer_html();
+ } elsif ($action eq "rss") {
+ print "</channel></rss>";
+ }
+} elsif ($action eq "commit") {
+ my %co = git_commit($hash);
+ my %ad = date_str($co{'author_time_epoch'}, $co{'author_time_zone'});
+ my %cd = date_str($co{'committer_time_epoch'}, $co{'committer_time_zone'});
+ open my $fd, "-|", "$gitbin/diff-tree", "-r", $co{'parent'}, $hash;
my (@difftree) = map { chomp; $_ } <$fd>;
close $fd;
- header();
+ git_header_html();
+ print "<div class=\"page_nav\"> view\n";
+ print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | ";
+ print $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diff");
+ print "<br/><br/></div>\n";
+ print "<a class=\"log_title\" href=\"$my_uri?p=$project;a=commitdiff;h=$hash\">$co{'title'}</a>\n";
+ print "<div class=\"log_head\">";
+ print "author " . escapeHTML($co{'author'}) . " [" . $ad{'rfc2822'} . "]<br/>\n";
+ if ($ad{'hour'} < 7 ) { print "<span style=\"color: #990000;\">"; }
+ if ($ad{'hour'} < 7 ) { print "</span>"; }
+ print "committer " . escapeHTML($co{'committer'}) . " [" . $cd{'rfc2822'} . "]<br/>\n";
+ print "commit $hash<br/>\n";
+ print "tree " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'}"}, $co{'tree'}) . "<br/>\n";
+ my $parents = $co{'parents'};
+ foreach my $par (@$parents) {
+ print "parent " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$par"}, $par) . "<br/>\n";
+ }
+ print "</div>";
+ print "<div class=\"page_body\">\n";
+ my $comment = $co{'comment'};
+ foreach my $line (@$comment) {
+ if ($line =~ m/(signed-off|acked)-by:/i) {
+ print '<div class="signed_off">' . escapeHTML($line) . "<br/></div>\n";
+ } else {
+ print escapeHTML($line) . "<br/>\n";
+ }
+ }
+ print "<br/><br/>\n";
print "<pre>\n";
foreach my $line (@difftree) {
+ # '*100644->100644 blob 9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596 net/ipv4/route.c'
+ # '+100644 blob 4a83ab6cd565d21ab0385bac6643826b83c2fcd4 arch/arm/lib/bitops.h'
$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
my $op = $1;
my $mode = $2;
my $type = $3;
my $id = $4;
my $file = $5;
+ $mode =~ m/^([0-7]{6})/;
+ my $modestr = mode_str($1);
if ($type eq "blob") {
if ($op eq "+") {
- print "NEW\t" . $cgi->a({-href => "$myself?project=$project&action=show_file&hash=$id"}, $file) . "\n";
+ print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$id"}, $file) . " (new)\n";
} elsif ($op eq "-") {
- print "DEL\t" . $cgi->a({-href => "$myself?project=$project&action=show_file&hash=$id"}, $file) . "\n";
+ print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;hp=$id"}, $file) . " (removed)\n";
} elsif ($op eq "*") {
$id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
- my $old = $1;
- my $new = $2;
- print "DIFF\t" . $cgi->a({-href => "$myself?project=$project&action=show_diff&hash=$old&parent=$new"}, $file) . "\n";
+ my $from = $1;
+ my $to = $2;
+ print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to;hp=$from"}, $file) . "\n";
}
}
}
print "</pre>\n";
- footer();
-} elsif ($action eq "show_diff") {
- open my $fd2, "> $gittmp/$hash";
- open my $fd, "-|", "$gitbin/cat-file", "blob", $hash;
- while (my $line = <$fd>) {
- print $fd2 $line;
- }
- close $fd2;
- close $fd;
-
- open my $fd2, "> $gittmp/$parent";
- open my $fd, "-|", "$gitbin/cat-file", "blob", $parent;
- while (my $line = <$fd>) {
- print $fd2 $line;
- }
- close $fd2;
+ print "<br/></div>";
+ git_footer_html();
+} elsif ($action eq "blobdiff") {
+ git_header_html();
+ print "<div class=\"page_body\"><br/><br/>\n";
+ print "<pre>\n";
+ git_diff_html($hash_parent, $hash, $hash_parent, $hash);
+ print "</pre>\n";
+ print "<br/></div>";
+ git_footer_html();
+} elsif ($action eq "commitdiff") {
+ my %co = git_commit($hash);
+ open my $fd, "-|", "$gitbin/diff-tree", "-r", $co{'parent'}, $hash;
+ my (@difftree) = map { chomp; $_ } <$fd>;
close $fd;
- header();
+ git_header_html();
+ print "<div class=\"page_nav\"> view\n";
+ print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | ";
+ print $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diff");
+ print "<br/><br/></div>\n";
+ print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "log_title"}, $co{'title'}) ."\n";
+ print "<div class=\"page_body\">\n";
print "<pre>\n";
- open my $fd, "-|", "/usr/bin/diff", "-L", "$hash", "-L", "$parent", "-u", "-p", "$gittmp/$hash", "$gittmp/$parent";
- while (my $line = <$fd>) {
- print escapeHTML($line);
+ foreach my $line (@difftree) {
+ # '*100644->100644 blob 8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154 Makefile'
+ $line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
+ my $op = $1;
+ my $mode = $2;
+ my $type = $3;
+ my $id = $4;
+ my $file = $5;
+ if ($type eq "blob") {
+ if ($op eq "+") {
+ git_diff_html("", $file, "", $id);
+ } elsif ($op eq "-") {
+ git_diff_html($file, "", $id, "");
+ } elsif ($op eq "*") {
+ $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
+ git_diff_html($file, $file, $1, $2);
+ }
+ }
}
- close $fd;
- unlink("$gittmp/$hash");
- unlink("$gittmp/$parent");
- print "</pre>\n";
- footer();
+ print "<br/></pre>\n";
+ print "</div>";
+ git_footer_html();
} else {
- header();
- print "unknown action\n";
- footer();
+ git_header_html();
+ print "<div class=\"head2\">\n";
+ print "unknown action";
+ print "</div><br/><br/>\n";
+ git_footer_html();
}
Lady’s Gitweb / Gitweb / blobdiff