X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/b61f79572834f3c15b8967cb372d5a4d168389d0aadf8ed3cbd3c19305227576..e32bb2294da7e4d79967cd6e680fdef8e5b572a26dc1e481fe02a1d64e98ca24:/gitweb.cgi diff --git a/gitweb.cgi b/gitweb.cgi index 7a7bc1d..2731937 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -14,7 +14,7 @@ use CGI::Carp qw(fatalsToBrowser); use Fcntl ':mode'; my $cgi = new CGI; -my $version = "107"; +my $version = "145"; my $my_url = $cgi->url(); my $my_uri = $cgi->url(-absolute => 1); my $rss_link = ""; @@ -30,102 +30,129 @@ my $gittmp = "/tmp/gitweb"; # target of the home link on top of all pages my $home_link = $my_uri; -$home_link = "/git"; -# handler to return the list of projects -sub get_projects_list { - my @list; +# html text to include at home page +my $home_text = "indextext.html"; - # search in directory -# my $dir = $projectroot; -# opendir my $dh, $dir || return undef; -# while (my $dir = readdir($dh)) { -# if (-e "$projectroot/$dir/HEAD") { -# push @list, $dir; -# } -# } -# closedir($dh); - - # read from file - my $file = "index/index.txt"; - open my $fd , $file || return undef; - while (my $line = <$fd>) { - chomp $line; - if (-e "$projectroot/$line/HEAD") { - push @list, $line; - } - } - close $fd; +# source of projects list +#my $projects_list = $projectroot; +my $projects_list = "index/index.txt"; - @list = sort @list; - return \@list; +# input validation and dispatch +my $action = $cgi->param('a'); +if (defined $action) { + if ($action =~ m/[^0-9a-zA-Z\.\-]+/) { + undef $action; + die_error(undef, "Invalid action parameter."); + } + if ($action eq "git-logo.png") { + git_logo(); + exit; + } +} else { + $action = "summary"; } -# input validation my $project = $cgi->param('p'); if (defined $project) { if ($project =~ m/(^|\/)(|\.|\.\.)($|\/)/) { undef $project; - die_error("", "Non-canonical project parameter."); + die_error(undef, "Non-canonical project parameter."); } if ($project =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~]/) { undef $project; - die_error("", "Invalid character in project parameter."); + die_error(undef, "Invalid character in project parameter."); } if (!(-d "$projectroot/$project")) { undef $project; - die_error("", "No such directory."); + die_error(undef, "No such directory."); } if (!(-e "$projectroot/$project/HEAD")) { undef $project; - die_error("", "No such project."); + die_error(undef, "No such project."); } $rss_link = ""; + $ENV{'GIT_OBJECT_DIRECTORY'} = "$projectroot/$project/objects"; $ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects"; +} else { + git_project_list(); + exit; } my $file_name = $cgi->param('f'); if (defined $file_name) { if ($file_name =~ m/(^|\/)(|\.|\.\.)($|\/)/) { undef $file_name; - die_error("", "Non-canonical file parameter."); + die_error(undef, "Non-canonical file parameter."); } - if ($file_name =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~]/) { + if ($file_name =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~\:\!]/) { undef $file_name; - die_error("", "Invalid character in file parameter."); + die_error(undef, "Invalid character in file parameter."); } } -my $action = $cgi->param('a'); -if (defined $action) { - if ($action =~ m/[^0-9a-zA-Z\.\-]+/) { - undef $action; - die_error("", "Invalid action parameter."); - } -} else { - $action = "log"; -} - my $hash = $cgi->param('h'); if (defined $hash && !($hash =~ m/^[0-9a-fA-F]{40}$/)) { undef $hash; - die_error("", "Invalid hash parameter."); + die_error(undef, "Invalid hash parameter."); } my $hash_parent = $cgi->param('hp'); if (defined $hash_parent && !($hash_parent =~ m/^[0-9a-fA-F]{40}$/)) { undef $hash_parent; - die_error("", "Invalid parent hash parameter."); + die_error(undef, "Invalid hash_parent parameter."); +} + +my $hash_base = $cgi->param('hb'); +if (defined $hash_base && !($hash_base =~ m/^[0-9a-fA-F]{40}$/)) { + undef $hash_base; + die_error(undef, "Invalid parent hash parameter."); } my $time_back = $cgi->param('t'); if (defined $time_back) { if ($time_back =~ m/^[^0-9]+$/) { undef $time_back; - die_error("", "Invalid time parameter."); + die_error(undef, "Invalid time parameter."); } } +if ($action eq "summary") { + git_summary(); + exit; +} elsif ($action eq "tags") { + git_tags(); + exit; +} elsif ($action eq "blob") { + git_blob(); + exit; +} elsif ($action eq "tree") { + git_tree(); + exit; +} elsif ($action eq "rss") { + git_rss(); + exit; +} elsif ($action eq "commit") { + git_commit(); + exit; +} elsif ($action eq "log") { + git_log(); + exit; +} elsif ($action eq "blobdiff") { + git_blobdiff(); + exit; +} elsif ($action eq "commitdiff") { + git_commitdiff(); + exit; +} elsif ($action eq "history") { + git_history(); + exit; +} else { + undef $action; + die_error(undef, "Unknown action."); + exit; +} + sub git_header_html { my $status = shift || "200 OK"; @@ -146,53 +173,53 @@ sub git_header_html { $title $rss_link @@ -200,11 +227,11 @@ a.rss_logo:hover { background-color:#ee5500; } EOF print "
\n" . - "" . + "" . "\"git\""; print $cgi->a({-href => $home_link}, "projects") . " / "; if (defined $project) { - print $cgi->a({-href => "$my_uri?p=$project;a=log"}, escapeHTML($project)); + print $cgi->a({-href => "$my_uri?p=$project;a=summary"}, escapeHTML($project)); if (defined $action) { print " / $action"; } @@ -215,7 +242,7 @@ EOF sub git_footer_html { print "
\n"; if (defined $project) { - my $descr = git_description($project); + my $descr = git_read_description($project); if (defined $descr) { print "
" . escapeHTML($descr) . "
\n"; } @@ -236,24 +263,34 @@ sub die_error { print "$status - $error\n"; print "
\n"; git_footer_html(); - exit 0; + exit; +} + +sub git_get_type { + my $hash = shift; + + open my $fd, "-|", "$gitbin/git-cat-file -t $hash" || return; + my $type = <$fd>; + close $fd; + chomp $type; + return $type; } -sub git_head { +sub git_read_hash { my $path = shift; - open my $fd, "$projectroot/$path/HEAD" || return undef; + + open my $fd, "$projectroot/$path" || return undef; my $head = <$fd>; close $fd; chomp $head; if ($head =~ m/^[0-9a-fA-F]{40}$/) { return $head; - } else { - return undef; } } -sub git_description { +sub git_read_description { my $path = shift; + open my $fd, "$projectroot/$path/description" || return undef; my $descr = <$fd>; close $fd; @@ -261,7 +298,29 @@ sub git_description { return $descr; } -sub git_commit { +sub git_read_tag { + my $tag_id = shift; + my %tag; + + open my $fd, "-|", "$gitbin/git-cat-file tag $tag_id" || return; + while (my $line = <$fd>) { + chomp $line; + if ($line =~ m/^object ([0-9a-fA-F]{40})$/) { + $tag{'object'} = $1; + } elsif ($line =~ m/^type (.*)$/) { + $tag{'type'} = $1; + } elsif ($line =~ m/^tag (.*)$/) { + $tag{'name'} = $1; + } + } + close $fd || return; + if (!defined $tag{'name'}) { + return + }; + return %tag +} + +sub git_read_commit { my $commit = shift; my %co; my @parents; @@ -288,23 +347,28 @@ sub git_commit { $co{'committer_name'} =~ s/ <.*//; } } + if (!defined $co{'tree'}) { + close $fd; + return undef + }; $co{'parents'} = \@parents; $co{'parent'} = $parents[0]; my (@comment) = map { chomp; $_ } <$fd>; $co{'comment'} = \@comment; - $co{'title'} = $comment[0]; + $comment[0] =~ m/^(.{0,60}[^ ]*)/; + $co{'title'} = $1; + if ($comment[0] ne $co{'title'}) { + $co{'title'} .= " ..."; + } close $fd || return; - if (!defined $co{'tree'}) { - return undef - }; my $age = time - $co{'committer_epoch'}; $co{'age'} = $age; if ($age > 60*60*24*365*2) { $co{'age_string'} = (int $age/60/60/24/365); $co{'age_string'} .= " years ago"; - } elsif ($age > 60*60*24*365/12*2) { - $co{'age_string'} = int $age/60/60/24/365/12; + } elsif ($age > 60*60*24*(365/12)*2) { + $co{'age_string'} = int $age/60/60/24/(365/12); $co{'age_string'} .= " months ago"; } elsif ($age > 60*60*24*7*2) { $co{'age_string'} = int $age/60/60/24/7; @@ -361,15 +425,20 @@ sub git_diff_html { open my $fd, "-|", "/usr/bin/diff -u -p -L $from_name -L $to_name $from_tmp $to_tmp"; while (my $line = <$fd>) { - my $char = substr($line,0,1); - # skip errors - next if $char eq '\\'; - # color the diff - 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 '@'; + chomp($line); + my $char = substr($line, 0, 1); + my $color = ""; + if ($char eq '+') { + $color = " style=\"color:#008800;\""; + } elsif ($char eq '-') { + $color = " style=\"color:#cc0000;\""; + } elsif ($char eq '@') { + $color = " style=\"color:#990099;\""; + } elsif ($char eq '\\') { + # skip errors + next; + } + print "
" . escapeHTML($line) . "
\n"; } close $fd; @@ -440,7 +509,7 @@ sub date_str { } # git-logo (cached in browser for one day) -if (defined $action && $action eq "git-logo.png") { +sub git_logo { print $cgi->header(-type => 'image/png', -expires => '+1d'); # cat git-logo.png | hexdump -e '16/1 " %02x" "\n"' | sed 's/ /\\x/g' print "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52" . @@ -456,105 +525,384 @@ if (defined $action && $action eq "git-logo.png") { "\x99\x30\xb8\x93\x0a\x11\xb9\x45\x88\xc1\x8d\xa0\xa2\x44\x21\x06" . "\x27\x41\x82\x40\x85\xc1\x45\x89\x20\x70\x01\x00\xa4\x3d\x21\xc5" . "\x12\x1c\x9a\xfe\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82"; - exit; } -# project browser -if (!defined $project) { - my $projects = get_projects_list(); +sub get_file_owner { + my $path = shift; + + my ($dev, $ino, $mode, $nlink, $st_uid, $st_gid, $rdev, $size) = stat($path); + my ($name, $passwd, $uid, $gid, $quota, $comment, $gcos, $dir, $shell) = getpwuid($st_uid); + if (!defined $gcos) { + return undef; + } + my $owner = $gcos; + $owner =~ s/[,;].*$//; + return $owner; +} + +sub git_project_list { + my @list; + + if (-d $projects_list) { + # search in directory + my $dir = $projects_list; + opendir my $dh, $dir || return undef; + while (my $dir = readdir($dh)) { + if (-e "$projectroot/$dir/HEAD") { + my $pr = { + path => $dir, + }; + push @list, $pr + } + } + closedir($dh); + } elsif (-f $projects_list) { + # read from file: + # 'git/git.git:Linus Torvalds' + # 'linux/hotplug/udev.git' + open my $fd , $projects_list || return undef; + while (my $line = <$fd>) { + chomp $line; + my ($path, $owner) = split ':', $line; + if (!defined $path) { + next; + } + if (-e "$projectroot/$path/HEAD") { + my $pr = { + path => $path, + owner => $owner, + }; + push @list, $pr + } + } + close $fd; + } + + if (!@list) { + die_error(undef, "No project found."); + } + @list = sort {$a->{'path'} cmp $b->{'path'}} @list; + git_header_html(); - print "
\n"; - print "\n"; - print "\n" . + if (-f $home_text) { + print "
\n"; + open (my $fd, $home_text); + print <$fd>; + close $fd; + print "
\n"; + } + print "

\n" . + "
\n" . + "\n" . "\n" . "\n" . "\n" . "\n" . - "\n" . - "
"; - foreach my $proj (@$projects) { - my $head = git_head($proj); + "\n" . + "\n"; + foreach my $pr (@list) { + my %proj = %$pr; + my $head = git_read_hash("$proj{'path'}/HEAD"); if (!defined $head) { next; } - $ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$proj/objects"; - my %co = git_commit($head); + $ENV{'GIT_OBJECT_DIRECTORY'} = "$projectroot/$proj{'path'}/objects"; + $ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$proj{'path'}/objects"; + my %co = git_read_commit($head); if (!%co) { next; } - my $descr = git_description($proj) || ""; - my $owner = ""; - my ($dev, $ino, $mode, $nlink, $st_uid, $st_gid, $rdev, $size) = stat("$projectroot/$proj"); - my ($name, $passwd, $uid, $gid, $quota, $comment, $gcos, $dir, $shell) = getpwuid($st_uid); - if (defined $gcos) { - $owner = $gcos; - $owner =~ s/[,;].*$//; + my $descr = git_read_description($proj{'path'}) || ""; + # get directory owner if not already specified + if (!defined $proj{'owner'}) { + $proj{'owner'} = get_file_owner("$projectroot/$proj{'path'}") || ""; } print "\n" . - "\n" . + "\n" . "\n" . - "\n"; + "\n"; + my $colored_age; if ($co{'age'} < 60*60*2) { - print "\n"; + $colored_age = "$co{'age_string'}"; } elsif ($co{'age'} < 60*60*24*2) { - print "\n"; + $colored_age = "$co{'age_string'}"; } else { - print "\n"; + $colored_age = "$co{'age_string'}"; } - print "\n"; - undef %co; + print "\n" . + "\n" . + "\n"; } print "
ProjectDescriptionOwnerlast change
" . $cgi->a({-href => "$my_uri?p=$proj;a=log"}, escapeHTML($proj)) . "" . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary"}, escapeHTML($proj{'path'})) . "$descr$owner$proj{'owner'}" . $co{'age_string'} . "" . $co{'age_string'} . "" . $co{'age_string'} . "
$colored_age" . + $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=log"}, "log") . + " | " . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=tree"}, "tree") . + "
\n" . "
\n" . "
\n"; git_footer_html(); - exit; } -# action dispatch -if ($action eq "blob") { - open my $fd, "-|", "$gitbin/git-cat-file blob $hash" || die_error("", "Open failed."); +sub git_read_tags { + my @taglist; + + opendir my $dh, "$projectroot/$project/refs/tags"; + my @tags = grep !m/^\./, readdir $dh; + closedir($dh); + foreach my $tag_file (@tags) { + my $tag_id = git_read_hash("$project/refs/tags/$tag_file"); + my $type = git_get_type($tag_id) || next; + my %tag_item; + my %co; + if ($type eq "tag") { + my %tag = git_read_tag($tag_id); + if ($tag{'type'} eq "commit") { + %co = git_read_commit($tag{'object'}); + } + $tag_item{'type'} = $tag{'type'}; + $tag_item{'name'} = $tag{'name'}; + $tag_item{'id'} = $tag{'object'}; + } elsif ($type eq "commit"){ + %co = git_read_commit($tag_id); + $tag_item{'type'} = "commit"; + $tag_item{'name'} = $tag_file; + $tag_item{'id'} = $tag_id; + } + $tag_item{'epoch'} = $co{'author_epoch'} || 0; + $tag_item{'age'} = $co{'age_string'} || "unknown"; + + push @taglist, \%tag_item; + } + # sort tags by age + @taglist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @taglist; + return \@taglist; +} + +sub git_summary { + my $descr = git_read_description($project) || "none"; + my $head = git_read_hash("$project/HEAD"); + $ENV{'GIT_OBJECT_DIRECTORY'} = "$projectroot/$project/objects"; + $ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects"; + my %co = git_read_commit($head); + my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'}); + + my $owner; + if (-f $projects_list) { + open (my $fd , $projects_list); + while (my $line = <$fd>) { + chomp $line; + my ($pr, $ow) = split ':', $line; + if ($pr eq $project) { + $owner = $ow; + last; + } + } + close $fd; + } + if (!defined $owner) { + $owner = get_file_owner("$projectroot/$project"); + } + git_header_html(); - print "
\n"; - print "

