my $cgi = new CGI;
-my $version = "053";
+my $version = "085";
my $projectroot = "/pub/scm";
-my $defaultprojects = "linux/kernel/git";
+my $home_link = "/git";
my $gitbin = "/usr/bin";
my $gittmp = "/tmp/gitweb";
-my $giturl = "/pub/software/scm/cogito";
+my $logo_link = "/pub/software/scm/cogito";
my $my_url = $cgi->url();
my $my_uri = $cgi->url(-absolute => 1);
-
-mkdir($gittmp, 0700);
+my $rss_link = "";
my $project = $cgi->param('p');
+if (defined($project)) {
+ if ($project =~ /(^|\/)(|\.|\.\.)($|\/)/) {
+ $project = "";
+ die_error("", "Invalid project parameter.");
+ }
+ if (!(-d "$projectroot/$project")) {
+ $project = "";
+ die_error("", "No such project.");
+ }
+ $rss_link = "<link rel=\"alternate\" title=\"$project log\" href=\"$my_uri?p=$project;a=rss\" type=\"application/rss+xml\"/>";
+}
+
+my $file_name = $cgi->param('f');
+if (defined($file_name) && $file_name =~ /(^|\/)(|\.|\.\.)($|\/)/) {
+ $file_name = "";
+ die_error("", "Invalid file parameter.");
+}
+
my $action = $cgi->param('a');
+if (defined($action) && $action =~ m/[^0-9a-zA-Z\.\-]+$/) {
+ $action = "";
+ die_error("", "Invalid action parameter.");
+}
+
my $hash = $cgi->param('h');
+if (defined($hash) && !($hash =~ m/^[0-9a-fA-F]{40}$/)) {
+ $hash = "";
+ die_error("", "Invalid hash parameter.");
+}
+
my $hash_parent = $cgi->param('hp');
-my $time_back = $cgi->param('t');
-if (!(defined($time_back))) {
- $time_back = 1;
+if (defined($hash_parent) && !($hash_parent =~ m/^[0-9a-fA-F]{40}$/)) {
+ $hash_parent = "";
+ die_error("", "Invalid parent hash parameter.");
}
-$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects";
-# sanitize input
-$action =~ s/[^0-9a-zA-Z\.\-]//g;
-$hash =~ s/[^0-9a-fA-F]//g;
-$hash_parent =~ s/[^0-9a-fA-F]//g;
-$time_back =~ s/[^0-9]+//g;
-if (defined($project) && $project =~ /(^|\/)(|\.|\.\.)($|\/)/) {
- print $cgi->header(-type=>'text/plain', -status=>'403 Permission denied');
- print "Malformed query, file missing or permission denied\n";
- exit 0;
+my $time_back = $cgi->param('t');
+if (defined($time_back) && !($time_back =~ m/^[0-9]+$/)) {
+ $time_back = "";
+ die_error("", "Invalid time parameter.");
}
-$project =~ s/|//g;
+
+$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects";
+mkdir($gittmp, 0700);
sub git_header_html {
- print $cgi->header(-type => 'text/html', -charset => 'utf-8');
-print <<EOF;
+ my $status = shift || "200 OK";
+
+ print $cgi->header(-type=>'text/html', -charset => 'utf-8', -status=> $status);
+ print <<EOF;
+<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- git web interface v$version, (C) 2005, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke <ch\@gierke.de> -->
<html>
<head>
- <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: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_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;
- line-height:15px;
- 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>
+<title>git - $project</title>
+$rss_link
+<style type="text/css">
+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; font-weight:bold; background-color:#d9d8d1;
+}
+div.page_header a:visited { color:#0000cc; }
+div.page_header a:hover { color:#880000; }
+div.page_nav { margin:0px 25px; padding:8px; 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; background-color: #d9d8d1; }
+div.page_footer_text { float:left; color:#555555; font-style:italic; }
+div.page_body { margin:0px 25px; padding:8px; border:solid #d9d8d1; border-width:0px 1px; }
+div.title, a.title {
+ display:block; margin:0px 25px; padding:6px 8px;
+ font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
+}
+a.title:hover { background-color: #d9d8d1; }
+div.title_text { margin:0px 25px; padding:6px 8px; border: solid #d9d8d1; border-width:0px 1px 1px; }
+div.log_body { margin:0px 25px; padding:8px; padding-left:150px; border:solid #d9d8d1; border-width:0px 1px; }
+span.log_age { position:relative; float:left; width:142px; font-style:italic; }
+div.log_link { font-size:10px; font-family:sans-serif; font-style:normal; position:relative; float:left; width:142px; }
+div.list {
+ display:block; margin:0px 25px; padding:4px 6px 2px; border:solid #d9d8d1; border-width:1px 1px 0px;
+ font-weight:bold;
+}
+div.list_head {
+ display:block; margin:0px 25px; padding:4px 6px 4px; border:solid #d9d8d1; border-width:1px 1px 0px;
+ font-style:italic;
+}
+div.list a { text-decoration:none; color:#000000; }
+div.list a:hover { color:#880000; }
+div.link {
+ margin:0px 25px; padding:0px 6px 8px; border:solid #d9d8d1; border-width:0px 1px;
+ font-family:sans-serif; font-size:10px;
+}
+td.key { padding-right:10px; }
+a.xml_logo { float:right; border:1px solid;
+ line-height:15px;
+ 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:10px; display:block; text-decoration:none;
+}
+a.xml_logo:hover { background-color:#ee5500; }
+</style>
</head>
<body>
EOF
print "<div class=\"page_header\">\n" .
- "<a href=\"$giturl\">" .
+ "<a href=\"$logo_link\">" .
"<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") . " / ";
- }
+ print $cgi->a({-href => "$my_uri"}, "projects") . " / ";
if ($project ne "") {
- print $cgi->a({-href => "$my_uri?p=$project;a=log"}, $project);
+ print $cgi->a({-href => "$my_uri?p=$project;a=log"}, escapeHTML($project));
}
if ($action ne "") {
print " / $action";
}
sub git_footer_html {
- print "<div class=\"page_footer\">";
- print "<div class=\"page_footer_text\">version $version</div>";
- if ($project ne '') {
+ print "<div class=\"page_footer\">\n";
+ if ($project ne "") {
+ if (-e "$projectroot/$project/description") {
+ open(my $fd, "$projectroot/$project/description");
+ my $descr = <$fd>;
+ print "<div class=\"page_footer_text\">" . escapeHTML($descr) . "</div>\n";
+ close $fd;
+ }
print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "xml_logo"}, "XML") . "\n";
}
- print "</div>";
- print "</body>\n</html>";
+ print "</div>\n" .
+ "</body>\n" .
+ "</html>";
+}
+
+sub die_error {
+ my $status = shift || "403 Forbidden";
+ my $error = shift || "Malformed query, file missing or permission denied";
+
+ git_header_html($status);
+ print "<div class=\"page_body\">\n" .
+ "<br/><br/>\n";
+ print "$status - $error\n";
+ print "<br/></div>\n";
+ git_footer_html();
+ exit 0;
}
sub git_head {
my $path = shift;
- open my $fd, "$projectroot/$path/HEAD";
+ open(my $fd, "$projectroot/$path/HEAD") || die_error("", "Invalid project directory.");
my $head = <$fd>;
close $fd;
chomp $head;
$co{'committer_name'} =~ s/ <.*//;
}
}
+ if (!defined($co{'tree'})) {
+ return;
+ }
$co{'parents'} = \@parents;
$co{'parent'} = $parents[0];
my (@comment) = map { chomp; $_ } <$fd>;
$co{'comment'} = \@comment;
$co{'title'} = $comment[0];
close $fd;
+
+ my $age = time - $co{'committer_epoch'};
+ $co{'age'} = $age;
+ if ($age > 60*60*24*365*2) {
+ $co{'age_string'} = (int $age/60/60/24/365);
+ $co{'age_string'} .= " years ago";
+ } elsif ($age > 60*60*24*365/12*2) {
+ $co{'age_string'} = int $age/60/60/24/365/12;
+ $co{'age_string'} .= " months ago";
+ } elsif ($age > 60*60*24*7*2) {
+ $co{'age_string'} = int $age/60/60/24/7;
+ $co{'age_string'} .= " weeks ago";
+ } elsif ($age > 60*60*24*2) {
+ $co{'age_string'} = int $age/60/60/24;
+ $co{'age_string'} .= " days ago";
+ } elsif ($age > 60*60*2) {
+ $co{'age_string'} = int $age/60/60;
+ $co{'age_string'} .= " hours ago";
+ } elsif ($age > 60*2) {
+ $co{'age_string'} = int $age/60;
+ $co{'age_string'} .= " minutes ago";
+ }
return %co;
}
# create tmp from-file
if ($from ne "") {
$from_tmp = "$gittmp/gitweb_" . $$ . "_from";
- open my $fd2, "> $from_tmp";
+ open(my $fd2, "> $from_tmp");
open my $fd, "-|", "$gitbin/cat-file blob $from";
my @file = <$fd>;
print $fd2 @file;
my $perms = oct shift;
my $modestr;
if ($perms & 040000) {
- $modestr .= 'drwxrwxr-x';
+ $modestr .= 'drwxr-xr-x';
} else {
# git cares only about the executable bit
if ($perms & 0100) {
- $modestr .= '-rwxrwxr-x';
+ $modestr .= '-rwxr-xr-x';
} else {
- $modestr .= '-rw-rw-r--';
+ $modestr .= '-rw-r--r--';
};
}
return $modestr;
exit;
}
-# show list of default projects
-if ($project eq "") {
- opendir(my $fd, "$projectroot/$defaultprojects");
- my (@users) = sort grep(!/^\./, readdir($fd));
- closedir($fd);
- git_header_html();
- print "<div class=\"page_body\">\n";
- print "<br/><br/>\n";
- foreach my $user (@users) {
- opendir($fd, "$projectroot/$defaultprojects/$user");
- my (@repos) = sort grep(/\.git$/, readdir($fd));
- closedir($fd);
- foreach my $repo (@repos) {
- if (-e "$projectroot/$defaultprojects/$user/$repo/HEAD") {
- print $cgi->a({-href => "$my_uri?p=$defaultprojects/$user/$repo;a=log"}, "$defaultprojects/$user/$repo") . "<br/>\n";
- }
- }
- }
- print "<br/></div>";
- git_footer_html();
+if (!defined($project)) {
+ print $cgi->redirect($home_link);
exit;
}
-if ($action eq "") {
+if (!defined($action)) {
$action = "log";
}
+if (!defined($time_back)) {
+ $time_back = 1;
+}
+
if ($action eq "blob") {
git_header_html();
- print "<div class=\"page_body\"><pre><br/><br/>\n";
- open my $fd, "-|", "$gitbin/cat-file blob $hash";
+ print "<div class=\"page_nav\">\n";
+ print "<br/><br/></div>\n";
+ print "<div class=\"title\">$hash</div>\n";
+ print "<div class=\"page_body\"><pre>\n";
+ open(my $fd, "-|", "$gitbin/cat-file blob $hash");
my $nr;
while (my $line = <$fd>) {
$nr++;
printf "<span style =\"color: #999999;\">%4i\t</span>%s", $nr, escapeHTML($line);;
}
close $fd;
- print "<br/><br/></pre>\n";
+ print "<br/></pre>\n";
print "</div>";
git_footer_html();
} elsif ($action eq "tree") {
open my $fd, "-|", "$gitbin/ls-tree $hash";
my (@entries) = map { chomp; $_ } <$fd>;
close $fd;
+
git_header_html();
+ my %co = git_commit($hash);
+ if (defined(%co)) {
+ print "<div class=\"page_nav\"> view\n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | " .
+ $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diffs") . " | " .
+ $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") .
+ "<br/><br/>\n" .
+ "</div>\n";
+ print "<div>\n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
+ "</div>\n";
+ } else {
+ print "<div class=\"page_nav\">\n";
+ print "<br/><br/></div>\n";
+ print "<div class=\"title\">$hash</div>\n";
+ }
print "<div class=\"page_body\">\n";
print "<br/><pre>\n";
foreach my $line (@entries) {
git_footer_html();
} elsif ($action eq "log" || $action eq "rss") {
open my $fd, "-|", "$gitbin/rev-list " . git_head($project);
- my (@revtree) = map { chomp; $_ } <$fd>;
+ my (@revlist) = map { chomp; $_ } <$fd>;
close $fd;
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") . " | \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" .
+ print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last day") . " | " .
+ $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | " .
+ $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | " .
+ $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | " .
$cgi->a({-href => "$my_uri?p=$project;a=log;t=0"}, "all") . "<br/>\n";
print "<br/><br/>\n" .
"</div>\n";
"<language>en</language>\n";
}
- for (my $i = 0; $i <= $#revtree; $i++) {
- my $commit = $revtree[$i];
+ for (my $i = 0; $i <= $#revlist; $i++) {
+ my $commit = $revlist[$i];
my %co = git_commit($commit);
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 .= " years ago";
- } elsif ($age > 60*60*24*365/12*2) {
- $age_string = int $age/60/60/24/365/12;
- $age_string .= " months ago";
- } elsif ($age > 60*60*24*7*2) {
- $age_string = int $age/60/60/24/7;
- $age_string .= " weeks ago";
- } elsif ($age > 60*60*24*2) {
- $age_string = int $age/60/60/24;
- $age_string .= " days ago";
- } elsif ($age > 60*60*2) {
- $age_string = int $age/60/60;
- $age_string .= " hours ago";
- } elsif ($age > 60*2) {
- $age_string = int $age/60;
- $age_string .= " minutes ago";
- }
if ($action eq "log") {
- if ($time_back > 0 && $age > $time_back*60*60*24) {
+ if ($time_back > 0 && $co{'age'} > $time_back*60*60*24) {
if ($i == 0) {
- print "<div class=\"page_body\"> Last change $age_string.<br/><br/></div>\n";
+ print "<div class=\"page_body\"> Last change " . $co{'age_string'} . ".<br/><br/></div>\n";
}
last;
}
- 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" .
+ print "<div>\n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "title"},
+ "<span class=\"log_age\">" . $co{'age_string'} . "</span>" . escapeHTML($co{'title'})) . "\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" .
+ print "<div class=\"title_text\">\n" .
+ "<div class=\"log_link\">\n" .
+ "view " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " .
+ $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "diff") . "<br/>\n" .
"</div>\n" .
- escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]<br/>\n" .
+ "<i>" . escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]</i><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 '<div class="signed_off">' . escapeHTML($line) . "<br/></div>\n";
- } else {
- print escapeHTML($line) . "<br/>\n";
- }
+ last if ($line =~ m/^(signed-off|acked)-by:/i);
+ print escapeHTML($line) . "<br/>\n";
}
- print "<br/><br/>\n" .
+ print "<br/>\n" .
"</div>\n";
} elsif ($action eq "rss") {
last if ($i >= 20);
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<link> " . $my_url . "?p=$project;a=commit;h=$commit</link>\n" .
"\t<description>";
my $comment = $co{'comment'};
foreach my $line (@$comment) {
}
} elsif ($action eq "commit") {
my %co = git_commit($hash);
+ if (!defined(%co)) {
+ die_error("", "Unknown commit object.");
+ }
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;
+ my @difftree;
+ if (defined($co{'parent'})) {
+ open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash";
+ @difftree = map { chomp; $_ } <$fd>;
+ close $fd;
+ } else {
+ # fake git-diff-tree output for initial revision
+ open my $fd, "-|", "$gitbin/ls-tree -r $hash";
+ @difftree = map { chomp; "+" . $_ } <$fd>;
+ close $fd;
+ }
git_header_html();
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" .
+ $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diffs") . " | \n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") . "\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;\">"; }
+ print "<div>\n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
+ "</div>\n";
+ print "<div class=\"title_text\">\n" .
+ "<table cellspacing=\"0\">";
+ print "<tr><td class=\"key\">author</td><td>" . escapeHTML($co{'author'}) . "</td><tr><td></td><td>" .
+ " " . $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";
+ if ($ad{'hour_local'} < 6 ) {
+ print "</span>";
+ }
+ print "</i>\n" .
+ "</td></tr>\n";
+ print "<tr><td class=\"key\">committer</td><td>" . escapeHTML($co{'committer'}) . "</td><tr><td></td><td>" .
+ " " . $cd{'rfc2822'} . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "</i>\n" .
+ "</td></tr>\n";
+ print "<tr><td class=\"key\">commit</td><td style=\"font-family: monospace;\">$hash</td></tr>\n";
+ print "<tr><td class=\"key\">tree</td><td style=\"font-family: monospace;\">" . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, $co{'tree'}) . "</td></tr>\n";
my $parents = $co{'parents'};
foreach my $par (@$parents) {
- print "parent    " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "<br/>\n";
+ print "<tr><td class=\"key\">parent</td><td style=\"font-family: monospace;\">" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "</td></tr>\n";
}
- print "</div>\n";
+ print "</table></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 '<div class="signed_off">' . escapeHTML($line) . "<br/></div>\n";
+ print "<span style=\"color: #888888\">" . escapeHTML($line) . "</span><br/>\n";
} else {
print escapeHTML($line) . "<br/>\n";
}
}
- print "<br/><br/>\n";
- print "<pre>\n";
+ print "</div>\n";
+ if ($#difftree > 10) {
+ print "<div class=\"list_head\">" . ($#difftree + 1) . " files changed:<br/></div>\n";
+ }
foreach my $line (@difftree) {
# '*100644->100644 blob 9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596 net/ipv4/route.c'
# '+100644 blob 4a83ab6cd565d21ab0385bac6643826b83c2fcd4 arch/arm/lib/bitops.h'
+ # '*100664->100644 blob b1a8e3dd5556b61dd771d32307c6ee5d7150fa43->b1a8e3dd5556b61dd771d32307c6ee5d7150fa43 show-files.c'
+ # '*100664->100644 blob d08e895238bac36d8220586fdc28c27e1a7a76d3->d08e895238bac36d8220586fdc28c27e1a7a76d3 update-cache.c'
$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);
+ my $mode_chng = "";
if ($type eq "blob") {
if ($op eq "+") {
- print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$id"}, $file) . " (new)\n";
+ print "<div class=\"list\">\n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"},
+ escapeHTML($file) . " <span style=\"color: #008000;\">[new]</span>") . "\n" .
+ "</div>";
+ print "<div class=\"link\">\n" .
+ "view " .
+ $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . "<br/>\n" .
+ "</div>\n";
} elsif ($op eq "-") {
- print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;hp=$id"}, $file) . " (removed)\n";
+ print "<div class=\"list\">\n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"},
+ escapeHTML($file) . " <span style=\"color: #c00000;\">[removed]</span>") . "\n" .
+ "</div>";
+ print "<div class=\"link\">\n" .
+ "view " .
+ $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . " | " .
+ $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "<br/>\n" .
+ "</div>\n";
} elsif ($op eq "*") {
$id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
- my $from = $1;
- my $to = $2;
- print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to;hp=$from"}, $file) . "\n";
+ my $from_id = $1;
+ my $to_id = $2;
+ $mode =~ m/^([0-7]{6})->([0-7]{6})$/;
+ my $from_mode = $1;
+ my $to_mode = $2;
+ my $mode_chnge = "";
+ if ($from_mode != $to_mode) {
+ $mode_chnge = " <span style=\"color: #888888;\"> [chmod $mode]</span>\n";
+ }
+ print "<div class=\"list\">\n";
+ if ($to_id ne $from_id) {
+ print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id"},
+ escapeHTML($file) . $mode_chnge) . "\n" .
+ "</div>\n";
+ } else {
+ print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id"},
+ escapeHTML($file) . $mode_chnge) . "\n" .
+ "</div>\n";
+ }
+ print "<div class=\"link\">\n" .
+ "view ";
+ if ($to_id ne $from_id) {
+ print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id"}, "diff") . " | ";
+ }
+ print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id"}, "file") . " | " .
+ $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "<br/>\n" .
+ "</div>\n";
}
}
}
- print "</pre>\n" .
- "<br/></div>\n";
git_footer_html();
} elsif ($action eq "blobdiff") {
git_header_html();
- print "<div class=\"page_body\"><br/><br/>\n" .
+ print "<div class=\"page_nav\">\n";
+ print "<br/><br/></div>\n";
+ print "<div class=\"title\">$hash vs $hash_parent</div>\n";
+ print "<div class=\"page_body\">\n" .
"<pre>\n";
git_diff_html($hash_parent, $hash, $hash_parent, $hash);
print "</pre>\n" .
git_footer_html();
} elsif ($action eq "commitdiff") {
my %co = git_commit($hash);
+ if (!defined(%co)) {
+ die_error("", "Unknown commit object.");
+ }
open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash";
my (@difftree) = map { chomp; $_ } <$fd>;
close $fd;
git_header_html();
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" .
+ $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diffs") . " | \n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") . "\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>\n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
+ "</div>\n";
print "<div class=\"page_body\">\n" .
"<pre>\n";
foreach my $line (@difftree) {
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);
+ if ($1 ne $2) {
+ git_diff_html($file, $file, $1, $2);
+ }
}
}
}
print "<br/></pre>\n";
print "</div>";
git_footer_html();
-} else {
+} elsif ($action eq "history") {
+ if (!(defined($hash))) {
+ $hash = git_head($project);
+ }
+ open my $fd, "-|", "$gitbin/rev-list $hash";
+ my (@revlist) = map { chomp; $_ } <$fd>;
+ close $fd;
+
git_header_html();
- print "<div class=\"page_body\">\n" .
- "<br/><br/>\n";
- print "unknown action\n";
- print "<br/></div>\n";
+ print "<div class=\"page_nav\">\n";
+ print "<br/><br/></div>\n";
+ print "<div>\n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($file_name)) . "\n" .
+ "</div>\n";
+ foreach my $rev (@revlist) {
+ my %co = git_commit($rev);
+ my $parents = $co{'parents'};
+ my $found = 0;
+ foreach my $parent (@$parents) {
+ open $fd, "-|", "$gitbin/diff-tree -r $parent $rev $file_name";
+ my (@difftree) = map { chomp; $_ } <$fd>;
+ close $fd;
+
+ foreach my $line (@difftree) {
+ $line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
+ my $file = $5;
+ if ($file eq $file_name) {
+ $found = 1;
+ last;
+ }
+ }
+ }
+ if ($found) {
+ print "<div class=\"list\">\n" .
+ $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$rev"},
+ "<span class=\"log_age\">" . $co{'age_string'} . "</span>" . escapeHTML($co{'title'})) . "\n" .
+ "</div>\n";
+ print "<div class=\"link\">\n" .
+ "view " .
+ $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$rev"}, "commit") . " | " .
+ $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$rev"}, "tree") . "<br/><br/>\n" .
+ "</div>\n";
+ }
+ }
git_footer_html();
+} else {
+ $action = "";
+ die_error("", "Unknown action.");
}
projects / git.git / blobdiff