X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/3a6fd6520897b9bb4fb9ab9b52e1b97d3127cc124dae8d31307ce4abc8383c42..4eae448c98abe86322f3e08ffd2c5f4ed5358f88d5c93c1691611c7f94201538:/gitweb.cgi?ds=sidebyside diff --git a/gitweb.cgi b/gitweb.cgi index e80be7d..b7316cb 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -1,176 +1,436 @@ #!/usr/bin/perl -# gitweb.pl - simple web interface to track changes in git repositories +# gitweb - simple web interface to track changes in git repositories # # (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 qw(:standard :escapeHTML -nosticky); +use CGI::Util qw(unescape); use CGI::Carp qw(fatalsToBrowser); +use Fcntl ':mode'; my $cgi = new CGI; - -my $version = "056"; -my $projectroot = "/home/kay/public_html/pub/scm"; -my $defaultprojects = "linux/kernel/git"; -my $gitbin = "/home/kay/bin/git"; -my $gittmp = "/tmp"; +my $version = "235"; my $my_url = $cgi->url(); my $my_uri = $cgi->url(-absolute => 1); +my $rss_link = ""; -my $project = $cgi->param('p'); +# absolute fs-path which will be prepended to the project path +my $projectroot = "/pub/scm"; + +# location of the git-core binaries +my $gitbin = "/usr/bin"; + +# location for temporary files needed for diffs +my $git_temp = "/tmp/gitweb"; + +# 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.aux"; + +# 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; + } elsif ($action eq "opml") { + git_opml(); + exit; + } +} + +my $project = $cgi->param('p'); +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")) { + 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_DIR'} = "$projectroot/$project"; +} else { + git_project_list(); + exit; +} + +my $file_name = $cgi->param('f'); +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'); -my $hash_parent = $cgi->param('hp'); -my $time_back = $cgi->param('t'); -$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects"; +if (defined $hash) { + if (!($hash =~ m/^[0-9a-fA-F]{40}$/)) { + if ($hash =~ m/(^|\/)(|\.|\.\.)($|\/)/) { + undef $hash; + die_error(undef, "Non-canonical hash parameter."); + } + if ($hash =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~\:\!]/) { + undef $hash; + die_error(undef, "Invalid character in hash parameter."); + } + # replace branch-name with hash + my $branchlist = git_read_refs("refs/heads"); + foreach my $entry (@$branchlist) { + my %branch = %$entry; + if ($branch{'name'} eq $hash) { + $hash = $branch{'id'}; + last; + } + } + } +} -# validate input -if (defined($project) && $project =~ /(^|\/)(|\.|\.\.)($|\/)/) { - die_error("", "Invalid project parameter."); +my $hash_parent = $cgi->param('hp'); +if (defined $hash_parent && !($hash_parent =~ m/^[0-9a-fA-F]{40}$/)) { + undef $hash_parent; + die_error(undef, "Invalid hash_parent parameter."); } -if (defined($action) && !$action =~ m/^[0-9a-zA-Z\.\-]+$/) { - die_error("", "Invalid action 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."); } -if (defined($hash) && !($hash =~ m/^[0-9a-fA-F]{40}$/)) { - die_error("", "Invalid hash parameter."); + +my $page = $cgi->param('pg'); +if (defined $page) { + if ($page =~ m/^[^0-9]+$/) { + undef $page; + die_error(undef, "Invalid page parameter."); + } } -if (defined($hash_parent) && !($hash_parent =~ m/^[0-9a-fA-F]{40}$/)) { - die_error("", "Invalid parent hash parameter."); + +my $searchtext = $cgi->param('s'); +if (defined $searchtext) { + if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) { + undef $searchtext; + die_error(undef, "Invalid search parameter."); + } + $searchtext = quotemeta $searchtext; } -if (defined($time_back) && !($time_back =~ m/^[0-9]+$/)) { - die_error("", "Invalid time parameter."); + +if (!defined $action || $action eq "summary") { + git_summary(); + exit; +} elsif ($action eq "branches") { + git_branches(); + exit; +} elsif ($action eq "tags") { + git_tags(); + exit; +} elsif ($action eq "blob") { + git_blob(); + exit; +} elsif ($action eq "blob_plain") { + git_blob_plain(); + 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 "blobdiff_plain") { + git_blobdiff_plain(); + exit; +} elsif ($action eq "commitdiff") { + git_commitdiff(); + exit; +} elsif ($action eq "commitdiff_plain") { + git_commitdiff_plain(); + exit; +} elsif ($action eq "history") { + git_history(); + exit; +} elsif ($action eq "search") { + git_search(); + exit; +} elsif ($action eq "shortlog") { + git_shortlog(); + exit; +} elsif ($action eq "tag") { + git_tag(); + exit; } else { - $time_back = 1; + 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 < - + + - git - $project $action - - + + +$title +$rss_link + EOF print "
\n" . - "" . - "\"git\""; - if ($defaultprojects ne "") { - print $cgi->a({-href => "$my_uri"}, "projects") . " / "; - } - if ($project ne "") { - print $cgi->a({-href => "$my_uri?p=$project;a=log"}, $project); - } - if ($action ne "") { - print " / $action"; + "" . + "\"git\"" . + "\n"; + 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"; + if (!defined $searchtext) { + $searchtext = ""; + } + $cgi->param("a", "search"); + print $cgi->startform(-method => "get", -action => "$my_uri") . + "
\n" . + $cgi->hidden(-name => "p") . "\n" . + $cgi->hidden(-name => "a") . "\n" . + $cgi->textfield(-name => "s", -value => $searchtext) . "\n" . + "
" . + $cgi->end_form() . "\n"; } print "
\n"; } sub git_footer_html { - print "
"; - print "
version $version
"; - if ($project ne '') { - print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "xml_logo"}, "XML") . "\n"; + print "
\n"; + if (defined $project) { + my $descr = git_read_description($project); + if (defined $descr) { + print "
" . escapeHTML($descr) . "
\n"; + } + print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "rss_logo"}, "RSS") . "\n"; + } else { + print $cgi->a({-href => "$my_uri?a=opml", -class => "rss_logo"}, "RSS") . "\n"; } - print "
"; - print "\n"; + print "
\n" . + "\n" . + ""; } sub die_error { my $status = shift || "403 Forbidden"; my $error = shift || "Malformed query, file missing or permission denied"; + git_header_html($status); print "
\n" . - "

\n"; - print "$error\n"; - print "
\n"; + "

\n" . + "$status - $error\n" . + "
\n" . + "\n"; git_footer_html(); - exit 0; + exit; } -sub git_head { +sub git_get_type { + my $hash = shift; + + open my $fd, "-|", "$gitbin/git-cat-file -t $hash" or return; + my $type = <$fd>; + close $fd or return; + chomp $type; + return $type; +} + +sub git_read_hash { my $path = shift; - open(my $fd, "$projectroot/$path/HEAD") || die_error("", "Invalid project directory.");; + + open my $fd, "$projectroot/$path" or return undef; my $head = <$fd>; close $fd; chomp $head; - return $head; + if ($head =~ m/^[0-9a-fA-F]{40}$/) { + return $head; + } } -sub git_commit { - my $commit = shift; +sub git_read_description { + my $path = shift; + + open my $fd, "$projectroot/$path/description" or return undef; + my $descr = <$fd>; + close $fd; + chomp $descr; + return $descr; +} + +sub git_read_tag { + my $tag_id = shift; + my %tag; + my @comment; + + open my $fd, "-|", "$gitbin/git-cat-file tag $tag_id" or return; + $tag{'id'} = $tag_id; + 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; + } elsif ($line =~ m/^tagger (.*) ([0-9]+) (.*)$/) { + $tag{'author'} = $1; + $tag{'epoch'} = $2; + $tag{'tz'} = $3; + } elsif ($line =~ m/--BEGIN/) { + push @comment, $line; + last; + } elsif ($line eq "") { + last; + } + } + push @comment, <$fd>; + $tag{'comment'} = \@comment; + close $fd or return; + if (!defined $tag{'name'}) { + return + }; + return %tag +} + +sub git_read_commit { + my $commit_id = shift; + my $commit_text = shift; + + my @commit_lines; my %co; my @parents; - open my $fd, "-|", "$gitbin/cat-file commit $commit"; - while (my $line = <$fd>) { - chomp($line); - last if $line eq ""; - if ($line =~ m/^tree (.*)$/) { + if (defined $commit_text) { + @commit_lines = @$commit_text; + } else { + open my $fd, "-|", "$gitbin/git-cat-file commit $commit_id" or return; + @commit_lines = map { chomp; $_ } <$fd>; + close $fd or return; + } + while (my $line = shift @commit_lines) { + last if $line eq "\n"; + if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) { $co{'tree'} = $1; - } elsif ($line =~ m/^parent (.*)$/) { + } elsif ($line =~ m/^parent ([0-9a-fA-F]{40})$/) { push @parents, $1; } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) { $co{'author'} = $1; $co{'author_epoch'} = $2; $co{'author_tz'} = $3; - $co{'author_name'} = $co{'author'}; - $co{'author_name'} =~ s/ <.*//; + if ($co{'author'} =~ m/^([^<]+) ; - $co{'comment'} = \@comment; - $co{'title'} = $comment[0]; - close $fd; + $co{'comment'} = \@commit_lines; + foreach my $title (@commit_lines) { + if ($title ne "") { + $co{'title'} = chop_str($title, 80); + # remove leading stuff of merges to make the interesting part visible + if (length($title) > 50) { + $title =~ s/^Automatic //; + $title =~ s/^merge (of|with) /Merge ... /i; + if (length($title) > 50) { + $title =~ s/(http|rsync):\/\///; + } + if (length($title) > 50) { + $title =~ s/(master|www|rsync)\.//; + } + if (length($title) > 50) { + $title =~ s/kernel.org:?//; + } + if (length($title) > 50) { + $title =~ s/\/pub\/scm//; + } + } + $co{'title_short'} = chop_str($title, 50); + last; + } + } + + 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); + $co{'age_string'} .= " months ago"; + } elsif ($age > 60*60*24*7*2) { + $co{'age_string'} = int $age/60/60/24/7; + $co{'age_string'} .= " weeks ago"; + } elsif ($age > 60*60*24*2) { + $co{'age_string'} = int $age/60/60/24; + $co{'age_string'} .= " days ago"; + } elsif ($age > 60*60*2) { + $co{'age_string'} = int $age/60/60; + $co{'age_string'} .= " hours ago"; + } elsif ($age > 60*2) { + $co{'age_string'} = int $age/60; + $co{'age_string'} .= " min ago"; + } elsif ($age > 2) { + $co{'age_string'} = int $age; + $co{'age_string'} .= " sec ago"; + } else { + $co{'age_string'} .= " right now"; + } + my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($co{'committer_epoch'}); + if ($age > 60*60*24*7*2) { + $co{'age_string_date'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon+1, $mday; + $co{'age_string_age'} = $co{'age_string'}; + } else { + $co{'age_string_date'} = $co{'age_string'}; + $co{'age_string_age'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon+1, $mday; + } return %co; } -sub git_diff_html { - my $from_name = shift || "/dev/null"; - my $to_name = shift || "/dev/null"; +sub git_diff_print { my $from = shift; + my $from_name = shift; my $to = shift; + my $to_name = shift; + my $format = shift || "html"; my $from_tmp = "/dev/null"; my $to_tmp = "/dev/null"; - my $from_label = "/dev/null"; - my $to_label = "/dev/null"; my $pid = $$; # create tmp from-file - if ($from ne "") { - $from_tmp = "$gittmp/gitweb_" . $$ . "_from"; - open(my $fd2, "> $from_tmp"); - open my $fd, "-|", "$gitbin/cat-file blob $from"; + if (defined $from) { + $from_tmp = "$git_temp/gitweb_" . $$ . "_from"; + open my $fd2, "> $from_tmp"; + open my $fd, "-|", "$gitbin/git-cat-file blob $from"; my @file = <$fd>; print $fd2 @file; close $fd2; close $fd; - $from_label = "a/$from_name"; } # create tmp to-file - if ($to ne "") { - $to_tmp = "$gittmp/gitweb_" . $$ . "_to"; + if (defined $to) { + $to_tmp = "$git_temp/gitweb_" . $$ . "_to"; open my $fd2, "> $to_tmp"; - open my $fd, "-|", "$gitbin/cat-file blob $to"; + open my $fd, "-|", "$gitbin/git-cat-file blob $to"; my @file = <$fd>; print $fd2 @file; close $fd2; close $fd; - $to_label = "b/$to_name"; } - open my $fd, "-|", "/usr/bin/diff -u -p -L $from_label -L $to_label $from_tmp $to_tmp"; - print "===== "; - if ($from ne "") { - print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from"}, $from); - } else { - print $from_name; - } - print " vs "; - if ($to ne "") { - print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to"}, $to); + open my $fd, "-|", "/usr/bin/diff -u -p -L $from_name -L $to_name $from_tmp $to_tmp"; + if ($format eq "plain") { + undef $/; + print <$fd>; + $/ = "\n"; } else { - print $to_name; - } - print " =====\n"; - while (my $line = <$fd>) { - my $char = substr($line,0,1); - print '' if $char eq '+'; - print '' if $char eq '-'; - print '' if $char eq '@'; - print escapeHTML($line); - print '' if $char eq '+' or $char eq '-' or $char eq '@'; + while (my $line = <$fd>) { + 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; + } + while ((my $pos = index($line, "\t")) != -1) { + if (my $count = (8 - (($pos-1) % 8))) { + my $spaces = ' ' x $count; + $line =~ s/\t/$spaces/; + } + } + print "
" . escapeHTML($line) . "
\n"; + } } close $fd; - if ($from ne "") { - unlink("$from_tmp"); + if (defined $from) { + unlink($from_tmp); } - if ($to ne "") { - unlink("$to_tmp"); + if (defined $to) { + unlink($to_tmp); } } sub mode_str { - my $perms = oct shift; - my $modestr; - if ($perms & 040000) { - $modestr .= 'drwxrwxr-x'; - } else { + my $mode = oct shift; + + 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 ($perms & 0100) { - $modestr .= '-rwxrwxr-x'; + if ($mode & S_IXUSR) { + return '-rwxr-xr-x'; } else { - $modestr .= '-rw-rw-r--'; + return '-rw-r--r--'; }; + } else { + return '----------'; + } +} + +sub chop_str { + my $str = shift; + my $len = shift; + my $add_len = shift || 10; + + $str =~ m/^(.{0,$len}[^ \/\-_:\.@]{0,$add_len})/; + my $chopped = $1; + if ($chopped ne $str) { + $chopped .= " ..."; + } + return $chopped; +} + +sub file_type { + my $mode = oct shift; + + if (S_ISDIR($mode & S_IFMT)) { + return "directory"; + } elsif (S_ISLNK($mode)) { + return "symlink"; + } elsif (S_ISREG($mode)) { + return "file"; + } else { + return "unknown"; + } +} + +sub format_log_line_html { + my $line = shift; + + $line = escapeHTML($line); + $line =~ s/ / /g; + if ($line =~ m/([0-9a-fA-F]{40})/) { + my $hash_text = $1; + if (git_get_type($hash_text) eq "commit") { + my $link = $cgi->a({-class => "text", -href => "$my_uri?p=$project;a=commit;h=$hash_text"}, $hash_text); + $line =~ s/$hash_text/$link/; + } } - return $modestr; + return $line; } sub date_str { @@ -289,8 +657,8 @@ sub date_str { $date{'rfc2822'} = sprintf "%s, %d %s %4d %02d:%02d:%02d +0000", $days[$wday], $mday, $months[$mon], 1900+$year, $hour ,$min, $sec; $date{'mday-time'} = sprintf "%d %s %02d:%02d", $mday, $months[$mon], $hour ,$min; - $tz =~ m/((-|\+)[0-9][0-9])([0-9][0-9])/; - my $local = $epoch + (($1 + ($2/60)) * 3600); + $tz =~ m/^([+\-][0-9][0-9])([0-9][0-9])$/; + my $local = $epoch + ((int $1 + ($2/60)) * 3600); ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($local); $date{'hour_local'} = $hour; $date{'minute_local'} = $min; @@ -298,303 +666,1513 @@ sub date_str { return %date; } -if ($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"; } -# show list of default projects -if ($project eq "") { - opendir(my $fd, "$projectroot/$defaultprojects") || die_error("", "No projects found."); - my (@users) = sort grep(!/^\./, readdir($fd)); - closedir($fd); +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_read_projects { + my @list; + + if (-d $projects_list) { + # search in directory + my $dir = $projects_list; + opendir my $dh, $dir or 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(url-encoded): + # 'git%2Fgit.git Linus+Torvalds' + # 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin' + # 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman' + open my $fd , $projects_list or return undef; + while (my $line = <$fd>) { + chomp $line; + my ($path, $owner) = split ' ', $line; + $path = unescape($path); + $owner = unescape($owner); + if (!defined $path) { + next; + } + if (-e "$projectroot/$path/HEAD") { + my $pr = { + path => $path, + owner => $owner, + }; + push @list, $pr + } + } + close $fd; + } + @list = sort {$a->{'path'} cmp $b->{'path'}} @list; + return @list; +} + +sub git_project_list { + my @list = git_read_projects(); + if (!@list) { + die_error(undef, "No project found."); + } git_header_html(); - print "
\n"; - print "