\n"; - print "
$hash
\n"; - print "
\n";
+	print "
\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree"}, "tree") .
+	      "

\n" .
+	      "
\n";
+	print "
project
\n";
+	print "
\n" .
+	      "\n" .
+	      "\n" .
+	      "\n" .
+	      "\n" .
+	      "
description" . escapeHTML($descr) . "
owner$owner
last change$cd{'rfc2822'}
\n" .
+	      "
\n";
+	open my $fd, "-|", "$gitbin/git-rev-list --max-count=11 " . git_read_hash("$project/HEAD") || die_error(undef, "Open failed.");
+	my (@revlist) = map { chomp; $_ } <$fd>;
+	close $fd;
+	print "
\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=log", -class => "title"}, "recent commits") .
+	      "
\n";
+	my $i = 10;
+	foreach my $commit (@revlist) {
+		my %co = git_read_commit($commit);
+		my %ad = date_str($co{'author_epoch'});
+		print "
\n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"},
+		      "$co{'age_string'}" . escapeHTML($co{'title'})) . "\n" .
+		      "
\n";
+		if (--$i == 0) {
+			print "
" . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "...") . "
\n";
+			last;
+		}
+	}
+	print "

\n";
+
+	my $taglist = git_read_tags();
+	if (defined @$taglist) {
+		print "
\n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=tags", -class => "title"}, "recent tags") .
+		      "
\n";
+		my $i = 10;
+		foreach my $entry (@$taglist) {
+			my %tag = %$entry;
+			print "
\n" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"},
+			      "$tag{'age'}" .  escapeHTML($tag{'name'})) . "\n" .
+			      "
\n";
+			if (--$i == 0) {
+				print "
" . $cgi->a({-href => "$my_uri?p=$project;a=tags"}, "...") . "
\n";
+				last;
+			}
+		}
+		print "

