-about heads tags
-
-\$ git log --pretty=format:'%h %s (%cs)%d'
+\$ git log --pretty=format:'%h %s (%cs)%d'$tip_html
EOM
for (@r) {
my $d; # decorations
@@ -94,7 +145,7 @@ EOM
" (", $cs, ")\n";
print $zfh "\t(", ascii_html($d), ")\n" if $d;
}
- print $zfh "# no commits, yet\n" if !@r;
+ print $zfh '# no commits in `', ($tip//'HEAD'),"', yet\n\n" if !@r;
print $zfh "...\n" if $last;
# README
@@ -102,66 +153,37 @@ 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\$ " .
- "git cat-file blob ",
+ qq(git cat-file blob ).
ascii_html($ref_path), "\n",
$l->to_html($$bref), '
';
}
# refs/heads
- print $zfh "# heads (aka `branches'):\n\$ " .
- "git for-each-ref --sort=-creatordate refs/heads" .
- " \\\n\t--format='%(HEAD) ". # no space for %(align:) hint
- "%(refname:short) %(subject) (%(creatordate:short))'\n";
+ print $zfh '', $HEADS_CMD , '';
@r = split(/^/sm, shift(@x) // '');
- $last = pop(@r) if scalar(@r) > $ctx->{wcr}->{summary_branches};
- for (@r) {
- my ($pfx, $oid, $ref, $s, $cd) = split(/\0/);
- utf8::decode($_) for ($ref, $s);
- chomp $cd;
- my $align = length($ref) < 12 ? ' ' x (12 - length($ref)) : '';
- print $zfh "$pfx ", ascii_html($ref),
- "$align ", ascii_html($s), " ($cd)\n";
- }
- print $zfh "# no heads (branches) yet...\n" if !@r;
- print $zfh "...\n" if $last;
- print $zfh "\n# tags:\n\$ " .
- "git for-each-ref --sort=-creatordate refs/tags" .
- " \\\n\t--format='". # no space for %(align:) hint
- "%(refname:short) %(subject) (%(creatordate:short))'\n";
+ $last = scalar(@r) > $ctx->{wcr}->{summary_branches} ? pop(@r) : undef;
+ chomp(@r);
+ for (@r) { print $zfh _refs_heads_link($_, './') }
+ print $zfh $NO_HEADS if !@r;
+ print $zfh qq(...\n) if $last;
+ print $zfh "\n", $TAGS_CMD, '';
@r = split(/^/sm, shift(@x) // '');
- $last = pop(@r) if scalar(@r) > $ctx->{wcr}->{summary_tags};
- my @s = sort keys %{$ctx->{wcr}->{snapshots}};
- my $n;
- if (@s) {
- $n = $ctx->{git}->local_nick // die "BUG: $ctx->{git_dir} nick";
- $n =~ s/\.git\z/-/;
- ($n) = ($n =~ m!([^/]+)\z!);
- $n = ascii_html($n);
- }
- for (@r) {
- my (undef, $oid, $ref, $s, $cd) = split(/\0/);
- utf8::decode($_) for ($ref, $s);
- chomp $cd;
- my $align = length($ref) < 12 ? ' ' x (12 - length($ref)) : '';
- print $zfh "", ascii_html($ref),
- "$align ", ascii_html($s), " ($cd)";
- if (@s) {
- my $v = $ref;
- $v =~ s/\A[vV]//;
- print $zfh "\t", join(' ', map {
- qq{$_} } @s);
- }
- print $zfh "\n";
- }
- print $zfh "# no tags yet...\n" if !@r;
- print $zfh "...\n" if $last;
+ $last = scalar(@r) > $ctx->{wcr}->{summary_tags} ? pop(@r) : undef;
+ my ($snap_pfx, @snap_fmt) = _snapshot_link_prep($ctx);
+ chomp @r;
+ for (@r) { print $zfh _refs_tags_link($_, './', $snap_pfx, @snap_fmt) }
+ print $zfh $NO_TAGS if !@r;
+ print $zfh qq(...\n) if $last;
$wcb->($ctx->html_done(''));
}
sub capture_refs ($$) { # psgi_qx callback to capture git-for-each-ref + git-log
my ($bref, $ctx) = @_;
my $qsp_err = delete $ctx->{-qsp_err};
+ utf8::decode($$bref);
$ctx->{-each_refs} = $$bref;
summary_finish($ctx) if $ctx->{-readme};
}
@@ -180,59 +202,121 @@ 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' --" ],
- { GIT_DIR => $ctx->{git}->{git_dir} });
+ qq(git log -$nl --pretty=format:'%d %H %h %cs %s' "\$@" --));
+ push @cmd, 'git', $tip if defined($tip);
+ my $qsp = PublicInbox::Qspawn->new(\@cmd,
+ { GIT_DIR => $ctx->{git}->{git_dir} },
+ { quiet => 1, 2 => $self->{log_fh} });
$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);
}
}
+# called by GzipFilter->close after translate
+sub zflush { $_[0]->SUPER::zflush('', $_[0]->_html_end) }
+
+# called by GzipFilter->write or GetlineBody->getline
+sub translate {
+ my $ctx = shift;
+ my $rec = $_[0] // return zflush($ctx); # getline
+ my @out;
+ my $fbuf = delete($ctx->{fbuf}) // shift;
+ $fbuf .= shift while @_;
+ if ($ctx->{-heads}) {
+ while ($fbuf =~ s/\A([^\n]+)\n//s) {
+ utf8::decode(my $x = $1);
+ push @out, _refs_heads_link($x, '../../');
+ }
+ } else {
+ my ($snap_pfx, @snap_fmt) = _snapshot_link_prep($ctx);
+ while ($fbuf =~ s/\A([^\n]+)\n//s) {
+ utf8::decode(my $x = $1);
+ push @out, _refs_tags_link($x, '../../',
+ $snap_pfx, @snap_fmt);
+ }
+ }
+ $ctx->{fbuf} = $fbuf;
+ $ctx->SUPER::translate(@out);
+}
+
+sub _refs_parse_hdr { # {parse_hdr} for Qspawn
+ my ($r, $bref, $ctx) = @_;
+ my ($code, $top);
+ if ($r == 0) {
+ $code = 404;
+ $top = $ctx->{-heads} ? $NO_HEADS : $NO_TAGS;
+ } else {
+ $code = 200;
+ $top = $ctx->{-heads} ? $HEADS_CMD : $TAGS_CMD;
+ }
+ PublicInbox::WwwStream::html_init($ctx);
+ bless $ctx, __PACKAGE__; # re-bless for ->translate
+ print { $ctx->{zfh} } '', $top;
+ [ $code, delete($ctx->{-res_hdr}), $ctx ]; # [2] is qspawn.filter
+}
+
+sub refs_foo { # /$REPO/refs/{heads,tags} endpoints
+ my ($self, $ctx, $pfx) = @_;
+ $ctx->{wcr} = $self;
+ $ctx->{-upfx} = '../../';
+ $ctx->{-heads} = 1 if $pfx eq 'refs/heads';
+ my $qsp = PublicInbox::Qspawn->new([@EACH_REF, $pfx ],
+ { GIT_DIR => $ctx->{git}->{git_dir} });
+ $qsp->psgi_return($ctx->{env}, undef, \&_refs_parse_hdr, $ctx);
+}
+
sub srv { # endpoint called by PublicInbox::WWW
my ($self, $ctx) = @_;
my $path_info = $ctx->{env}->{PATH_INFO};
my $git;
# handle clone requests
my $cr = $self->{pi_cfg}->{-code_repos};
- if ($path_info =~ m!\A/(.+?)/($PublicInbox::GitHTTPBackend::ANY)\z!x) {
- $git = $cr->{$1} and return
+ if ($path_info =~ m!\A/(.+?)/($PublicInbox::GitHTTPBackend::ANY)\z!x and
+ ($git = $cr->{$1})) {
PublicInbox::GitHTTPBackend::serve($ctx->{env},$git,$2);
- }
- $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
- ($ctx->{git} = $cr->{$1}) and
- return PublicInbox::ViewVCS::show($ctx, $2);
-
- # snapshots:
- if ($path_info =~ m!\A/(.+?)/snapshot/([^/]+)\z! and
+ } elsif ($path_info =~ m!\A/(.+?)/\z! and ($ctx->{git} = $cr->{$1})) {
+ summary($self, $ctx)
+ } elsif ($path_info =~ m!\A/(.+?)/([a-f0-9]+)/s/([^/]+)?\z! and
+ ($ctx->{git} = $cr->{$1})) {
+ $ctx->{lh} = $self->{log_fh};
+ PublicInbox::ViewVCS::show($ctx, $2, $3);
+ } elsif ($path_info =~ m!\A/(.+?)/tree/(.*)\z! and
+ ($ctx->{git} = $cr->{$1})) {
+ $ctx->{lh} = $self->{log_fh};
+ PublicInbox::RepoTree::srv_tree($ctx, $2) // r(404);
+ } elsif ($path_info =~ m!\A/(.+?)/snapshot/([^/]+)\z! and
($ctx->{git} = $cr->{$1})) {
$ctx->{wcr} = $self;
- return PublicInbox::RepoSnapshot::srv($ctx, $2) // r(404);
- }
-
- if ($path_info =~ m!\A/(.+?)/atom/(.*)\z! and
+ PublicInbox::RepoSnapshot::srv($ctx, $2) // r(404);
+ } elsif ($path_info =~ m!\A/(.+?)/atom/(.*)\z! and
($ctx->{git} = $cr->{$1})) {
- return PublicInbox::RepoAtom::srv_atom($ctx, $2) // r(404);
- }
-
- # enforce trailing slash:
- if ($path_info =~ m!\A/(.+?)\z! and ($git = $cr->{$1})) {
+ $ctx->{lh} = $self->{log_fh};
+ PublicInbox::RepoAtom::srv_atom($ctx, $2) // r(404);
+ } elsif ($path_info =~ m!\A/(.+?)/tags\.atom\z! and
+ ($ctx->{git} = $cr->{$1})) {
+ PublicInbox::RepoAtom::srv_tags_atom($ctx);
+ } elsif ($path_info =~ m!\A/(.+?)/(refs/(?:heads|tags))/\z! and
+ ($ctx->{git} = $cr->{$1})) {
+ refs_foo($self, $ctx, $2);
+ } elsif ($path_info =~ m!\A/(.+?)\z! and ($git = $cr->{$1})) {
my $qs = $ctx->{env}->{QUERY_STRING};
my $url = $git->base_url($ctx->{env});
$url .= "?$qs" if $qs ne '';