lei rediff: regenerate diffs from stdin

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

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 5d701d5e14e817ac0b5120eb5ed10bab28608c05..9dbbeba98c6cd362e609ae7d9cb923a7b746aa00 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -135,6 +135,23 @@ my @lxs_opt = (qw(remote! local! external! include|I=s@ exclude=s@ only=s@
        import-remote! no-torsocks torsocks=s),
        PublicInbox::LeiQuery::curl_opt());
 
+# we don't support -C as an alias for --find-copies since it's already
+# used for chdir
+our @diff_opt = qw(unified|U=i output-indicator-new=s output-indicator-old=s
+       output-indicator-context=s indent-heuristic!
+       minimal patience histogram anchored=s@ diff-algorithm=s
+       color-moved=s color-moved-ws=s no-color-moved no-color-moved-ws
+       word-diff:s word-diff-regex=s color-words:s no-renames
+       rename-empty! check ws-error-highlight=s full-index binary
+       abbrev:i break-rewrites|B:s find-renames|M:s find-copies:s
+       find-copies-harder irreversible-delete|D l=i diff-filter=s
+       S=s G=s find-object=s pickaxe-all pickaxe-regex O=s R
+       relative:s text|a ignore-cr-at-eol ignore-space-at-eol
+       ignore-space-change|b ignore-all-space|w ignore-blank-lines
+       inter-hunk-context=i function-context|W exit-code ext-diff
+       no-ext-diff textconv! src-prefix=s dst-prefix=s no-prefix
+       line-prefix=s);
+
 # we generate shell completion + help using %CMD and %OPTDESC,
 # see lei__complete() and PublicInbox::LeiHelp
 # command => [ positional_args, 1-line description, Getopt::Long option spec ]
@@ -145,7 +162,7 @@ our %CMD = ( # sorted in order of importance/use:
        qw(save output|mfolder|o=s format|f=s dedupe|d=s threads|t+
        sort|s=s reverse|r offset=i pretty jobs|j=s globoff|g augment|a
        import-before! lock=s@ rsyncable alert=s@ mua=s verbose|v+
-       color!), @c_opt, opt_dash('limit|n=i', '[0-9]+') ],
+       color! mail-sync!), @c_opt, opt_dash('limit|n=i', '[0-9]+') ],
 
 'up' => [ 'OUTPUT|--all', 'update saved search',
        qw(jobs|j=s lock=s@ alert=s@ mua=s verbose|v+ all:s), @c_opt ],
@@ -162,6 +179,11 @@ our %CMD = ( # sorted in order of importance/use:
        qw(git-dir=s@ cwd! verbose|v+ mail! oid-a|A=s path-a|a=s path-b|b=s),
        @lxs_opt, @c_opt ],
 
+'rediff' => [ '[--stdin|LOCATION...]',
+               'regenerate a diff with different options',
+       qw(git-dir=s@ cwd! verbose|v+ color:s no-color),
+       @diff_opt, @lxs_opt, @c_opt ],
+
 'add-external' => [ 'LOCATION',
        'add/set priority of a publicinbox|extindex for extra matches',
        qw(boost=i mirror=s no-torsocks torsocks=s inbox-version=i
@@ -170,8 +192,8 @@ our %CMD = ( # sorted in order of importance/use:
 'ls-external' => [ '[FILTER]', 'list publicinbox|extindex locations',
        qw(format|f=s z|0 globoff|g invert-match|v local remote), @c_opt ],
 'ls-label' => [ '', 'list labels', qw(z|0 stats:s), @c_opt ],
-'ls-mail-sync' => [ '', 'list mail sync folders',
-               qw(z|0 z|0 globoff|g invert-match|v local remote), @c_opt ],
+'ls-mail-sync' => [ '[FILTER]', 'list mail sync folders',
+               qw(z|0 globoff|g invert-match|v local remote), @c_opt ],
 'forget-external' => [ 'LOCATION...|--prune',
        'exclude further results from a publicinbox|extindex',
        qw(prune), @c_opt ],
@@ -270,6 +292,7 @@ my %OPTDESC = (
 'incremental!  import' => 'import already seen IMAP and NNTP articles',
 'globoff|g' => "do not match locations using '*?' wildcards ".
                "and\xa0'[]'\x{a0}ranges",
+'invert-match|v' => 'select non-matching lines',
 'color!' => 'disable color (for --format=text)',
 'verbose|v+' => 'be more verbose',
 'external!' => 'do not use externals',
@@ -542,7 +565,7 @@ sub pkt_op_pair {
 }
 
 sub workers_start {
-       my ($lei, $wq, $ident, $jobs, $ops) = @_;
+       my ($lei, $wq, $jobs, $ops) = @_;
        $ops = {
                '!' => [ \&fail_handler, $lei ],
                '|' => [ \&sigpipe_handler, $lei ],
@@ -552,6 +575,7 @@ sub workers_start {
        };
        $ops->{''} //= [ $wq->can('_lei_wq_eof') || \&wq_eof, $lei ];
        my $end = $lei->pkt_op_pair;
+       my $ident = $wq->{-wq_ident} // "lei-$lei->{cmd} worker";
        $wq->wq_workers_start($ident, $jobs, $lei->oldset, { lei => $lei });
        delete $lei->{pkt_op_p};
        my $op_c = delete $lei->{pkt_op_c};