\n";
+	}
+	git_footer_html();
+}
+
+sub git_tags {
+	my $head = git_read_hash("$project/HEAD");
+	git_header_html();
+	print "
\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$head"}, "commit") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree"}, "tree") .
+	      "

\n" .
+	      "
\n";
+	my $taglist = git_read_tags();
+	print "
\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, "tags") .
+	      "
\n";
+	if (defined @$taglist) {
+		foreach my $entry (@$taglist) {
+			my %tag = %$entry;
+			print "
\n" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"},
+			      "$tag{'age'}" .  escapeHTML($tag{'name'})) . "\n" .
+			      "
\n";
+		}
+	}
+	print "

\n";
+	git_footer_html();
+}
+
+sub git_get_hash_by_path {
+	my $base = shift;
+	my $path = shift;
+
+	my $tree = $base;
+	my @parts = split '/', $path;
+	while (my $part = shift @parts) {
+		open my $fd, "-|", "$gitbin/git-ls-tree $tree" || die_error(undef, "Open git-ls-tree failed.");
+		my (@entries) = map { chomp; $_ } <$fd>;
+		close $fd || return undef;
+		foreach my $line (@entries) {
+			#'100644	blob	0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa	panic.c'
+			$line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
+			my $t_mode = $1;
+			my $t_type = $2;
+			my $t_hash = $3;
+			my $t_name = $4;
+			if ($t_name eq $part) {
+				if (!(@parts)) {
+					return $t_hash;
+				}
+				if ($t_type eq "tree") {
+					$tree = $t_hash;
+				}
+				last;
+			}
+		}
+	}
+}
+
+sub git_blob {
+	if (!defined $hash && defined $file_name) {
+		my $base = $hash_base || git_read_hash("$project/HEAD");
+		$hash = git_get_hash_by_path($base, $file_name, "blob");
+	}
+	open my $fd, "-|", "$gitbin/git-cat-file blob $hash" || die_error(undef, "Open failed.");
+	my $base = $file_name || "";
+	git_header_html();
+	if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
+		print "
\n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree");
+		if (defined $file_name) {
+			print " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base;f=$file_name"}, "history");
+		}
+		print "

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

