X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/1f369c85ca0dee892d504527ed0529b3df7f9501b49e2d156c0fde14ac811b2c..f797305daf36d29f33de26f50998111613113784667a26d6d63680d85b81c16d:/gitweb.cgi diff --git a/gitweb.cgi b/gitweb.cgi index c8e20d0..f153034 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -10,11 +10,12 @@ use strict; use warnings; use CGI qw(:standard :escapeHTML); +use CGI::Util qw(unescape); use CGI::Carp qw(fatalsToBrowser); use Fcntl ':mode'; my $cgi = new CGI; -my $version = "142"; +my $version = "150"; my $my_url = $cgi->url(); my $my_uri = $cgi->url(-absolute => 1); my $rss_link = ""; @@ -36,7 +37,7 @@ my $home_text = "indextext.html"; # source of projects list #my $projects_list = $projectroot; -my $projects_list = "index/index.txt"; +my $projects_list = "index/index.aux"; # input validation and dispatch my $action = $cgi->param('a'); @@ -120,6 +121,9 @@ if (defined $time_back) { if ($action eq "summary") { git_summary(); exit; +} elsif ($action eq "branches") { + git_branches(); + exit; } elsif ($action eq "tags") { git_tags(); exit; @@ -192,7 +196,7 @@ div.title, a.title { a.title:hover { background-color: #d9d8d1; } div.title_text { padding:6px 8px; border: solid #d9d8d1; border-width:0px 0px 1px; } div.log_body { padding:8px 8px 8px 150px; } -span.log_age { position:relative; float:left; width:142px; font-style:italic; } +span.age { position:relative; float:left; width:142px; font-style:italic; } div.log_link { font-size:10px; font-family:sans-serif; font-style:normal; position:relative; float:left; width:142px; @@ -381,10 +385,10 @@ sub git_read_commit { $co{'age_string'} .= " hours ago"; } elsif ($age > 60*2) { $co{'age_string'} = int $age/60; - $co{'age_string'} .= " minutes ago"; + $co{'age_string'} .= " min ago"; } elsif ($age > 2) { $co{'age_string'} = int $age; - $co{'age_string'} .= " seconds ago"; + $co{'age_string'} .= " sec ago"; } else { $co{'age_string'} .= " right now"; } @@ -563,7 +567,9 @@ sub git_project_list { open my $fd , $projects_list || return undef; while (my $line = <$fd>) { chomp $line; - my ($path, $owner) = split ':', $line; + my ($path, $owner) = split ' ', $line; + $path = unescape($path); + $owner = unescape($owner); if (!defined $path) { next; } @@ -618,7 +624,7 @@ sub git_project_list { $proj{'owner'} = get_file_owner("$projectroot/$proj{'path'}") || ""; } print "\n" . - "" . $cgi->a({-href => "$my_uri?p=" . $proj{'path'} . ";a=summary"}, escapeHTML($proj{'path'})) . "\n" . + "" . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary"}, escapeHTML($proj{'path'})) . "\n" . "$descr\n" . "$proj{'owner'}\n"; my $colored_age; @@ -634,7 +640,8 @@ sub git_project_list { $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" . "
\n" . @@ -642,14 +649,15 @@ sub git_project_list { git_footer_html(); } -sub git_read_tags { +sub git_read_refs { + my $ref_dir = shift; my @taglist; - opendir my $dh, "$projectroot/$project/refs/tags"; + opendir my $dh, "$projectroot/$project/$ref_dir"; my @tags = grep !m/^\./, readdir $dh; closedir($dh); foreach my $tag_file (@tags) { - my $tag_id = git_read_hash("$project/refs/tags/$tag_file"); + my $tag_id = git_read_hash("$project/$ref_dir/$tag_file"); my $type = git_get_type($tag_id) || next; my %tag_item; my %co; @@ -665,6 +673,7 @@ sub git_read_tags { %co = git_read_commit($tag_id); $tag_item{'type'} = "commit"; $tag_item{'name'} = $tag_file; + $tag_item{'title'} = $co{'title'}; $tag_item{'id'} = $tag_id; } $tag_item{'epoch'} = $co{'author_epoch'} || 0; @@ -690,7 +699,9 @@ sub git_summary { open (my $fd , $projects_list); while (my $line = <$fd>) { chomp $line; - my ($pr, $ow) = split ':', $line; + my ($pr, $ow) = split ' ', $line; + $pr = unescape($pr); + $ow = unescape($ow); if ($pr eq $project) { $owner = $ow; last; @@ -705,7 +716,7 @@ sub git_summary { git_header_html(); print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") . - " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;hb=$head"}, "latest tree") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree"}, "tree") . "

