X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/8db6ba40527c06246585a0102f18ed1e354a86565717a95a5235d23a3182f74c..6e24be63d45dccceab99187fa2c87277b4fa394d424f75a8d1f8e11540ff0056:/gitweb.cgi diff --git a/gitweb.cgi b/gitweb.cgi index 0ef682b..bdb3e5f 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -15,13 +15,14 @@ use CGI::Carp qw(fatalsToBrowser); use Fcntl ':mode'; my $cgi = new CGI; -my $version = "227"; +my $version = "239"; my $my_url = $cgi->url(); my $my_uri = $cgi->url(-absolute => 1); my $rss_link = ""; # absolute fs-path which will be prepended to the project path my $projectroot = "/pub/scm"; +$projectroot = "/home/kay/public_html/pub/scm"; # location of the git-core binaries my $gitbin = "/usr/bin"; @@ -55,6 +56,14 @@ if (defined $action) { } } +my $order = $cgi->param('o'); +if (defined $order) { + if ($order =~ m/[^a-zA-Z0-9_]/) { + undef $order; + die_error(undef, "Invalid order parameter."); + } +} + my $project = $cgi->param('p'); if (defined $project) { if ($project =~ m/(^|\/)(|\.|\.\.)($|\/)/) { @@ -94,13 +103,24 @@ if (defined $file_name) { my $hash = $cgi->param('h'); if (defined $hash) { - 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."); + 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; + } + } } } @@ -181,6 +201,9 @@ if (!defined $action || $action eq "summary") { } elsif ($action eq "shortlog") { git_shortlog(); exit; +} elsif ($action eq "tag") { + git_tag(); + exit; } else { undef $action; die_error(undef, "Unknown action."); @@ -213,7 +236,7 @@ body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d a { color:#0000cc; } a:hover, a:visited, a:active { color:#880000; } div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; } -div.page_header a:visited { color:#0000cc; } +div.page_header a:visited, a.header { color:#0000cc; } div.page_header a:hover { color:#880000; } div.page_nav { padding:8px; } div.page_nav a:visited { color:#0000cc; } @@ -237,6 +260,9 @@ div.log_link { div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; } a.list { text-decoration:none; color:#000000; } a.list:hover { text-decoration:underline; color:#880000; } +a.text { text-decoration:none; color:#0000cc; } +a.text:visited { text-decoration:none; color:#880000; } +a.text:hover { text-decoration:underline; color:#880000; } table { padding:8px 4px; } th { padding:2px 5px; font-size:12px; text-align:left; } tr.light:hover { background-color:#edece6; } @@ -296,7 +322,7 @@ sub git_footer_html { } 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 $cgi->a({-href => "$my_uri?a=opml", -class => "rss_logo"}, "OPML") . "\n"; } print "\n" . "\n" . @@ -322,7 +348,7 @@ sub git_get_type { open my $fd, "-|", "$gitbin/git-cat-file -t $hash" or return; my $type = <$fd>; - close $fd; + close $fd or return; chomp $type; return $type; } @@ -352,8 +378,10 @@ sub git_read_description { 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})$/) { @@ -362,8 +390,19 @@ sub git_read_tag { $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 @@ -371,6 +410,37 @@ sub git_read_tag { return %tag } +sub age_string { + my $age = shift; + my $age_str; + + if ($age > 60*60*24*365*2) { + $age_str = (int $age/60/60/24/365); + $age_str .= " years ago"; + } elsif ($age > 60*60*24*(365/12)*2) { + $age_str = int $age/60/60/24/(365/12); + $age_str .= " months ago"; + } elsif ($age > 60*60*24*7*2) { + $age_str = int $age/60/60/24/7; + $age_str .= " weeks ago"; + } elsif ($age > 60*60*24*2) { + $age_str = int $age/60/60/24; + $age_str .= " days ago"; + } elsif ($age > 60*60*2) { + $age_str = int $age/60/60; + $age_str .= " hours ago"; + } elsif ($age > 60*2) { + $age_str = int $age/60; + $age_str .= " min ago"; + } elsif ($age > 2) { + $age_str = int $age; + $age_str .= " sec ago"; + } else { + $age_str .= " right now"; + } + return $age_str; +} + sub git_read_commit { my $commit_id = shift; my $commit_text = shift; @@ -443,37 +513,14 @@ sub git_read_commit { 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"; - } + $co{'age_string'} = age_string($age); 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, $mday; + $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, $mday; + $co{'age_string_age'} = sprintf "%4i-%02u-%02i", 1900 + $year, $mon+1, $mday; } return %co; } @@ -596,6 +643,21 @@ sub file_type { } } +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 $line; +} + sub date_str { my $epoch = shift; my $tz = shift || "-0000"; @@ -699,9 +761,30 @@ sub git_read_projects { sub git_project_list { my @list = git_read_projects(); + my @projects; if (!@list) { die_error(undef, "No project found."); } + foreach my $pr (@list) { + my $head = git_read_hash("$pr->{'path'}/HEAD"); + if (!defined $head) { + next; + } + $ENV{'GIT_DIR'} = "$projectroot/$pr->{'path'}"; + my %co = git_read_commit($head); + if (!%co) { + next; + } + $pr->{'commit'} = \%co; + if (!defined $pr->{'descr'}) { + my $descr = git_read_description($pr->{'path'}) || ""; + $pr->{'descr'} = chop_str($descr, 25, 5); + } + if (!defined $pr->{'owner'}) { + $pr->{'owner'} = get_file_owner("$projectroot/$pr->{'path'}") || ""; + } + push @projects, $pr; + } git_header_html(); if (-f $home_text) { print "
\n"; @@ -711,53 +794,57 @@ sub git_project_list { print "
\n"; } print "\n" . - "\n" . - "\n" . - "\n" . - "\n" . - "\n" . - "\n" . + "\n"; + if (!defined($order) || (defined($order) && ($order eq "project"))) { + @projects = sort {$a->{'path'} cmp $b->{'path'}} @projects; + print "\n"; + } else { + print "\n"; + } + if (defined($order) && ($order eq "descr")) { + @projects = sort {$a->{'descr'} cmp $b->{'descr'}} @projects; + print "\n"; + } else { + print "\n"; + } + if (defined($order) && ($order eq "owner")) { + @projects = sort {$a->{'owner'} cmp $b->{'owner'}} @projects; + print "\n"; + } else { + print "\n"; + } + if (defined($order) && ($order eq "age")) { + @projects = sort {$a->{'commit'}{'age'} <=> $b->{'commit'}{'age'}} @projects; + print "\n"; + } else { + print "\n"; + } + print "\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'}") || ""; - } + foreach my $pr (@projects) { if ($alternate) { print "\n"; } else { print "\n"; } $alternate ^= 1; - print "\n" . - "\n" . - "\n"; + 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'}"; + if ($pr->{'commit'}{'age'} < 60*60*2) { + $colored_age = "$pr->{'commit'}{'age_string'}"; + } elsif ($pr->{'commit'}{'age'} < 60*60*24*2) { + $colored_age = "$pr->{'commit'}{'age_string'}"; } else { - $colored_age = "$co{'age_string'}"; + $colored_age = "$pr->{'commit'}{'age_string'}"; } print "\n" . "\n" . "\n"; } @@ -792,23 +879,34 @@ sub git_read_refs { my $type = git_get_type($ref_id) || next; my %ref_item; my %co; + $ref_item{'type'} = $type; + $ref_item{'id'} = $ref_id; + $ref_item{'epoch'} = 0; + $ref_item{'age'} = "unknown"; 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{'epoch'} = $co{'committer_epoch'}; + $ref_item{'age'} = $co{'age_string'}; + } elsif (defined($tag{'epoch'})) { + my $age = time - $tag{'epoch'}; + $ref_item{'epoch'} = $tag{'epoch'}; + $ref_item{'age'} = age_string($age); } - $ref_item{'type'} = $tag{'type'}; + $ref_item{'reftype'} = $tag{'type'}; $ref_item{'name'} = $tag{'name'}; - $ref_item{'id'} = $tag{'object'}; + $ref_item{'refid'} = $tag{'object'}; } elsif ($type eq "commit"){ %co = git_read_commit($ref_id); - $ref_item{'type'} = "commit"; + $ref_item{'reftype'} = "commit"; $ref_item{'name'} = $ref_file; $ref_item{'title'} = $co{'title'}; - $ref_item{'id'} = $ref_id; + $ref_item{'refid'} = $ref_id; + $ref_item{'epoch'} = $co{'committer_epoch'}; + $ref_item{'age'} = $co{'age_string'}; } - $ref_item{'epoch'} = $co{'committer_epoch'} || 0; - $ref_item{'age'} = $co{'age_string'} || "unknown"; push @reflist, \%ref_item; } @@ -906,6 +1004,11 @@ sub git_summary { 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 { @@ -915,14 +1018,22 @@ sub git_summary { if ($i-- > 0) { print "\n" . "\n" . - "\n" . + "\n" . ""; @@ -973,6 +1084,45 @@ sub git_summary { git_footer_html(); } +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" . + "
ProjectDescriptionOwnerlast change
Project" . $cgi->a({-class => "header", -href => "$my_uri?o=project"}, "Project") . "Description" . $cgi->a({-class => "header", -href => "$my_uri?o=descr"}, "Description") . "Owner" . $cgi->a({-class => "header", -href => "$my_uri?o=owner"}, "Owner") . "Last Change" . $cgi->a({-class => "header", -href => "$my_uri?o=age"}, "Last Change") . "
" . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary", -class => "list"}, escapeHTML($proj{'path'})) . "$descr" . chop_str($proj{'owner'}, 15) . "" . $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=summary", -class => "list"}, escapeHTML($pr->{'path'})) . "$pr->{'descr'}" . chop_str($pr->{'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") . + $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=shortlog"}, "shortlog") . + " | " . $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=log"}, "log") . "
$tag{'age'}" . - $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'name'}", -class => "list"}, "" . - escapeHTML($tag{'name'}) . "") . + $cgi->a({-href => "$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}", -class => "list"}, + "" . escapeHTML($tag{'name'}) . "") . "" . - $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'name'}"}, $tag{'type'}); - if ($tag{'type'} eq "commit") { + ""; + 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{'name'}"}, "log"); + " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'refid'}"}, "log"); } print "
\n" . + "\n" . + "\n" . + "\n" . + "\n" . + "\n"; + if (defined($tag{'author'})) { + my %ad = date_str($tag{'epoch'}, $tag{'tz'}); + print "\n"; + print "\n"; + } + print "
object" . $cgi->a({-class => "list", -href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'object'}"}, $tag{'object'}) . "" . $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'object'}"}, $tag{'type'}) . "
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(); @@ -994,6 +1144,11 @@ sub git_tags { 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 { @@ -1002,14 +1157,22 @@ sub git_tags { $alternate ^= 1; print "$tag{'age'}\n" . "" . - $cgi->a({-href => "$my_uri?p=$project;a=shortlog;h=$tag{'name'}", -class => "list"}, + $cgi->a({-href => "$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}", -class => "list"}, "" . escapeHTML($tag{'name'}) . "") . "\n" . - "" . - $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'name'}"}, $tag{'type'}); - if ($tag{'type'} eq "commit") { + ""; + if (defined($comment)) { + print $cgi->a({-class => "list", -href => "$my_uri?p=$project;a=tag;h=$tag{'id'}"}, $comment); + } + print "\n" . + ""; + 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{'name'}"}, "log"); + " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'refid'}"}, "log"); } print "\n" . ""; @@ -1234,10 +1397,9 @@ sub git_tree { 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."); + open my $fd, "-|", "$gitbin/git-rev-list --max-count=150 " . 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"; @@ -1247,9 +1409,17 @@ sub git_rss { "$project log\n". "en\n"; - foreach my $commit (@revlist) { + for (my $i = 0; $i <= $#revlist; $i++) { + my $commit = $revlist[$i]; my %co = git_read_commit($commit); + # we read 150, we always show 30 and the ones more recent than 48 hours + if (($i >= 20) && ((time - $co{'committer_epoch'}) > 48*60*60)) { + last; + } my %cd = date_str($co{'committer_epoch'}); + open $fd, "-|", "$gitbin/git-diff-tree -r $co{'parent'} $co{'id'}" or next; + my @difftree = map { chomp; $_ } <$fd>; + close $fd or next; print "\n" . "" . sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . escapeHTML($co{'title'}) . @@ -1263,6 +1433,14 @@ sub git_rss { foreach my $line (@$comment) { print "$line<br/>\n"; } + print "<br/>\n"; + foreach my $line (@difftree) { + 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 $file = $7; + print "$file<br/>\n"; + } print "]]>\n" . "</content:encoded>\n" . "</item>\n"; @@ -1384,7 +1562,7 @@ sub git_log { } else { $empty = 0; } - print escapeHTML($line) . "<br/>\n"; + print format_log_line_html($line) . "<br/>\n"; } if (!$empty) { print "<br/>\n"; @@ -1404,10 +1582,12 @@ sub git_commit { my @difftree; my $root = ""; - if (!defined $co{'parent'}) { + my $parent = $co{'parent'}; + if (!defined $parent) { $root = " --root"; + $parent = ""; } - open my $fd, "-|", "$gitbin/git-diff-tree -r -M $root $co{'parent'} $hash" or die_error(undef, "Open failed."); + 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(); @@ -1485,7 +1665,7 @@ sub git_commit { print "<span style=\"color: #888888\">" . escapeHTML($line) . "</span><br/>\n"; } else { $signed = 0; - print escapeHTML($line) . "<br/>\n"; + print format_log_line_html($line) . "<br/>\n"; } } print "</div>\n"; @@ -1499,7 +1679,9 @@ sub git_commit { foreach my $line (@difftree) { # ':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}) (.)([0-9]{0,3})\t(.*)$/; + 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; @@ -1507,14 +1689,13 @@ sub git_commit { my $status = $5; my $similarity = $6; my $file = $7; - #print "$line ($status)<br/>\n"; if ($alternate) { print "<tr class=\"dark\">\n"; } else { print "<tr class=\"light\">\n"; } $alternate ^= 1; - if ($status eq "N") { + if ($status eq "A") { my $mode_chng = ""; if (S_ISREG(oct $to_mode)) { $mode_chng = sprintf(" with mode: %04o", (oct $to_mode) & 0777); @@ -1676,7 +1857,7 @@ sub git_commitdiff { } else { $empty = 0; } - print escapeHTML($line) . "<br/>\n"; + print format_log_line_html($line) . "<br/>\n"; } print "<br/>\n"; foreach my $line (@difftree) { @@ -1689,7 +1870,7 @@ sub git_commitdiff { my $to_id = $4; my $status = $5; my $file = $6; - if ($status eq "N") { + if ($status eq "A") { print "<div class=\"diff_info\">" . file_type($to_mode) . ":" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, $to_id) . "(new)" . "</div>\n"; @@ -1721,25 +1902,51 @@ sub git_commitdiff_plain { 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'}); - print $cgi->header(-type => "text/plain", -charset => 'utf-8'); my $comment = $co{'comment'}; - print "Author: $co{'author'}\n" . + print "From: $co{'author'}\n" . "Date: $ad{'rfc2822'} ($ad{'tz_local'})\n". - "Source: $my_url?p=$project;a=commitdiff;h=$hash\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"; + 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 "N") { + 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"); @@ -1777,7 +1984,7 @@ sub git_history { print "<table cellspacing=\"0\">\n"; my $alternate = 0; while (my $line = <$fd>) { - if ($line =~ m/^([0-9a-fA-F]{40}) /){ + if ($line =~ m/^([0-9a-fA-F]{40})/){ $commit = $1; next; }