# gitweb.pl - simple web interface to track changes in git repositories
#
-# Version 031
-#
# (C) 2005, Kay Sievers <kay.sievers@vrfy.org>
# (C) 2005, Christian Gierke <ch@gierke.de>
#
my $cgi = new CGI;
-my $projectroot = "/home/kay/public_html";
-my $defaultprojects = ".";
+my $version = "049";
+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 $my_url_parm = $cgi->url(-path => 1);
-$my_url_parm =~ s/.*$my_uri//;
-
-my $project = "";
-my $action = "";
-my $hash = "";
-my $hash_parent = "";
-my $view_back = 1;
-# get values from url
-if ($my_url_parm =~ m#/+(.+)/+commit/+([0-9a-fA-F]+)$#) {
- $project = $1;
- $action = "commit";
- $hash = $2;
-} elsif ($my_url_parm =~ m#/+(.+)/+commitdiff/+([0-9a-fA-F]+)$#) {
- $project = $1;
- $action = "commitdiff";
- $hash = $2;
-} elsif ($my_url_parm =~ m#/+(.+)/+blobdiff/+([0-9a-fA-F]+)/([0-9a-fA-F]+)$#) {
- $project = $1;
- $action = "blobdiff";
- $hash = $2;
- $hash_parent = $3;
-} elsif ($my_url_parm =~ m#/+(.+)/+blob/+([0-9a-fA-F]+)$#) {
- $project = $1;
- $action = "blob";
- $hash = $2;
-} elsif ($my_url_parm =~ m#/+(.+)/+tree/+([0-9a-fA-F]+)$#) {
- $project = $1;
- $action = "tree";
- $hash = $2;
-} elsif ($my_url_parm =~ m#/+(.+)/+log/+([0-9]+)$#) {
- $project = $1;
- $action = "log";
- $view_back = $2;
-} elsif ($my_url_parm =~ m#/+(.+)/+log$#) {
- $project = $1;
- $action = "log";
- $view_back = 1;
-} elsif ($my_url_parm =~ m#/+(.+)/rss$#) {
- $project = $1;
- $action = "rss";
- $view_back = 1;
-} elsif ($my_url_parm =~ m#/+git-logo.png$#) {
- print $cgi->header(-type => 'image/png', -expires => '+1d');
- print "\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104\122".
- "\000\000\000\110\000\000\000\033\004\003\000\000\000\055\331\324".
- "\055\000\000\000\030\120\114\124\105\377\377\377\140\140\135\260".
- "\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;
-} elsif ($my_url_parm =~ m#/(.+)$#) {
- $project = $1;
- $action = "log";
- $view_back = 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');
+if (!(defined($time_back))) {
+ $time_back = 1;
}
+$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/.git/objects";
# sanitize input
-$project =~ s#\/\.+##g;
-
-$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/.git/objects";
+$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;
+$hash_parent =~ s/[^0-9a-fA-F]//g;
+$time_back =~ s/[^0-9]+//g;
sub git_header_html {
print $cgi->header(-type => 'text/html', -charset => 'utf-8');
<html>
<head>
<title>git - $project $action</title>
- <link rel="alternate" title="$project log" href="$my_uri/$project/rss" type="application/rss+xml"/>
+ <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.body { border-width:1px; border-style:solid; border-color:#D9D8D1; }
- div.head1 { font-size:20px; padding:8px; background-color: #D9D8D1; font-weight:bold; }
- div.head1 a:visited { color:#0000cc; }
- div.head1 a:hover { color:#880000; }
- div.head1 a:active { color:#880000; }
- div.head2 { padding:8px; }
- div.head2 a:visited { color:#0000cc; }
- div.head2 a:hover { color:#880000; }
- div.head2 a:active { color:#880000; }
- div.title { padding:8px; background-color: #D9D8D1; font-weight:bold; }
- div.title a { color:#000000; text-decoration:none; }
- div.title a:hover { color:#880000; text-decoration:underline; }
- div.title a:visited { color:#000000; }
- table { padding:0px; margin:0px; width:100%; }
- tr { vertical-align:top; }
- td { padding:8px; margin:0px; font-family: sans-serif; font-size: 12px; }
- td.head1 { background-color: #D9D8D1; font-weight:bold; }
- td.head1 a { color:#000000; text-decoration:none; }
- td.head1 a:hover { color:#880000; text-decoration:underline; }
- td.head1 a:visited { color:#000000; }
- td.head2 { background-color: #EDECE6; font-family: monospace; font-size:12px; }
- td.head3 { background-color: #EDECE6; font-size:10px; }
- div.signed_off { color: #a9a8a1; }
+ 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; }
- pre { padding:8px; }
+ div.page_header { margin:15px 25px 0px; height:25px; padding:8px; font-size:18px; clear:both; font-weight:bold; background-color: #d9d8d1; }
+ div.page_header a:visited { color:#0000cc; }
+ div.page_nav { margin:0px 25px; padding:8px; clear:both; 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; 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; }
+ span.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=\"body\">\n";
- print "<div class=\"head1\">";
- print "<a href=\"http://kernel.org/pub/software/scm/git/\">" .
- "<img src=\"$my_uri/git-logo.png\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/></a>";
+ print "<div class=\"page_header\">\n" .
+ "<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 $cgi->a({-href => "$my_uri/$project/log"}, $project);
+ print $cgi->a({-href => "$my_uri?p=$project;a=log"}, $project);
}
if ($action ne "") {
print " / $action";
}
sub git_footer_html {
- print "</div>\n";
+ 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>";
print "</body>\n</html>";
}
sub git_head {
- open my $fd, "$projectroot/$project/.git/HEAD";
+ my $path = shift;
+ open my $fd, "$projectroot/$path/.git/HEAD";
my $head = <$fd>;
close $fd;
chomp $head;
my %co;
my @parents;
- open my $fd, "-|", "$gitbin/cat-file", "commit", $commit;
+ open my $fd, "-|", "$gitbin/cat-file commit $commit";
while (my $line = <$fd>) {
chomp($line);
last if $line eq "";
$co{'tree'} = $1;
} elsif ($line =~ m/^parent (.*)$/) {
push @parents, $1;
- } elsif ($line =~ m/^committer (.*>) ([0-9]+) (.*)$/) {
- $co{'committer'} = $1;
- $co{'committer_time'} = $2;
- $co{'committer_timezone'} = $3;
- } elsif ($line =~ m/^author (.*>) ([0-9]+) (.*)$/) {
+ } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
$co{'author'} = $1;
- $co{'author_time'} = $2;
- $co{'author_timezone'} = $3;
+ $co{'author_epoch'} = $2;
+ $co{'author_tz'} = $3;
+ $co{'author_name'} = $co{'author'};
+ $co{'author_name'} =~ s/ <.*//;
+ } elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) {
+ $co{'committer'} = $1;
+ $co{'committer_epoch'} = $2;
+ $co{'committer_tz'} = $3;
+ $co{'committer_name'} = $co{'committer'};
+ $co{'committer_name'} =~ s/ <.*//;
}
}
$co{'parents'} = \@parents;
my $to_label = "/dev/null";
my $pid = $$;
- # create temp from-file
+ # create tmp from-file
if ($from ne "") {
$from_tmp = "$gittmp/gitweb_" . $$ . "_from";
open my $fd2, "> $from_tmp";
- open my $fd, "-|", "$gitbin/cat-file", "blob", $from;
+ open my $fd, "-|", "$gitbin/cat-file blob $from";
my @file = <$fd>;
print $fd2 @file;
close $fd2;
if ($to ne "") {
$to_tmp = "$gittmp/gitweb_" . $$ . "_to";
open my $fd2, "> $to_tmp";
- open my $fd, "-|", "$gitbin/cat-file", "blob", $to;
+ open my $fd, "-|", "$gitbin/cat-file blob $to";
my @file = <$fd>;
print $fd2 @file;
close $fd2;
$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;\">===== ";
+ open my $fd, "-|", "/usr/bin/diff -u -p -L $from_label -L $to_label $from_tmp $to_tmp";
+ print "<span style=\"color: #000099;\">===== ";
if ($from ne "") {
- print $cgi->a({-href => "$my_uri/$project/blob/$from"}, $from);
+ 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/$project/blob/$to"}, $to);
+ 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 '<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 '@';
}
sub mode_str {
my $perms = oct shift;
my $modestr;
- if ($perms & 040000) { $modestr .= 'd' } else { $modestr .= '-' };
- for (my $i = 0; $i < 3; $i++) {
- if ($perms & 0400) { $modestr .= 'r' } else { $modestr .= '-' };
- if ($perms & 0200) { $modestr .= 'w' } else { $modestr .= '-' };
- if ($perms & 0100) { $modestr .= 'x' } else { $modestr .= '-' };
- $perms <<= 3;
+ 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{'minute'} = $min;
+ $date{'mday'} = $mday;
+ $date{'day'} = $days[$wday];
+ $date{'month'} = $months[$mon];
+ $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{'hour_local'} = $hour;
+ $date{'minute_local'} = $min;
+ $date{'tz_local'} = $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;
+}
+
# show list of default projects
if ($project eq "") {
opendir(my $fd, "$projectroot/$defaultprojects");
- my (@path) = grep(!/^\./, readdir($fd));
+ my (@path) = sort grep(!/^\./, readdir($fd));
closedir($fd);
git_header_html();
- print "<div class=\"head2\">\n";
+ 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/$defaultprojects/$line/log"}, $line) . "<br/>\n";
+ print $cgi->a({-href => "$my_uri?p=$defaultprojects/$line;a=log"}, "$defaultprojects/$line") . "<br/>\n";
}
}
- print "</div><br/>";
+ print "<br/></div>";
git_footer_html();
exit;
}
+if ($action eq "") {
+ $action = "log";
+}
+
if ($action eq "blob") {
git_header_html();
- print "<br/><br/>\n";
- print "<pre>\n";
- open my $fd, "-|", "$gitbin/cat-file", "blob", $hash;
+ 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";
- print "<br/>";
+ print "<br/><br/></pre>\n";
+ print "</div>";
git_footer_html();
} elsif ($action eq "tree") {
if ($hash eq "") {
- $hash = git_head();
+ $hash = git_head($project);
}
- open my $fd, "-|", "$gitbin/ls-tree", $hash;
+ open my $fd, "-|", "$gitbin/ls-tree $hash";
my (@entries) = map { chomp; $_ } <$fd>;
close $fd;
git_header_html();
- print "<br/><br/>\n";
- print "<pre>\n";
+ 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_hash = $3;
my $t_name = $4;
if ($t_type eq "blob") {
- print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri/$project/blob/$t_hash"}, $t_name) . "\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 mode_str($t_mode). " " . $cgi->a({-href => "$my_uri/$project/tree/$t_hash"}, $t_name) . "\n";
+ print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash"}, $t_name) . "\n";
}
}
print "</pre>\n";
- print "<br/>";
+ print "<br/></div>";
git_footer_html();
} elsif ($action eq "log" || $action eq "rss") {
- open my $fd, "-|", "$gitbin/rev-list", git_head();
+ open my $fd, "-|", "$gitbin/rev-list " . git_head($project);
my (@revtree) = map { chomp; $_ } <$fd>;
close $fd;
if ($action eq "log") {
git_header_html();
- print "<div class=\"head2\">\n";
+ print "<div class=\"page_nav\">\n";
print "view ";
- print $cgi->a({-href => "$my_uri/$project/log"}, "last day") . " | ";
- print $cgi->a({-href => "$my_uri/$project/log/7"}, "week") . " | ";
- print $cgi->a({-href => "$my_uri/$project/log/31"}, "month") . " | ";
- print $cgi->a({-href => "$my_uri/$project/log/365"}, "year") . " | ";
- print $cgi->a({-href => "$my_uri/$project/log/0"}, "all") . "<br/>\n";
- print "<br/><br/>\n";
- print "</div>\n";
- print "<table cellspacing=\"0\" class=\"log\">\n";
+ 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".
for (my $i = 0; $i <= $#revtree; $i++) {
my $commit = $revtree[$i];
-
my %co = git_commit($commit);
- my $age = time - $co{'committer_time'};
+ my %ad = date_str($co{'author_epoch'});
+ my $age = time - $co{'committer_epoch'};
my $age_string;
if ($age > 60*60*24*365*2) {
$age_string = int $age/60/60/24/365;
$age_string .= " minutes ago";
}
if ($action eq "log") {
- if ($view_back > 0 && $age > $view_back*60*60*24) {
+ if ($time_back > 0 && $age > $time_back*60*60*24) {
if ($i == 0) {
- print "<tr>\n";
- print "<td class=\"head1\"> Last change $age_string. </td>\n";
- print "</tr>\n";
+ print "<div class=\"page_body\"> Last change $age_string.<br/><br/></div>\n";
}
last;
}
- print "<tr>\n";
- print "<td class=\"head1\">" . $age_string . "</td>\n";
- print "<td class=\"head1\">" . $cgi->a({-href => "$my_uri/$project/commit/$commit"}, $co{'title'}) . "</td>";
- print "</tr>\n";
- print "<tr>\n";
- print "<td class=\"head3\">";
- print $cgi->a({-href => "$my_uri/$project/commit/$commit"}, "view commit") . "<br/>\n";
- print $cgi->a({-href => "$my_uri/$project/commitdiff/$commit"}, "view diff") . "<br/>\n";
- print "</td>\n";
- print "<td class=\"head2\">\n";
- print "author " . escapeHTML($co{'author'}) . " [" . gmtime($co{'author_time'}) . " " . $co{'author_timezone'} . "]<br/>\n";
- print "committer " . escapeHTML($co{'committer'}) . " [" . gmtime($co{'committer_time'}) . " " . $co{'committer_timezone'} . "]<br/>\n";
- print "</td>";
- print "</tr>\n";
- print "<tr>\n";
- print "<td></td>\n";
- print "<td>\n";
+ print "<div><a href=\"$my_uri?p=$project;a=commit;h=$commit\" class=\"log_title\">\n" .
+ "<span class=\"log_age\">" . $age_string . "</span>\n" . escapeHTML($co{'title'}) . "</a>\n" .
+ "</div>\n";
+ print "<div class=\"log_head\">\n" .
+ "<div class=\"log_functions\">\n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "view commit") . "<br/>\n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "view diff") . "<br/>\n" .
+ "</div>\n" .
+ escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]<br/>\n" .
+ "</div>\n" .
+ "<div class=\"log_body\">\n";
my $comment = $co{'comment'};
foreach my $line (@$comment) {
if ($line =~ m/^(signed-off|acked)-by:/i) {
print escapeHTML($line) . "<br/>\n";
}
}
- print "<br/><br/>\n";
- print "</td>";
- print "</tr>\n";
+ print "<br/><br/>\n" .
+ "</div>\n";
} elsif ($action eq "rss") {
last if ($i >= 20);
- my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday) = gmtime($co{'author_time'});
- my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
- print "<item>\n\t<title>";
- printf("%s %02d, %02d:%02d - ", $months[$mon], $mday, $hour, $min);
- print escapeHTML($co{'title'}) . "</title>\n";
- print "\t<link> " . $my_url . "/$project/commit/$commit</link>\n";
- print "\t<description>";
+ 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";
- print "</item>\n";
+ print "\t</description>\n" .
+ "</item>\n";
}
}
if ($action eq "log") {
- print "</table>\n";
git_footer_html();
} elsif ($action eq "rss") {
print "</channel></rss>";
}
} elsif ($action eq "commit") {
my %co = git_commit($hash);
- open my $fd, "-|", "$gitbin/diff-tree", "-r", $co{'parent'}, $hash;
+ my %ad = date_str($co{'author_epoch'}, $co{'author_tz'});
+ my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
+ open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash";
my (@difftree) = map { chomp; $_ } <$fd>;
close $fd;
git_header_html();
- print "<div class=\"head2\"> view\n";
- print $cgi->a({-href => "$my_uri/$project/commit/$hash"}, "commit") . " | ";
- print $cgi->a({-href => "$my_uri/$project/commitdiff/$hash"}, "diff");
- print "</div><br/><br/>\n";
- print "<div class=\"title\">" . $cgi->a({-href => "$my_uri/$project/commitdiff/$hash"}, $co{'title'}) . "<br/></div>\n";
- print "<table cellspacing=\"0\" class=\"log\">\n";
- print "<tr>\n";
- print "<td class=\"head2\">";
- print "author " . escapeHTML($co{'author'}) . " [" . gmtime($co{'author_time'}) . " " . $co{'author_timezone'} . "]<br/>\n";
- print "committer " . escapeHTML($co{'committer'}) . " [" . gmtime($co{'committer_time'}) . " " . $co{'committer_timezone'} . "]<br/>\n";
- print "commit $hash<br/>\n";
- print "tree " . $cgi->a({-href => "$my_uri/$project/tree/$co{'tree'}"}, $co{'tree'}) . "<br/>\n";
+ 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"}, "diff") . "\n" .
+ "<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\">\n";
+ print "author " . escapeHTML($co{'author'}) . "<br/>\n";
+ print "author-time " . $ad{'rfc2822'};
+ if ($ad{'hour_local'} < 6) { print "<span style=\"color: #cc0000;\">"; }
+ printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
+ if ($ad{'hour_local'} < 6 ) { print "</span>"; }
+ print "<br/>\n";
+ print "committer " . escapeHTML($co{'committer'}) . "<br/>\n";
+ print "commit-time " . $ad{'rfc2822'};
+ printf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'});
+ print "<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/$project/tree/$par"}, $par) . "<br/>\n";
+ print "parent    " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "<br/>\n";
}
- print "</td>";
- print "</tr>\n";
- print "<tr>\n";
- print "<td>\n";
+ print "</div>\n";
+ print "<div class=\"page_body\">\n";
my $comment = $co{'comment'};
foreach my $line (@$comment) {
if ($line =~ m/(signed-off|acked)-by:/i) {
}
}
print "<br/><br/>\n";
- print "</td>";
- print "</tr>\n";
- print "</table>";
-
print "<pre>\n";
foreach my $line (@difftree) {
# '*100644->100644 blob 9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596 net/ipv4/route.c'
my $modestr = mode_str($1);
if ($type eq "blob") {
if ($op eq "+") {
- print "added\t$modestr " . $cgi->a({-href => "$my_uri/$project/blob/$id"}, $file) . "\n";
+ print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$id"}, $file) . " (new)\n";
} elsif ($op eq "-") {
- print "removed\t$modestr " . $cgi->a({-href => "$my_uri/$project/blob/$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 "changed\t$modestr " . $cgi->a({-href => "$my_uri/$project/blobdiff/$old/$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";
- print "<br/>";
+ print "</pre>\n" .
+ "<br/></div>";
git_footer_html();
} elsif ($action eq "blobdiff") {
git_header_html();
- print "<br/><br/>\n";
- git_diff_html($hash, $hash_parent, $hash, $hash_parent);
- print "</pre>\n";
- print "<br/>";
+ print "<div class=\"page_body\"><br/><br/>\n" .
+ git_diff_html($hash_parent, $hash, $hash_parent, $hash);
+ print "</pre>\n" .
+ "<br/></div>";
git_footer_html();
} elsif ($action eq "commitdiff") {
my %co = git_commit($hash);
- open my $fd, "-|", "$gitbin/diff-tree", "-r", $co{'parent'}, $hash;
+ open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash";
my (@difftree) = map { chomp; $_ } <$fd>;
close $fd;
git_header_html();
- print "<div class=\"head2\"> view\n";
- print $cgi->a({-href => "$my_uri/$project/commit/$hash"}, "commit") . " | ";
- print $cgi->a({-href => "$my_uri/$project/commitdiff/$hash"}, "diff");
- print "</div><br/><br/>\n";
- print "<div class=\"title\">" . $cgi->a({-href => "$my_uri/$project/commit/$hash"}, $co{'title'}) . "<br/></div>\n";
- print "<pre>\n";
+ 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"}, "diff") . "\n" .
+ "<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" .
+ "<pre>\n";
foreach my $line (@difftree) {
# '*100644->100644 blob 8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154 Makefile'
$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
}
}
}
- print "</pre>\n";
- print "<br/>";
+ print "<br/></pre>\n";
+ print "</div>";
+ git_footer_html();
+} else {
+ git_header_html();
+ print "<div class=\"page_body\">\n" .
+ "<br/><br/>\n";
+ print "unknown action\n";
+ print "<br/></div>\n";
git_footer_html();
}
Lady’s Gitweb / Gitweb / blobdiff