lei: simplify common LeiInput users with ->wq1_start

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

diff --git a/lib/PublicInbox/LeiRediff.pm b/lib/PublicInbox/LeiRediff.pm
index decb721b7a4c47e9eaf3acbba51fcfbaa913be78..f0521bcc6b623ae54963809754a9e0ae9f67aeca 100644 (file)
--- a/lib/PublicInbox/LeiRediff.pm
+++ b/lib/PublicInbox/LeiRediff.pm
@@ -30,7 +30,7 @@ sub rediff_user_cb { # called by solver when done
 
        # don't try to support all the git-show(1) options for non-blob,
        # this is just a convenience:
-       $type ne 'blob' and return $lei->err(<<EOF);
+       $type ne 'blob' and return warn(<<EOF);
 # $oid is a $type of $size bytes in:
 # $git->{git_dir} (wanted: $oid_want)
 EOF
@@ -279,10 +279,7 @@ sub lei_rediff {
        my $isatty = -t $lei->{1};
        $lei->{opt}->{color} //= $isatty;
        $lei->start_pager if $isatty;
-       my ($op_c, $ops) = $lei->workers_start($self, 1);
-       $lei->{wq1} = $self;
-       net_merge_all_done($self) unless $lei->{auth};
-       $lei->wait_wq_events($op_c, $ops);
+       $lei->wq1_start($self);
 }
 
 sub ipc_atfork_child {
@@ -303,7 +300,6 @@ sub ipc_atfork_child {
        $self->{gits} = [ map {
                        PublicInbox::Git->new($lei->rel2abs($_))
                } @{$self->{lei}->{opt}->{'git-dir'}} ];
-       $lei->{env}->{'psgi.errors'} = $lei->{2}; # ugh...
        $lei->{env}->{TMPDIR} = $self->{rdtmp}->dirname;
        if (my $nr = ($lei->{opt}->{drq} || $lei->{opt}->{'dequote-only'})) {
                my $re = '\s*> ' x $nr;