X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/b1d9903c3eec6297ea97114bb9abf011b2099aec062ca36ee9f0d926e85854a6..f2077f0053f3705a10e237d87e8f68bceaa55941e23f5d84a737ae66c5cdf89e:/gitweb.cgi diff --git a/gitweb.cgi b/gitweb.cgi index 43f3a40..7da50c8 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -14,114 +14,133 @@ use CGI::Carp qw(fatalsToBrowser); my $cgi = new CGI; -my $version = "064"; +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); +my $rss_link = ""; -mkdir($gittmp, 0700); my $project = $cgi->param('p'); -my $action = $cgi->param('a'); -my $hash = $cgi->param('h'); -my $hash_parent = $cgi->param('hp'); -my $file_name = $cgi->param('f'); -my $time_back = $cgi->param('t'); -$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects"; - -# validate input -if (defined($project) && $project =~ /(^|\/)(|\.|\.\.)($|\/)/) { - die_error("", "Invalid project parameter."); +if (defined($project)) { + if ($project =~ /(^|\/)(|\.|\.\.)($|\/)/) { + $project = ""; + die_error("", "Invalid project parameter."); + } + if (!(-d "$projectroot/$project")) { + $project = ""; + die_error("", "No such project."); + } + $rss_link = ""; } + +my $file_name = $cgi->param('f'); if (defined($file_name) && $file_name =~ /(^|\/)(|\.|\.\.)($|\/)/) { + $file_name = ""; die_error("", "Invalid file parameter."); } -if (defined($action) && !$action =~ m/^[0-9a-zA-Z\.\-]+$/) { + +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'); if (defined($hash_parent) && !($hash_parent =~ m/^[0-9a-fA-F]{40}$/)) { + $hash_parent = ""; die_error("", "Invalid parent hash parameter."); } + +my $time_back = $cgi->param('t'); if (defined($time_back) && !($time_back =~ m/^[0-9]+$/)) { + $time_back = ""; die_error("", "Invalid time parameter."); } +$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects"; +mkdir($gittmp, 0700); + sub git_header_html { my $status = shift || "200 OK"; print $cgi->header(-type=>'text/html', -charset => 'utf-8', -status=> $status); print < + - git - $project $action - - +git - $project +$rss_link + EOF print "
\n" . - "" . + "" . "\"git\""; - 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"; @@ -130,25 +149,29 @@ EOF } sub git_footer_html { - print "
"; - print "
version $version
"; - if ($project ne '') { + print "
\n"; + if ($project ne "") { + if (-e "$projectroot/$project/description") { + open(my $fd, "$projectroot/$project/description"); + my $descr = <$fd>; + print "
" . escapeHTML($descr) . "
\n"; + close $fd; + } print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "xml_logo"}, "XML") . "\n"; } - print "
"; - print "\n"; + print "
\n" . + "\n" . + ""; } sub die_error { my $status = shift || "403 Forbidden"; my $error = shift || "Malformed query, file missing or permission denied"; - $project = ""; - $action = ""; git_header_html($status); print "
\n" . "

\n"; - print "$error\n"; + print "$status - $error\n"; print "
\n"; git_footer_html(); exit 0; @@ -156,7 +179,7 @@ sub die_error { sub git_head { my $path = shift; - open(my $fd, "$projectroot/$path/HEAD") || die_error("", "Invalid project directory.");; + open(my $fd, "$projectroot/$path/HEAD") || die_error("", "Invalid project directory."); my $head = <$fd>; close $fd; chomp $head; @@ -190,7 +213,9 @@ sub git_commit { $co{'committer_name'} =~ s/ <.*//; } } - if (!defined($co{'tree'})) { die_error("", "Invalid commit object."); } + if (!defined($co{'tree'})) { + return; + } $co{'parents'} = \@parents; $co{'parent'} = $parents[0]; my (@comment) = map { chomp; $_ } <$fd>; @@ -294,13 +319,13 @@ sub mode_str { 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; @@ -349,26 +374,8 @@ if ($action eq "git-logo.png") { exit; } -# show list of default projects -if ($project eq "") { - opendir(my $fd, "$projectroot/$defaultprojects") || die_error("", "No projects found."); - my (@users) = sort grep(!/^\./, readdir($fd)); - closedir($fd); - git_header_html(); - print "
\n"; - print "

\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") . "
\n"; - } - } - } - print "
"; - git_footer_html(); +if (!defined($project)) { + print $cgi->redirect($home_link); exit; } @@ -385,7 +392,7 @@ if ($action eq "blob") { print "
\n"; print "

\n"; print "
$hash
\n"; - print "


\n";
+	print "
\n";
 	open(my $fd, "-|", "$gitbin/cat-file blob $hash");
 	my $nr;
 	while (my $line = <$fd>) {
@@ -393,7 +400,7 @@ if ($action eq "blob") {
 		printf "%4i\t%s", $nr, escapeHTML($line);;
 	}
 	close $fd;
-	print "

\n";
+	print "
\n"; print "
"; git_footer_html(); } elsif ($action eq "tree") { @@ -403,10 +410,24 @@ if ($action eq "blob") { open my $fd, "-|", "$gitbin/ls-tree $hash"; my (@entries) = map { chomp; $_ } <$fd>; close $fd; + git_header_html(); - print "
\n"; - print "

\n"; - print "
$hash
\n"; + my %co = git_commit($hash); + if (defined(%co)) { + print "
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") . + "

\n" . + "
\n"; + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . + "
\n"; + } else { + print "
\n"; + print "

\n"; + print "
$hash
\n"; + } print "
\n"; print "
\n";
 	foreach my $line (@entries) {
@@ -417,9 +438,9 @@ if ($action eq "blob") {
 		my $t_hash = $3;
 		my $t_name = $4;
 		if ($t_type eq "blob") {
-			print mode_str($t_mode). " $t_name (" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash"}, "view") . ")\n";
+			print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash"}, $t_name) . "\n";
 		} elsif ($t_type eq "tree") {
-			print mode_str($t_mode). " $t_name (" . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash"}, "view") . ")\n";
+			print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash"}, $t_name) . "\n";
 		}
 	}
 	print "
\n"; @@ -434,10 +455,10 @@ if ($action eq "blob") { git_header_html(); print "
\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") . "
\n"; print "

\n" . "
\n"; @@ -463,26 +484,24 @@ if ($action eq "blob") { } last; } - print "
\n" . - "" . $co{'age_string'} . "\n" . escapeHTML($co{'title'}) . "\n" . + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "title"}, + "" . $co{'age_string'} . "" . 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" . + print "
\n" . + "
\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") . "
\n" . "
\n" . - escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]
\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) { - print '
' . escapeHTML($line) . "
\n"; - } else { - print escapeHTML($line) . "
\n"; - } + last if ($line =~ m/^(signed-off|acked)-by:/i); + print escapeHTML($line) . "
\n"; } - print "

\n" . + print "
\n" . "
\n"; } elsif ($action eq "rss") { last if ($i >= 20); @@ -505,85 +524,139 @@ if ($action eq "blob") { } } 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 "
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"}, "diffs") . "\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" . "

\n"; - print "$co{'title'}\n"; - print "
\n"; - print "author      " . escapeHTML($co{'author'}) . "
\n"; - print "author-time " . $ad{'rfc2822'}; - if ($ad{'hour_local'} < 6) { print ""; } + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . + "
\n"; + print "
\n" . + ""; + print "\n"; + print "\n"; + print "\n"; + print "\n"; my $parents = $co{'parents'}; foreach my $par (@$parents) { - print "parent      " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "
\n"; + print "\n"; } - print "\n"; + print "
author" . escapeHTML($co{'author'}) . "
" . + " " . $ad{'rfc2822'}; + if ($ad{'hour_local'} < 6) { + print ""; + } printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}); - if ($ad{'hour_local'} < 6 ) { print ""; } - print "
\n"; - print "committer   " . escapeHTML($co{'committer'}) . "
\n"; - print "commit-time " . $cd{'rfc2822'}; - printf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}); - print "
\n"; - print "commit      $hash
\n"; - print "tree        " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'}"}, $co{'tree'}) . "
\n"; + if ($ad{'hour_local'} < 6 ) { + print ""; + } + print "\n" . + "
committer" . escapeHTML($co{'committer'}) . "
" . + " " . $cd{'rfc2822'} . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "\n" . + "
commit$hash
tree" . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, $co{'tree'}) . "
parent" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "
\n"; print "
\n"; my $comment = $co{'comment'}; foreach my $line (@$comment) { if ($line =~ m/(signed-off|acked)-by:/i) { - print '
' . escapeHTML($line) . "
\n"; + print "" . escapeHTML($line) . "
\n"; } else { print escapeHTML($line) . "
\n"; } } - print "

