diff --git a/gitweb.pl b/gitweb.pl index ab4623db35..e1ca3f8c6b 100755 --- a/gitweb.pl +++ b/gitweb.pl @@ -19,7 +19,7 @@ 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*2; +my $view_back = $cgi->param("view_back") || 60*60*24; my $projectroot = "$gitroot/$project"; $ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/.git/objects"; @@ -27,7 +27,7 @@ $hash =~ s/[^0-9a-fA-F]//g; $parent =~ s/[^0-9a-fA-F]//g; $project =~ s/[^0-9a-zA-Z\-\._]//g; -sub header { +sub git_header { print $cgi->header(-type => 'text/html; charset: utf-8'); print < @@ -36,64 +36,127 @@ print <GIT EOF + print "
\n"; + print "
"; + print "\"git\""; + print $cgi->a({-href => "$myself"}, "projects"); if ($project ne "") { - print "
\n"; - print "
" . $project . "
\n"; - print "
\n"; - print $cgi->a({-href => "$myself?project=$project&action=show_tree"}, "Browse Project") . "
\n"; - print "Show Log "; - print $cgi->a({-href => "$myself?project=$project&action=show_log&view_back=" . 60*60*24}, "day") . "\n"; - print $cgi->a({-href => "$myself?project=$project&action=show_log&view_back=" . 60*60*24*7}, "week") . "\n"; - print $cgi->a({-href => "$myself?project=$project&action=show_log&view_back=" . 60*60*24*30}, "month") . "\n"; - print $cgi->a({-href => "$myself?project=$project&action=show_log&view_back=" . 60*60*24*365}, "year") . "
\n"; - print "
\n"; - print "

\n"; + print " / " . $cgi->a({-href => "$myself?project=$project&action=log&view_back=" . 60*60*24}, $project); } + if ($action ne "") { + print " / " . $action . " " . $hash; + } + print "
\n"; } -sub footer { +sub git_footer { print "
"; print $cgi->end_html(); } +sub git_diff { + my $old_name = shift; + my $new_name = shift; + 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"; + + if ($old ne "") { + open my $fd2, "> $gittmp/$old"; + open my $fd, "-|", "$gitbin/cat-file", "blob", $old; + while (my $line = <$fd>) { + print $fd2 $line; + } + close $fd2; + close $fd; + $tmp_old = "$gittmp/$old"; + $label_old = "a/$old_name"; + } + + if ($new ne "") { + open my $fd2, "> $gittmp/$new"; + open my $fd, "-|", "$gitbin/cat-file", "blob", $new; + while (my $line = <$fd>) { + print $fd2 $line; + } + close $fd2; + close $fd; + $tmp_new = "$gittmp/$new"; + $label_new = "b/$new_name"; + } + + open my $fd, "-|", "/usr/bin/diff", "-L", $label_old, "-L", $label_new, "-u", "-p", $tmp_old, $tmp_new; + while (my $line = <$fd>) { + my $char = substr($line,0,1); + 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 '@'; + } + close $fd; + #unlink("$gittmp/$new"); + #unlink("$gittmp/$old"); +} + if ($project eq "") { open my $fd, "-|", "ls", "-1", $gitroot; my (@path) = map { chomp; $_ } <$fd>; close $fd; - header(); - print "Projects:

\n"; + git_header(); + print "

\n"; foreach my $line (@path) { if (-e "$gitroot/$line/.git/HEAD") { print $cgi->a({-href => "$myself?project=$line"}, $line) . "
\n"; } } - footer(); + print "
"; + git_footer(); exit; } if ($action eq "") { - print $cgi->redirect("$myself?project=$project&action=show_log&view_back=$view_back"); + print $cgi->redirect("$myself?project=$project&action=log&view_back=$view_back"); exit; } -if ($action eq "show_file") { - header(); +if ($action eq "file") { + git_header(); + print "

\n"; print "
\n";
 	open my $fd, "-|", "$gitbin/cat-file", "blob", $hash;
 	my $nr;
@@ -103,14 +166,14 @@ if ($action eq "show_file") {
 	}
 	close $fd;
 	print "
\n"; - footer(); -} elsif ($action eq "show_tree") { + print "
"; + git_footer(); +} elsif ($action eq "tree") { if ($hash eq "") { open my $fd, "$projectroot/.git/HEAD"; my $head = <$fd>; chomp $head; close $fd; - open $fd, "-|", "$gitbin/cat-file", "commit", $head; my $tree = <$fd>; chomp $tree; @@ -121,7 +184,8 @@ if ($action eq "show_file") { open my $fd, "-|", "$gitbin/ls-tree", $hash; my (@entries) = map { chomp; $_ } <$fd>; close $fd; - header(); + git_header(); + print "

\n"; print "
\n";
 	foreach my $line (@entries) {
 		$line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
@@ -129,22 +193,32 @@ if ($action eq "show_file") {
 		my $t_hash = $3;
 		my $t_name = $4;
 		if ($t_type eq "blob") {
-			print "FILE\t" . $cgi->a({-href => "$myself?project=$project&action=show_file&hash=$3"}, $4) . "\n";
+			print "FILE\t" . $cgi->a({-href => "$myself?project=$project&action=file&hash=$3"}, $4) . "\n";
 		} elsif ($t_type eq "tree") {
-			print "DIR\t" . $cgi->a({-href => "$myself?project=$project&action=show_tree&hash=$3"}, $4) . "\n";
+			print "DIR\t" . $cgi->a({-href => "$myself?project=$project&action=tree&hash=$3"}, $4) . "\n";
 		}
 	}
 	print "
\n"; - footer(); -} elsif ($action eq "show_log") { + print "
"; + git_footer(); +} elsif ($action eq "log" || $action eq "show_log" ) { open my $fd, "$projectroot/.git/HEAD"; my $head = <$fd>; chomp $head; close $fd; - open my $fd, "-|", "$gitbin/rev-tree", $head; + open $fd, "-|", "$gitbin/rev-tree", $head; my (@revtree) = map { chomp; $_ } <$fd>; close $fd; - header(); + 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 "

\n"; + print "
\n"; print "\n"; foreach my $rev (reverse sort @revtree) { if (!($rev =~ m/^([0-9]+) ([0-9a-fA-F]+).* ([0-9a-fA-F]+)/)) { @@ -221,15 +295,19 @@ if ($action eq "show_file") { } print "\n"; print "\n"; - print ""; + print ""; print "\n"; print "\n"; - print "\n"; + print "\n"; print "\n"; } print "
" . $age_string . "" . $shortlog . "" . $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 "		\n"; print "author    " . escapeHTML($author) . " [" . gmtime($author_time) . " " . $author_timezone . "]
\n"; print "committer " . escapeHTML($committer) . " [" . gmtime($committer_time) . " " . $committer_timezone . "]
\n"; - print "commit    $commit
\n"; - print "tree      $tree
\n"; + print "commit    $commit
\n"; + print "tree      $tree
\n"; foreach my $par (@parents) { print "parent    $par
\n"; } @@ -243,25 +321,26 @@ if ($action eq "show_file") { print "
\n"; - footer(); -} elsif ($action eq "show_cset") { + git_footer(); +} elsif ($action eq "commit") { open my $fd, "-|", "$gitbin/cat-file", "commit", $hash; my $tree = <$fd>; chomp $tree; $tree =~ s/tree //; close $fd; - open my $fd, "-|", "$gitbin/cat-file", "commit", $parent; + open $fd, "-|", "$gitbin/cat-file", "commit", $parent; my $parent_tree = <$fd>; chomp $parent_tree; $parent_tree =~ s/tree //; close $fd; - open my $fd, "-|", "$gitbin/diff-tree", "-r", $parent_tree, $tree; + open $fd, "-|", "$gitbin/diff-tree", "-r", $parent_tree, $tree; my (@difftree) = map { chomp; $_ } <$fd>; close $fd; - header(); + git_header(); + print "

\n"; print "
\n";
 	foreach my $line (@difftree) {
 		$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
@@ -272,49 +351,75 @@ if ($action eq "show_file") {
 		my $file = $5;
 		if ($type eq "blob") {
 			if ($op eq "+") {
-				print "NEW\t" . $cgi->a({-href => "$myself?project=$project&action=show_file&hash=$id"}, $file) . "\n";
+				print "NEW\t" . $cgi->a({-href => "$myself?project=$project&action=file&hash=$id"}, $file) . "\n";
 			} elsif ($op eq "-") {
-				print "DEL\t" . $cgi->a({-href => "$myself?project=$project&action=show_file&hash=$id"}, $file) . "\n";
+				print "DEL\t" . $cgi->a({-href => "$myself?project=$project&action=file&hash=$id"}, $file) . "\n";
 			} elsif ($op eq "*") {
 				$id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
 				my $old = $1;
 				my $new = $2;
-				print "DIFF\t" . $cgi->a({-href => "$myself?project=$project&action=show_diff&hash=$old&parent=$new"}, $file) . "\n";
+				print "DIFF\t" . $cgi->a({-href => "$myself?project=$project&action=diff&hash=$old&parent=$new"}, $file) . "\n";
 			}
 		}
 	}
 	print "
\n"; - footer(); -} elsif ($action eq "show_diff") { - open my $fd2, "> $gittmp/$hash"; - open my $fd, "-|", "$gitbin/cat-file", "blob", $hash; - while (my $line = <$fd>) { - print $fd2 $line; - } - close $fd2; + print "
"; + git_footer(); +} elsif ($action eq "diff") { + git_header(); + print "

\n"; + print "
\n";
+	git_diff($hash, $parent, $hash, $parent);
+	print "
\n"; + print "
"; + git_footer(); +} elsif ($action eq "diffs") { + open my $fd, "-|", "$gitbin/cat-file", "commit", $hash; + my $tree = <$fd>; + chomp $tree; + $tree =~ s/tree //; close $fd; - open my $fd2, "> $gittmp/$parent"; - open my $fd, "-|", "$gitbin/cat-file", "blob", $parent; - while (my $line = <$fd>) { - print $fd2 $line; - } - close $fd2; + open $fd, "-|", "$gitbin/cat-file", "commit", $parent; + my $parent_tree = <$fd>; + chomp $parent_tree; + $parent_tree =~ s/tree //; + close $fd; + + open $fd, "-|", "$gitbin/diff-tree", "-r", $parent_tree, $tree; + my (@difftree) = map { chomp; $_ } <$fd>; close $fd; - header(); + git_header(); + print "

\n"; print "
\n";
-	open my $fd, "-|", "/usr/bin/diff", "-L", "$hash", "-L", "$parent", "-u", "-p", "$gittmp/$hash", "$gittmp/$parent";
-	while (my $line = <$fd>) {
-		print escapeHTML($line);
+	foreach my $line (@difftree) {
+		$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
+		my $op = $1;
+		my $mode = $2;
+		my $type = $3;
+		my $id = $4;
+		my $file = $5;
+		if ($type eq "blob") {
+			if ($op eq "+") {
+				git_diff("", $file, "", $id);
+			} elsif ($op eq "-") {
+				git_diff($file, "", $id, "");
+			} elsif ($op eq "*") {
+				$id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
+				git_diff($file, $file, $1, $2);
+			}
+		}
+		print "
\n";
 	}
-	close $fd;
-	unlink("$gittmp/$hash");
-	unlink("$gittmp/$parent");
 	print "
\n"; - footer(); + print "
"; + print "
"; + git_footer(); } else { - header(); + git_header(); + print "

\n"; print "unknown action\n"; - footer(); + print "
"; + git_footer(); }