# gitweb.pl - simple web interface to track changes in git repositories
#
-# Version 035
+# Version 042
#
# (C) 2005, Kay Sievers <kay.sievers@vrfy.org>
# (C) 2005, Christian Gierke <ch@gierke.de>
my $action = $cgi->param('a');
my $hash = $cgi->param('h');
my $hash_parent = $cgi->param('hp');
-my $time_back = $cgi->param('t');
+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;
$hash_parent =~ s/[^0-9a-fA-F]//g;
<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 { font-size:18px; 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; }
}
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;
$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]+) (.*)$/) {
$co{'author'} = $1;
- $co{'author_time'} = $2;
+ $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/ <.*//;
}
}
$co{'parents'} = \@parents;
}
open my $fd, "-|", "/usr/bin/diff", "-L", $from_label, "-L", $to_label, "-u", "-p", $from_tmp, $to_tmp;
- print "<span style =\"color: #000099;\">===== ";
+ print "<span style=\"color: #000099;\">===== ";
if ($from ne "") {
print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from"}, $from);
} else {
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{'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".
# 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";
git_footer_html();
} elsif ($action eq "tree") {
if ($hash eq "") {
- $hash = git_head();
+ $hash = git_head($project);
}
open my $fd, "-|", "$gitbin/ls-tree", $hash;
my (@entries) = map { chomp; $_ } <$fd>;
print "<br/>";
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;
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_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;
print $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$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 escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]<br/>\n";
print "</td>";
print "</tr>\n";
print "<tr>\n";
print "</tr>\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 "<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'};
}
} 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;
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 "author " . escapeHTML($co{'author'}) . " [" . $ad{'rfc2822'} . "]<br/>\n";
+ if ($ad{'hour'} < 7 ) { print "<span style=\"color: #990000;\">"; }
+ print "localtime " . $ad{'rfc2822_local'} . "<br/>\n";
+ 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'};
my $modestr = mode_str($1);
if ($type eq "blob") {
if ($op eq "+") {
- print "added\t$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$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?p=$project;a=blob;h=$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?p=$project;a=blobdiff;h=$old;hp=$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";
}
}
}
git_header_html();
print "<br/><br/>\n";
print "<pre>\n";
- git_diff_html($hash, $hash_parent, $hash, $hash_parent);
+ git_diff_html($hash_parent, $hash, $hash_parent, $hash);
print "</pre>\n";
print "<br/>";
git_footer_html();
Lady’s Gitweb / Gitweb / blobdiff