\n"; - print "
\n";
+	print "
\n"; + if ($#difftree > 10) { + print "
" . ($#difftree + 1) . " files changed:
\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 $file" . "[new] " . - "(" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "view") . ")\n"; + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, + escapeHTML($file) . " [new]") . "\n" . + "
"; + print "
\n" . + "view " . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . "
\n" . + "
\n"; } elsif ($op eq "-") { - print "$modestr $file" . "[removed] " . - "(" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "view") . ")\n"; + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, + escapeHTML($file) . " [removed]") . "\n" . + "
"; + print "
\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") . "
\n" . + "
\n"; } elsif ($op eq "*") { $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/; - my $from = $1; - my $to = $2; - print "$modestr $file " . - "(" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to"}, "view") . ")" . - "(" . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to;hp=$from"}, "diff") . ")" . - "(" . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . ")\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 = " [chmod $mode]\n"; + } + print "
\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" . + "
\n"; + } else { + print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id"}, + escapeHTML($file) . $mode_chnge) . "\n" . + "
\n"; + } + print "
\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") . "
\n" . + "
\n"; } } } - print "\n" . - "
\n"; git_footer_html(); } elsif ($action eq "blobdiff") { git_header_html(); print "
\n"; print "

\n"; print "
$hash vs $hash_parent
\n"; - print "


