new public-inbox-{clone,fetch} commands

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

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index bbb6ab7e439c0f6332fba41d1115b7af53f70833..6d5d3c03319846310f8c16d219eebb0c372cd79c 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -468,6 +468,8 @@ sub x_it ($$) {
                $self->{pkt_op_p}->pkt_do('x_it', $code);
        } elsif ($self->{sock}) { # to lei(1) client
                send($self->{sock}, "x_it $code", MSG_EOR);
+       } elsif ($quit == \&CORE::exit) { # an admin command
+               exit($code >> 8);
        } # else ignore if client disconnected
 }
 
@@ -511,7 +513,7 @@ sub fail ($$;$) {
        my ($self, $buf, $exit_code) = @_;
        $self->{failed}++;
        err($self, $buf) if defined $buf;
-       # calls fail_handler:
+       # calls fail_handler
        $self->{pkt_op_p}->pkt_do('!') if $self->{pkt_op_p};
        x_it($self, ($exit_code // 1) << 8);
        undef;
@@ -536,6 +538,8 @@ sub child_error { # passes non-fatal curl exit codes to user
                $self->{pkt_op_p}->pkt_do('child_error', $child_error);
        } elsif ($self->{sock}) { # to lei(1) client
                send($self->{sock}, "child_error $child_error", MSG_EOR);
+       } else { # non-lei admin command
+               $self->{child_error} ||= $child_error;
        } # else noop if client disconnected
 }
 
@@ -820,7 +824,7 @@ sub _lei_cfg ($;$) {
                $cur_st = pack('dd', $st[10], $st[7]);
                qerr($self, "# $f created") if $self->{cmd} ne 'config';
        }
-       my $cfg = PublicInbox::Config->git_config_dump($f);
+       my $cfg = PublicInbox::Config->git_config_dump($f, $self->{2});
        $cfg->{-st} = $cur_st;
        $cfg->{'-f'} = $f;
        if ($sto && canonpath_harder($sto_dir // store_path($self))
@@ -1029,13 +1033,15 @@ sub path_to_fd {
 
 # caller needs to "-t $self->{1}" to check if tty
 sub start_pager {
-       my ($self) = @_;
+       my ($self, $new_env) = @_;
        my $fh = popen_rd([qw(git var GIT_PAGER)]);
        chomp(my $pager = <$fh> // '');
        close($fh) or warn "`git var PAGER' error: \$?=$?";
        return if $pager eq 'cat' || $pager eq '';
-       my $new_env = { LESS => 'FRX', LV => '-c' };
-       $new_env->{MORE} = 'FRX' if $^O eq 'freebsd';
+       $new_env //= {};
+       $new_env->{LESS} //= 'FRX';
+       $new_env->{LV} //= '-c';
+       $new_env->{MORE} = $new_env->{LESS} if $^O eq 'freebsd';
        pipe(my ($r, $wpager)) or return warn "pipe: $!";
        my $rdr = { 0 => $r, 1 => $self->{1}, 2 => $self->{2} };
        my $pgr = [ undef, @$rdr{1, 2} ];
@@ -1052,6 +1058,19 @@ sub start_pager {
        $self->{pgr} = $pgr;
 }
 
+# display a message for user before spawning full-screen $VISUAL
+sub pgr_err {
+       my ($self, @msg) = @_;
+       return $self->err(@msg) unless $self->{sock} && -t $self->{2};
+       start_pager($self, { LESS => 'RX' }); # no 'F' so we prompt
+       print { $self->{2} } @msg;
+       $self->{2}->autoflush(1);
+       my $pgr = delete($self->{pgr}) or return;
+       $self->{2} = $pgr->[2];
+       $self->{1} = $pgr->[1];
+       send($self->{sock}, 'wait', MSG_EOR); # wait for user to quit pager
+}
+
 sub stop_pager {
        my ($self) = @_;
        my $pgr = delete($self->{pgr}) or return;