From: Kay Sievers Date: Sun, 7 Aug 2005 18:13:02 +0000 (+0200) Subject: v048 X-Git-Tag: v1.4.0~1^2~119 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff7669a5b9922e86831e59398e89bad1372dc581;p=git.git v048 --- diff --git a/gitweb.pl b/gitweb.pl index cdf0e3d75..643787f18 100755 --- a/gitweb.pl +++ b/gitweb.pl @@ -14,7 +14,7 @@ use CGI::Carp qw(fatalsToBrowser); my $cgi = new CGI; -my $version = "043"; +my $version = "048"; my $projectroot = "/"; my $defaultprojects = "home/kay/public_html"; my $gitbin = "/home/kay/bin/git"; @@ -26,7 +26,10 @@ 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') || 1; +my $time_back = $cgi->param('t'); +if (!(defined($time_back))) { + $time_back = 1; +} $ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/.git/objects"; # sanitize input @@ -53,26 +56,33 @@ print < EOF - print "
"; - print "" . + print "
\n" . + "" . "\"git\""; if ($defaultprojects ne "") { print $cgi->a({-href => "$my_uri"}, "projects") . " / "; @@ -89,9 +99,9 @@ EOF sub git_footer_html { print "
"; print "
version $version
"; - if ($project ne '') { - print "XML"; - } + if ($project ne '') { + print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "xml_logo"}, "XML") . "\n"; + } print "
"; print "\n"; } @@ -110,7 +120,7 @@ sub git_commit { 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 ""; @@ -153,11 +163,11 @@ sub git_diff_html { 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; @@ -169,7 +179,7 @@ sub git_diff_html { 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; @@ -177,7 +187,7 @@ sub git_diff_html { $to_label = "b/$to_name"; } - open my $fd, "-|", "/usr/bin/diff", "-L", $from_label, "-L", $to_label, "-u", "-p", $from_tmp, $to_tmp; + open my $fd, "-|", "/usr/bin/diff -u -p -L $from_label -L $to_label $from_tmp $to_tmp"; print "===== "; if ($from ne "") { print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from"}, $from); @@ -234,6 +244,10 @@ sub date_str { 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; @@ -280,10 +294,14 @@ if ($project eq "") { exit; } +if ($action eq "") { + $action = "log"; +} + if ($action eq "blob") { git_header_html(); print "


\n";
-	open my $fd, "-|", "$gitbin/cat-file", "blob", $hash;
+	open my $fd, "-|", "$gitbin/cat-file blob $hash";
 	my $nr;
 	while (my $line = <$fd>) {
 		$nr++;
@@ -297,7 +315,7 @@ if ($action eq "blob") {
 	if ($hash eq "") {
 		$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();
@@ -320,7 +338,7 @@ if ($action eq "blob") {
 	print "
"; git_footer_html(); } elsif ($action eq "log" || $action eq "rss") { - open my $fd, "-|", "$gitbin/rev-list", git_head($project); + open my $fd, "-|", "$gitbin/rev-list " . git_head($project); my (@revtree) = map { chomp; $_ } <$fd>; close $fd; @@ -328,13 +346,13 @@ if ($action eq "blob") { git_header_html(); print "
\n"; print "view "; - print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last day") . " | "; - print $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | "; - print $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | "; - print $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | "; - print $cgi->a({-href => "$my_uri?p=$project;a=log;t=0"}, "all") . "
\n"; - print "

\n"; - print "
\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") . "
\n"; + print "

\n" . + "
\n"; } elsif ($action eq "rss") { print $cgi->header(-type => 'text/xml', -charset => 'utf-8'); print "\n". @@ -372,24 +390,23 @@ if ($action eq "blob") { $age_string .= " minutes ago"; } if ($action eq "log") { - if ($time_back > 0 && $age > $time_back*60*60*24) { + if ($time_back > 0 && $age > $time_back*60*60*24) { if ($i == 0) { print "
Last change $age_string.

\n"; } last; } - print ""; - print "
" . $age_string . "
\n"; - print $co{'title'}; - print "\n"; - print "
\n"; - print "
"; - print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "view commit") . "
\n"; - print $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "view diff") . "
\n"; - print "
\n"; - print escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]
\n"; - print "
"; - print "
\n"; + print "
\n" . + "" . $age_string . "\n" . escapeHTML($co{'title'}) . "\n" . + "
\n"; + print "
\n" . + "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "view commit") . "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "view diff") . "
\n" . + "
\n" . + escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]
\n" . + "
\n" . + "
\n"; my $comment = $co{'comment'}; foreach my $line (@$comment) { if ($line =~ m/^(signed-off|acked)-by:/i) { @@ -398,19 +415,20 @@ if ($action eq "blob") { print escapeHTML($line) . "
\n"; } } - print "

\n"; - print "
"; + print "

\n" . + "
\n"; } elsif ($action eq "rss") { last if ($i >= 20); - print "\n\t" . $ad{'mday-time'} . " - " . escapeHTML($co{'title'}) . "\n"; - print "\t " . $my_url . "/$project/commit/$commit\n"; - print "\t"; + print "\n" . + "\t" . sprintf("%d %s %02d:%02d", $ad{'mday'}, $ad{'month'}, $ad{'hour'}, $ad{'min'}) . " - " . escapeHTML($co{'title'}) . "\n" . + "\t " . $my_url . "?p=$project;a==commit;h=$commit\n" . + "\t"; my $comment = $co{'comment'}; foreach my $line (@$comment) { print escapeHTML($line) . "\n"; } - print "\t\n"; - print "\n"; + print "\t\n" . + "\n"; } } if ($action eq "log") { @@ -422,28 +440,28 @@ if ($action eq "blob") { 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; + open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash"; my (@difftree) = map { chomp; $_ } <$fd>; close $fd; git_header_html(); - print "
view\n"; - print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | "; - print $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diff"); - print "

\n"; + print "
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" . + "

\n"; print "$co{'title'}\n"; - print "
"; - print "author    " . escapeHTML($co{'author'}) . " [" . $ad{'rfc2822'} . "]
\n"; + print "
" . + "author    " . escapeHTML($co{'author'}) . " [" . $ad{'rfc2822'} . "]
\n"; if ($ad{'hour'} < 7 ) { print ""; } if ($ad{'hour'} < 7 ) { print ""; } - print "committer " . escapeHTML($co{'committer'}) . " [" . $cd{'rfc2822'} . "]
\n"; - print "commit    $hash
\n"; - print "tree      " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'}"}, $co{'tree'}) . "
\n"; + print "committer " . escapeHTML($co{'committer'}) . " [" . $cd{'rfc2822'} . "]
\n" . + "commit    $hash
\n" . + "tree      " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'}"}, $co{'tree'}) . "
\n"; my $parents = $co{'parents'}; foreach my $par (@$parents) { - print "parent    " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$par"}, $par) . "
\n"; + print "parent    " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "
\n"; } - print "
"; + print "
\n"; print "
\n"; my $comment = $co{'comment'}; foreach my $line (@$comment) { @@ -479,31 +497,31 @@ if ($action eq "blob") { } } } - print "\n"; - print "
"; + print "\n" . + "
"; git_footer_html(); } elsif ($action eq "blobdiff") { git_header_html(); - print "


\n"; - print "
\n";
+	print "


\n" .
+	      "
\n";
 	git_diff_html($hash_parent, $hash, $hash_parent, $hash);
-	print "
\n";
-	print "
";
+	print "
\n" . + "
"; 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 "
view\n"; - print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | "; - print $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diff"); - print "

\n"; + print "
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" . + "

\n"; print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "log_title"}, $co{'title'}) ."\n"; - print "
\n"; - print "
\n";
+	print "
\n" .
+	      "
\n";
 	foreach my $line (@difftree) {
 		# '*100644->100644	blob	8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154	Makefile'
 		$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
@@ -528,8 +546,9 @@ if ($action eq "blob") {
 	git_footer_html();
 } else {
 	git_header_html();
-	print "
\n";
-	print "unknown action";
-	print "


\n";
+	print "
\n" .
+	      "

\n";
+	print "unknown action\n";
+	print "
\n";
 	git_footer_html();
 }