From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 10/16] lei rediff: order-file support
Date: Sun, 1 Oct 2023 02:43:17 +0000 [thread overview]
Message-ID: <20231001024323.1960491-10-e@80x24.org> (raw)
In-Reply-To: <20231001024323.1960491-1-e@80x24.org>
---
lib/PublicInbox/LEI.pm | 6 +++---
lib/PublicInbox/LeiRediff.pm | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index beb0f897..48c5644b 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -159,7 +159,7 @@ our @diff_opt = qw(unified|U=i output-indicator-new=s output-indicator-old=s
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
+ S=s G=s find-object=s pickaxe-all pickaxe-regex 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
@@ -198,8 +198,8 @@ 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 drq:1 dequote-only:1),
- @diff_opt, @lxs_opt, @net_opt, @c_opt ],
+ qw(git-dir=s@ cwd! verbose|v+ color:s no-color drq:1 dequote-only:1
+ order-file=s), @diff_opt, @lxs_opt, @net_opt, @c_opt ],
'mail-diff' => [ '--stdin|LOCATION...', 'diff the contents of emails',
'stdin|', # /|\z/ must be first for lone dash
diff --git a/lib/PublicInbox/LeiRediff.pm b/lib/PublicInbox/LeiRediff.pm
index efd24d17..6cc6131b 100644
--- a/lib/PublicInbox/LeiRediff.pm
+++ b/lib/PublicInbox/LeiRediff.pm
@@ -82,6 +82,7 @@ sub _lei_diff_prepare ($$) {
push @$cmd, $c ? "-$c" : "--$o";
}
}
+ push(@$cmd, "-O$opt->{'order-file'}") if $opt->{'order-file'};
}
sub diff_ctxq ($$) {
next prev parent reply other threads:[~2023-10-01 2:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-01 2:43 [PATCH 01/16] git: decouple cat_async_retry from POSIX pipe semantics Eric Wong
2023-10-01 2:43 ` [PATCH 02/16] git: use Unix stream sockets for `cat-file --batch-*' Eric Wong
2023-10-01 2:43 ` [PATCH 03/16] git+gcf2client: switch to level-triggered wakeups Eric Wong
2023-10-01 2:43 ` [PATCH 04/16] gcf2: Eric Wong
2023-10-01 2:43 ` [PATCH 05/16] t/git: show git_version in diag output Eric Wong
2023-10-01 2:43 ` [PATCH 06/16] process_pipe: do not run `close' perlop unless requested Eric Wong
2023-10-01 2:43 ` [PATCH 07/16] git: improve error reporting Eric Wong
2023-10-01 2:43 ` [PATCH 08/16] git: packed_bytes: account for TOUTTOC between glob and stat Eric Wong
2023-10-01 2:43 ` [PATCH 09/16] gcf2client: warnings Eric Wong
2023-10-01 2:43 ` Eric Wong [this message]
2023-10-01 2:43 ` [PATCH 11/16] lei: correct exit signal Eric Wong
2023-10-01 2:43 ` [PATCH 12/16] lei mail-diff: remove correct temporary directory Eric Wong
2023-10-01 2:43 ` [PATCH 13/16] lei rediff: perl -e instead of -E Eric Wong
2023-10-01 2:43 ` [PATCH 14/16] lei_store: unlink early Eric Wong
2023-10-01 2:43 ` [PATCH 15/16] overidx: fix version comparison Eric Wong
2023-10-01 2:43 ` [PATCH 16/16] enable warnings globally Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231001024323.1960491-10-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).