\n" .
+		      "
$hash
\n";
+	}
+	if (defined $file_name) {
+		print "
/$file_name
\n";
+	}
+	print "
\n";
 	my $nr;
 	while (my $line = <$fd>) {
+		chomp $line;
 		$nr++;
-		printf "%4i\t%s", $nr, escapeHTML($line);;
+		print "
";
+		printf "%4i", $nr;
+		print " " .escapeHTML($line) . "
\n";
 	}
 	close $fd || print "Reading blob failed.\n";
-	print "

\n"; print "
"; git_footer_html(); -} elsif ($action eq "tree") { +} + +sub git_tree { if (!defined $hash) { - $hash = git_head($project); + $hash = git_read_hash("$project/HEAD"); + if (defined $file_name) { + my $base = $hash_base || git_read_hash("$project/HEAD"); + $hash = git_get_hash_by_path($base, $file_name, "tree"); + } } - open my $fd, "-|", "$gitbin/git-ls-tree $hash" || die_error("", "Open failed."); + if (!defined $hash_base) { + $hash_base = git_read_hash("$project/HEAD"); + } + open my $fd, "-|", "$gitbin/git-ls-tree $hash" || die_error(undef, "Open git-ls-tree failed."); my (@entries) = map { chomp; $_ } <$fd>; - close $fd || die_error("", "Reading tree failed."); + close $fd || die_error(undef, "Reading tree failed."); git_header_html(); - my %co = git_commit($hash); - if (%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") . + my $base_key = ""; + my $file_key = ""; + my $base = ""; + if (defined $hash_base && (my %co = git_read_commit($hash_base))) { + $base_key = ";hb=$hash_base"; + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree") . "

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

\n"; print "
$hash
\n"; } + if (defined $file_name) { + $base = "$file_name/"; + print "
/$file_name
\n"; + } else { + print "
/
\n"; + } print "
\n"; - print "
\n";
+	print "\n";
 	foreach my $line (@entries) {
 		#'100644	blob	0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa	panic.c'
 		$line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
@@ -562,42 +910,47 @@ if ($action eq "blob") {
 		my $t_type = $2;
 		my $t_hash = $3;
 		my $t_name = $4;
+		$file_key = ";f=$base$t_name";
+		print "\n" .
+		      "\n";
 		if ($t_type eq "blob") {
-			print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash"}, $t_name);
-			if (S_ISLNK(oct $t_mode)) {
-				open my $fd, "-|", "$gitbin/git-cat-file blob $t_hash";
-				my $target = <$fd>;
-				close $fd;
-				print "\t -> $target";
-			}
-			print "\n";
+			print "\n";
+			print "\n";
 		} elsif ($t_type eq "tree") {
-			print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash"}, $t_name) . "\n";
+			print "\n";
 		}
+		print "\n";
 	}
-	print "\n";
-	print "
";
+	print "
" . mode_str($t_mode) . "$t_name" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash" . $base_key . $file_key}, "blob") .
+			      " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base" . $file_key}, "history") .
+			      "" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash" . $base_key . $file_key}, $t_name) .
+			      "
\n" .
+	      "
"; git_footer_html(); -} elsif ($action eq "rss") { - open my $fd, "-|", "$gitbin/git-rev-list --max-count=20 " . git_head($project) || die_error("", "Open failed."); +} + +sub git_rss { + open my $fd, "-|", "$gitbin/git-rev-list --max-count=20 " . git_read_hash("$project/HEAD") || die_error(undef, "Open failed."); my (@revlist) = map { chomp; $_ } <$fd>; - close $fd || die_error("", "Reading rev-list failed."); + close $fd || die_error(undef, "Reading rev-list failed."); print $cgi->header(-type => 'text/xml', -charset => 'utf-8'); print "\n". "\n"; print "\n"; print "$project\n". - " " . $my_url . "/$project/log\n". + " $my_url/$project/log\n". "$project log\n". "en\n"; foreach my $commit (@revlist) { - my %co = git_commit($commit); + my %co = git_read_commit($commit); my %ad = date_str($co{'author_epoch'}); print "\n" . - "\t" . sprintf("%d %s %02d:%02d", $ad{'mday'}, $ad{'month'}, $ad{'hour'}, $ad{'min'}) . " - " . escapeHTML($co{'title'}) . "\n" . - "\t " . $my_url . "?p=$project;a=commit;h=$commit\n" . + "\t" . sprintf("%d %s %02d:%02d", $ad{'mday'}, $ad{'month'}, $ad{'hour'}, $ad{'minute'}) . " - " . escapeHTML($co{'title'}) . "\n" . + "\t $my_url?p=$project;a=commit;h=$commit\n" . "\t"; my $comment = $co{'comment'}; foreach my $line (@$comment) { @@ -605,12 +958,12 @@ if ($action eq "blob") { } print "\t\n" . "\n"; - undef %ad; - undef %co; } print ""; -} elsif ($action eq "log") { - my $head = git_head($project); +} + +sub git_log { + my $head = git_read_hash("$project/HEAD"); my $limit_option = ""; if (!defined $time_back) { $limit_option = "--max-count=10"; @@ -618,78 +971,94 @@ if ($action eq "blob") { my $date = time - $time_back*24*60*60; $limit_option = "--max-age=$date"; } - open my $fd, "-|", "$gitbin/git-rev-list $limit_option $head" || die_error("", "Open failed."); + open my $fd, "-|", "$gitbin/git-rev-list $limit_option $head" || die_error(undef, "Open failed."); my (@revlist) = map { chomp; $_ } <$fd>; - close $fd || die_error("", "Reading rev-list failed."); + close $fd || die_error(undef, "Reading rev-list failed."); git_header_html(); print "
\n"; - print "view "; print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last 10") . " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;t=1"}, "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" . + print "
\n" . "
\n"; if (!@revlist) { - my %co = git_commit($head); - print "
Last change " . $co{'age_string'} . ".

