From adf3ee8e48fd4f3a75d4ee9a2e3209bd087c6417 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sun, 7 Aug 2005 19:56:44 +0200 Subject: [PATCH] v003 --- gitweb.pl | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gitweb.pl b/gitweb.pl index b0efd7cda..dafd687e8 100755 --- a/gitweb.pl +++ b/gitweb.pl @@ -73,7 +73,7 @@ EOF print "\"git\""; 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=$project;action=log;view_back=" . 60*60*24}, $project); } if ($action ne "") { print " / $action"; @@ -120,19 +120,19 @@ sub git_diff { close $fd2; close $fd; $tmp_new = "$gittmp/$new"; - $new_label = "a/$new_name"; + $new_label = "b/$new_name"; } open my $fd, "-|", "/usr/bin/diff", "-L", $old_label, "-L", $new_label, "-u", "-p", $tmp_old, $tmp_new; print '
===== '; if ($old ne "") { - print $cgi->a({-href => "$myself?project=$project&action=blob&hash=$old"}, $old); + print $cgi->a({-href => "$myself?project=$project;action=blob;hash=$old"}, $old); } else { print $old_name; } print " vs "; if ($new ne "") { - print $cgi->a({-href => "$myself?project=$project&action=blob&hash=$new"}, $new); + print $cgi->a({-href => "$myself?project=$project;action=blob;hash=$new"}, $new); } else { print $new_name; } @@ -167,7 +167,7 @@ if ($project eq "") { } if ($action eq "") { - print $cgi->redirect("$myself?project=$project&action=log&view_back=$view_back"); + print $cgi->redirect("$myself?project=$project;action=log;view_back=$view_back"); exit; } @@ -206,9 +206,9 @@ if ($action eq "blob") { 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=$project;action=blob;hash=$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=$project;action=tree;hash=$3"}, $4) . "\n"; } } print "\n"; @@ -225,11 +225,11 @@ if ($action eq "blob") { git_header(); print "
\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") . "
\n"; + 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") . "
\n"; print "

\n"; print "
\n"; print "\n"; @@ -302,13 +302,13 @@ if ($action eq "blob") { } print "\n"; print "\n"; - print ""; + print ""; print "\n"; print "\n"; print "\n"; print "
" . $age_string . "" . $shortlog . "" . $cgi->a({-href => "$myself?project=$project;action=commit;hash=$commit;parent=$parent"}, $shortlog) . "
"; - print $cgi->a({-href => "$myself?project=$project&action=diffs&hash=$commit&parent=$parent"}, "view diff") . "
\n"; - print $cgi->a({-href => "$myself?project=$project&action=commit&hash=$commit&parent=$parent"}, "view commit") . "
\n"; - print $cgi->a({-href => "$myself?project=$project&action=tree&hash=$tree"}, "view tree") . "
\n"; + print $cgi->a({-href => "$myself?project=$project;action=diffs;hash=$commit;parent=$parent"}, "view diff") . "
\n"; + print $cgi->a({-href => "$myself?project=$project;action=commit;hash=$commit;parent=$parent"}, "view commit") . "
\n"; + print $cgi->a({-href => "$myself?project=$project;action=tree;hash=$tree"}, "view tree") . "
\n"; print "
\n"; print "author    " . escapeHTML($author) . " [" . gmtime($author_time) . " " . $author_timezone . "]
\n"; @@ -335,7 +335,8 @@ if ($action eq "blob") { close $fd; git_header(); - print "

\n"; + print "
\n"; + print "view " . $cgi->a({-href => "$myself?project=$project;action=diffs;hash=$hash;parent=$parent"}, "diff") . "

\n"; print "
\n";
 	foreach my $line (@difftree) {
 		# '*100644->100644	blob	9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596	net/ipv4/route.c'
@@ -348,14 +349,14 @@ if ($action eq "blob") {
 		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 "NEW\t" . $cgi->a({-href => "$myself?project=$project;action=blob;hash=$id"}, $file) . "\n";
 			} elsif ($op eq "-") {
-				print "DEL\t" . $cgi->a({-href => "$myself?project=$project&action=blob&hash=$id"}, $file) . "\n";
+				print "DEL\t" . $cgi->a({-href => "$myself?project=$project;action=blob;hash=$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=$project;action=diff;hash=$old;parent=$new"}, $file) . "\n";
 			}
 		}
 	}
@@ -376,7 +377,8 @@ if ($action eq "blob") {
 	close $fd;
 
 	git_header();
-	print "

\n"; + print "
\n"; + print "view " . $cgi->a({-href => "$myself?project=$project;action=commit;hash=$hash;parent=$parent"}, "commit") . "

\n"; print "
\n";
 	foreach my $line (@difftree) {
 		# '*100644->100644	blob	8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154	Makefile'
@@ -399,7 +401,6 @@ if ($action eq "blob") {
 	}
 	print "
\n"; print "
"; - print "
"; git_footer(); } else { git_header(); -- 2.26.2