\n" . "
\n"; print "
project
\n"; @@ -715,47 +726,83 @@ sub git_summary { "owner$owner\n" . "last change$cd{'rfc2822'}\n" . "\n" . - "
\n"; + "
\n"; open my $fd, "-|", "$gitbin/git-rev-list --max-count=11 " . git_read_hash("$project/HEAD") || die_error(undef, "Open failed."); my (@revlist) = map { chomp; $_ } <$fd>; close $fd; print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=log", -class => "title"}, "recent commits") . + $cgi->a({-href => "$my_uri?p=$project;a=log", -class => "title"}, "commits") . "
\n"; my $i = 10; + print "
\n" . + "\n"; foreach my $commit (@revlist) { my %co = git_read_commit($commit); my %ad = date_str($co{'author_epoch'}); - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, - "" . $co{'age_string'} . "" . escapeHTML($co{'title'})) . "\n" . - "
\n"; - if (--$i == 0) { - print "
" . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "...") . "
\n"; + print "\n"; + if (--$i > 0) { + print "\n" . + "\n" . + "\n" . + ""; + } else { + print "\n" . + ""; last; } } - print "
\n"; + print "" . + "\n"; - my $taglist = git_read_tags(); + my $taglist = git_read_refs("refs/tags"); if (defined @$taglist) { print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=tags", -class => "title"}, "recent tags") . + $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'})) . "
" . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "...") . "
\n"; foreach my $entry (@$taglist) { my %tag = %$entry; - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"}, - "$tag{'age'}" . escapeHTML($tag{'name'})) . "\n" . - "
\n"; - if (--$i == 0) { - print "
" . $cgi->a({-href => "$my_uri?p=$project;a=tags"}, "...") . "
\n"; + print "\n"; + if (--$i > 0) { + print "\n" . + "\n" . + ""; + } else { + print "\n" . + ""; last; } } + print "" . + "\n"; + } + + 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 = 10; + print "
\n" . + "
$tag{'age'}" . $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"}, escapeHTML($tag{'name'})) . "
" . $cgi->a({-href => "$my_uri?p=$project;a=tags"}, "...") . "
\n"; + foreach my $entry (@$branchlist) { + my %tag = %$entry; + print "\n"; + if (--$i > 0) { + print "\n" . + "\n" . + ""; + } else { + print "\n" . + ""; + last; + } + } + print "" . + "\n"; } - print "
\n"; git_footer_html(); } @@ -768,7 +815,7 @@ sub git_tags { " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree"}, "tree") . "

\n" . "\n"; - my $taglist = git_read_tags(); + my $taglist = git_read_refs("refs/tags"); print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, "tags") . "
\n"; @@ -777,11 +824,37 @@ sub git_tags { my %tag = %$entry; print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"}, - "$tag{'age'}" . escapeHTML($tag{'name'})) . "\n" . + "$tag{'age'}" . escapeHTML($tag{'name'})) . "\n" . "
\n"; } } - print "
\n"; + print "

\n"; + 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=log"}, "log") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$head"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree"}, "tree") . + "

\n" . + "
\n"; + my $taglist = git_read_refs("refs/heads"); + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, "branches") . + "
\n"; + 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"; + } + } + print "

