From: Taylor Blau <me@ttaylorr.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 2/2] diff-filter: be more careful when looking for negative bits
Date: Wed, 26 Jan 2022 17:55:10 -0500 [thread overview]
Message-ID: <YfHRTrdwZVwxcPBK@nand.local> (raw)
In-Reply-To: <xmqq1r0vt0y7.fsf@gitster.g>
On Tue, Jan 25, 2022 at 11:23:28PM -0800, Junio C Hamano wrote:
> diff.c | 31 ++++++++++++++++++++++++++++---
> t/t4202-log.sh | 4 +++-
> 2 files changed, 31 insertions(+), 4 deletions(-)
>
> diff --git a/diff.c b/diff.c
> index fc1151b9c7..a57e458f63 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -4821,13 +4821,38 @@ static int diff_opt_diff_filter(const struct option *option,
> prepare_filter_bits();
>
> /*
> - * If the input starts with a negation e.g. 'd', and we haven't
> + * If there is a negation e.g. 'd' in the input, and we haven't
> * initialized the filter field with another --diff-filter, start
> * from full set of bits, except for AON.
> + * However, the user can try to limit to selected positive bits,
> + * in which case we do not have to.
> + *
> + * NEEDSWORK: the "we haven't initialied" above is meant to
> + * address cases where multiple options, e.g. --diff-filter=d
> + * --diff-filter=a are given. But this implementation is
> + * insufficient when we refrain from starting from full set
> + * when any positive bit is given. Consider "--diff-filter=D
> + * --diff-filter=r", which ought to behave the same way as
> + * "--diff-filter=Dr" and "--diff-filter=rD". The right fix
> + * would probably involve two "opt->filter[NP]" fields,
> + * records positive and negative bits separately in them while
> + * parsing, and then after processing all options, compute
> + * opt->filter by subtracting opt->filterN from opt->filterP
> + * (and when we do so, fill opt->filterP to full bits if it is
> + * absolutely empty).
> */
> if (!opt->filter) {
> - optch = optarg[0];
> - if (optch >= 'a' && 'z' >= optch) {
> + int has_positive = 0;
> + int has_negative = 0;
> +
> + for (i = 0; (optch = optarg[i]) != '\0'; i++) {
> + if (optch < 'a' || 'z' < optch)
> + has_positive++;
> + else
> + has_negative++;
> + }
> +
> + if (!has_positive && has_negative) {
> opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
> opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
> }
Ahh. I feel much better about this implementation. Something was nagging
me about treating optarg[0] specially, and you put very succinctly what
it was that was bothering me.
(One small nit that I absolutely do not care about is using a variable
that starts with 'has_'--which I would expect to be a boolean--to count
the number of positive/negative filters. Perhaps calling these
positive_nr, and negative_nr, respectively, would be clearer.)
> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
> index 28f727937d..128183e66f 100755
> --- a/t/t4202-log.sh
> +++ b/t/t4202-log.sh
> @@ -142,10 +142,12 @@ test_expect_success 'diff-filter=R' '
>
> '
>
> -test_expect_success 'diff-filter=Ra' '
> +test_expect_success 'diff-filter=Ra and aR' '
>
> git log -M --pretty="format:%s" --diff-filter=R HEAD >expect &&
> git log -M --pretty="format:%s" --diff-filter=Ra HEAD >actual &&
> + test_cmp expect actual &&
> + git log -M --pretty="format:%s" --diff-filter=aR HEAD >actual &&
> test_cmp expect actual
Perfect.
Thanks,
Taylor
next prev parent reply other threads:[~2022-01-26 22:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 22:29 [PATCH 0/2] Fix two --diff-filter bugs Johannes Schindelin via GitGitGadget
2022-01-25 22:29 ` [PATCH 1/2] docs(diff): lose incorrect claim about `diff-files --diff-filter=A` Johannes Schindelin via GitGitGadget
2022-01-26 7:03 ` Junio C Hamano
2022-01-25 22:29 ` [PATCH 2/2] diff-filter: be more careful when looking for negative bits Johannes Schindelin via GitGitGadget
2022-01-25 23:21 ` Taylor Blau
2022-01-28 11:52 ` Johannes Schindelin
2022-01-26 7:23 ` Junio C Hamano
2022-01-26 22:55 ` Taylor Blau [this message]
2022-01-26 23:36 ` Junio C Hamano
2022-01-28 11:54 ` Johannes Schindelin
2022-01-26 17:57 ` Ævar Arnfjörð Bjarmason
2022-01-27 19:08 ` [PATCH v2 0/3] Fix two --diff-filter bugs Johannes Schindelin via GitGitGadget
2022-01-27 19:08 ` [PATCH v2 1/3] docs(diff): lose incorrect claim about `diff-files --diff-filter=A` Johannes Schindelin via GitGitGadget
2022-01-27 19:08 ` [PATCH v2 2/3] diff.c: move the diff filter bits definitions up a bit Johannes Schindelin via GitGitGadget
2022-01-27 19:08 ` [PATCH v2 3/3] diff-filter: be more careful when looking for negative bits Johannes Schindelin via GitGitGadget
2022-01-28 1:16 ` Junio C Hamano
2022-01-28 12:01 ` Johannes Schindelin
2022-01-28 12:02 ` [PATCH v3 0/3] Fix two --diff-filter bugs Johannes Schindelin via GitGitGadget
2022-01-28 12:02 ` [PATCH v3 1/3] docs(diff): lose incorrect claim about `diff-files --diff-filter=A` Johannes Schindelin via GitGitGadget
2022-01-28 12:02 ` [PATCH v3 2/3] diff.c: move the diff filter bits definitions up a bit Johannes Schindelin via GitGitGadget
2022-01-28 12:02 ` [PATCH v3 3/3] diff-filter: be more careful when looking for negative bits Johannes Schindelin via GitGitGadget
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YfHRTrdwZVwxcPBK@nand.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).