\n"; + my %co = git_read_commit($head); + print "
Last change $co{'age_string'}.

\n"; } foreach my $commit (@revlist) { - my %co = git_commit($commit); + my %co = git_read_commit($commit); next if !%co; my %ad = date_str($co{'author_epoch'}); print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "title"}, - "" . $co{'age_string'} . "" . escapeHTML($co{'title'})) . "\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" . - "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" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") . + "
\n" . "
\n" . - "" . escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]
\n" . + "" . escapeHTML($co{'author_name'}) . " [$ad{'rfc2822'}]
\n" . "
\n" . "
\n"; my $comment = $co{'comment'}; + my $empty = 0; foreach my $line (@$comment) { - last if ($line =~ m/^(signed-off|acked)-by:/i); - print escapeHTML($line) . "
\n"; + if ($line =~ m/^(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { + next; + } + if ($line eq "") { + if ($empty) { + next; + } + $empty = 1; + } else { + $empty = 0; + } + print escapeHTML($line) . "
\n"; } - print "
\n" . - "
\n"; - undef %ad; - undef %co; + if (!$empty) { + print "
\n"; + } + print "
\n"; } git_footer_html(); -} elsif ($action eq "commit") { - my %co = git_commit($hash); +} + +sub git_commit { + my %co = git_read_commit($hash); if (!%co) { - die_error("", "Unknown commit object."); + die_error(undef, "Unknown commit object."); } my %ad = date_str($co{'author_epoch'}, $co{'author_tz'}); my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'}); my @difftree; if (defined $co{'parent'}) { - open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash" || die_error("", "Open failed."); + open my $fd, "-|", "$gitbin/git-diff-tree -r $co{'parent'} $hash" || die_error(undef, "Open failed."); @difftree = map { chomp; $_ } <$fd>; - close $fd || die_error("", "Reading diff-tree failed."); + close $fd || die_error(undef, "Reading diff-tree failed."); } else { # fake git-diff-tree output for initial revision - open my $fd, "-|", "$gitbin/git-ls-tree -r $hash" || die_error("", "Open failed."); + open my $fd, "-|", "$gitbin/git-ls-tree -r $hash" || die_error(undef, "Open failed."); @difftree = map { chomp; "+" . $_ } <$fd>; - close $fd || die_error("", "Reading ls-tree failed."); + close $fd || die_error(undef, "Reading ls-tree failed."); } 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=tree;h=$hash"}, "tree") . "\n" . + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit"); + if (defined $co{'parent'}) { + print " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff"); + } + print " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") . "\n" . "

\n"; if (defined $co{'parent'}) { print "
\n" . @@ -697,13 +1066,13 @@ if ($action eq "blob") { "
\n"; } else { print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; } print "
\n" . "\n"; print "\n". - "\n"; print "\n"; - print "\n"; + print "\n"; print "\n"; print "\n"; + $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, $co{'tree'}) . "\n"; my $parents = $co{'parents'}; foreach my $par (@$parents) { print "
author" . escapeHTML($co{'author'}) . "
" . $ad{'rfc2822'}; + "
$ad{'rfc2822'}"; if ($ad{'hour_local'} < 6) { printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}); } else { @@ -711,11 +1080,10 @@ if ($action eq "blob") { } print "
committer" . escapeHTML($co{'committer'}) . "
" . $cd{'rfc2822'} . - sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "
$cd{'rfc2822'}" . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "
commit$hash
tree" . - $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, $co{'tree'}) . "
parent" . @@ -725,17 +1093,32 @@ if ($action eq "blob") { "\n"; print "
\n"; my $comment = $co{'comment'}; + my $empty = 0; + my $signed = 0; foreach my $line (@$comment) { - if ($line =~ m/(signed-off|acked)-by:/i) { + # print only one empty line + if ($line eq "") { + if ($empty || $signed) { + next; + } + $empty = 1; + } else { + $empty = 0; + } + if ($line =~ m/^(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { + $signed = 1; print "" . escapeHTML($line) . "
\n"; } else { + $signed = 0; print escapeHTML($line) . "
\n"; } } print "
\n"; + print "
\n"; if ($#difftree > 10) { - print "
" . ($#difftree + 1) . " files changed:
\n"; + print(($#difftree + 1) . " files changed:\n"); } + print "
\n"; foreach my $line (@difftree) { # '*100644->100644 blob 9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596 net/ipv4/route.c' # '+100644 blob 4a83ab6cd565d21ab0385bac6643826b83c2fcd4 arch/arm/lib/bitops.h' @@ -754,22 +1137,20 @@ if ($action eq "blob") { $mode_chng = sprintf(" with mode: %04o", (oct $mode) & 0777); } print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, - escapeHTML($file) . " [new " . file_type($mode) . $mode_chng . "]") . "\n" . - "
"; - print "
\n" . - "view " . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, + escapeHTML($file) . " [new " . file_type($mode) . "$mode_chng]") . "\n" . + "
\n"; + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "blob") . "\n" . "
\n"; } elsif ($op eq "-") { print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, escapeHTML($file) . " [deleted " . file_type($mode) . "]") . "\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" . + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "blob") . " | " . + $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]+)/; @@ -780,7 +1161,7 @@ if ($action eq "blob") { my $to_mode = $2; my $mode_chnge = ""; if ($from_mode != $to_mode) { - $mode_chnge = " [changed"; + $mode_chnge = " [changed"; if (((oct $from_mode) & S_IFMT) != ((oct $to_mode) & S_IFMT)) { $mode_chnge .= " from " . file_type($from_mode) . " to " . file_type($to_mode); } @@ -795,64 +1176,86 @@ if ($action eq "blob") { } print "
\n"; if ($to_id ne $from_id) { - print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id"}, + print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file"}, escapeHTML($file) . $mode_chnge) . "\n" . "
\n"; } else { - print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id"}, + print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, escapeHTML($file) . $mode_chnge) . "\n" . "
\n"; } - print "
\n" . - "view "; + print "
\n"; 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=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file"}, "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" . + print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, "blob") . " | " . + $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "\n" . "
\n"; } } } git_footer_html(); -} elsif ($action eq "blobdiff") { +} + +sub git_blobdiff { mkdir($gittmp, 0700); git_header_html(); - print "
\n"; - print "

