X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/be731a362b6c8212efe520e1166c163e04ef7dbeb7c3c31feb971ad4847d29b0..b6fd76222eb509ba29552c1df7ad05e8df856e8dee500e63062552f85f89ced8:/gitweb.cgi diff --git a/gitweb.cgi b/gitweb.cgi index 8ec96cd..83435a3 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -15,7 +15,7 @@ use CGI::Carp qw(fatalsToBrowser); use Fcntl ':mode'; my $cgi = new CGI; -my $version = "152"; +my $version = "164"; my $my_url = $cgi->url(); my $my_uri = $cgi->url(-absolute => 1); my $rss_link = ""; @@ -194,28 +194,21 @@ div.title, a.title { font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000; } a.title:hover { background-color: #d9d8d1; } -div.title_text { padding:6px 8px; border: solid #d9d8d1; border-width:0px 0px 1px; } +div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; } div.log_body { padding:8px 8px 8px 150px; } span.age { position:relative; float:left; width:142px; font-style:italic; } div.log_link { + padding:0px 8px; font-size:10px; font-family:sans-serif; font-style:normal; - position:relative; float:left; width:142px; + position:relative; float:left; width:136px; } -div.list { display:block; padding:4px 8px 2px; } -div.list_head { - display:block; padding:6px 6px 4px; border:solid #d9d8d1; - border-width:0px 0px 1px; font-style:italic; -} -div.list a { text-decoration:none; color:#000000; } -div.list a:hover { color:#880000; } -div.list_link { - padding:4px 8px 6px; border:solid #d9d8d1; border-width:0px 0px 1px; - font-family:sans-serif; font-size:10px; -} -td { padding:5px 15px 0px 0px; font-size:12px; } -th { padding-right:10px; font-size:12px; text-align:left; } -td.link { font-family:sans-serif; font-size:10px; } -td.pre { font-family:monospace; font-size:12px; white-space:pre; padding:2px 15px 0px 0px; } +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 { color:#880000; } +table { padding:8px 4px; } +th { padding:2px 5px; font-size:12px; text-align:left; } +td { padding:2px 5px; font-size:12px; } +td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; } div.pre { font-family:monospace; font-size:12px; white-space:pre; } div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; } div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; } @@ -263,9 +256,10 @@ sub die_error { git_header_html($status); print "
\n" . - "

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

\n" . + "$status - $error\n" . + "
\n" . + "\n"; git_footer_html(); exit; } @@ -311,9 +305,9 @@ sub git_read_tag { chomp $line; if ($line =~ m/^object ([0-9a-fA-F]{40})$/) { $tag{'object'} = $1; - } elsif ($line =~ m/^type (.*)$/) { + } elsif ($line =~ m/^type (.+)$/) { $tag{'type'} = $1; - } elsif ($line =~ m/^tag (.*)$/) { + } elsif ($line =~ m/^tag (.+)$/) { $tag{'name'} = $1; } } @@ -333,16 +327,19 @@ sub git_read_commit { while (my $line = <$fd>) { last if $line eq "\n"; chomp $line; - if ($line =~ m/^tree (.*)$/) { + 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; - $comment[0] =~ m/^(.{0,60}[^ ]*)/; - $co{'title'} = $1; - if ($comment[0] ne $co{'title'}) { - $co{'title'} .= " ..."; - } + $co{'title'} = chop_str($comment[0], 50); close $fd || return; my $age = time - $co{'committer_epoch'}; @@ -473,6 +466,18 @@ sub mode_str { } } +sub chop_str { + my $str = shift; + my $len = shift; + + $str =~ m/^(.{0,$len}[^ \/\-_:\.@]{0,10})/; + my $chopped = $1; + if ($chopped ne $str) { + $chopped .= " ..."; + } + return $chopped; +} + sub file_type { my $mode = oct shift; @@ -561,9 +566,10 @@ sub git_project_list { } closedir($dh); } elsif (-f $projects_list) { - # read from file: - # 'git/git.git:Linus Torvalds' - # 'linux/hotplug/udev.git' + # 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 || return undef; while (my $line = <$fd>) { chomp $line; @@ -597,8 +603,7 @@ sub git_project_list { close $fd; print "\n"; } - print "

\n" . - "\n" . + print "
\n" . "\n" . "\n" . "\n" . @@ -606,6 +611,7 @@ sub git_project_list { "\n" . "\n" . "\n"; + my $alternate = 0; foreach my $pr (@list) { my %proj = %$pr; my $head = git_read_hash("$proj{'path'}/HEAD"); @@ -619,14 +625,20 @@ sub git_project_list { next; } my $descr = git_read_description($proj{'path'}) || ""; + $descr = chop_str($descr, 30); # get directory owner if not already specified if (!defined $proj{'owner'}) { $proj{'owner'} = get_file_owner("$projectroot/$proj{'path'}") || ""; } - print "\n" . - "\n" . + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\n" . "\n" . - "\n"; + "\n"; my $colored_age; if ($co{'age'} < 60*60*2) { $colored_age = "$co{'age_string'}"; @@ -639,13 +651,10 @@ sub git_project_list { "\n" . "\n"; } - print "
ProjectDescriptionlast change
" . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary"}, escapeHTML($proj{'path'})) . "
" . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary", -class => "list"}, escapeHTML($proj{'path'})) . "$descr$proj{'owner'}" . chop_str($proj{'owner'}, 20) . "" . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary"}, "summary") . " | " . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=log"}, "log") . - " | " . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=tree"}, "tree") . "
\n" . - "
\n" . - "
\n"; + print "\n"; git_footer_html(); } @@ -720,30 +729,37 @@ sub git_summary { "

