From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id BD0301F569 for ; Sun, 1 Oct 2023 09:54:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1696154070; bh=mrkwKSt5lh3UdfrZHhyHe9OVPpUtDMt9e7CDSUqI3Ms=; h=From:To:Subject:Date:In-Reply-To:References:From; b=V+poVSp6YPA9jODpMIqrhtcZmvPwtocXoi4IBgMcYTPnL8HPZLK0aFjqi5F2iFw1n lacovqjnedAETf7Hfdc7lDeg9kMtUfYbTlPIK0nS4ZHTRXUTdv5/Ti9lIp+CzAuDkB MMGHXZbalT1ug+/x8Ik1vjS7nEewSNEeWxuRIUZU= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 06/13] lei rediff: `git diff -O' support Date: Sun, 1 Oct 2023 09:54:22 +0000 Message-ID: <20231001095429.2092610-7-e@80x24.org> In-Reply-To: <20231001095429.2092610-1-e@80x24.org> References: <20231001095429.2092610-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We can't use the `-O' switch since it conflicts with --only|-O= to specify externals. Thus we'll introduce a more verbose `--order-file=FILE' option when running `git diff'. --- 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 ($$) {