X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/ccad27541614029c261a34d76cbd00c42b105ee23f72447d9bfb4d6fed7756ac..6862b4874af58c044b00469c1686ab6313206b8ad8356f4cfffd9da468b96dcb:/gitweb.pl diff --git a/gitweb.pl b/gitweb.pl index fec369d..504c1fb 100755 --- a/gitweb.pl +++ b/gitweb.pl @@ -1,32 +1,93 @@ #!/usr/bin/perl -# This file is licensed under the GPL v2, or a later version +# gitweb.pl - simple web interface to track changes in git repositories +# +# Version 016 +# # (C) 2005, Kay Sievers # (C) 2005, Christian Gierke +# +# This file is licensed under the GPL v2, or a later version use strict; use warnings; use CGI qw(:standard :escapeHTML); use CGI::Carp qw(fatalsToBrowser); +my $gitbin = "/home/kay/bin/git"; # path to the git executables +my $gitroot = "/home/kay/public_html"; # path to the git repositories +my $gittmp = "/tmp"; # temporary files location + my $cgi = new CGI; -my $gitbin = "/home/kay/bin/git"; -my $gitroot = "/home/kay/public_html"; -my $gittmp = "/tmp"; -my $myself = $cgi->url(-relative => 1); +my $project = ""; +my $action = ""; +my $hash = ""; +my $hash_parent = ""; +my $view_back; +my $myself = $cgi->url(-absolute => 1); +my $url_parm = $cgi->url(-path => 1); +$url_parm =~ s/.*$myself//; -my $project = $cgi->param("project") || ""; -my $action = $cgi->param("action") || ""; -my $hash = $cgi->param("hash") || ""; -my $parent = $cgi->param("parent") || ""; -my $view_back = $cgi->param("view_back") || 60*60*24; -my $projectroot = "$gitroot/$project"; -$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/.git/objects"; +# get values from url +if ($url_parm =~ m#/([^/]+)/commit/([0-9a-fA-F]+)$#) { + $project = $1; + $action = "commit"; + $hash = $2; +} elsif ($url_parm =~ m#/([^/]+)/treediff/([0-9a-fA-F]+)$#) { + $project = $1; + $action = "treediff"; + $hash = $2; +} elsif ($url_parm =~ m#/([^/]+)/diff/([0-9a-fA-F]+)/([0-9a-fA-F]+)$#) { + $project = $1; + $action = "diff"; + $hash = $2; + $hash_parent = $3; +} elsif ($url_parm =~ m#/([^/]+)/blob/([0-9a-fA-F]+)$#) { + $project = $1; + $action = "blob"; + $hash = $2; +} elsif ($url_parm =~ m#/([^/]+)/tree/([0-9a-fA-F]+)$#) { + $project = $1; + $action = "tree"; + $hash = $2; +} elsif ($url_parm =~ m#/([^/]+)/log/([0-9]+)$#) { + $project = $1; + $action = "log"; + $view_back = $2; +} elsif ($url_parm =~ m#/([^/]+)/log$#) { + $project = $1; + $action = "log"; + $view_back = 1; +} elsif ($url_parm =~ m#/git-logo.png$#) { + print $cgi->header(-type => 'image/png'); + print "\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104\122". + "\000\000\000\110\000\000\000\033\004\003\000\000\000\055\331\324". + "\055\000\000\000\030\120\114\124\105\377\377\377\140\140\135\260". + "\257\252\000\200\000\316\315\307\300\000\000\350\350\346\367\367". + "\366\225\014\247\107\000\000\000\163\111\104\101\124\050\317\143". + "\110\147\040\004\112\134\030\012\010\052\142\123\141\040\002\010". + "\015\151\105\254\241\241\001\060\014\223\140\066\046\122\221\261". + "\001\021\326\341\125\144\154\154\314\154\154\014\242\014\160\052". + "\142\006\052\301\142\035\263\001\002\123\244\010\350\000\003\030". + "\046\126\021\324\341\040\227\033\340\264\016\065\044\161\051\202". + "\231\060\270\223\012\021\271\105\210\301\215\240\242\104\041\006". + "\047\101\202\100\205\301\105\211\040\160\001\000\244\075\041\305". + "\022\034\232\376\000\000\000\000\111\105\116\104\256\102\140\202"; + exit; +} elsif ($url_parm =~ m#/([^/]+)$#) { + $project = $1; + $action = "log"; + $view_back = 1; +} +# sanitize input $hash =~ s/[^0-9a-fA-F]//g; -$parent =~ s/[^0-9a-fA-F]//g; +$hash_parent =~ s/[^0-9a-fA-F]//g; $project =~ s/[^0-9a-zA-Z\-\._]//g; +my $projectroot = "$gitroot/$project"; +$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/.git/objects"; + sub git_header { print $cgi->header(-type => 'text/html; charset: utf-8'); print <\n"; print "
"; - print "\"git\""; + 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/log"}, $project); } if ($action ne "") { print " / $action"; @@ -85,16 +145,17 @@ sub git_footer { } sub git_diff { - my $old_name = shift; - my $new_name = shift; + my $old_name = shift || "/dev/null"; + my $new_name = shift || "/dev/null"; my $old = shift; my $new = shift; - my $label_old = "/dev/null"; - my $label_new = "/dev/null"; my $tmp_old = "/dev/null"; my $tmp_new = "/dev/null"; + my $old_label = "/dev/null"; + my $new_label = "/dev/null"; + # create temp from-file if ($old ne "") { open my $fd2, "> $gittmp/$old"; open my $fd, "-|", "$gitbin/cat-file", "blob", $old; @@ -104,9 +165,10 @@ sub git_diff { close $fd2; close $fd; $tmp_old = "$gittmp/$old"; - $label_old = "a/$old_name"; + $old_label = "a/$old_name"; } + # create tmp to-file if ($new ne "") { open my $fd2, "> $gittmp/$new"; open my $fd, "-|", "$gitbin/cat-file", "blob", $new; @@ -116,32 +178,45 @@ sub git_diff { close $fd2; close $fd; $tmp_new = "$gittmp/$new"; - $label_new = "b/$new_name"; + $new_label = "b/$new_name"; } - open my $fd, "-|", "/usr/bin/diff", "-L", $label_old, "-L", $label_new, "-u", "-p", $tmp_old, $tmp_new; + 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/blob/$old"}, $old); + } else { + print $old_name; + } + print " vs "; + if ($new ne "") { + print $cgi->a({-href => "$myself/$project/blob/$new"}, $new); + } else { + print $new_name; + } + print " =====\n"; while (my $line = <$fd>) { my $char = substr($line,0,1); - print '
' if $char eq '+'; - print '
' if $char eq '-'; - print '
' if $char eq '@'; + print '' if $char eq '+'; + print '' if $char eq '-'; + print '' if $char eq '@'; print escapeHTML($line); - print '
' if $char eq '+' or $char eq '-' or $char eq '@'; + print '' if $char eq '+' or $char eq '-' or $char eq '@'; } close $fd; - #unlink("$gittmp/$new"); - #unlink("$gittmp/$old"); + unlink("$gittmp/$new"); + unlink("$gittmp/$old"); } if ($project eq "") { - open my $fd, "-|", "ls", "-1", $gitroot; - my (@path) = map { chomp; $_ } <$fd>; - close $fd; + opendir(my $fd, $gitroot); + my (@path) = grep(!/^\./, readdir($fd)); + closedir($fd); git_header(); print "

\n"; foreach my $line (@path) { if (-e "$gitroot/$line/.git/HEAD") { - print $cgi->a({-href => "$myself?project=$line"}, $line) . "
\n"; + print $cgi->a({-href => "$myself/$line/log"}, $line) . "
\n"; } } print "
"; @@ -150,7 +225,7 @@ if ($project eq "") { } if ($action eq "") { - print $cgi->redirect("$myself?project=$project&action=log&view_back=$view_back"); + print $cgi->redirect("$myself/$project/log/$view_back"); exit; } @@ -174,12 +249,7 @@ if ($action eq "blob") { my $head = <$fd>; chomp $head; close $fd; - open $fd, "-|", "$gitbin/cat-file", "commit", $head; - my $tree = <$fd>; - chomp $tree; - $tree =~ s/tree //; - close $fd; - $hash = $tree; + $hash = $head; } open my $fd, "-|", "$gitbin/ls-tree", $hash; my (@entries) = map { chomp; $_ } <$fd>; @@ -188,20 +258,21 @@ if ($action eq "blob") { print "

\n"; print "
\n";
 	foreach my $line (@entries) {
+		#'100644	blob	0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa	panic.c'
 		$line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
 		my $t_type = $2;
 		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/blob/$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/tree/$3"}, $4) . "\n";
 		}
 	}
 	print "