\n" . "\n"; print "
project
\n"; - print "
\n" . - "\n" . + print "
\n" . "\n" . "\n" . "\n" . - "
description" . escapeHTML($descr) . "
owner$owner
last change$cd{'rfc2822'}
\n" . - "
\n"; - open my $fd, "-|", "$gitbin/git-rev-list --max-count=11 " . git_read_hash("$project/HEAD") || die_error(undef, "Open failed."); + "\n"; + open my $fd, "-|", "$gitbin/git-rev-list --max-count=16 " . git_read_hash("$project/HEAD") || die_error(undef, "Open failed."); my (@revlist) = map { chomp; $_ } <$fd>; close $fd; print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=log", -class => "title"}, "commits") . "
\n"; - my $i = 10; - print "
\n" . - "\n"; + my $i = 15; + print "
\n"; + my $alternate = 0; foreach my $commit (@revlist) { my %co = git_read_commit($commit); my %ad = date_str($co{'author_epoch'}); - print "\n"; + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; if (--$i > 0) { - print "\n" . - "\n" . - "\n" . + print "\n" . + "\n" . + "\n" . + "\n" . ""; } else { print "\n" . @@ -751,23 +767,28 @@ sub git_summary { last; } } - print "" . - "\n"; + 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 = 10; - print "
\n" . - "
$co{'age_string'}$co{'author_name'}" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, escapeHTML($co{'title'})) . "$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'}) . "") . "" . + $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=log"}, "...") . "
\n"; + my $i = 15; + print "
\n"; + my $alternate = 0; foreach my $entry (@$taglist) { my %tag = %$entry; - print "\n"; + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; if (--$i > 0) { - print "\n" . - "\n" . + print "\n" . + "\n" . + "\n" . ""; } else { print "\n" . @@ -775,8 +796,7 @@ sub git_summary { last; } } - print "" . - "\n"; + print ""; } my $branchlist = git_read_refs("refs/heads"); @@ -784,15 +804,21 @@ sub git_summary { print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=branches", -class => "title"}, "branches") . "
\n"; - my $i = 10; - print "
\n" . - "
$tag{'age'}" . $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"}, escapeHTML($tag{'name'})) . "$tag{'age'}" . $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}", -class => "list"}, "" . escapeHTML($tag{'name'}) . "") . "" . $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"}, $tag{'type'}) . "
" . $cgi->a({-href => "$my_uri?p=$project;a=tags"}, "...") . "
\n"; + my $i = 15; + print "
\n"; + my $alternate = 0; foreach my $entry (@$branchlist) { my %tag = %$entry; - print "\n"; + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; if (--$i > 0) { - print "\n" . - "\n" . + print "\n" . + "\n" . + "\n" . ""; } else { print "\n" . @@ -800,8 +826,7 @@ sub git_summary { last; } } - print "" . - "\n"; + print ""; } git_footer_html(); } @@ -819,16 +844,24 @@ sub git_tags { print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, "tags") . "
\n"; + print "
$tag{'age'}" . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}"}, escapeHTML($tag{'name'})) . "$tag{'age'}" . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}", -class => "list"}, "" . escapeHTML($tag{'name'}) . "") . "" . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}"}, "log") . "
" . $cgi->a({-href => "$my_uri?p=$project;a=branches"}, "...") . "
\n"; + my $alternate = 0; if (defined @$taglist) { foreach my $entry (@$taglist) { my %tag = %$entry; - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"}, - "$tag{'age'}" . escapeHTML($tag{'name'})) . "\n" . - "
\n"; + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\n" . + "\n" . + "\n" . + ""; } } - print "