\n"; - foreach my $user (@users) { - opendir($fd, "$projectroot/$defaultprojects/$user"); - my (@repos) = sort grep(/\.git$/, readdir($fd)); - closedir($fd); - foreach my $repo (@repos) { - if (-e "$projectroot/$defaultprojects/$user/$repo/HEAD") { - print $cgi->a({-href => "$my_uri?p=$defaultprojects/$user/$repo;a=log"}, "$defaultprojects/$user/$repo") . "
\n"; + 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"; + my $alternate = 0; + foreach my $pr (@list) { + my %proj = %$pr; + my $head = git_read_hash("$proj{'path'}/HEAD"); + if (!defined $head) { + next; + } + $ENV{'GIT_DIR'} = "$projectroot/$proj{'path'}"; + my %co = git_read_commit($head); + if (!%co) { + next; + } + my $descr = git_read_description($proj{'path'}) || ""; + $descr = chop_str($descr, 25, 5); + # get directory owner if not already specified + if (!defined $proj{'owner'}) { + $proj{'owner'} = get_file_owner("$projectroot/$proj{'path'}") || ""; + } + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\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" . + "\n"; + } + print "
ProjectDescriptionOwnerlast change
" . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary", -class => "list"}, escapeHTML($proj{'path'})) . "$descr" . chop_str($proj{'owner'}, 15) . "$colored_age" . + $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=shortlog"}, "shortlog") . + " | " . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=log"}, "log") . + "
\n"; + git_footer_html(); +} + +sub git_read_refs { + my $ref_dir = shift; + my @reflist; + + my @refs; + opendir my $dh, "$projectroot/$project/$ref_dir"; + while (my $dir = readdir($dh)) { + if ($dir =~ m/^\./) { + next; + } + if (-d "$projectroot/$project/$ref_dir/$dir") { + opendir my $dh2, "$projectroot/$project/$ref_dir/$dir"; + my @subdirs = grep !m/^\./, readdir $dh2; + closedir($dh2); + foreach my $subdir (@subdirs) { + push @refs, "$dir/$subdir" } + next; } + push @refs, $dir; + } + closedir($dh); + foreach my $ref_file (@refs) { + my $ref_id = git_read_hash("$project/$ref_dir/$ref_file"); + my $type = git_get_type($ref_id) || next; + my %ref_item; + my %co; + $ref_item{'type'} = $type; + $ref_item{'id'} = $ref_id; + if ($type eq "tag") { + my %tag = git_read_tag($ref_id); + $ref_item{'comment'} = $tag{'comment'}; + if ($tag{'type'} eq "commit") { + %co = git_read_commit($tag{'object'}); + } + $ref_item{'reftype'} = $tag{'type'}; + $ref_item{'name'} = $tag{'name'}; + $ref_item{'refid'} = $tag{'object'}; + } elsif ($type eq "commit"){ + %co = git_read_commit($ref_id); + $ref_item{'reftype'} = "commit"; + $ref_item{'name'} = $ref_file; + $ref_item{'title'} = $co{'title'}; + $ref_item{'refid'} = $ref_id; + } + $ref_item{'epoch'} = $co{'committer_epoch'} || 0; + $ref_item{'age'} = $co{'age_string'} || "unknown"; + + push @reflist, \%ref_item; + } + # sort tags by age + @reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist; + return \@reflist; +} + +sub git_summary { + my $descr = git_read_description($project) || "none"; + my $head = git_read_hash("$project/HEAD"); + 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; + $pr = unescape($pr); + $ow = unescape($ow); + if ($pr eq $project) { + $owner = $ow; + last; + } + } + close $fd; + } + if (!defined $owner) { + $owner = get_file_owner("$projectroot/$project"); + } + + git_header_html(); + print "
\n" . + "summary". + " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") . + " | " . $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=commitdiff;h=$head"}, "commitdiff") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree"}, "tree") . + "