\n"; git_footer_html(); } @@ -827,7 +900,7 @@ sub git_blob { print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") . " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") . - " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash_base"}, "tree"); + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree"); if (defined $file_name) { print " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base;f=$file_name"}, "history"); } @@ -866,6 +939,9 @@ sub git_tree { $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/git-ls-tree $hash" || die_error(undef, "Open git-ls-tree failed."); my (@entries) = map { chomp; $_ } <$fd>; close $fd || die_error(undef, "Reading tree failed."); @@ -937,7 +1013,7 @@ sub git_rss { "\n"; print "\n"; print "$project\n". - " " . $my_url . "/$project/log\n". + " $my_url/$project/log\n". "$project log\n". "en\n"; @@ -946,7 +1022,7 @@ sub git_rss { my %ad = date_str($co{'author_epoch'}); print "\n" . "\t" . sprintf("%d %s %02d:%02d", $ad{'mday'}, $ad{'month'}, $ad{'hour'}, $ad{'minute'}) . " - " . escapeHTML($co{'title'}) . "\n" . - "\t " . $my_url . "?p=$project;a=commit;h=$commit\n" . + "\t $my_url?p=$project;a=commit;h=$commit\n" . "\t"; my $comment = $co{'comment'}; foreach my $line (@$comment) { @@ -959,7 +1035,9 @@ sub git_rss { } sub git_log { - my $head = git_read_hash("$project/HEAD"); + if (!defined $hash) { + $hash = git_read_hash("$project/HEAD"); + } my $limit_option = ""; if (!defined $time_back) { $limit_option = "--max-count=10"; @@ -967,7 +1045,7 @@ sub git_log { my $date = time - $time_back*24*60*60; $limit_option = "--max-age=$date"; } - open my $fd, "-|", "$gitbin/git-rev-list $limit_option $head" || die_error(undef, "Open failed."); + open my $fd, "-|", "$gitbin/git-rev-list $limit_option $hash" || die_error(undef, "Open failed."); my (@revlist) = map { chomp; $_ } <$fd>; close $fd || die_error(undef, "Reading rev-list failed."); @@ -983,8 +1061,8 @@ sub git_log { "
\n"; if (!@revlist) { - my %co = git_read_commit($head); - print "
Last change " . $co{'age_string'} . ".

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

\n"; } foreach my $commit (@revlist) { @@ -993,7 +1071,7 @@ sub git_log { my %ad = date_str($co{'author_epoch'}); print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "title"}, - "" . $co{'age_string'} . "" . escapeHTML($co{'title'})) . "\n" . + "$co{'age_string'}" . escapeHTML($co{'title'})) . "\n" . "
\n"; print "
\n" . "
\n" . @@ -1001,13 +1079,13 @@ sub git_log { " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") . "
\n" . "
\n" . - "" . escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]
\n" . + "" . escapeHTML($co{'author_name'}) . " [$ad{'rfc2822'}]
\n" . "
\n" . "
\n"; my $comment = $co{'comment'}; my $empty = 0; foreach my $line (@$comment) { - if ($line =~ m/^(signed[ \-]off[\-]by[ :]|acked[\-]by[ \:]|cc[ :])/i) { + if ($line =~ m/^(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { next; } if ($line eq "") { @@ -1038,7 +1116,7 @@ sub git_commit { my @difftree; if (defined $co{'parent'}) { - open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash" || die_error(undef, "Open failed."); + open my $fd, "-|", "$gitbin/git-diff-tree -r $co{'parent'} $hash" || die_error(undef, "Open failed."); @difftree = map { chomp; $_ } <$fd>; close $fd || die_error(undef, "Reading diff-tree failed."); } else { @@ -1054,7 +1132,7 @@ sub git_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" . + print " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") . "\n" . "

\n"; if (defined $co{'parent'}) { print "
\n" . @@ -1062,13 +1140,13 @@ sub git_commit { "
\n"; } else { print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; } print "
\n" . "
$tag{'age'}" . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}"}, escapeHTML($tag{'name'})) . "
" . $cgi->a({-href => "$my_uri?p=$project;a=branches"}, "...") . "
\n"; print "\n". - "\n"; print "\n"; - print "\n"; + print "\n"; print "\n"; print "\n"; + $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, $co{'tree'}) . "\n"; my $parents = $co{'parents'}; foreach my $par (@$parents) { print "
author" . escapeHTML($co{'author'}) . "
" . $ad{'rfc2822'}; + "
$ad{'rfc2822'}"; if ($ad{'hour_local'} < 6) { printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}); } else { @@ -1076,10 +1154,10 @@ sub git_commit { } print "
committer" . escapeHTML($co{'committer'}) . "
" . $cd{'rfc2822'} . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "
$cd{'rfc2822'}" . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "
commit$hash
tree" . - $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=" . $hash}, $co{'tree'}) . "
parent" . @@ -1101,7 +1179,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 { @@ -1134,7 +1212,7 @@ sub git_commit { } 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" . + 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" . @@ -1201,7 +1279,7 @@ sub git_blobdiff { $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"); + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree"); if (defined $file_name) { print " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base;f=$file_name"}, "history"); } @@ -1237,7 +1315,7 @@ 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."); + open my $fd, "-|", "$gitbin/git-diff-tree -r $co{'parent'} $hash" || die_error(undef, "Open failed."); my (@difftree) = map { chomp; $_ } <$fd>; close $fd || die_error(undef, "Reading diff-tree failed."); @@ -1252,6 +1330,24 @@ sub git_commitdiff { $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; + foreach my $line (@$comment) { + if ($line =~ m/^(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { + next; + } + if ($line eq "") { + if ($empty) { + next; + } + $empty = 1; + } else { + $empty = 0; + } + print escapeHTML($line) . "
\n"; + } + print "
\n"; foreach my $line (@difftree) { # '*100644->100644 blob 8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154 Makefile' $line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/; @@ -1306,7 +1402,7 @@ sub git_history { print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff") . " | " . - $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash"}, "tree") . + $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") . "

\n" . "
\n"; print "
\n" . @@ -1334,16 +1430,16 @@ sub git_history { } print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, - "" . $co{'age_string'} . "" . escapeHTML($co{'title'})) . "\n" . + "$co{'age_string'}" . escapeHTML($co{'title'})) . "\n" . "
\n"; print "
\n" . $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"}, "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"}, "diff"); } print "
\n" . "
\n";