\n"; print "
"; git_footer(); -} elsif ($action eq "log" || $action eq "show_log" ) { +} elsif ($action eq "log") { open my $fd, "$projectroot/.git/HEAD"; my $head = <$fd>; chomp $head; @@ -212,38 +283,30 @@ 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/log"}, "last day") . " | "; + print $cgi->a({-href => "$myself/$project/log/7"}, "week") . " | "; + print $cgi->a({-href => "$myself/$project/log/31"}, "month") . " | "; + print $cgi->a({-href => "$myself/$project/log/365"}, "year") . " | "; + print $cgi->a({-href => "$myself/$project/log/0"}, "all") . "
\n"; print "

\n"; print "
\n"; print "\n"; foreach my $rev (reverse sort @revtree) { - if (!($rev =~ m/^([0-9]+) ([0-9a-fA-F]+).* ([0-9a-fA-F]+)/)) { - last; - } + # '1114106118 755e3010ee10dadf42a8a80770e1b115fb038d9b:1 2af17b4854036a1c2ec6c101d93c8dd1ed80d24e:1' + last if !($rev =~ m/^([0-9]+) ([0-9a-fA-F]+).* ([0-9a-fA-F]+)/); my $time = $1; my $commit = $2; my $parent = $3; my @parents; - my $author; - my $author_name; - my $author_time; - my $author_timezone; - my $committer; - my $committer_time; - my $committer_timezone; + my ($author, $author_time, $author_timezone); + my ($committer, $committer_time, $committer_timezone); my $tree; my $comment; my $shortlog; open my $fd, "-|", "$gitbin/cat-file", "commit", $commit; while (my $line = <$fd>) { chomp($line); - if ($line eq "") { - last; - } + last if $line eq ""; if ($line =~ m/^tree (.*)$/) { $tree = $1; } elsif ($line =~ m/^parent (.*)$/) { @@ -256,8 +319,6 @@ if ($action eq "blob") { $author = $1; $author_time = $2; $author_timezone = $3; - $author =~ m/^(.*) ; @@ -265,13 +326,15 @@ if ($action eq "blob") { $comment = $shortlog . "
"; while (my $line = <$fd>) { chomp($line); - $comment .= escapeHTML($line) . "
\n"; + if ($line =~ m/signed-off-by:/i) { + $comment .= '
' . escapeHTML($line) . "
\n"; + } else { + $comment .= escapeHTML($line) . "
\n"; + } } close $fd; - my $age = time-$author_time; - if ($view_back > 0 && $age > $view_back) { - last; - } + my $age = time-$committer_time; + last if ($view_back > 0 && $age > $view_back*60*60*24); my $age_string; if ($age > 60*60*24*365*2) { @@ -295,13 +358,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/commit/$commit"}, $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/treediff/$commit"}, "view diff") . "
\n"; + print $cgi->a({-href => "$myself/$project/commit/$commit"}, "view commit") . "
\n"; + print $cgi->a({-href => "$myself/$project/tree/$tree"}, "view tree") . "
\n"; print "		\n"; print "author    " . escapeHTML($author) . " [" . gmtime($author_time) . " " . $author_timezone . "]
\n"; @@ -323,26 +386,31 @@ if ($action eq "blob") { print "
\n"; git_footer(); } elsif ($action eq "commit") { + my $parent = ""; open my $fd, "-|", "$gitbin/cat-file", "commit", $hash; - my $tree = <$fd>; - chomp $tree; - $tree =~ s/tree //; - close $fd; - - open $fd, "-|", "$gitbin/cat-file", "commit", $parent; - my $parent_tree = <$fd>; - chomp $parent_tree; - $parent_tree =~ s/tree //; + while (my $line = <$fd>) { + chomp($line); + last if $line eq ""; + if ($line =~ m/^parent (.*)$/ && $parent eq "") { + $parent = $1; + } + } + my $shortlog = <$fd>; + $shortlog = escapeHTML($shortlog); close $fd; - open $fd, "-|", "$gitbin/diff-tree", "-r", $parent_tree, $tree; + open $fd, "-|", "$gitbin/diff-tree", "-r", $parent, $hash; my (@difftree) = map { chomp; $_ } <$fd>; close $fd; git_header(); - print "

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