\n" . + "
\n"; + print "
 
\n"; + print "\n" . + "\n" . + "\n" . + "\n" . + "
description" . escapeHTML($descr) . "
owner$owner
last change$cd{'rfc2822'}
\n"; + open my $fd, "-|", "$gitbin/git-rev-list --max-count=17 " . git_read_hash("$project/HEAD") or die_error(undef, "Open failed."); + my (@revlist) = map { chomp; $_ } <$fd>; + close $fd; + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=shortlog", -class => "title"}, "shortlog") . + "
\n"; + my $i = 16; + print "\n"; + my $alternate = 0; + foreach my $commit (@revlist) { + my %co = git_read_commit($commit); + my %ad = date_str($co{'author_epoch'}); + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + if ($i-- > 0) { + print "\n" . + "\n" . + "\n" . + "\n" . + ""; + } else { + print "\n" . + ""; + last; + } + } + print ""; + + my $taglist = git_read_refs("refs/tags"); + if (defined @$taglist) { + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=tags", -class => "title"}, "tags") . + "
\n"; + my $i = 16; + print "
$co{'age_string'}" . escapeHTML(chop_str($co{'author_name'}, 10)) . "" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, + "" . escapeHTML($co{'title_short'}) . "") . + "" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") . + "
" . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "...") . "
\n"; + my $alternate = 0; + foreach my $entry (@$taglist) { + my %tag = %$entry; + my $comment_lines = $tag{'comment'}; + my $comment = shift @$comment_lines; + if (defined($comment)) { + $comment = chop_str($comment, 30, 5); + } + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + if ($i-- > 0) { + print "\n" . + "\n" . + "\n" . + "\n" . + ""; + } else { + print "\n" . + ""; + last; + } + } + print ""; + } + + my $branchlist = git_read_refs("refs/heads"); + if (defined @$branchlist) { + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=branches", -class => "title"}, "branches") . + "
\n"; + my $i = 16; + print "
$tag{'age'}" . + $cgi->a({-href => "$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}", -class => "list"}, + "" . escapeHTML($tag{'name'}) . "") . + ""; + if (defined($comment)) { + print $cgi->a({-class => "list", -href => "$my_uri?p=$project;a=tag;h=$tag{'id'}"}, $comment); + } + print ""; + if ($tag{'type'} eq "tag") { + print $cgi->a({-href => "$my_uri?p=$project;a=tag;h=$tag{'id'}"}, "tag") . " | "; + } + print $cgi->a({-href => "$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}"}, $tag{'reftype'}); + if ($tag{'reftype'} eq "commit") { + print " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}"}, "shortlog") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'refid'}"}, "log"); + } + print "
" . $cgi->a({-href => "$my_uri?p=$project;a=tags"}, "...") . "
\n"; + my $alternate = 0; + foreach my $entry (@$branchlist) { + my %tag = %$entry; + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + if ($i-- > 0) { + print "\n" . + "\n" . + "\n" . + ""; + } else { + print "\n" . + ""; + last; + } + } + print ""; } - print "
"; git_footer_html(); - exit; } -if ($action eq "") { - $action = "log"; +sub git_tag { + my $head = git_read_hash("$project/HEAD"); + git_header_html(); + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") . + " | " . $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=commitdiff;h=$head"}, "commitdiff") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;hb=$head"}, "tree") . "
\n" . + "
\n" . + "
\n"; + my %tag = git_read_tag($hash); + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($tag{'name'})) . "\n" . + "
\n"; + print "
\n" . + "
$tag{'age'}" . + $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}", -class => "list"}, + "" . escapeHTML($tag{'name'}) . "") . + "" . + $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}"}, "shortlog") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'name'}"}, "log") . + "
" . $cgi->a({-href => "$my_uri?p=$project;a=branches"}, "...") . "
\n" . + "\n"; + if (defined($tag{'author'})) { + my %ad = date_str($tag{'epoch'}, $tag{'tz'}); + print "\n"; + print "\n"; + } + print "
$tag{'type'}" . $cgi->a({-class => "text", -href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'object'}"}, $tag{'object'}) . "
author" . escapeHTML($tag{'author'}) . "
" . $ad{'rfc2822'} . sprintf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}) . "
\n\n" . + "
\n"; + print "
"; + my $comment = $tag{'comment'}; + foreach my $line (@$comment) { + print escapeHTML($line) . "
\n"; + } + 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=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") . + " | " . $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=commitdiff;h=$head"}, "commitdiff") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;hb=$head"}, "tree") . "
\n" . + "
\n" . + "
\n"; + my $taglist = git_read_refs("refs/tags"); + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, " ") . + "
\n"; + print "\n"; + my $alternate = 0; + if (defined @$taglist) { + foreach my $entry (@$taglist) { + my %tag = %$entry; + my $comment_lines = $tag{'comment'}; + my $comment = shift @$comment_lines; + if (defined($comment)) { + $comment = chop_str($comment, 30, 5); + } + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\n" . + "\n" . + "\n" . + "\n" . + ""; + } + } + print ""; + git_footer_html(); +} + +sub git_branches { + my $head = git_read_hash("$project/HEAD"); + git_header_html(); + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") . + " | " . $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=commitdiff;h=$head"}, "commitdiff") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;hb=$head"}, "tree") . "
\n" . + "
\n" . + "
\n"; + my $taglist = git_read_refs("refs/heads"); + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, " ") . + "
\n"; + print "
$tag{'age'}" . + $cgi->a({-href => "$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}", -class => "list"}, + "" . escapeHTML($tag{'name'}) . "") . + ""; + if (defined($comment)) { + print $cgi->a({-class => "list", -href => "$my_uri?p=$project;a=tag;h=$tag{'id'}"}, $comment); + } + print ""; + if ($tag{'type'} eq "tag") { + print $cgi->a({-href => "$my_uri?p=$project;a=tag;h=$tag{'id'}"}, "tag") . " | "; + } + print $cgi->a({-href => "$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}"}, $tag{'reftype'}); + if ($tag{'reftype'} eq "commit") { + print " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}"}, "shortlog") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'refid'}"}, "log"); + } + print "
\n"; + my $alternate = 0; + if (defined @$taglist) { + foreach my $entry (@$taglist) { + my %tag = %$entry; + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\n" . + "\n" . + "\n" . + ""; + } + } + print ""; + git_footer_html(); +} + +sub git_get_hash_by_path { + my $base = shift; + my $path = shift || return undef; + + my $tree = $base; + my @parts = split '/', $path; + while (my $part = shift @parts) { + open my $fd, "-|", "$gitbin/git-ls-tree $tree" or die_error(undef, "Open git-ls-tree failed."); + my (@entries) = map { chomp; $_ } <$fd>; + close $fd or return undef; + foreach my $line (@entries) { + #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c' + $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\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; + } + } + } } -if ($action eq "blob") { +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" or die_error(undef, "Open failed."); + my $base = $file_name || ""; git_header_html(); - print "


\n";
-	open(my $fd, "-|", "$gitbin/cat-file blob $hash");
+	if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
+		print "
\n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") .
+		      " | " . $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";
+		print $cgi->a({-href => "$my_uri?p=$project;a=blob_plain;h=$hash"}, "plain") . "
\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);;
+		while ((my $pos = index($line, "\t")) != -1) {
+			if (my $count = (8 - ($pos % 8))) {
+				my $spaces = ' ' x $count;
+				$line =~ s/\t/$spaces/;
+			}
+		}
+		printf "
%4i %s
\n", $nr, $nr, $nr, escapeHTML($line);
 	}
-	close $fd;
-	print "

\n"; + close $fd or print "Reading blob failed.\n"; print "
"; git_footer_html(); -} elsif ($action eq "tree") { - if ($hash eq "") { - $hash = git_head($project); +} + +sub git_blob_plain { + print $cgi->header(-type => "text/plain", -charset => 'utf-8'); + open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or return; + undef $/; + print <$fd>; + $/ = "\n"; + close $fd; +} + +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"); + } + if (!defined $hash_base) { + $hash_base = git_read_hash("$project/HEAD"); + } } - open my $fd, "-|", "$gitbin/ls-tree $hash"; + open my $fd, "-|", "$gitbin/git-ls-tree $hash" or die_error(undef, "Open git-ls-tree failed."); my (@entries) = map { chomp; $_ } <$fd>; - close $fd; + close $fd or die_error(undef, "Reading tree failed."); + git_header_html(); + 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=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash_base"}, "shortlog") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash_base"}, "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") . + " | tree" . + "