\n"; - print "
$hash vs $hash_parent
\n"; + if (defined $hash_base && (my %co = git_read_commit($hash_base))) { + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree"); + if (defined $file_name) { + print " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base;f=$file_name"}, "history"); + } + print "

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

\n" . + "
$hash vs $hash_parent
\n"; + } + if (defined $file_name) { + print "
\n" . + "/$file_name\n" . + "
\n"; + } print "
\n" . - "
\n";
-	print "blob:" .
-	      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$hash_parent"}, $hash_parent) .
+	      "
blob:" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$hash_parent;hb=$hash_base;f=$file_name"}, $hash_parent) .
 	      " -> blob:" .
-	      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$hash"}, $hash) .
-	      "\n";
-	git_diff_html($hash_parent, $hash_parent, $hash, $hash);
-	print "
\n" . - "
"; + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name"}, $hash) . + "
\n"; + git_diff_html($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash); + print ""; git_footer_html(); -} elsif ($action eq "commitdiff") { +} + +sub git_commitdiff { mkdir($gittmp, 0700); - my %co = git_commit($hash); + my %co = git_read_commit($hash); if (!%co) { - die_error("", "Unknown commit object."); + die_error(undef, "Unknown commit object."); } - open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash" || die_error("", "Open failed."); + open my $fd, "-|", "$gitbin/git-diff-tree -r $co{'parent'} $hash" || die_error(undef, "Open failed."); my (@difftree) = map { chomp; $_ } <$fd>; - close $fd || die_error("", "Reading diff-tree failed."); + close $fd || die_error(undef, "Reading diff-tree failed."); 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=tree;h=$hash"}, "tree") . "\n" . + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash"}, "tree") . "

