lei: generalize auxiliary WQ handling

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

diff --git a/lib/PublicInbox/LeiRediff.pm b/lib/PublicInbox/LeiRediff.pm
index 3c8ebe4183f41dc3ed126c38416ec2cc3671f931..7607b44f5aece34d5db15989f78904935096b210 100644 (file)
--- a/lib/PublicInbox/LeiRediff.pm
+++ b/lib/PublicInbox/LeiRediff.pm
@@ -108,8 +108,9 @@ EOM
        push @cmd, '--'.($opt->{color} && !$opt->{'no-color'} ? '' : 'no-').
                        'color';
        for my $o (@PublicInbox::LEI::diff_opt) {
-               $o =~ s/\|([a-z0-9])\b//i; # remove single char short option
-               my $c = $1;
+               my $c = '';
+               # remove single char short option
+               $o =~ s/\|([a-z0-9])\b//i and $c = $1;
                if ($o =~ s/=[is]@\z//) {
                        my $v = $opt->{$o} or next;
                        push @cmd, map { $c ? "-$c$_" : "--$o=$_" } @$v;
@@ -200,7 +201,6 @@ sub input_eml_cb { # callback for all emails
 sub lei_rediff {
        my ($lei, @inputs) = @_;
        $lei->_lei_store(1)->write_prepare($lei);
-       $lei->{opt}->{stdin} = 1 if !@inputs;
        $lei->{opt}->{'in-format'} //= 'eml';
        # maybe it's a non-email (code) blob from a coderepo
        my $git_dirs = $lei->{opt}->{'git-dir'} //= [];
@@ -227,7 +227,7 @@ sub lei_rediff {
        my ($op_c, $ops) = $lei->workers_start($self, 1);
        $lei->{wq1} = $self;
        net_merge_all_done($self) unless $lei->{auth};
-       $op_c->op_wait_event($ops);
+       $lei->wait_wq_events($op_c, $ops);
 }
 
 sub ipc_atfork_child {