\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"; + print "

\n"; + print "
$hash
\n"; + } + if (defined $file_name) { + $base = "$file_name/"; + print "
/$file_name
\n"; + } else { + print "
/
\n"; + } print "
\n"; - print "
\n";
+	print "
$tag{'age'}" . + $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}", -class => "list"}, "" . escapeHTML($tag{'name'}) . "") . + "" . + $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}"}, "shortlog") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'name'}"}, "log") . + "
\n"; + my $alternate = 0; foreach my $line (@entries) { #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c' - $line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/; + $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/; my $t_mode = $1; my $t_type = $2; my $t_hash = $3; my $t_name = $4; + $file_key = ";f=$base$t_name"; + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\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) . "\n"; + print "\n" . + "\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" . + "\n"; } + print "\n"; } - print "\n"; - print "
"; + print "
" . mode_str($t_mode) . "" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash" . $base_key . $file_key, -class => "list"}, $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) . + "" . + $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash" . $base_key . $file_key}, "tree") . + "
\n" . + ""; git_footer_html(); -} elsif ($action eq "log" || $action eq "rss") { - open my $fd, "-|", "$gitbin/rev-list " . git_head($project); - my (@revtree) = map { chomp; $_ } <$fd>; +} + +sub git_rss { + # http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ + open my $fd, "-|", "$gitbin/git-rev-list --max-count=20 " . git_read_hash("$project/HEAD") or die_error(undef, "Open failed."); + my (@revlist) = map { chomp; $_ } <$fd>; + close $fd or die_error(undef, "Reading rev-list failed."); + + print $cgi->header(-type => 'text/xml', -charset => 'utf-8'); + print "\n". + "\n"; + print "\n"; + print "$project\n". + "" . escapeHTML("$my_url?p=$project;a=summary") . "\n". + "$project log\n". + "en\n"; + + foreach my $commit (@revlist) { + my %co = git_read_commit($commit); + my %cd = date_str($co{'committer_epoch'}); + print "\n" . + "" . + sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . escapeHTML($co{'title'}) . + "\n" . + "$cd{'rfc2822'}\n" . + "" . escapeHTML("$my_url?p=$project;a=commit;h=$commit") . "\n" . + "" . escapeHTML($co{'title'}) . "\n" . + "" . + "\n"; + } + print "]]>\n" . + "\n" . + "\n"; + } + print ""; +} + +sub git_opml { + my @list = git_read_projects(); + + print $cgi->header(-type => 'text/xml', -charset => 'utf-8'); + print "\n". + "\n". + "". + " Git OPML Export\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_DIR'} = "$projectroot/$proj{'path'}"; + my %co = git_read_commit($head); + if (!%co) { + next; + } + + my $path = escapeHTML(chop_str($proj{'path'}, 25, 5)); + my $rss = "$my_url?p=$proj{'path'};a=rss"; + my $html = "$my_url?p=$proj{'path'};a=summary"; + print "\n"; + } + print "\n". + "\n". + "\n"; +} + +sub git_log { + my $head = git_read_hash("$project/HEAD"); + if (!defined $hash) { + $hash = $head; + } + if (!defined $page) { + $page = 0; + } + git_header_html(); + print "
\n"; + print $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash"}, "shortlog") . + " | 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=$hash;hb=$hash"}, "tree") . "
\n"; + + my $limit = sprintf("--max-count=%i", (100 * ($page+1))); + open my $fd, "-|", "$gitbin/git-rev-list $limit $hash" or die_error(undef, "Open failed."); + my (@revlist) = map { chomp; $_ } <$fd>; close $fd; - if ($action eq "log") { - git_header_html(); - print "
\n"; - print "view "; - print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last day") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=log;t=0"}, "all") . "
\n"; - print "

