#!/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
+#
+# Version 020
+#
# (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 qw(:standard :escapeHTML);
use CGI::Carp qw(fatalsToBrowser);
+my $projectroot = "/home/kay/public_html";
+my $defaultprojects = ".";
+my $gitbin = "/home/kay/bin/git";
+my $gittmp = "/tmp";
+
my $cgi = new CGI;
-my $gitbin = "/home/kay/bin/git";
-my $gitroot = "/home/kay/public_html";
-my $gittmp = "/tmp";
-my $myself = $cgi->url(-relative => 1);
+my $project = "";
+my $action = "";
+my $hash = "";
+my $hash_parent = "";
+my $view_back;
+my $myself = $cgi->url(-absolute => 1);
+my $url_parm = $cgi->url(-path => 1);
+$url_parm =~ s/.*$myself//;
+
+# get values from url
+if ($url_parm =~ m#/(.+)/commit/([0-9a-fA-F]+)$#) {
+ $project = $1;
+ $action = "commit";
+ $hash = $2;
+} elsif ($url_parm =~ m#/(.+)/treediff/([0-9a-fA-F]+)$#) {
+ $project = $1;
+ $action = "treediff";
+ $hash = $2;
+} elsif ($url_parm =~ m#/(.+)/diff/([0-9a-fA-F]+)/([0-9a-fA-F]+)$#) {
+ $project = $1;
+ $action = "diff";
+ $hash = $2;
+ $hash_parent = $3;
+} elsif ($url_parm =~ m#/(.+)/blob/([0-9a-fA-F]+)$#) {
+ $project = $1;
+ $action = "blob";
+ $hash = $2;
+} elsif ($url_parm =~ m#/(.+)/tree/([0-9a-fA-F]+)$#) {
+ $project = $1;
+ $action = "tree";
+ $hash = $2;
+} elsif ($url_parm =~ m#/(.+)/log/([0-9]+)$#) {
+ $project = $1;
+ $action = "log";
+ $view_back = $2;
+} elsif ($url_parm =~ m#/(.+)/log$#) {
+ $project = $1;
+ $action = "log";
+ $view_back = 1;
+} elsif ($url_parm =~ m#/git-logo.png$#) {
+ print $cgi->header(-type => 'image/png');
+ 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 ($url_parm =~ m#/(.+)$#) {
+ $project = $1;
+ $action = "log";
+ $view_back = 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;
-my $projectroot = "$gitroot/$project";
-$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/.git/objects";
+# sanitize input
+$project =~ s#\/\.+##g;
-$hash =~ s/[^0-9a-fA-F]//g;
-$parent =~ s/[^0-9a-fA-F]//g;
-$project =~ s/[^0-9a-zA-Z\-\._]//g;
+$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/.git/objects";
sub git_header {
print $cgi->header(-type => 'text/html; charset: utf-8');
div.head2 a:hover { color:#880000; }
div.head2 a:active { color:#880000; }
div.main { padding:8px; font-family: sans-serif; font-size: 12px; }
+ div.shortlog { padding:8px; background-color: #D9D8D1; font-weight:bold; }
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 a:visited { color:#000000; }
td.head2 { background-color: #EDECE6; font-family: monospace; font-size:12px; }
td.head3 { background-color: #EDECE6; font-size:10px; }
- div.add { color: #008800; }
- div.subtract { color: #CC0000; }
- div.diff_head { color: #990099; }
+ div.signed_off { color: #a9a8a1; }
a { color:#0000cc; }
a:hover { color:#880000; }
a:visited { color:#880000; }
EOF
print "<div class=\"body\">\n";
print "<div class=\"head1\">";
- print "<a href=\"http://kernel.org/pub/software/scm/git/\"><img src=\"git_logo.png\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/></a>";
- print $cgi->a({-href => "$myself"}, "projects");
+ print "<a href=\"http://kernel.org/pub/software/scm/git/\"><img src=\"$myself/git-logo.png\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/></a>";
+ if ($defaultprojects ne "") {
+ print $cgi->a({-href => "$myself"}, "projects") . " / ";
+ }
if ($project ne "") {
- print " / " . $cgi->a({-href => "$myself?project=$project&action=log&view_back=" . 60*60*24}, $project);
+ print $cgi->a({-href => "$myself/$project/log"}, $project);
}
if ($action ne "") {
print " / $action";
}
sub git_diff {
- my $old_name = shift;
- my $new_name = shift;
+ my $old_name = shift || "/dev/null";
+ my $new_name = shift || "/dev/null";
my $old = shift;
my $new = shift;
- my $label_old = "/dev/null";
- my $label_new = "/dev/null";
my $tmp_old = "/dev/null";
my $tmp_new = "/dev/null";
+ my $old_label = "/dev/null";
+ my $new_label = "/dev/null";
+ # create temp from-file
if ($old ne "") {
open my $fd2, "> $gittmp/$old";
open my $fd, "-|", "$gitbin/cat-file", "blob", $old;
close $fd2;
close $fd;
$tmp_old = "$gittmp/$old";
- $label_old = "a/$old_name";
+ $old_label = "a/$old_name";
}
+ # create tmp to-file
if ($new ne "") {
open my $fd2, "> $gittmp/$new";
open my $fd, "-|", "$gitbin/cat-file", "blob", $new;
close $fd2;
close $fd;
$tmp_new = "$gittmp/$new";
- $label_new = "b/$new_name";
+ $new_label = "b/$new_name";
}
- open my $fd, "-|", "/usr/bin/diff", "-L", $label_old, "-L", $label_new, "-u", "-p", $tmp_old, $tmp_new;
+ open my $fd, "-|", "/usr/bin/diff", "-L", $old_label, "-L", $new_label, "-u", "-p", $tmp_old, $tmp_new;
+ print "<span style =\"color: #000099;\">===== ";
+ if ($old ne "") {
+ print $cgi->a({-href => "$myself/$project/blob/$old"}, $old);
+ } else {
+ print $old_name;
+ }
+ print " vs ";
+ if ($new ne "") {
+ print $cgi->a({-href => "$myself/$project/blob/$new"}, $new);
+ } else {
+ print $new_name;
+ }
+ print " =====</span>\n";
while (my $line = <$fd>) {
my $char = substr($line,0,1);
- print '<div class="add">' if $char eq '+';
- print '<div class="subtract">' if $char eq '-';
- print '<div class="diff_head">' 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 '</div>' if $char eq '+' or $char eq '-' or $char eq '@';
+ print '</span>' if $char eq '+' or $char eq '-' or $char eq '@';
}
close $fd;
- #unlink("$gittmp/$new");
- #unlink("$gittmp/$old");
+ unlink("$gittmp/$new");
+ unlink("$gittmp/$old");
}
if ($project eq "") {
- open my $fd, "-|", "ls", "-1", $gitroot;
- my (@path) = map { chomp; $_ } <$fd>;
- close $fd;
+ opendir(my $fd, "$projectroot/$defaultprojects");
+ my (@path) = grep(!/^\./, readdir($fd));
+ closedir($fd);
git_header();
print "<br/><br/><div class=\"main\">\n";
foreach my $line (@path) {
- if (-e "$gitroot/$line/.git/HEAD") {
- print $cgi->a({-href => "$myself?project=$line"}, $line) . "<br/>\n";
+ if (-e "$projectroot/$defaultprojects/$line/.git/HEAD") {
+ print $cgi->a({-href => "$myself/$defaultprojects/$line/log"}, $line) . "<br/>\n";
}
}
print "<br/></div>";
exit;
}
-if ($action eq "") {
- print $cgi->redirect("$myself?project=$project&action=log&view_back=$view_back");
- exit;
-}
-
if ($action eq "blob") {
git_header();
print "<br/><br/><div class=\"main\">\n";
git_footer();
} elsif ($action eq "tree") {
if ($hash eq "") {
- open my $fd, "$projectroot/.git/HEAD";
+ open my $fd, "$projectroot/$project/.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 = $head;
}
open my $fd, "-|", "$gitbin/ls-tree", $hash;
my (@entries) = map { chomp; $_ } <$fd>;
print "<br/><br/><div class=\"main\">\n";
print "<pre>\n";
foreach my $line (@entries) {
+ #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c'
$line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
my $t_type = $2;
my $t_hash = $3;
my $t_name = $4;
if ($t_type eq "blob") {
- print "BLOB\t" . $cgi->a({-href => "$myself?project=$project&action=blob&hash=$3"}, $4) . "\n";
+ print "BLOB\t" . $cgi->a({-href => "$myself/$project/blob/$3"}, $4) . "\n";
} elsif ($t_type eq "tree") {
- print "TREE\t" . $cgi->a({-href => "$myself?project=$project&action=tree&hash=$3"}, $4) . "\n";
+ print "TREE\t" . $cgi->a({-href => "$myself/$project/tree/$3"}, $4) . "\n";
}
}
print "</pre>\n";
print "<br/></div>";
git_footer();
-} elsif ($action eq "log" || $action eq "show_log" ) {
- open my $fd, "$projectroot/.git/HEAD";
+} elsif ($action eq "log") {
+ open my $fd, "$projectroot/$project/.git/HEAD";
my $head = <$fd>;
chomp $head;
close $fd;
open $fd, "-|", "$gitbin/rev-tree", $head;
- my (@revtree) = map { chomp; $_ } <$fd>;
+ my (@revtree) = reverse sort map { chomp; $_ } <$fd>;
close $fd;
git_header();
print "<div class=\"head2\">\n";
print "view ";
- print $cgi->a({-href => "$myself?project=$project&action=log&view_back=" . 60*60*24}, "last day") . " | ";
- print $cgi->a({-href => "$myself?project=$project&action=log&view_back=" . 60*60*24*7}, "week") . " | ";
- print $cgi->a({-href => "$myself?project=$project&action=log&view_back=" . 60*60*24*30}, "month") . " | ";
- print $cgi->a({-href => "$myself?project=$project&action=log&view_back=" . 60*60*24*365}, "year") . " | ";
- print $cgi->a({-href => "$myself?project=$project&action=log&view_back=-1"}, "all") . "<br/>\n";
+ print $cgi->a({-href => "$myself/$project/log"}, "last day") . " | ";
+ print $cgi->a({-href => "$myself/$project/log/7"}, "week") . " | ";
+ print $cgi->a({-href => "$myself/$project/log/31"}, "month") . " | ";
+ print $cgi->a({-href => "$myself/$project/log/365"}, "year") . " | ";
+ print $cgi->a({-href => "$myself/$project/log/0"}, "all") . "<br/>\n";
print "<br/><br/>\n";
print "</div>\n";
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;
- }
+ for (my $i = 0; $i <= $#revtree; $i++) {
+ my $rev = $revtree[$i];
+ #foreach my $rev (@revtree) {
+ # '1114106118 755e3010ee10dadf42a8a80770e1b115fb038d9b:1 2af17b4854036a1c2ec6c101d93c8dd1ed80d24e:1'
+ last if !($rev =~ m/^([0-9]+) ([0-9a-fA-F]+).* ([0-9a-fA-F]+)/);
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 ($author, $author_time, $author_timezone);
+ my ($committer, $committer_time, $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;
- }
+ last if $line eq "";
if ($line =~ m/^tree (.*)$/) {
$tree = $1;
} elsif ($line =~ m/^parent (.*)$/) {
$author = $1;
$author_time = $2;
$author_timezone = $3;
- $author =~ m/^(.*) </;
- $author_name = $1;
}
}
$shortlog = <$fd>;
$comment = $shortlog . "<br/>";
while (my $line = <$fd>) {
chomp($line);
- $comment .= escapeHTML($line) . "<br/>\n";
+ if ($line =~ m/signed-off-by:/i) {
+ $comment .= '<div class="signed_off">' . escapeHTML($line) . "<br/></div>\n";
+ } else {
+ $comment .= escapeHTML($line) . "<br/>\n";
+ }
}
close $fd;
- my $age = time-$author_time;
- if ($view_back > 0 && $age > $view_back) {
- last;
- }
+ my $age = time-$committer_time;
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";
}
+ if ($view_back > 0 && $age > $view_back*60*60*24) {
+ if ($i == 0) {
+ print "<tr>\n";
+ print "<td class=\"head1\"> Last change $age_string. </td>\n";
+ print "</tr>\n";
+ }
+ last;
+ }
print "<tr>\n";
print "<td class=\"head1\">" . $age_string . "</td>\n";
- print "<td class=\"head1\"><a href=\"$myself?project=$project&action=commit&hash=$commit&parent=$parent\">" . $shortlog . "</a></td>";
+ print "<td class=\"head1\">" . $cgi->a({-href => "$myself/$project/commit/$commit"}, $shortlog) . "</td>";
print "</tr>\n";
print "<tr>\n";
print "<td class=\"head3\">";
- print $cgi->a({-href => "$myself?project=$project&action=diffs&hash=$commit&parent=$parent"}, "view diff") . "<br/>\n";
- print $cgi->a({-href => "$myself?project=$project&action=commit&hash=$commit&parent=$parent"}, "view commit") . "<br/>\n";
- print $cgi->a({-href => "$myself?project=$project&action=tree&hash=$tree"}, "view tree") . "<br/>\n";
+ print $cgi->a({-href => "$myself/$project/treediff/$commit"}, "view diff") . "<br/>\n";
+ print $cgi->a({-href => "$myself/$project/commit/$commit"}, "view commit") . "<br/>\n";
+ print $cgi->a({-href => "$myself/$project/tree/$tree"}, "view tree") . "<br/>\n";
print "</td>\n";
print "<td class=\"head2\">\n";
print "author " . escapeHTML($author) . " [" . gmtime($author_time) . " " . $author_timezone . "]<br/>\n";
print "</table>\n";
git_footer();
} elsif ($action eq "commit") {
+ my $parent = "";
open my $fd, "-|", "$gitbin/cat-file", "commit", $hash;
- my $tree = <$fd>;
- chomp $tree;
- $tree =~ s/tree //;
- close $fd;
-
- open $fd, "-|", "$gitbin/cat-file", "commit", $parent;
- my $parent_tree = <$fd>;
- chomp $parent_tree;
- $parent_tree =~ s/tree //;
+ while (my $line = <$fd>) {
+ chomp($line);
+ last if $line eq "";
+ if ($line =~ m/^parent (.*)$/ && $parent eq "") {
+ $parent = $1;
+ }
+ }
+ my $shortlog = <$fd>;
+ $shortlog = escapeHTML($shortlog);
close $fd;
- open $fd, "-|", "$gitbin/diff-tree", "-r", $parent_tree, $tree;
+ open $fd, "-|", "$gitbin/diff-tree", "-r", $parent, $hash;
my (@difftree) = map { chomp; $_ } <$fd>;
close $fd;
git_header();
- print "<br/><br/><div class=\"main\">\n";
+ print "<div class=\"main\">\n";
+ print "view " . $cgi->a({-href => "$myself/$project/treediff/$hash"}, "diff") . "<br/><br/><br/>\n";
+ print "<div class=\"shortlog\">$shortlog<br/></div>\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 $file = $5;
if ($type eq "blob") {
if ($op eq "+") {
- print "NEW\t" . $cgi->a({-href => "$myself?project=$project&action=blob&hash=$id"}, $file) . "\n";
+ print "added\t" . $cgi->a({-href => "$myself/$project/blob/$id"}, $file) . "\n";
} elsif ($op eq "-") {
- print "DEL\t" . $cgi->a({-href => "$myself?project=$project&action=blob&hash=$id"}, $file) . "\n";
+ print "removed\t" . $cgi->a({-href => "$myself/$project/blob/$id"}, $file) . "\n";
} elsif ($op eq "*") {
$id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
my $old = $1;
my $new = $2;
- print "CHANGED\t" . $cgi->a({-href => "$myself?project=$project&action=diff&hash=$old&parent=$new"}, $file) . "\n";
+ print "changed\t" . $cgi->a({-href => "$myself/$project/diff/$old/$new"}, $file) . "\n";
}
}
}
git_header();
print "<br/><br/><div class=\"main\">\n";
print "<pre>\n";
- git_diff($hash, $parent, $hash, $parent);
+ git_diff($hash, $hash_parent, $hash, $hash_parent);
print "</pre>\n";
print "<br/></div>";
git_footer();
-} elsif ($action eq "diffs") {
+} elsif ($action eq "treediff") {
+ my $parent = "";
open my $fd, "-|", "$gitbin/cat-file", "commit", $hash;
- my $tree = <$fd>;
- chomp $tree;
- $tree =~ s/tree //;
- close $fd;
-
- open $fd, "-|", "$gitbin/cat-file", "commit", $parent;
- my $parent_tree = <$fd>;
- chomp $parent_tree;
- $parent_tree =~ s/tree //;
+ while (my $line = <$fd>) {
+ chomp($line);
+ last if $line eq "";
+ if ($line =~ m/^parent (.*)$/ && $parent eq "") {
+ $parent = $1;
+ }
+ }
+ my $shortlog = <$fd>;
+ $shortlog = escapeHTML($shortlog);
close $fd;
- open $fd, "-|", "$gitbin/diff-tree", "-r", $parent_tree, $tree;
+ open $fd, "-|", "$gitbin/diff-tree", "-r", $parent, $hash;
my (@difftree) = map { chomp; $_ } <$fd>;
close $fd;
git_header();
- print "<br/><br/><div class=\"main\">\n";
+ print "<div class=\"main\">\n";
+ print "view " . $cgi->a({-href => "$myself/$project/commit/$hash"}, "commit") . "<br/><br/><br/>\n";
+ print "<div class=\"shortlog\">$shortlog<br/></div>\n";
print "<pre>\n";
foreach my $line (@difftree) {
+ # '*100644->100644 blob 8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154 Makefile'
$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
my $op = $1;
my $mode = $2;
git_diff($file, $file, $1, $2);
}
}
- print "<br/>\n";
}
print "</pre>\n";
print "<br/></div>";
- print "<br/></div>";
git_footer();
} else {
git_header();
Lady’s Gitweb / Gitweb / blobdiff