\n"; print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; - print "
\n" . - "
\n";
+	print "
\n";
 	foreach my $line (@difftree) {
 		# '*100644->100644	blob	8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154	Makefile'
 		$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
@@ -863,14 +1266,14 @@ if ($action eq "blob") {
 		my $file = $5;
 		if ($type eq "blob") {
 			if ($op eq "+") {
-				print "" .  file_type($mode) . ":" .
-				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, $id) . "(new)" .
-				      "\n";
+				print "
" .  file_type($mode) . ":" .
+				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, $id) . "(new)" .
+				      "
\n";
 				git_diff_html(undef, "/dev/null", $id, "b/$file");
 			} elsif ($op eq "-") {
-				print "" . file_type($mode) . ":" .
-				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, $id) . "(deleted)" .
-				      "\n";
+				print "
" . file_type($mode) . ":" .
+				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, $id) . "(deleted)" .
+				      "
\n";
 				git_diff_html($id, "a/$file", undef, "/dev/null");
 			} elsif ($op eq "*") {
 				$id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
@@ -880,29 +1283,42 @@ if ($action eq "blob") {
 				my $from_mode = $1;
 				my $to_mode = $2;
 				if ($from_id ne $to_id) {
-					print "" .
-					      file_type($from_mode) . ":" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id"}, $from_id) .
+					print "
" .
+					      file_type($from_mode) . ":" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file"}, $from_id) .
 					      " -> " .
-					      file_type($to_mode) . ":" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id"}, $to_id);
-					print "\n";
+					      file_type($to_mode) . ":" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, $to_id);
+					print "
\n";
 					git_diff_html($from_id, "a/$file",  $to_id, "b/$file");
 				}
 			}
 		}
 	}