\n" . + if ($hash ne $head || $page) { + print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "HEAD"); + } else { + print "HEAD"; + } + if ($page > 0) { + print " ⋅ " . + $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash;pg=" . ($page-1), -accesskey => "p", -title => "Alt-p"}, "prev"); + } else { + print " ⋅ prev"; + } + if ($#revlist >= (100 * ($page+1)-1)) { + print " ⋅ " . + $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash;pg=" . ($page+1), -accesskey => "n", -title => "Alt-n"}, "next"); + } else { + print " ⋅ next"; + } + print "
\n" . + "
\n"; + if (!@revlist) { + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, " ") . "
\n"; - } elsif ($action eq "rss") { - print $cgi->header(-type => 'text/xml', -charset => 'utf-8'); - print "\n". - "\n"; - print "\n"; - print "$project\n". - " " . $my_url . "/$project/log\n". - "$project log\n". - "en\n"; - } - - for (my $i = 0; $i <= $#revtree; $i++) { - my $commit = $revtree[$i]; - my %co = git_commit($commit); + my %co = git_read_commit($hash); + print "
Last change $co{'age_string'}.

\n"; + } + for (my $i = ($page * 100); $i <= $#revlist; $i++) { + my $commit = $revlist[$i]; + my %co = git_read_commit($commit); + next if !%co; my %ad = date_str($co{'author_epoch'}); - my $age = time - $co{'committer_epoch'}; - my $age_string; - if ($age > 60*60*24*365*2) { - $age_string = int $age/60/60/24/365; - $age_string .= " years ago"; - } elsif ($age > 60*60*24*365/12*2) { - $age_string = int $age/60/60/24/365/12; - $age_string .= " months ago"; - } elsif ($age > 60*60*24*7*2) { - $age_string = int $age/60/60/24/7; - $age_string .= " weeks ago"; - } elsif ($age > 60*60*24*2) { - $age_string = int $age/60/60/24; - $age_string .= " days ago"; - } elsif ($age > 60*60*2) { - $age_string = int $age/60/60; - $age_string .= " hours ago"; - } elsif ($age > 60*2) { - $age_string = int $age/60; - $age_string .= " minutes ago"; - } - if ($action eq "log") { - if ($time_back > 0 && $age > $time_back*60*60*24) { - if ($i == 0) { - print "
Last change $age_string.

\n"; - } - last; + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "title"}, + "$co{'age_string'}" . escapeHTML($co{'title'})) . "\n" . + "
\n"; + print "
\n" . + "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "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) { + if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { + next; } - print "\n"; - print "
\n" . - "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "view commit") . "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "view diff") . "
\n" . - "
\n" . - escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]
\n" . - "
\n" . - "
\n"; - my $comment = $co{'comment'}; - foreach my $line (@$comment) { - if ($line =~ m/^(signed-off|acked)-by:/i) { - print '
' . escapeHTML($line) . "
\n"; - } else { - print escapeHTML($line) . "
\n"; + if ($line eq "") { + if ($empty) { + next; } + $empty = 1; + } else { + $empty = 0; } - print "

