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 $view_back = $cgi->param("view_back") || 60*60*24;
my $projectroot = "$gitroot/$project";
$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/.git/objects";
$parent =~ s/[^0-9a-fA-F]//g;
$project =~ s/[^0-9a-zA-Z\-\._]//g;
-sub header {
+sub git_header {
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">
<title>GIT</title>
<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.body { 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; }
+ 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.main { padding:8px; font-family: sans-serif; font-size: 12px; }
+ 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; }
- 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; }
+ td.head3 { background-color: #EDECE6; font-size:10px; }
+ div.add { color: #008800; }
+ div.subtract { color: #CC0000; }
+ div.diff_head { color: #990099; }
+ a { color:#0000cc; }
+ a:hover { color:#880000; }
+ a:visited { color:#880000; }
+ a:active { color:#880000; }
</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=\"git_logo.png\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/></a>";
+ print $cgi->a({-href => "$myself"}, "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 => "$myself?project=$project&action=log&view_back=" . 60*60*24}, $project);
}
+ if ($action ne "") {
+ print " / " . $action . " " . $hash;
+ }
+ print "</div>\n";
}
-sub footer {
+sub git_footer {
print "</div>";
print $cgi->end_html();
}
+sub git_diff {
+ my $old_name = shift;
+ my $new_name = shift;
+ 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";
+
+ if ($old ne "") {
+ open my $fd2, "> $gittmp/$old";
+ open my $fd, "-|", "$gitbin/cat-file", "blob", $old;
+ while (my $line = <$fd>) {
+ print $fd2 $line;
+ }
+ close $fd2;
+ close $fd;
+ $tmp_old = "$gittmp/$old";
+ $label_old = "a/$old_name";
+ }
+
+ if ($new ne "") {
+ open my $fd2, "> $gittmp/$new";
+ open my $fd, "-|", "$gitbin/cat-file", "blob", $new;
+ while (my $line = <$fd>) {
+ print $fd2 $line;
+ }
+ close $fd2;
+ close $fd;
+ $tmp_new = "$gittmp/$new";
+ $label_new = "b/$new_name";
+ }
+
+ open my $fd, "-|", "/usr/bin/diff", "-L", $label_old, "-L", $label_new, "-u", "-p", $tmp_old, $tmp_new;
+ 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 escapeHTML($line);
+ print '</div>' if $char eq '+' or $char eq '-' or $char eq '@';
+ }
+ close $fd;
+ #unlink("$gittmp/$new");
+ #unlink("$gittmp/$old");
+}
+
if ($project eq "") {
open my $fd, "-|", "ls", "-1", $gitroot;
my (@path) = map { chomp; $_ } <$fd>;
close $fd;
- header();
- print "Projects:<br/><br/>\n";
+ 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";
}
}
- footer();
+ print "<br/></div>";
+ git_footer();
exit;
}
if ($action eq "") {
- print $cgi->redirect("$myself?project=$project&action=show_log&view_back=$view_back");
+ print $cgi->redirect("$myself?project=$project&action=log&view_back=$view_back");
exit;
}
-if ($action eq "show_file") {
- header();
+if ($action eq "file") {
+ git_header();
+ print "<br/><br/><div class=\"main\">\n";
print "<pre>\n";
open my $fd, "-|", "$gitbin/cat-file", "blob", $hash;
my $nr;
}
close $fd;
print "</pre>\n";
- footer();
-} elsif ($action eq "show_tree") {
+ print "<br/></div>";
+ git_footer();
+} 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;
open my $fd, "-|", "$gitbin/ls-tree", $hash;
my (@entries) = map { chomp; $_ } <$fd>;
close $fd;
- header();
+ git_header();
+ print "<br/><br/><div class=\"main\">\n";
print "<pre>\n";
foreach my $line (@entries) {
$line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
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 "FILE\t" . $cgi->a({-href => "$myself?project=$project&action=file&hash=$3"}, $4) . "\n";
} elsif ($t_type eq "tree") {
- print "DIR\t" . $cgi->a({-href => "$myself?project=$project&action=show_tree&hash=$3"}, $4) . "\n";
+ print "DIR\t" . $cgi->a({-href => "$myself?project=$project&action=tree&hash=$3"}, $4) . "\n";
}
}
print "</pre>\n";
- footer();
-} elsif ($action eq "show_log") {
+ print "<br/></div>";
+ git_footer();
+} elsif ($action eq "log" || $action eq "show_log" ) {
open my $fd, "$projectroot/.git/HEAD";
my $head = <$fd>;
chomp $head;
close $fd;
- open my $fd, "-|", "$gitbin/rev-tree", $head;
+ open $fd, "-|", "$gitbin/rev-tree", $head;
my (@revtree) = map { chomp; $_ } <$fd>;
close $fd;
- header();
+ 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 "<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]+)/)) {
}
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 "<td class=\"head1\"><a href=\"$myself?project=$project&action=commit&hash=$commit&parent=$parent\">" . $shortlog . "</a></td>";
print "</tr>\n";
print "<tr>\n";
- print "<td class=\"head2\"></td>\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 "</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";
+ print "commit $commit<br/>\n";
+ print "tree $tree<br/>\n";
foreach my $par (@parents) {
print "parent $par<br/>\n";
}
print "</tr>\n";
}
print "</table>\n";
- footer();
-} elsif ($action eq "show_cset") {
+ git_footer();
+} elsif ($action eq "commit") {
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;
+ open $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;
+ open $fd, "-|", "$gitbin/diff-tree", "-r", $parent_tree, $tree;
my (@difftree) = map { chomp; $_ } <$fd>;
close $fd;
- header();
+ git_header();
+ print "<br/><br/><div class=\"main\">\n";
print "<pre>\n";
foreach my $line (@difftree) {
$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
my $file = $5;
if ($type eq "blob") {
if ($op eq "+") {
- print "NEW\t" . $cgi->a({-href => "$myself?project=$project&action=show_file&hash=$id"}, $file) . "\n";
+ print "NEW\t" . $cgi->a({-href => "$myself?project=$project&action=file&hash=$id"}, $file) . "\n";
} elsif ($op eq "-") {
- print "DEL\t" . $cgi->a({-href => "$myself?project=$project&action=show_file&hash=$id"}, $file) . "\n";
+ print "DEL\t" . $cgi->a({-href => "$myself?project=$project&action=file&hash=$id"}, $file) . "\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";
+ print "DIFF\t" . $cgi->a({-href => "$myself?project=$project&action=diff&hash=$old&parent=$new"}, $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;
+ print "<br/></div>";
+ git_footer();
+} elsif ($action eq "diff") {
+ git_header();
+ print "<br/><br/><div class=\"main\">\n";
+ print "<pre>\n";
+ git_diff($hash, $parent, $hash, $parent);
+ print "</pre>\n";
+ print "<br/></div>";
+ git_footer();
+} elsif ($action eq "diffs") {
+ open my $fd, "-|", "$gitbin/cat-file", "commit", $hash;
+ my $tree = <$fd>;
+ chomp $tree;
+ $tree =~ s/tree //;
close $fd;
- open my $fd2, "> $gittmp/$parent";
- open my $fd, "-|", "$gitbin/cat-file", "blob", $parent;
- while (my $line = <$fd>) {
- print $fd2 $line;
- }
- close $fd2;
+ open $fd, "-|", "$gitbin/cat-file", "commit", $parent;
+ my $parent_tree = <$fd>;
+ chomp $parent_tree;
+ $parent_tree =~ s/tree //;
+ close $fd;
+
+ open $fd, "-|", "$gitbin/diff-tree", "-r", $parent_tree, $tree;
+ my (@difftree) = map { chomp; $_ } <$fd>;
close $fd;
- header();
+ git_header();
+ print "<br/><br/><div class=\"main\">\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) {
+ $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("", $file, "", $id);
+ } elsif ($op eq "-") {
+ git_diff($file, "", $id, "");
+ } elsif ($op eq "*") {
+ $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
+ git_diff($file, $file, $1, $2);
+ }
+ }
+ print "<br/>\n";
}
- close $fd;
- unlink("$gittmp/$hash");
- unlink("$gittmp/$parent");
print "</pre>\n";
- footer();
+ print "<br/></div>";
+ print "<br/></div>";
+ git_footer();
} else {
- header();
+ git_header();
+ print "<br/><br/><div class=\"main\">\n";
print "unknown action\n";
- footer();
+ print "<br/></div>";
+ git_footer();
}
projects / git.git / commitdiff