lei rediff: add --drq and --dequote-only

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

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 3ff8a347af8bd30735cdc22a4706f0b4c0f9fe89..b8159cba29229e1dfecd038f6d33d3874b8227bd 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -201,7 +201,7 @@ our %CMD = ( # sorted in order of importance/use:
 'rediff' => [ '--stdin|LOCATION...',
                'regenerate a diff with different options',
        'stdin|', # /|\z/ must be first for lone dash
-       qw(git-dir=s@ cwd! verbose|v+ color:s no-color),
+       qw(git-dir=s@ cwd! verbose|v+ color:s no-color drq:1 dequote-only:1),
        @diff_opt, @lxs_opt, @net_opt, @c_opt ],
 
 'add-external' => [ 'LOCATION',
@@ -519,8 +519,7 @@ sub fail ($$;$) {
        my ($self, $buf, $exit_code) = @_;
        $self->{failed}++;
        err($self, $buf) if defined $buf;
-       # calls fail_handler
-       $self->{pkt_op_p}->pkt_do('!') if $self->{pkt_op_p};
+       $self->{pkt_op_p}->pkt_do('fail_handler') if $self->{pkt_op_p};
        x_it($self, ($exit_code // 1) << 8);
        undef;
 }
@@ -552,7 +551,7 @@ sub child_error { # passes non-fatal curl exit codes to user
 sub note_sigpipe { # triggers sigpipe_handler
        my ($self, $fd) = @_;
        close(delete($self->{$fd})); # explicit close silences Perl warning
-       $self->{pkt_op_p}->pkt_do('|') if $self->{pkt_op_p};
+       $self->{pkt_op_p}->pkt_do('sigpipe_handler') if $self->{pkt_op_p};
        x_it($self, 13);
 }
 
@@ -579,6 +578,7 @@ sub _lei_atfork_child {
        close $listener if $listener;
        undef $listener;
        $dir_idle->force_close if $dir_idle;
+       undef $dir_idle;
        %PATH2CFG = ();
        $MDIR2CFGPATH = {};
        eval 'no warnings; undef $PublicInbox::LeiNoteEvent::to_flush';
@@ -614,11 +614,11 @@ sub incr {
 
 sub pkt_ops {
        my ($lei, $ops) = @_;
-       $ops->{'!'} = [ \&fail_handler, $lei ];
-       $ops->{'|'} = [ \&sigpipe_handler, $lei ];
-       $ops->{x_it} = [ \&x_it, $lei ];
-       $ops->{child_error} = [ \&child_error, $lei ];
-       $ops->{incr} = [ \&incr, $lei ];
+       $ops->{fail_handler} = [ $lei ];
+       $ops->{sigpipe_handler} = [ $lei ];
+       $ops->{x_it} = [ $lei ];
+       $ops->{child_error} = [ $lei ];
+       $ops->{incr} = [ $lei ];
        $ops;
 }
 
@@ -1414,6 +1414,7 @@ sub add_maildir_watch ($$) {
 
 sub refresh_watches {
        my ($lei) = @_;
+       $dir_idle or return;
        my $cfg = _lei_cfg($lei) or return;
        my $old = $cfg->{-watches};
        my $watches = $cfg->{-watches} //= {};