X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/b4e52fba87376249a43cb9cdd3adbee1d8c5e1d185c26af8c6867129b5ffffcf..1f369c85ca0dee892d504527ed0529b3df7f9501b49e2d156c0fde14ac811b2c:/gitweb.cgi diff --git a/gitweb.cgi b/gitweb.cgi index 362e2e6..c8e20d0 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -5,80 +5,164 @@ # (C) 2005, Kay Sievers # (C) 2005, Christian Gierke # -# This file is licensed under the GPL v2, or a later version +# This program is licensed under the GPL v2, or a later version use strict; use warnings; use CGI qw(:standard :escapeHTML); use CGI::Carp qw(fatalsToBrowser); +use Fcntl ':mode'; my $cgi = new CGI; +my $version = "142"; +my $my_url = $cgi->url(); +my $my_uri = $cgi->url(-absolute => 1); +my $rss_link = ""; -# begin config +# absolute fs-path which will be prepended to the project path my $projectroot = "/pub/scm"; -$projectroot = "/home/kay/public_html/pub/scm"; -my $home_link = "/git"; -$home_link = "/~kay/git"; + +# location of the git-core binaries my $gitbin = "/usr/bin"; + +# location for temporary files needed for diffs my $gittmp = "/tmp/gitweb"; -my $logo_link = "/pub/software/scm/cogito"; -$logo_link = "/~kay/pub/software/scm/cogito"; -# end config -my $version = "089"; -my $my_url = $cgi->url(); -my $my_uri = $cgi->url(-absolute => 1); -my $rss_link = ""; +# target of the home link on top of all pages +my $home_link = $my_uri; + +# html text to include at home page +my $home_text = "indextext.html"; + +# source of projects list +#my $projects_list = $projectroot; +my $projects_list = "index/index.txt"; + +# 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"; +} my $project = $cgi->param('p'); -if (defined($project)) { - if ($project =~ /(^|\/)(|\.|\.\.)($|\/)/) { - $project = ""; - die_error("", "Invalid project parameter."); +if (defined $project) { + if ($project =~ m/(^|\/)(|\.|\.\.)($|\/)/) { + undef $project; + die_error(undef, "Non-canonical project parameter."); + } + if ($project =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~]/) { + undef $project; + die_error(undef, "Invalid character in project parameter."); } if (!(-d "$projectroot/$project")) { - $project = ""; - die_error("", "No such project."); + undef $project; + die_error(undef, "No such directory."); + } + if (!(-e "$projectroot/$project/HEAD")) { + undef $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) && $file_name =~ /(^|\/)(|\.|\.\.)($|\/)/) { - $file_name = ""; - die_error("", "Invalid file parameter."); -} - -my $action = $cgi->param('a'); -if (defined($action) && $action =~ m/[^0-9a-zA-Z\.\-]+$/) { - $action = ""; - die_error("", "Invalid action parameter."); +if (defined $file_name) { + if ($file_name =~ m/(^|\/)(|\.|\.\.)($|\/)/) { + undef $file_name; + die_error(undef, "Non-canonical file parameter."); + } + if ($file_name =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~\:\!]/) { + undef $file_name; + die_error(undef, "Invalid character in file parameter."); + } } my $hash = $cgi->param('h'); -if (defined($hash) && !($hash =~ m/^[0-9a-fA-F]{40}$/)) { - $hash = ""; - die_error("", "Invalid hash parameter."); +if (defined $hash && !($hash =~ m/^[0-9a-fA-F]{40}$/)) { + undef $hash; + die_error(undef, "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."); +if (defined $hash_parent && !($hash_parent =~ m/^[0-9a-fA-F]{40}$/)) { + undef $hash_parent; + 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) && !($time_back =~ m/^[0-9]+$/)) { - $time_back = ""; - die_error("", "Invalid time parameter."); +if (defined $time_back) { + if ($time_back =~ m/^[^0-9]+$/) { + undef $time_back; + die_error(undef, "Invalid time parameter."); + } } -mkdir($gittmp, 0700); +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"; + my $title = "git"; + if (defined $project) { + $title .= " - $project"; + if (defined $action) { + $title .= "/$action"; + } + } print $cgi->header(-type=>'text/html', -charset => 'utf-8', -status=> $status); print < @@ -86,56 +170,56 @@ sub git_header_html { -git - $project +$title $rss_link @@ -143,26 +227,24 @@ a.rss_logo:hover { background-color:#ee5500; } EOF print "
\n" . - "" . + "" . "\"git\""; - print $cgi->a({-href => "$my_uri"}, "projects") . " / "; - if ($project ne "") { - print $cgi->a({-href => "$my_uri?p=$project;a=log"}, escapeHTML($project)); - } - if ($action ne "") { - print " / $action"; + print $cgi->a({-href => $home_link}, "projects") . " / "; + if (defined $project) { + print $cgi->a({-href => "$my_uri?p=$project;a=summary"}, escapeHTML($project)); + if (defined $action) { + print " / $action"; + } } print "
\n"; } sub git_footer_html { print "
\n"; - if ($project ne "") { - if (-e "$projectroot/$project/description") { - open(my $fd, "$projectroot/$project/description"); - my $descr = <$fd>; + if (defined $project) { + my $descr = git_read_description($project); + if (defined $descr) { print "
" . escapeHTML($descr) . "
\n"; - close $fd; } print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "rss_logo"}, "RSS") . "\n"; } @@ -181,27 +263,72 @@ 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") || die_error("", "Invalid project directory."); + + open my $fd, "$projectroot/$path" || return undef; my $head = <$fd>; close $fd; chomp $head; - return $head; + if ($head =~ m/^[0-9a-fA-F]{40}$/) { + return $head; + } } -sub git_commit { +sub git_read_description { + my $path = shift; + + open my $fd, "$projectroot/$path/description" || return undef; + my $descr = <$fd>; + close $fd; + chomp $descr; + return $descr; +} + +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; - open my $fd, "-|", "$gitbin/git-cat-file commit $commit"; + open my $fd, "-|", "$gitbin/git-cat-file commit $commit" || return; while (my $line = <$fd>) { - chomp($line); - last if $line eq ""; + last if $line eq "\n"; + chomp $line; if ($line =~ m/^tree (.*)$/) { $co{'tree'} = $1; } elsif ($line =~ m/^parent (.*)$/) { @@ -220,23 +347,28 @@ sub git_commit { $co{'committer_name'} =~ s/ <.*//; } } - if (!defined($co{'tree'})) { - return; - } + 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]; - close $fd; + $comment[0] =~ m/^(.{0,60}[^ ]*)/; + $co{'title'} = $1; + if ($comment[0] ne $co{'title'}) { + $co{'title'} .= " ..."; + } + close $fd || return; 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; @@ -250,6 +382,11 @@ sub git_commit { } elsif ($age > 60*2) { $co{'age_string'} = int $age/60; $co{'age_string'} .= " minutes ago"; + } elsif ($age > 2) { + $co{'age_string'} = int $age; + $co{'age_string'} .= " seconds ago"; + } else { + $co{'age_string'} .= " right now"; } return %co; } @@ -265,9 +402,9 @@ sub git_diff_html { my $pid = $$; # create tmp from-file - if ($from ne "") { + if (defined $from) { $from_tmp = "$gittmp/gitweb_" . $$ . "_from"; - open(my $fd2, "> $from_tmp"); + open my $fd2, "> $from_tmp"; open my $fd, "-|", "$gitbin/git-cat-file blob $from"; my @file = <$fd>; print $fd2 @file; @@ -276,7 +413,7 @@ sub git_diff_html { } # create tmp to-file - if ($to ne "") { + if (defined $to) { $to_tmp = "$gittmp/gitweb_" . $$ . "_to"; open my $fd2, "> $to_tmp"; open my $fd, "-|", "$gitbin/git-cat-file blob $to"; @@ -288,22 +425,27 @@ 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; - if ($from ne "") { + if (defined $from) { unlink($from_tmp); } - if ($to ne "") { + if (defined $to) { unlink($to_tmp); } } @@ -311,35 +453,31 @@ sub git_diff_html { sub mode_str { my $mode = oct shift; - my $modestr; - if (($mode & 00170000) == 0040000 ) { - $modestr = 'drwxr-xr-x'; - } elsif (($mode & 00170000) == 0120000 ) { - $modestr = 'lrwxrwxrwx'; - } elsif (($mode & 00170000) == 0100000 ) { + if (S_ISDIR($mode & S_IFMT)) { + return 'drwxr-xr-x'; + } elsif (S_ISLNK($mode)) { + return 'lrwxrwxrwx'; + } elsif (S_ISREG($mode)) { # git cares only about the executable bit - if ($mode & 0100) { - $modestr = '-rwxr-xr-x'; + if ($mode & S_IXUSR) { + return '-rwxr-xr-x'; } else { - $modestr = '-rw-r--r--'; + return '-rw-r--r--'; }; + } else { + return '----------'; } - return $modestr; } sub file_type { my $mode = oct shift; - if (($mode & 0170000) == 0040000 ) { + if (S_ISDIR($mode & S_IFMT)) { return "directory"; - } elsif (($mode & 0170000) == 0120000 ) { + } elsif (S_ISLNK($mode)) { return "symlink"; - } elsif (($mode & 0170000) == 0100000 ) { - if ($mode & 0100) { - return "executable file"; - } else { - return "file"; - } + } elsif (S_ISREG($mode)) { + return "file"; } else { return "unknown"; } @@ -370,80 +508,397 @@ sub date_str { return %date; } -if (defined($action) && $action eq "git-logo.png") { +# git-logo (cached in browser for one day) +sub git_logo { print $cgi->header(-type => 'image/png', -expires => '+1d'); - 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; + # 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" . + "\x00\x00\x00\x48\x00\x00\x00\x1b\x04\x03\x00\x00\x00\x2d\xd9\xd4" . + "\x2d\x00\x00\x00\x18\x50\x4c\x54\x45\xff\xff\xff\x60\x60\x5d\xb0" . + "\xaf\xaa\x00\x80\x00\xce\xcd\xc7\xc0\x00\x00\xe8\xe8\xe6\xf7\xf7" . + "\xf6\x95\x0c\xa7\x47\x00\x00\x00\x73\x49\x44\x41\x54\x28\xcf\x63" . + "\x48\x67\x20\x04\x4a\x5c\x18\x0a\x08\x2a\x62\x53\x61\x20\x02\x08" . + "\x0d\x69\x45\xac\xa1\xa1\x01\x30\x0c\x93\x60\x36\x26\x52\x91\xb1" . + "\x01\x11\xd6\xe1\x55\x64\x6c\x6c\xcc\x6c\x6c\x0c\xa2\x0c\x70\x2a" . + "\x62\x06\x2a\xc1\x62\x1d\xb3\x01\x02\x53\xa4\x08\xe8\x00\x03\x18" . + "\x26\x56\x11\xd4\xe1\x20\x97\x1b\xe0\xb4\x0e\x35\x24\x71\x29\x82" . + "\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"; } -if (!defined($project)) { - print $cgi->redirect($home_link); - exit; +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; } -if (!defined($action)) { - $action = "log"; +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(); + 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" . + "\n"; + foreach my $pr (@list) { + my %proj = %$pr; + my $head = git_read_hash("$proj{'path'}/HEAD"); + if (!defined $head) { + next; + } + $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_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"; + my $colored_age; + if ($co{'age'} < 60*60*2) { + $colored_age = "$co{'age_string'}"; + } elsif ($co{'age'} < 60*60*24*2) { + $colored_age = "$co{'age_string'}"; + } else { + $colored_age = "$co{'age_string'}"; + } + print "\n" . + "\n"; + } + print "
ProjectDescriptionOwnerlast change
" . $cgi->a({-href => "$my_uri?p=" . $proj{'path'} . ";a=summary"}, escapeHTML($proj{'path'})) . "$descr$proj{'owner'}$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(); } -if (!defined($time_back)) { - $time_back = 1; +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; } -if ($action eq "blob") { +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";
-	open(my $fd, "-|", "$gitbin/git-cat-file blob $hash");
+	print "
\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;hb=$head"}, "latest 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 "
\n"; + close $fd || print "Reading blob failed.\n"; print "
"; git_footer_html(); -} elsif ($action eq "tree") { - if ($hash eq "") { - $hash = git_head($project); +} + +sub git_tree { + if (!defined $hash) { + $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"; + open my $fd, "-|", "$gitbin/git-ls-tree $hash" || die_error(undef, "Open git-ls-tree failed."); my (@entries) = map { chomp; $_ } <$fd>; - close $fd; + 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(.*)$/;
@@ -451,26 +906,31 @@ 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 (((oct $t_mode) & 0170000) == 0120000) {
-				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); +} + +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; + close $fd || die_error(undef, "Reading rev-list failed."); print $cgi->header(-type => 'text/xml', -charset => 'utf-8'); print "\n". @@ -482,10 +942,10 @@ if ($action eq "blob") { "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" . 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'}; @@ -496,120 +956,165 @@ if ($action eq "blob") { "\n"; } print ""; -} elsif ($action eq "log") { - my $date = 0; - if ($time_back > 0) { - $date = time - $time_back*24*60*60; +} + +sub git_log { + my $head = git_read_hash("$project/HEAD"); + my $limit_option = ""; + if (!defined $time_back) { + $limit_option = "--max-count=10"; + } elsif ($time_back > 0) { + my $date = time - $time_back*24*60*60; + $limit_option = "--max-age=$date"; } - my $head = git_head($project); - open my $fd, "-|", "$gitbin/git-rev-list --max-age=$date $head"; + open my $fd, "-|", "$gitbin/git-rev-list $limit_option $head" || die_error(undef, "Open failed."); my (@revlist) = map { chomp; $_ } <$fd>; - close $fd; + 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 day") . " | " . + 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); + if (!@revlist) { + 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"}, + $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" . "
\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"; + 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"; + if (defined $co{'parent'}) { + open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash" || die_error(undef, "Open failed."); @difftree = map { chomp; $_ } <$fd>; - close $fd; + 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"; + open my $fd, "-|", "$gitbin/git-ls-tree -r $hash" || die_error(undef, "Open failed."); @difftree = map { chomp; "+" . $_ } <$fd>; - close $fd; + 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"; - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . - "
\n"; + if (defined $co{'parent'}) { + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . + "
\n"; + } else { + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . + "
\n"; + } print "
\n" . - ""; - print "
author" . escapeHTML($co{'author'}) . "
" . - " " . $ad{'rfc2822'}; + "\n"; + print "\n". + "\n"; - print "\n"; - print "\n"; - print "\n"; + printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}); + } else { + printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}); + } + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; my $parents = $co{'parents'}; foreach my $par (@$parents) { - 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" . - "
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'}) . "
committer" . escapeHTML($co{'committer'}) . "
" . $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=" . $co{'tree'} . ";hb=" . $hash}, $co{'tree'}) . "
parent" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "
parent" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "
\n"; + print "
". + "
\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' @@ -621,26 +1126,27 @@ if ($action eq "blob") { my $type = $3; my $id = $4; my $file = $5; - my $mode_chng = ""; if ($type eq "blob") { if ($op eq "+") { + my $mode_chng = ""; + if (S_ISREG(oct $mode)) { + $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) . "]") . "\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]+)/; @@ -650,67 +1156,102 @@ if ($action eq "blob") { my $from_mode = $1; my $to_mode = $2; my $mode_chnge = ""; - if (((oct $from_mode) & 0170100) != ((oct $to_mode) & 0170100)) { - $mode_chnge = " [changed from " . file_type($from_mode) . " to " . file_type($to_mode) . "]\n"; + if ($from_mode != $to_mode) { + $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); + } + if (((oct $from_mode) & 0777) != ((oct $to_mode) & 0777)) { + if (S_ISREG($from_mode) && S_ISREG($to_mode)) { + $mode_chnge .= sprintf(" mode: %04o->%04o", (oct $from_mode) & 0777, (oct $to_mode) & 0777); + } elsif (S_ISREG($to_mode)) { + $mode_chnge .= sprintf(" mode: %04o", (oct $to_mode) & 0777); + } + } + $mode_chnge .= "]\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"}, + 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") { - my %co = git_commit($hash); +} + +sub git_commitdiff { + mkdir($gittmp, 0700); + 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"; + open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash" || die_error(undef, "Open failed."); my (@difftree) = map { chomp; $_ } <$fd>; - close $fd; + 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(.*)$/;
@@ -721,15 +1262,15 @@ if ($action eq "blob") {
 		my $file = $5;
 		if ($type eq "blob") {
 			if ($op eq "+") {
-				print "new " .  file_type($mode) . ":" .
-				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, $id) .
-				      "\n";
-				git_diff_html("", "/dev/null", $id, "b/$file");
+				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 "deleted " . file_type($mode) . ":" .
-				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, $id) .
-				      "\n";
-				git_diff_html($id, "a/$file", "", "/dev/null");
+				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]+)/;
 				my $from_id = $1;
@@ -738,65 +1279,77 @@ 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") { - if (!(defined($hash))) { - $hash = git_head($project); - } - open my $fd, "-|", "$gitbin/git-rev-list $hash"; - my (@revlist) = map { chomp; $_ } <$fd>; - close $fd; +} +sub git_history { + if (!defined $hash) { + $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"; - foreach my $rev (@revlist) { - my %co = git_commit($rev); - my $parents = $co{'parents'}; - my $found = 0; - foreach my $parent (@$parents) { - open $fd, "-|", "$gitbin/git-diff-tree -r $parent $rev $file_name"; - my (@difftree) = map { chomp; $_ } <$fd>; - close $fd; - - foreach my $line (@difftree) { - $line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/; - my $file = $5; - if ($file eq $file_name) { - $found = 1; - last; - } - } + 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>) { + if ($line =~ m/^([0-9a-fA-F]{40}) /){ + $commit = $1; + next; } - if ($found) { + if ($line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/ && (defined $commit)) { + my $type = $3; + my $file = $5; + if ($file ne $file_name || $type ne "blob") { + next; + } + my %co = git_read_commit($commit); + if (!%co) { + next; + } print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$rev"}, + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "" . $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" . + 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 $commit; } } + close $fd; git_footer_html(); -} else { - $action = ""; - die_error("", "Unknown action."); }