X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/43c53ef1b0c0237c2e7c075ba8f0c153456f1eb63387dacf6226dde5ca41af6c..427852c6ac6bc4940e10c98c736d5112423c4f3694cf22e32183d0ef9d7783bc:/gitweb.cgi diff --git a/gitweb.cgi b/gitweb.cgi index fc1ac0f..fa2d045 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -14,12 +14,12 @@ use CGI::Carp qw(fatalsToBrowser); my $cgi = new CGI; -my $version = "063"; +my $version = "082"; 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); @@ -33,8 +33,13 @@ 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 =~ /(^|\/)(|\.|\.\.)($|\/)/) { + die_error("", "Invalid project parameter."); + } + if (!(-d "$projectroot/$project")) { + die_error("", "No such project."); + } } if (defined($file_name) && $file_name =~ /(^|\/)(|\.|\.\.)($|\/)/) { die_error("", "Invalid file parameter."); @@ -70,58 +75,63 @@ sub git_header_html { 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; + font-size:18px; 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_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; - clear:both; background-color: #d9d8d1; + 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; } + div.page_body { margin:0px 25px; padding:8px; border:solid #d9d8d1; border-width:0px 1px; } div.title { - display:block; margin:0px 25px; padding:8px; clear:both; - font-weight:bold; background-color: #d9d8d1; color:#000000; + display:block; margin:0px 25px; padding:8px; + font-weight:bold; background-color:#d9d8d1; color:#000000; + } + 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.title2 { + 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; } - a.log_title { - display:block; margin:0px 25px; padding:8px; clear:both; - font-weight:bold; background-color: #d9d8d1; text-decoration:none; color:#000000; + 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 0px; border:solid #d9d8d1; border-width:1px 1px 0px; + font-weight:bold; } - a.log_title:hover { background-color: #c9c8c1; } + div.list a { text-decoration:none; color:#000000; } + div.list a:hover { color:#880000; } + div.link { margin:0px 25px; padding:0px 6px; 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:11px; display:block; text-decoration:none; + font-size:10px; 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; } 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"; @@ -135,13 +145,17 @@ sub git_footer_html { if ($project ne '') { print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "xml_logo"}, "XML") . "\n"; } - print "
"; - print "\n"; + print "" . + "" . + ""; } 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"; @@ -187,7 +201,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>; @@ -291,13 +307,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; @@ -346,26 +362,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; } @@ -382,7 +380,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>) {
@@ -390,7 +388,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") { @@ -400,10 +398,23 @@ 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") . " | \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 "
\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) {
@@ -414,9 +425,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"; @@ -460,26 +471,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); @@ -502,6 +511,9 @@ 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"; @@ -511,76 +523,116 @@ 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 "$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 " . $ad{'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"; 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" . @@ -588,6 +640,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; @@ -595,9 +650,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) {
@@ -615,7 +673,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);
+				}
 			}
 		}
 	}
@@ -633,9 +693,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'};
@@ -655,13 +715,18 @@ 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");
+	die_error("", "Unknown action.");
 }