\n" . + print "
\n" . "
\n";
 	git_diff_html($hash_parent, $hash, $hash_parent, $hash);
 	print "
\n" . @@ -591,6 +664,9 @@ if ($action eq "blob") { 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; @@ -598,9 +674,12 @@ if ($action eq "blob") { git_header_html(); 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"}, "diffs") . "\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" . "

\n"; - print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "log_title"}, $co{'title'}) ."\n"; + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . + "
\n"; print "
\n" . "
\n";
 	foreach my $line (@difftree) {
@@ -618,7 +697,9 @@ if ($action eq "blob") {
 				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);
+				}
 			}
 		}
 	}
@@ -636,9 +717,9 @@ if ($action eq "blob") {
 	git_header_html();
 	print "
\n";
 	print "

\n";
-	print "
$file_name
\n";
-	print "
\n" .
-	      "
\n";
+	print "
\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($file_name)) . "\n" .
+	      "
\n";
 	foreach my $rev (@revlist) {
 		my %co = git_commit($rev);
 		my $parents  = $co{'parents'};
@@ -658,13 +739,19 @@ if ($action eq "blob") {
 			}
 		}
 		if ($found) {
-			print $co{'age_string'} . "\t " . $co{'author_name'} . "  - " . $co{'title'} .
-			      " (" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$rev"}, "view") .")\n";
+			print "
\n" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$rev"},
+			      "" . $co{'age_string'} . "" . escapeHTML($co{'title'})) . "\n" .
+			      "
\n";
+			print "
\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") . "

\n" .
+			      "
\n";
 		}
 	}
-	print "
\n";
-	print "
";
 	git_footer_html();
 } else {
-	die_error("", "unknown action");
+	$action = "";
+	die_error("", "Unknown action.");
 }