viewvcs: use git(1) for coderepo access

[public-inbox.git] / lib / PublicInbox / WwwCoderepo.pm

diff --git a/lib/PublicInbox/WwwCoderepo.pm b/lib/PublicInbox/WwwCoderepo.pm
index 7f8b34597b62a5d4069a6fecdf483da35483a43e..5ca8ef554774a6131560a7406423782e0acb5cb5 100644 (file)
--- a/lib/PublicInbox/WwwCoderepo.pm
+++ b/lib/PublicInbox/WwwCoderepo.pm
@@ -11,12 +11,12 @@ use File::Temp 0.19 (); # newdir
 use PublicInbox::ViewVCS;
 use PublicInbox::WwwStatic qw(r);
 use PublicInbox::GitHTTPBackend;
-use PublicInbox::Git;
-use PublicInbox::GitAsyncCat;
 use PublicInbox::WwwStream;
 use PublicInbox::Hval qw(ascii_html);
+use PublicInbox::ViewDiff qw(uri_escape_path);
 use PublicInbox::RepoSnapshot;
 use PublicInbox::RepoAtom;
+use PublicInbox::RepoTree;
 
 my $EACH_REF = "git for-each-ref --sort=-creatordate --format='%(HEAD)%00".
        join('%00', map { "%($_)" }
@@ -41,13 +41,11 @@ sub prepare_coderepos {
                $k = substr($k, length('publicinbox.'), -length('.coderepo'));
                my $ibx = $pi_cfg->lookup_name($k) // next;
                $pi_cfg->repo_objs($ibx);
-               push @{$self->{-strong}}, $ibx; # strengthen {-ibxs} weakref
        }
        for my $k (grep(/\Aextindex\.(?:.+)\.coderepo\z/, keys %$pi_cfg)) {
                $k = substr($k, length('extindex.'), -length('.coderepo'));
                my $eidx = $pi_cfg->lookup_ei($k) // next;
                $pi_cfg->repo_objs($eidx);
-               push @{$self->{-strong}}, $eidx; # strengthen {-ibxs} weakref
        }
 }
 
@@ -75,15 +73,12 @@ sub summary_finish {
        # git log
        my @r = split(/\n/s, pop(@x) // '');
        my $last = pop(@r) if scalar(@r) > $ctx->{wcr}->{summary_log};
+       my $tip_html = '';
+       if (defined(my $tip = $ctx->{qp}->{h})) {
+               $tip_html .= ' '.ascii_html($tip).' --';
+       }
        print $zfh <<EOM;
-<pre>
-<a
-href='#readme'>about</a> <a
-href='#heads'>heads</a> <a
-href='#tags'>tags</a>
-
-<a
-id=log>\$</a> git log --pretty=format:'%h %s (%cs)%d'
+<pre><a id=log>\$</a> git log --pretty=format:'%h %s (%cs)%d'$tip_html
 EOM
        for (@r) {
                my $d; # decorations
@@ -102,8 +97,10 @@ EOM
        if ($bref) {
                my $l = PublicInbox::Linkify->new;
                $$bref =~ s/\s*\z//sm;
+               my (undef, $path) = split(/:/, $ref_path, 2); # HEAD:README
                print $zfh "\n<a id=readme>\$</a> " .
-                       "git cat-file blob <a href=./$oid/s/>",
+                       qq(git cat-file blob <a href="./$oid/s/?b=) .
+                       ascii_html(uri_escape_path($path)) . q(">).
                        ascii_html($ref_path), "</a>\n",
                        $l->to_html($$bref), '</pre><hr><pre>';
        }
@@ -180,23 +177,27 @@ sub set_readme { # git->cat_async callback
 sub summary {
        my ($self, $ctx) = @_;
        $ctx->{wcr} = $self;
+       my $tip = $ctx->{qp}->{h}; # same as cgit
+       if (defined $tip && $tip eq '') {
+               delete $ctx->{qp}->{h};
+               undef($tip);
+       }
        my $nb = $self->{summary_branches} + 1;
        my $nt = $self->{summary_tags} + 1;
        my $nl = $self->{summary_log} + 1;
-       my $qsp = PublicInbox::Qspawn->new([qw(/bin/sh -c),
+
+       my @cmd = (qw(/bin/sh -c),
                "$EACH_REF --count=$nb refs/heads; echo && " .
                "$EACH_REF --count=$nt refs/tags; echo && " .
-               "git log -$nl --pretty=format:'%d %H %h %cs %s' --" ],
+               qq(git log -$nl --pretty=format:'%d %H %h %cs %s' "\$@" --));
+       push @cmd, '--', $tip if defined($tip);
+       my $qsp = PublicInbox::Qspawn->new(\@cmd,
                { GIT_DIR => $ctx->{git}->{git_dir} });
        $qsp->{qsp_err} = \($ctx->{-qsp_err} = '');
-       my @try = qw(HEAD:README HEAD:README.md); # TODO: configurable
+       $tip //= 'HEAD';
+       my @try = ("$tip:README", "$tip:README.md"); # TODO: configurable
        $ctx->{-nr_readme_tries} = [ @try ];
-       $ctx->{git}->cat_async($_, \&set_readme, $ctx) for @try;
-       if ($ctx->{env}->{'pi-httpd.async'}) {
-               PublicInbox::GitAsyncCat::watch_cat($ctx->{git});
-       } else { # synchronous
-               $ctx->{git}->cat_async_wait;
-       }
+       PublicInbox::ViewVCS::do_cat_async($ctx, \&set_readme, @try);
        sub { # $_[0] => PublicInbox::HTTP::{Identity,Chunked}
                $ctx->{env}->{'qspawn.wcb'} = $_[0];
                $qsp->psgi_qx($ctx->{env}, undef, \&capture_refs, $ctx);
@@ -215,9 +216,14 @@ sub srv { # endpoint called by PublicInbox::WWW
        }
        $path_info =~ m!\A/(.+?)/\z! and
                ($ctx->{git} = $cr->{$1}) and return summary($self, $ctx);
-       $path_info =~ m!\A/(.+?)/([a-f0-9]+)/s/\z! and
+       $path_info =~ m!\A/(.+?)/([a-f0-9]+)/s/([^/]+)?\z! and
                        ($ctx->{git} = $cr->{$1}) and
-               return PublicInbox::ViewVCS::show($ctx, $2);
+               return PublicInbox::ViewVCS::show($ctx, $2, $3);
+
+       if ($path_info =~ m!\A/(.+?)/tree/(.*)\z! and
+                       ($ctx->{git} = $cr->{$1})) {
+               return PublicInbox::RepoTree::srv_tree($ctx, $2) // r(404);
+       }
 
        # snapshots:
        if ($path_info =~ m!\A/(.+?)/snapshot/([^/]+)\z! and