\n" . - "
\n"; - } elsif ($action eq "rss") { - last if ($i >= 20); - 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"; - my $comment = $co{'comment'}; - foreach my $line (@$comment) { - print escapeHTML($line) . "\n"; - } - print "\t\n" . - "\n"; + print format_log_line_html($line) . "
\n"; + } + if (!$empty) { + print "
\n"; } + print "
\n"; } - if ($action eq "log") { - git_footer_html(); - } elsif ($action eq "rss") { - print ""; + git_footer_html(); +} + +sub git_commit { + my %co = git_read_commit($hash); + if (!%co) { + die_error(undef, "Unknown commit object."); } -} elsif ($action eq "commit") { - my %co = git_commit($hash); my %ad = date_str($co{'author_epoch'}, $co{'author_tz'}); my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'}); - open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash"; - my (@difftree) = map { chomp; $_ } <$fd>; - close $fd; + my @difftree; + my $root = ""; + my $parent = $co{'parent'}; + if (!defined $parent) { + $root = " --root"; + $parent = ""; + } + open my $fd, "-|", "$gitbin/git-diff-tree -r -M $root $parent $hash" or die_error(undef, "Open failed."); + @difftree = map { chomp; $_ } <$fd>; + close $fd or 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"}, "diff") . "\n" . + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash"}, "shortlog") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash"}, "log") . + " | 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 "$co{'title'}\n"; - print "
\n"; - print "author      " . escapeHTML($co{'author'}) . "
\n"; - print "author-time " . $ad{'rfc2822'}; - if ($ad{'hour_local'} < 6) { print ""; } - printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}); - if ($ad{'hour_local'} < 6 ) { print ""; } - print "
\n"; - print "committer   " . escapeHTML($co{'committer'}) . "
\n"; - print "commit-time " . $ad{'rfc2822'}; - printf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}); - print "
\n"; - print "commit      $hash
\n"; - print "tree        " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'}"}, $co{'tree'}) . "
\n"; + if (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" . + "\n"; + print "\n". + "" . + "" . + "\n"; + print "\n"; + print "\n"; + print "\n"; + print "" . + "" . + "" . + "" . + "\n"; my $parents = $co{'parents'}; foreach my $par (@$parents) { - print "parent      " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "
\n"; + print "" . + "" . + "" . + "" . + "\n"; } - print "\n"; + print "
author" . escapeHTML($co{'author'}) . "
$ad{'rfc2822'}"; + if ($ad{'hour_local'} < 6) { + 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 "
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", class => "list"}, $co{'tree'}) . + "" . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") . + "
parent" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par", class => "list"}, $par) . "" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash;hp=$par"}, "commitdiff") . + "
". + "
\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 '
' . escapeHTML($line) . "
\n"; + # 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 { - print escapeHTML($line) . "
\n"; + $signed = 0; + print format_log_line_html($line) . "
\n"; } } - print "