-	print "

\n"; - print "
"; + print "
\n" . + "
"; git_footer_html(); -} elsif ($action eq "history") { +} + +sub git_history { if (!defined $hash) { - $hash = git_head($project); + $hash = git_read_hash("$project/HEAD"); + } + my %co = git_read_commit($hash); + if (!%co) { + die_error(undef, "Unknown commit object."); } git_header_html(); - print "
\n"; - print "

\n"; + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | " . + $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff") . " | " . + $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") . + "

\n" . + "
\n"; print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($file_name)) . "\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; + print "
\n" . + "/$file_name
\n"; + print "
\n"; open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin $file_name"; my $commit; while (my $line = <$fd>) { @@ -916,26 +1332,28 @@ if ($action eq "blob") { if ($file ne $file_name || $type ne "blob") { next; } - my %co = git_commit($commit); + my %co = git_read_commit($commit); if (!%co) { next; } print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, - "" . $co{'age_string'} . "" . escapeHTML($co{'title'})) . "\n" . + "$co{'age_string'}" . escapeHTML($co{'title'})) . "\n" . "
\n"; - print "
\n" . - "view " . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " . - $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$commit"}, "tree") . "

\n" . + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$commit"}, "tree") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=blob;hb=$commit;f=$file"}, "blob"); + my $blob = git_get_hash_by_path($hash, $file_name); + my $blob_parent = git_get_hash_by_path($commit, $file_name); + if (defined $blob && defined $blob_parent && $blob ne $blob_parent) { + print " | " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$blob;hp=$blob_parent;hb=$commit;f=$file"}, "diff"); + } + print "
\n" . "
\n"; - undef %co; undef $commit; } } close $fd; git_footer_html(); -} else { - undef $action; - die_error("", "Unknown action."); }