\n"; + print "
$shortlog
\n"; print "
\n";
 	foreach my $line (@difftree) {
+		# '*100644->100644	blob	9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596	net/ipv4/route.c'
+		# '+100644	blob	4a83ab6cd565d21ab0385bac6643826b83c2fcd4	arch/arm/lib/bitops.h'
 		$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
 		my $op = $1;
 		my $mode = $2;
@@ -351,14 +419,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 "added\t" . $cgi->a({-href => "$myself/$project/blob/$id"}, $file) . "\n";
 			} elsif ($op eq "-") {
-				print "DEL\t" . $cgi->a({-href => "$myself?project=$project&action=blob&hash=$id"}, $file) . "\n";
+				print "removed\t" . $cgi->a({-href => "$myself/$project/blob/$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/diff/$old/$new"}, $file) . "\n";
 			}
 		}
 	}
@@ -369,31 +437,35 @@ if ($action eq "blob") {
 	git_header();
 	print "

\n";
 	print "
\n";
-	git_diff($hash, $parent, $hash, $parent);
+	git_diff($hash, $hash_parent, $hash, $hash_parent);
 	print "
\n";
 	print "
";
 	git_footer();
-} elsif ($action eq "diffs") {
+} elsif ($action eq "treediff") {
+	my $parent = "";
 	open my $fd, "-|", "$gitbin/cat-file", "commit", $hash;
-	my $tree = <$fd>;
-	chomp $tree;
-	$tree =~ s/tree //;
-	close $fd;
-
-	open $fd, "-|", "$gitbin/cat-file", "commit", $parent;
-	my $parent_tree = <$fd>;
-	chomp $parent_tree;
-	$parent_tree =~ s/tree //;
+	while (my $line = <$fd>) {
+		chomp($line);
+		last if $line eq "";
+		if ($line =~ m/^parent (.*)$/ && $parent eq "") {
+			$parent = $1;
+		}
+	}
+	my $shortlog = <$fd>;
+	$shortlog = escapeHTML($shortlog);
 	close $fd;
 
-	open $fd, "-|", "$gitbin/diff-tree", "-r", $parent_tree, $tree;
+	open $fd, "-|", "$gitbin/diff-tree", "-r", $parent, $hash;
 	my (@difftree) = map { chomp; $_ } <$fd>;
 	close $fd;
 
 	git_header();
-	print "

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


\n";
+	print "
$shortlog
\n";
 	print "
\n";
 	foreach my $line (@difftree) {
+		# '*100644->100644	blob	8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154	Makefile'
 		$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
 		my $op = $1;
 		my $mode = $2;
@@ -410,11 +482,9 @@ if ($action eq "blob") {
 				git_diff($file, $file, $1, $2);
 			}
 		}
-		print "
\n";
 	}
 	print "
\n";
 	print "
";
-	print "
";
 	git_footer();
 } else {
 	git_header();