From: Junio C Hamano <gitster@pobox.com>
To: "Carlos L. via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Martin Ågren [ ]" <martin.agren@gmail.com>,
"Paul Eggert [ ]" <eggert@cs.ucla.edu>,
"Carlos L." <00xc@protonmail.com>
Subject: Re: [PATCH v2] grep: add --max-count command line option
Date: Tue, 21 Jun 2022 09:27:30 -0700 [thread overview]
Message-ID: <xmqq5ykuhthp.fsf@gitster.g> (raw)
In-Reply-To: <pull.1278.v2.git.git.1655789777023.gitgitgadget@gmail.com> (Carlos L. via GitGitGadget's message of "Tue, 21 Jun 2022 05:36:16 +0000")
"Carlos L. via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: =?UTF-8?q?Carlos=20L=C3=B3pez?= <00xc@protonmail.com>
>
> This patch adds a command line option analogous to that of GNU
> grep(1)'s -m / --max-count, which users might already be used to.
> This makes it possible to limit the amount of matches shown in the
> output while keeping the functionality of other options such as -C
> (show code context) or -p (show containing function), which would be
> difficult to do with a shell pipeline (e.g. head(1)).
>
> Signed-off-by: Carlos López 00xc@protonmail.com
> ---
> ...
> Documentation/git-grep.txt | 8 ++++++++
> builtin/grep.c | 9 +++++++++
> grep.c | 2 ++
> grep.h | 2 ++
> 4 files changed, 21 insertions(+)
Tests?
> diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
> index 3d393fbac1b..19b817d5e58 100644
> --- a/Documentation/git-grep.txt
> +++ b/Documentation/git-grep.txt
> @@ -23,6 +23,7 @@ SYNOPSIS
> [--break] [--heading] [-p | --show-function]
> [-A <post-context>] [-B <pre-context>] [-C <context>]
> [-W | --function-context]
> + [(-m | --max-count) <num>]
> [--threads <num>]
> [-f <file>] [-e] <pattern>
> [--and|--or|--not|(|)|-e <pattern>...]
> @@ -238,6 +239,13 @@ providing this option will cause it to die.
> `git diff` works out patch hunk headers (see 'Defining a
> custom hunk-header' in linkgit:gitattributes[5]).
>
> +-m <num>::
> +--max-count <num>::
> + Limit the amount of matches per file. When using the `-v` or
> + `--invert-match` option, the search stops after the specified
> + number of non-matches. A value of -1 will return unlimited
> + results (the default).
Hmph ...
> + /*
> + * Optimize out the case where the amount of matches is limited to zero.
> + * We do this to keep results consistent with GNU grep(1).
> + */
> + if (opt.max_count == 0)
> + exit(EXIT_FAILURE);
> +
OK, so "stop before seeing any match" logically leads to "we found
nothing, so exit with non-zero".
> diff --git a/grep.c b/grep.c
> index 82eb7da1022..b32ab75cb6b 100644
> --- a/grep.c
> +++ b/grep.c
> @@ -1686,6 +1686,8 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
> bol = eol + 1;
> if (!left)
> break;
> + if (opt->max_count != -1 && count == opt->max_count)
> + break;
I would have written it "if (0 <= opt->max_count && ...)". What
happens when a trickster asks you to do "git grep -m -2"?
I guess what I am getting at is if we are better off saying that
negative means unlimited, instead of special casing -1 like this. I
didn't think it through so it may be perfectly possible that what
you wrote makes more sense than "anything negative is unlimited".
I dunno.
> left--;
> lno++;
> }
Thanks.
> diff --git a/grep.h b/grep.h
> index c722d25ed9d..bdcadce61b8 100644
> --- a/grep.h
> +++ b/grep.h
> @@ -171,6 +171,7 @@ struct grep_opt {
> int show_hunk_mark;
> int file_break;
> int heading;
> + int max_count;
> void *priv;
>
> void (*output)(struct grep_opt *opt, const void *data, size_t size);
> @@ -181,6 +182,7 @@ struct grep_opt {
> .relative = 1, \
> .pathname = 1, \
> .max_depth = -1, \
> + .max_count = -1, \
> .pattern_type_option = GREP_PATTERN_TYPE_UNSPECIFIED, \
> .colors = { \
> [GREP_COLOR_CONTEXT] = "", \
>
> base-commit: 5b71c59bc3b9365075e2a175aa7b6f2b0c84ce44
next prev parent reply other threads:[~2022-06-21 16:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 15:49 [PATCH] grep: add --max-count command line option Carlos L. via GitGitGadget
2022-06-20 15:57 ` Paul Eggert
2022-06-20 16:25 ` Carlos L.
2022-06-20 16:32 ` Paul Eggert
2022-06-21 5:36 ` [PATCH v2] " Carlos L. via GitGitGadget
2022-06-21 16:27 ` Junio C Hamano [this message]
2022-06-22 6:41 ` Carlos L.
2022-06-22 6:56 ` Junio C Hamano
[not found] ` <220622.86mte5knbe.gmgdl@evledraar.gmail.com>
2022-06-22 13:23 ` Carlos L.
2022-06-22 17:07 ` [PATCH v3 0/2] " Carlos L. via GitGitGadget
2022-06-22 17:07 ` [PATCH v3 1/2] " Carlos López via GitGitGadget
2022-06-22 17:07 ` [PATCH v3 2/2] tests: add tests for grep --max-count Carlos López via GitGitGadget
2022-06-22 18:10 ` Junio C Hamano
2022-06-22 19:47 ` [PATCH v4] grep: add --max-count command line option Carlos L. 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=xmqq5ykuhthp.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=00xc@protonmail.com \
--cc=eggert@cs.ucla.edu \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=martin.agren@gmail.com \
/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).