return ($_[0]);
}
+# checking HEAD file with -e is fragile if the repository was
+# initialized long time ago (i.e. symlink HEAD) and was pack-ref'ed
+# and then pruned.
+sub check_head_link {
+ my ($dir) = @_;
+ my $headfile = "$dir/HEAD";
+ return ((-e $headfile) ||
+ (-l $headfile && readlink($headfile) =~ /^refs\/heads\//));
+}
+
+sub check_export_ok {
+ my ($dir) = @_;
+ return (check_head_link($dir) &&
+ (!$export_ok || -e "$dir/$export_ok"));
+}
+
# rename detection options for git-diff and git-diff-tree
# - default is '-M', with the cost proportional to
# (number of removed files) * (number of new files).
if (defined $project) {
if (!validate_pathname($project) ||
!(-d "$projectroot/$project") ||
- !(-e "$projectroot/$project/HEAD") ||
+ !check_head_link("$projectroot/$project") ||
($export_ok && !(-e "$projectroot/$project/$export_ok")) ||
($strict_export && !project_in_list($project))) {
undef $project;
# find which part of PATH_INFO is project
$project = $path_info;
$project =~ s,/+$,,;
- while ($project && !-e "$projectroot/$project/HEAD") {
+ while ($project && !check_head_link("$projectroot/$project")) {
$project =~ s,/*[^/]*$,,;
}
# validate project
my $subdir = substr($File::Find::name, $pfxlen + 1);
# we check related file in $projectroot
- if (-e "$projectroot/$subdir/HEAD" && (!$export_ok ||
- -e "$projectroot/$subdir/$export_ok")) {
+ if (check_export_ok("$projectroot/$subdir")) {
push @list, { path => $subdir };
$File::Find::prune = 1;
}
if (!defined $path) {
next;
}
- if (-e "$projectroot/$path/HEAD" && (!$export_ok ||
- -e "$projectroot/$path/$export_ok")) {
+ if (check_export_ok("$projectroot/$path")) {
my $pr = {
path => $path,
owner => decode("utf8", $owner, Encode::FB_DEFAULT),
git_footer_html();
}
-sub git_blame_flush_chunk {
- my ($name, $revdata, $color, $rev, @line) = @_;
- my $label = substr($rev, 0, 8);
- my $line = scalar(@line);
- my $cnt = 0;
- my $pop = '';
-
- if ($revdata->{$rev} ne '') {
- $pop = ' title="' . esc_html($revdata->{$rev}) . '"';
- }
-
- for (@line) {
- my ($lineno, $data) = @$_;
- $cnt++;
- print "<tr class=\"$color\">\n";
- if ($cnt == 1) {
- print "<td class=\"sha1\"$pop";
- if ($line > 1) {
- print " rowspan=\"$line\"";
- }
- print ">";
- print $cgi->a({-href => href(action=>"commit",
- hash=>$rev,
- file_name=>$name)},
- $label);
- print "</td>\n";
- }
- print "<td class=\"linenr\">".
- "<a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" .
- esc_html($lineno) . "</a></td>\n";
- print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
- print "</tr>\n";
- }
-}
-
-# We can have up to N*2 lines. If it is more than N lines, split it
-# into two to avoid orphans.
-sub git_blame_flush_chunk_1 {
- my ($chunk_cap, $name, $revdata, $color, $rev, @chunk) = @_;
- if ($chunk_cap < @chunk) {
- my @first = splice(@chunk, 0, @chunk/2);
- git_blame_flush_chunk($name,
- $revdata,
- $color,
- $rev,
- @first);
- }
- git_blame_flush_chunk($name,
- $revdata,
- $color,
- $rev,
- @chunk);
-}
-
sub git_blame2 {
my $fd;
my $ftype;
- my $chunk_cap = 20;
my ($have_blame) = gitweb_check_feature('blame');
if (!$have_blame) {
<table class="blame">
<tr><th>Commit</th><th>Line</th><th>Data</th></tr>
HTML
- my @chunk = ();
- my %revdata = ();
while (<$fd>) {
- /^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
my ($full_rev, $author, $date, $lineno, $data) =
- /^([0-9a-f]{40}).*?\s\((.*?)\s+([-\d]+ [:\d]+ [-+\d]+)\s+(\d+)\)\s(.*)/;
- if (!exists $revdata{$full_rev}) {
- $revdata{$full_rev} = "$author, $date";
- }
+ /^([0-9a-f]{40}).*?\s\((.*?)\s+([-\d]+ [:\d]+ [-+\d]+)\s+(\d+)\)\s(.*)/;
+ my $rev = substr($full_rev, 0, 8);
+ my $print_c8 = 0;
+
if (!defined $last_rev) {
$last_rev = $full_rev;
+ $print_c8 = 1;
} elsif ($last_rev ne $full_rev) {
- git_blame_flush_chunk_1($chunk_cap,
- $file_name,
- \%revdata,
- $rev_color[$current_color],
- $last_rev, @chunk);
- @chunk = ();
$last_rev = $full_rev;
$current_color = ++$current_color % $num_colors;
+ $print_c8 = 1;
+ }
+ print "<tr class=\"$rev_color[$current_color]\">\n";
+ print "<td class=\"sha1\"";
+ if ($print_c8 == 1) {
+ print " title=\"$author, $date\"";
+ }
+ print ">";
+ if ($print_c8 == 1) {
+ print $cgi->a({-href => href(action=>"commit", hash=>$full_rev, file_name=>$file_name)},
+ esc_html($rev));
}
- elsif ($chunk_cap * 2 < @chunk) {
- # We have more than N*2 lines from the same
- # revision. Flush N lines and leave N lines
- # in @chunk to avoid orphaned lines.
- my @first = splice(@chunk, 0, $chunk_cap);
- git_blame_flush_chunk($file_name,
- \%revdata,
- $rev_color[$current_color],
- $last_rev, @first);
- }
- push @chunk, [$lineno, $data];
- }
- if (@chunk) {
- git_blame_flush_chunk_1($chunk_cap,
- $file_name,
- \%revdata,
- $rev_color[$current_color],
- $last_rev, @chunk);
+ print "</td>\n";
+ print "<td class=\"linenr\"><a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" .
+ esc_html($lineno) . "</a></td>\n";
+ print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
+ print "</tr>\n";
}
print "</table>\n";
print "</div>";