gitweb: Use File::Find::find in git_get_projects_list

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 1972792c20280970cad97954baaa613eca7436cb2363be624ee1ec8eb056ac9b..81c7365d8949f407a2bd43f48e9d6db1cc59e9499f3c91b5ae6aff45252c4b03 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -715,16 +715,26 @@ sub git_get_projects_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);
+               my $pfxlen = length("$dir");
+
+               File::Find::find({
+                       follow_fast => 1, # follow symbolic links
+                       dangling_symlinks => 0, # ignore dangling symlinks, silently
+                       wanted => sub {
+                               # skip project-list toplevel, if we get it.
+                               return if (m!^[/.]$!);
+                               # only directories can be git repositories
+                               return unless (-d $_);
+
+                               my $subdir = substr($File::Find::name, $pfxlen + 1);
+                               # we check related file in $projectroot
+                               if (-e "$projectroot/$subdir/HEAD") {
+                                       push @list, { path => $subdir };
+                                       $File::Find::prune = 1;
+                               }
+                       },
+               }, "$dir");
+
        } elsif (-f $projects_list) {
                # read from file(url-encoded):
                # 'git%2Fgit.git Linus+Torvalds'
@@ -1933,12 +1943,15 @@ sub git_shortlog_body {
 
 sub git_history_body {
        # Warning: assumes constant type (blob or tree) during history
-       my ($fd, $refs, $hash_base, $ftype, $extra) = @_;
+       my ($revlist, $from, $to, $refs, $hash_base, $ftype, $extra) = @_;
+
+       $from = 0 unless defined $from;
+       $to = $#{$revlist} unless (defined $to && $to <= $#{$revlist});
 
        print "<table class=\"history\" cellspacing=\"0\">\n";
        my $alternate = 0;
-       while (my $line = <$fd>) {
-               if ($line !~ m/^([0-9a-fA-F]{40})/) {
+       for (my $i = $from; $i <= $to; $i++) {
+               if ($revlist->[$i] !~ m/^([0-9a-fA-F]{40})/) {
                        next;
                }
 
@@ -3114,29 +3127,70 @@ sub git_history {
        if (!defined $hash_base) {
                $hash_base = git_get_head_hash($project);
        }
+       if (!defined $page) {
+               $page = 0;
+       }
        my $ftype;
        my %co = parse_commit($hash_base);
        if (!%co) {
                die_error(undef, "Unknown commit object");
        }
+
        my $refs = git_get_references();
-       git_header_html();
-       git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base);
-       git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
+       my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
+
        if (!defined $hash && defined $file_name) {
                $hash = git_get_hash_by_path($hash_base, $file_name);
        }
        if (defined $hash) {
                $ftype = git_get_type($hash);
        }
-       git_print_page_path($file_name, $ftype, $hash_base);
 
        open my $fd, "-|",
-               git_cmd(), "rev-list", "--full-history", $hash_base, "--", $file_name;
+               git_cmd(), "rev-list", $limit, "--full-history", $hash_base, "--", $file_name
+                       or die_error(undef, "Open git-rev-list-failed");
+       my @revlist = map { chomp; $_ } <$fd>;
+       close $fd
+               or die_error(undef, "Reading git-rev-list failed");
 
-       git_history_body($fd, $refs, $hash_base, $ftype);
+       my $paging_nav = '';
+       if ($page > 0) {
+               $paging_nav .=
+                       $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
+                                              file_name=>$file_name)},
+                               "first");
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
+                                              file_name=>$file_name, page=>$page-1),
+                                -accesskey => "p", -title => "Alt-p"}, "prev");
+       } else {
+               $paging_nav .= "first";
+               $paging_nav .= " &sdot; prev";
+       }
+       if ($#revlist >= (100 * ($page+1)-1)) {
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
+                                              file_name=>$file_name, page=>$page+1),
+                                -accesskey => "n", -title => "Alt-n"}, "next");
+       } else {
+               $paging_nav .= " &sdot; next";
+       }
+       my $next_link = '';
+       if ($#revlist >= (100 * ($page+1)-1)) {
+               $next_link =
+                       $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
+                                              file_name=>$file_name, page=>$page+1),
+                                -title => "Alt-n"}, "next");
+       }
+
+       git_header_html();
+       git_print_page_nav('history','', $hash_base,$co{'tree'},$hash_base, $paging_nav);
+       git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
+       git_print_page_path($file_name, $ftype, $hash_base);
+
+       git_history_body(\@revlist, ($page * 100), $#revlist,
+                        $refs, $hash_base, $ftype, $next_link);
 
-       close $fd;
        git_footer_html();
 }