\n"; - print "
\n";
+	print "
\n"; + print "
\n"; + if ($#difftree > 10) { + print(($#difftree + 1) . " files changed:\n"); + } + print "
\n"; + print "\n"; + my $alternate = 0; foreach my $line (@difftree) { - # '*100644->100644 blob 9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596 net/ipv4/route.c' - # '+100644 blob 4a83ab6cd565d21ab0385bac6643826b83c2fcd4 arch/arm/lib/bitops.h' - $line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/; - my $op = $1; - my $mode = $2; - my $type = $3; - my $id = $4; - my $file = $5; - $mode =~ m/^([0-7]{6})/; - my $modestr = mode_str($1); - if ($type eq "blob") { - if ($op eq "+") { - print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$id"}, $file) . " (new)\n"; - } elsif ($op eq "-") { - print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;hp=$id"}, $file) . " (removed)\n"; - } elsif ($op eq "*") { - $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/; - my $from = $1; - my $to = $2; - print "$modestr " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to;hp=$from"}, $file) . "\n"; - } - } - } - print "\n" . - "
\n"; + # ':100644 100644 03b218260e99b78c6df0ed378e59ed9205ccc96d 3b93d5e7cc7f7dd4ebed13a5cc1a4ad976fc94d8 M ls-files.c' + # ':100644 100644 7f9281985086971d3877aca27704f2aaf9c448ce bc190ebc71bbd923f2b728e505408f5e54bd073a M rev-tree.c' + if (!($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)([0-9]{0,3})\t(.*)$/)) { + next; + } + my $from_mode = $1; + my $to_mode = $2; + my $from_id = $3; + my $to_id = $4; + my $status = $5; + my $similarity = $6; + my $file = $7; + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + if ($status eq "A") { + my $mode_chng = ""; + if (S_ISREG(oct $to_mode)) { + $mode_chng = sprintf(" with mode: %04o", (oct $to_mode) & 0777); + } + print "\n" . + "\n" . + "\n"; + } elsif ($status eq "D") { + print "\n" . + "\n" . + "\n" + } elsif ($status eq "M" || $status eq "T") { + my $mode_chnge = ""; + 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" . + "\n" . + "\n"; + } elsif ($status eq "R") { + my ($from_file, $to_file) = split "\t", $file; + my $mode_chng = ""; + if ($from_mode != $to_mode) { + $mode_chng = sprintf(", mode: %04o", (oct $to_mode) & 0777); + } + print "\n" . + "\n" . + "\n"; + } + print "\n"; + } + print "
" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hp=$hash;f=$file", -class => "list"}, escapeHTML($file)) . "[new " . file_type($to_mode) . "$mode_chng]" . $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=blob;h=$from_id;hb=$hash;f=$file", -class => "list"}, escapeHTML($file)) . "[deleted " . file_type($from_mode). "]" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file"}, "blob") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . + ""; + if ($to_id ne $from_id) { + print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file", -class => "list"}, escapeHTML($file)); + } else { + print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file", -class => "list"}, escapeHTML($file)); + } + print "$mode_chnge"; + print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, "blob"); + if ($to_id ne $from_id) { + 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=history;h=$hash;f=$file"}, "history") . "\n"; + print "" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file", -class => "list"}, escapeHTML($to_file)) . "[moved from " . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$from_file", -class => "list"}, escapeHTML($from_file)) . + " with " . (int $similarity) . "% similarity$mode_chng]" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file"}, "blob"); + if ($to_id ne $from_id) { + print " | " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$to_file"}, "diff"); + } + print "
\n"; git_footer_html(); -} elsif ($action eq "blobdiff") { +} + +sub git_blobdiff { + mkdir($git_temp, 0700); git_header_html(); - print "


\n" . - "
\n";
-	git_diff_html($hash_parent, $hash, $hash_parent, $hash);
-	print "
\n" . - "
"; + if (defined $hash_base && (my %co = git_read_commit($hash_base))) { + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") . + " | " . $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"; + print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff_plain;h=$hash;hp=$hash_parent"}, "plain") . + "
\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 "
/$file_name
\n"; + } + print "
\n" . + "
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;hb=$hash_base;f=$file_name"}, $hash) . + "
\n"; + git_diff_print($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash); + print "
"; git_footer_html(); -} elsif ($action eq "commitdiff") { - my %co = git_commit($hash); - open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash"; +} + +sub git_blobdiff_plain { + mkdir($git_temp, 0700); + print $cgi->header(-type => "text/plain", -charset => 'utf-8'); + git_diff_print($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash, "plain"); +} + +sub git_commitdiff { + mkdir($git_temp, 0700); + my %co = git_read_commit($hash); + if (!%co) { + die_error(undef, "Unknown commit object."); + } + if (!defined $hash_parent) { + $hash_parent = $co{'parent'}; + } + open my $fd, "-|", "$gitbin/git-diff-tree -r $hash_parent $hash" or die_error(undef, "Open failed."); my (@difftree) = map { chomp; $_ } <$fd>; - close $fd; + close $fd or 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"}, "diff") . "\n" . - "

\n"; - print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "log_title"}, $co{'title'}) ."\n"; - print "
\n" . - "
\n";
+	print "
\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash"}, "shortlog") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash"}, "log") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") .
+	      " | commitdiff" .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") . "
\n";
+	print $cgi->a({-href => "$my_uri?p=$project;a=commitdiff_plain;h=$hash;hp=$hash_parent"}, "plain") . "\n" .
+	      "
\n";
+	print "
\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
+	      "
\n";
+	print "
\n";
+	my $comment = $co{'comment'};
+	my $empty = 0;
+	my $signed = 0;
+	my @log = @$comment;
+	# remove first and empty lines after that
+	shift @log;
+	while (defined $log[0] && $log[0] eq "") {
+		shift @log;
+	}
+	foreach my $line (@log) {
+		if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
+			next;
+		}
+		if ($line eq "") {
+			if ($empty) {
+				next;
+			}
+			$empty = 1;
+		} else {
+			$empty = 0;
+		}
+		print format_log_line_html($line) . "
\n";
+	}
+	print "
\n";
 	foreach my $line (@difftree) {
-		# '*100644->100644	blob	8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154	Makefile'
-		$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_html("", $file, "", $id);
-			} elsif ($op eq "-") {
-				git_diff_html($file, "", $id, "");
-			} elsif ($op eq "*") {
-				$id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
-				git_diff_html($file, $file, $1, $2);
-			}
-		}
-	}
-	print "
\n"; - print "
"; + # ':100644 100644 03b218260e99b78c6df0ed378e59ed9205ccc96d 3b93d5e7cc7f7dd4ebed13a5cc1a4ad976fc94d8 M ls-files.c' + # ':100644 100644 7f9281985086971d3877aca27704f2aaf9c448ce bc190ebc71bbd923f2b728e505408f5e54bd073a M rev-tree.c' + $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/; + my $from_mode = $1; + my $to_mode = $2; + my $from_id = $3; + my $to_id = $4; + my $status = $5; + my $file = $6; + if ($status eq "A") { + print "
" . file_type($to_mode) . ":" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, $to_id) . "(new)" . + "
\n"; + git_diff_print(undef, "/dev/null", $to_id, "b/$file"); + } elsif ($status eq "D") { + print "
" . file_type($from_mode) . ":" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file"}, $from_id) . "(deleted)" . + "
\n"; + git_diff_print($from_id, "a/$file", undef, "/dev/null"); + } elsif ($status eq "M") { + if ($from_id ne $to_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;hb=$hash;f=$file"}, $to_id); + print "
\n"; + git_diff_print($from_id, "a/$file", $to_id, "b/$file"); + } + } + } + print "
\n" . + "
"; + git_footer_html(); +} + +sub git_commitdiff_plain { + mkdir($git_temp, 0700); + open my $fd, "-|", "$gitbin/git-diff-tree -r $hash_parent $hash" or die_error(undef, "Open failed."); + my (@difftree) = map { chomp; $_ } <$fd>; + close $fd or die_error(undef, "Reading diff-tree failed."); + + # try to figure out the next tag after this commit + my $tagname; + my %taghash; + my $tags = git_read_refs("refs/tags"); + foreach my $entry (@$tags) { + my %tag = %$entry; + $taghash{$tag{'refid'}} = $tag{'name'}; + } + open $fd, "-|", "$gitbin/git-rev-list HEAD"; + while (my $commit = <$fd>) { + chomp $commit; + if ($taghash{$commit}) { + $tagname = $taghash{$commit}; + } + if ($commit eq $hash) { + last; + } + } + close $fd; + + print $cgi->header(-type => "text/plain", -charset => 'utf-8'); + my %co = git_read_commit($hash); + my %ad = date_str($co{'author_epoch'}, $co{'author_tz'}); + my $comment = $co{'comment'}; + print "From: $co{'author'}\n" . + "Date: $ad{'rfc2822'} ($ad{'tz_local'})\n". + "Subject: $co{'title'}\n"; + if (defined $tagname) { + print "X-Git-Tag: $tagname\n"; + } + print "X-Git-Url: $my_url?p=$project;a=commitdiff;h=$hash\n" . + "\n"; + + foreach my $line (@$comment) {; + print " $line\n"; + } + print "---\n\n"; + + foreach my $line (@difftree) { + $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/; + my $from_id = $3; + my $to_id = $4; + my $status = $5; + my $file = $6; + if ($status eq "A") { + git_diff_print(undef, "/dev/null", $to_id, "b/$file", "plain"); + } elsif ($status eq "D") { + git_diff_print($from_id, "a/$file", undef, "/dev/null", "plain"); + } elsif ($status eq "M") { + git_diff_print($from_id, "a/$file", $to_id, "b/$file", "plain"); + } + } +} + +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" . + $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") . + " | " . $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" . + "
\n"; + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . + "
\n"; + print "
/$file_name
\n"; + + open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin $file_name"; + my $commit; + print "\n"; + my $alternate = 0; + while (my $line = <$fd>) { + if ($line =~ m/^([0-9a-fA-F]{40})/){ + $commit = $1; + next; + } + if ($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/ && (defined $commit)) { + my %co = git_read_commit($commit); + if (!%co) { + next; + } + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\n" . + "\n" . + "\n" . + "\n" . + "\n"; + undef $commit; + } + } + print "
$co{'age_string_date'}" . escapeHTML(chop_str($co{'author_name'}, 15, 3)) . "" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, "" . + escapeHTML(chop_str($co{'title'}, 50)) . "") . "" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=blob;hb=$commit;f=$file_name"}, "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_name"}, + "diff to current"); + } + print "
\n"; + close $fd; + git_footer_html(); +} + +sub git_search { + if (!defined $searchtext) { + die_error("", "Text field empty."); + } + if (!defined $hash) { + $hash = git_read_hash("$project/HEAD"); + } + my %co = git_read_commit($hash); + if (!%co) { + die_error(undef, "Unknown commit object."); + } + # pickaxe may take all resources of your box and run for several minutes + # with every query - so decide by yourself how public you make this feature :) + my $commit_search = 1; + my $author_search = 0; + my $committer_search = 0; + my $pickaxe_search = 0; + if ($searchtext =~ s/^author\\://i) { + $author_search = 1; + } elsif ($searchtext =~ s/^committer\\://i) { + $committer_search = 1; + } elsif ($searchtext =~ s/^pickaxe\\://i) { + $commit_search = 0; + $pickaxe_search = 1; + } + git_header_html(); + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=summary;h=$hash"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "shortlog") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash"}, "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" . + "
\n"; + + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . + "
\n"; + print "\n"; + my $alternate = 0; + if ($commit_search) { + $/ = "\0"; + open my $fd, "-|", "$gitbin/git-rev-list --header $hash"; + while (my $commit_text = <$fd>) { + if (!grep m/$searchtext/i, $commit_text) { + next; + } + if ($author_search && !grep m/\nauthor .*$searchtext/i, $commit_text) { + next; + } + if ($committer_search && !grep m/\ncommitter .*$searchtext/i, $commit_text) { + next; + } + my @commit_lines = split "\n", $commit_text; + my $commit = shift @commit_lines; + my %co = git_read_commit($commit, \@commit_lines); + if (!%co) { + next; + } + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\n" . + "\n" . + "\n" . + "\n" . + "\n"; + } + close $fd; + } + + if ($pickaxe_search) { + $/ = "\n"; + open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin -S$searchtext"; + undef %co; + my @files; + while (my $line = <$fd>) { + if (%co && $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/) { + my %set; + $set{'file'} = $6; + $set{'from_id'} = $3; + $set{'to_id'} = $4; + $set{'id'} = $set{'to_id'}; + if ($set{'id'} =~ m/0{40}/) { + $set{'id'} = $set{'from_id'}; + } + if ($set{'id'} =~ m/0{40}/) { + next; + } + push @files, \%set; + } elsif ($line =~ m/^([0-9a-fA-F]{40}) /){ + if (%co) { + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\n" . + "\n" . + "\n" . + "\n" . + "\n"; + } + %co = git_read_commit($1); + } + } + close $fd; + } + print "
$co{'age_string_date'}" . escapeHTML(chop_str($co{'author_name'}, 15, 5)) . "" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, "" . escapeHTML(chop_str($co{'title'}, 50)) . "
"); + my $comment = $co{'comment'}; + foreach my $line (@$comment) { + if ($line =~ m/^(.*)($searchtext)(.*)$/i) { + my $lead = escapeHTML($1) || ""; + $lead = chop_str($lead, 30, 10); + my $match = escapeHTML($2) || ""; + my $trail = escapeHTML($3) || ""; + $trail = chop_str($trail, 30, 10); + my $text = "$lead$match$trail"; + print chop_str($text, 80, 5) . "
\n"; + } + } + print "		" . + $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"); + print "
$co{'age_string_date'}" . escapeHTML(chop_str($co{'author_name'}, 15, 5)) . "" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$co{'id'}", -class => "list"}, "" . + escapeHTML(chop_str($co{'title'}, 50)) . "
"); + while (my $setref = shift @files) { + my %set = %$setref; + print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$set{'id'};hb=$co{'id'};f=$set{'file'}", class => "list"}, + "" . escapeHTML($set{'file'}) . "") . + "
\n"; + } + print "		" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$co{'id'}"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$co{'id'}"}, "tree"); + print "
\n"; + git_footer_html(); +} + +sub git_shortlog { + my $head = git_read_hash("$project/HEAD"); + if (!defined $hash) { + $hash = $head; + } + if (!defined $page) { + $page = 0; + } + git_header_html(); + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=summary"}, "summary") . + " | shortlog" . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$hash"}, "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=$hash;hb=$hash"}, "tree") . "
\n"; + + my $limit = sprintf("--max-count=%i", (100 * ($page+1))); + open my $fd, "-|", "$gitbin/git-rev-list $limit $hash" or die_error(undef, "Open failed."); + my (@revlist) = map { chomp; $_ } <$fd>; + close $fd; + + if ($hash ne $head || $page) { + print $cgi->a({-href => "$my_uri?p=$project;a=shortlog"}, "HEAD"); + } else { + print "HEAD"; + } + if ($page > 0) { + print " ⋅ " . + $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page-1), -accesskey => "p", -title => "Alt-p"}, "prev"); + } else { + print " ⋅ prev"; + } + if ($#revlist >= (100 * ($page+1)-1)) { + print " ⋅ " . + $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page+1), -accesskey => "n", -title => "Alt-n"}, "next"); + } else { + print " ⋅ next"; + } + print "
\n" . + "
\n"; + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, " ") . + "
\n"; + print "\n"; + my $alternate = 0; + for (my $i = ($page * 100); $i <= $#revlist; $i++) { + my $commit = $revlist[$i]; + my %co = git_read_commit($commit); + my %ad = date_str($co{'author_epoch'}); + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\n" . + "\n" . + "\n" . + "\n" . + ""; + } + if ($#revlist >= (100 * ($page+1)-1)) { + print "\n" . + "\n" . + "\n"; + } + print ""; git_footer_html(); -} else { - die_error("", "unknown action"); }
$co{'age_string_date'}" . escapeHTML(chop_str($co{'author_name'}, 10)) . "" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, "" . + escapeHTML($co{'title_short'}) . "") . "" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") . + "
" . + $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page+1), -title => "Alt-n"}, "next") . + "