\n"; + print ""; git_footer_html(); } @@ -845,16 +878,24 @@ sub git_branches { print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, "branches") . "
\n"; + print "
$tag{'age'}" . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}", -class => "list"}, "" . escapeHTML($tag{'name'}) . "") . "" . $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"}, $tag{'type'}) . "
\n"; + my $alternate = 0; if (defined @$taglist) { foreach my $entry (@$taglist) { my %tag = %$entry; - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}"}, - "$tag{'age'}" . escapeHTML($tag{'name'})) . "\n" . - "
\n"; + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\n" . + "\n" . + "\n" . + ""; } } - print "

\n"; + print ""; git_footer_html(); } @@ -870,7 +911,7 @@ sub git_get_hash_by_path { close $fd || return undef; foreach my $line (@entries) { #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c' - $line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/; + $line =~ m/^([0-9]+)\t(.+)\t([0-9a-fA-F]{40})\t(.+)$/; my $t_mode = $1; my $t_type = $2; my $t_hash = $3; @@ -938,9 +979,9 @@ sub git_tree { 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"); + if (!defined $hash_base) { + $hash_base = git_read_hash("$project/HEAD"); + } } open my $fd, "-|", "$gitbin/git-ls-tree $hash" || die_error(undef, "Open git-ls-tree failed."); my (@entries) = map { chomp; $_ } <$fd>; @@ -975,26 +1016,37 @@ sub git_tree { } print "
\n"; print "
$tag{'age'}" . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}", -class => "list"}, "" . escapeHTML($tag{'name'}) . "") . "" . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}"}, "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]+)\t(.+)\t([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"; - print "\n" . - "\n"; + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\n"; if ($t_type eq "blob") { - print "\n"; + print "\n"; print "\n"; } elsif ($t_type eq "tree") { - print "\n"; + print "\n"; } print "\n"; } @@ -1085,7 +1137,7 @@ sub git_log { my $comment = $co{'comment'}; my $empty = 0; foreach my $line (@$comment) { - if ($line =~ m/^(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { + if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { next; } if ($line eq "") { @@ -1146,22 +1198,34 @@ sub git_commit { print "
\n" . "
" . mode_str($t_mode) . "
" . mode_str($t_mode) . "$t_name" . + $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") . "" . + print "" . $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=history;h=$hash_base" . $file_key}, "history") . + "
\n"; print "\n". - "" . + "\n"; + print "" . + "\n"; print "\n"; print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "" . + "" . + "" . + "" . + "\n"; my $parents = $co{'parents'}; foreach my $par (@$parents) { - print "\n"; + print "" . + "" . + "" . + "" . + "\n"; } print "
author" . escapeHTML($co{'author'}) . "
$ad{'rfc2822'}"; + "
$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"}, $co{'tree'}) . "
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"}, $par) . "
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"; @@ -1179,7 +1243,7 @@ sub git_commit { } else { $empty = 0; } - if ($line =~ m/^(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { + if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { $signed = 1; print "" . escapeHTML($line) . "
\n"; } else { @@ -1193,81 +1257,86 @@ sub git_commit { 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' # '*100664->100644 blob b1a8e3dd5556b61dd771d32307c6ee5d7150fa43->b1a8e3dd5556b61dd771d32307c6ee5d7150fa43 show-files.c' # '*100664->100644 blob d08e895238bac36d8220586fdc28c27e1a7a76d3->d08e895238bac36d8220586fdc28c27e1a7a76d3 update-cache.c' - $line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/; + $line =~ m/^(.)(.+)\t(.+)\t([0-9a-fA-F]{40}|[0-9a-fA-F]{40}->[0-9a-fA-F]{40})\t(.+)$/; my $op = $1; my $mode = $2; my $type = $3; my $id = $4; my $file = $5; - if ($type eq "blob") { - if ($op eq "+") { - my $mode_chng = ""; - if (S_ISREG(oct $mode)) { - $mode_chng = sprintf(" with mode: %04o", (oct $mode) & 0777); + if ($type ne "blob") { + next; + } + if ($alternate) { + print "\n"; + } else { + print "\n"; + } + $alternate ^= 1; + if ($op eq "+") { + my $mode_chng = ""; + if (S_ISREG(oct $mode)) { + $mode_chng = sprintf(" with mode: %04o", (oct $mode) & 0777); + } + print "\n" . + "\n" . + "\n"; + } elsif ($op eq "-") { + print "\n" . + "\n" . + "\n" + } elsif ($op eq "*") { + $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/; + my $from_id = $1; + my $to_id = $2; + $mode =~ m/^([0-7]{6})->([0-7]{6})$/; + my $from_mode = $1; + my $to_mode = $2; + 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); } - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, - escapeHTML($file) . " [new " . file_type($mode) . "$mode_chng]") . "\n" . - "
\n"; - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "blob") . "\n" . - "
\n"; - } elsif ($op eq "-") { - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, - escapeHTML($file) . " [deleted " . file_type($mode) . "]") . "\n" . - "
"; - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "blob") . " | " . - $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "\n" . - "
\n"; - } elsif ($op eq "*") { - $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/; - my $from_id = $1; - my $to_id = $2; - $mode =~ m/^([0-7]{6})->([0-7]{6})$/; - my $from_mode = $1; - my $to_mode = $2; - 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); - } + if (((oct $from_mode) & 0777) != ((oct $to_mode) & 0777)) { + if (S_ISREG($from_mode) && S_ISREG($to_mode)) { + $mode_chnge .= sprintf(" mode: %04o->%04o", (oct $from_mode) & 0777, (oct $to_mode) & 0777); + } elsif (S_ISREG($to_mode)) { + $mode_chnge .= sprintf(" mode: %04o", (oct $to_mode) & 0777); } - $mode_chnge .= "]\n"; } - print "
\n"; - if ($to_id ne $from_id) { - print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file"}, - escapeHTML($file) . $mode_chnge) . "\n" . - "
\n"; - } else { - print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, - escapeHTML($file) . $mode_chnge) . "\n" . - "\n"; - } - print "
\n"; - 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=blob;h=$to_id;hb=$hash;f=$file"}, "blob") . " | " . - $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "\n" . - "
\n"; + $mode_chnge .= "]\n"; + } + print "\n" . + "\n" . + "\n"; } + print "\n"; } + print "
" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hp=$hash;f=$file", -class => "list"}, escapeHTML($file)) . "[new " . file_type($mode) . "$mode_chng]" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "blob") . "" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file", -class => "list"}, escapeHTML($file)) . "[deleted " . file_type($mode). "]" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "blob") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . + ""; + 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 "
\n"; git_footer_html(); } @@ -1315,7 +1384,10 @@ sub git_commitdiff { if (!%co) { die_error(undef, "Unknown commit object."); } - open my $fd, "-|", "$gitbin/git-diff-tree -r $co{'parent'} $hash" || die_error(undef, "Open failed."); + if (!defined $hash_parent) { + $hash_parent = $co{'parent'}; + } + open my $fd, "-|", "$gitbin/git-diff-tree -r $hash_parent $hash" || die_error(undef, "Open failed."); my (@difftree) = map { chomp; $_ } <$fd>; close $fd || die_error(undef, "Reading diff-tree failed."); @@ -1334,12 +1406,13 @@ sub git_commitdiff { my $empty = 0; my $signed = 0; my @log = @$comment; + # remove first and empty lines after that shift @log; - #while ($log[0] eq "") { - # 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) { + if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { next; } if ($line eq "") { @@ -1355,7 +1428,7 @@ sub git_commitdiff { print "
\n"; foreach my $line (@difftree) { # '*100644->100644 blob 8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154 Makefile' - $line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/; + $line =~ m/^(.)(.+)\t(.+)\t([0-9a-fA-F]{40}|[0-9a-fA-F]{40}->[0-9a-fA-F]{40})\t(.+)$/; my $op = $1; my $mode = $2; my $type = $3; @@ -1416,41 +1489,45 @@ sub git_history { print "
\n" . "/$file_name
\n"; print "
\n"; + open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin $file_name"; my $commit; + print "\n"; + my $alternate = 0; while (my $line = <$fd>) { if ($line =~ m/^([0-9a-fA-F]{40}) /){ $commit = $1; next; } - if ($line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/ && (defined $commit)) { - my $type = $3; - my $file = $5; - if ($file ne $file_name || $type ne "blob") { - next; - } + if ($line =~ m/^(.)(.+)\t(.+)\t([0-9a-fA-F]{40}->[0-9a-fA-F]{40})\t(.+)$/ && (defined $commit)) { my %co = git_read_commit($commit); if (!%co) { next; } - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, - "$co{'age_string'}" . escapeHTML($co{'title'})) . "\n" . - "
\n"; - print "
\n" . + if ($alternate) { + print "
\n"; + } else { + print "\n"; + } + $alternate ^= 1; + print "\n" . + "\n" . + "\n" . + "\n" . + "\n"; undef $commit; } } + 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'}) . "") . "" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$commit"}, "tree") . - " | " . $cgi->a({-href => "$my_uri?p=$project;a=blob;hb=$commit;f=$file"}, "blob"); + " | " . $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"}, "diff"); + print " | " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$blob;hp=$blob_parent;hb=$commit;f=$file_name"}, "diff"); } - print "
\n" . - "\n"; + print "
\n"; close $fd; git_footer_html(); }