From: Jeff King <peff@peff.net>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 5/5] ref-filter.c: parse trailers arguments with %(contents) atom
Date: Sat, 30 Sep 2017 03:36:15 -0400 [thread overview]
Message-ID: <20170930073615.js3o57qmxlqnkpp5@sigill.intra.peff.net> (raw)
In-Reply-To: <20170930062238.87077-6-me@ttaylorr.com>
On Fri, Sep 29, 2017 at 11:22:38PM -0700, Taylor Blau wrote:
> The %(contents) atom takes a contents "field" as its argument. Since "trailers"
> is one of those fields, extend contents_atom_parser to parse "trailers"'s
> arguments when used through "%(contents)", like:
>
> %(contents:trailers:unfold,only)
>
> A caveat: trailers_atom_parser expects NULL when no arguments are given (see:
> `parse_ref_filter_atom`). To simulate this behavior without teaching
> trailers_atom_parser to accept strings with length zero, conditionally pass
> NULL to trailers_atom_parser if the arguments portion of the argument to
> %(contents) is empty.
Yeah, this is a weird effect of trailers_atom_parser() doing double-duty
to parse both "%(contents:trailers)" and "%(trailers)".
Though I think trailers_atom_parser() does do the sensible thing with an
empty string (there are no options, so nothing to parse). I.e., I'd
expect the same thing out of:
%(trailers:)
and
%(trailers)
even though one gets a NULL "arg" field and the other gets an empty
string.
> diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
> index b7325a25d..0aaac8af9 100644
> --- a/Documentation/git-for-each-ref.txt
> +++ b/Documentation/git-for-each-ref.txt
> @@ -214,10 +214,11 @@ blank line. The optional GPG signature is `contents:signature`. The
> first `N` lines of the message is obtained using `contents:lines=N`.
> Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1]
> are obtained as 'contents:trailers'. Non-trailer lines from the trailer block
> -can be omitted with 'trailers:only'. Whitespace-continuations can be removed
> -from trailers so that each trailer appears on a line by itself with its full
> -content with 'trailers:unfold'. Both can be used together as
> -'trailers:unfold,only'.
> +can be omitted with 'trailers:only', or 'contents:trailers:only'.
> +Whitespace-continuations can be removed from trailers so that each trailer
> +appears on a line by itself with its full content with 'trailers:unfold' or
> +'contents:trailers:unfold'. Both can be used together as 'trailers:unfold,only',
> +or 'contents:trailers:unfold,only'.
Rather than enumerate each, we might do better to just say explicitly
"contents:trailers" and "trailers" are aliases of one another. It looks
like we don't even document %(trailers) at all here. I'd actually be in
favor of just declaring %(trailers) the official spelling, and calling
"%(contents:trailers)" a historical alias.
> diff --git a/ref-filter.c b/ref-filter.c
> index 8573acbed..a8d4a52bd 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -207,8 +207,10 @@ static void contents_atom_parser(struct used_atom *atom, const char *arg)
> atom->u.contents.option = C_SIG;
> else if (!strcmp(arg, "subject"))
> atom->u.contents.option = C_SUB;
> - else if (!strcmp(arg, "trailers"))
> - atom->u.contents.option = C_TRAILERS;
> + else if (skip_prefix(arg, "trailers", &arg)) {
> + skip_prefix(arg, ":", &arg);
> + trailers_atom_parser(atom, strlen(arg) ? arg : NULL);
> + }
We usually spell "is this an empty string?" as "*arg" rather than
calling strlen().
However, I'm not sure we need to check. As I said above, I think
trailers_atom_parser() does the sensible thing with an empty string.
And if we _did_ want to distinguish between
%(contents:trailers:)
and
%(contents:trailers)
then I don't think this quite does it. It passes NULL for both cases. So
if we really want to emulate how parse_ref_filter_atom calls it, we'd
want:
if (!skip_prefix(arg, ":", &arg))
arg = NULL;
trailers_atom_parser(atom, arg);
> diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
> index 2bd0c5da7..d9b71589f 100755
> --- a/t/t6300-for-each-ref.sh
> +++ b/t/t6300-for-each-ref.sh
> @@ -642,6 +642,35 @@ test_expect_success '%(trailers:only) and %(trailers:unfold) work together' '
> test_cmp expect actual
> '
>
> +test_expect_success '%(contents:trailers:unfold) unfolds trailers' '
> + git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual &&
> + {
This has the same spaces/tabs thing going on as the previous commit.
-Peff
next prev parent reply other threads:[~2017-09-30 7:36 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-30 6:22 [PATCH 0/5] Support %(trailers) arguments in for-each-ref(1) Taylor Blau
2017-09-30 6:22 ` [PATCH 1/5] pretty.c: delimit "%(trailers)" arguments with "," Taylor Blau
2017-09-30 6:49 ` Jeff King
2017-09-30 6:22 ` [PATCH 2/5] t6300: refactor %(trailers) tests Taylor Blau
2017-09-30 7:01 ` Jeff King
2017-09-30 6:22 ` [PATCH 3/5] ref-filter.c: add trailer options to used_atom Taylor Blau
2017-09-30 7:10 ` Jeff King
2017-09-30 6:22 ` [PATCH 4/5] ref-filter.c: use trailer_opts to format trailers Taylor Blau
2017-09-30 7:21 ` Jeff King
2017-10-01 9:08 ` Junio C Hamano
2017-10-01 9:00 ` Junio C Hamano
2017-10-02 5:05 ` Jeff King
2017-10-02 5:11 ` Taylor Blau
2017-09-30 6:22 ` [PATCH 5/5] ref-filter.c: parse trailers arguments with %(contents) atom Taylor Blau
2017-09-30 7:36 ` Jeff King [this message]
2017-09-30 7:38 ` [PATCH 0/5] Support %(trailers) arguments in for-each-ref(1) Jeff King
2017-09-30 18:41 ` [PATCH v2 0/6] " Taylor Blau
2017-09-30 18:46 ` [PATCH v2 1/6] pretty.c: delimit "%(trailers)" arguments with "," Taylor Blau
2017-09-30 18:46 ` [PATCH v2 2/6] t6300: refactor %(trailers) tests Taylor Blau
2017-09-30 18:46 ` [PATCH v2 3/6] doc: 'trailers' is the preferred way to format trailers Taylor Blau
2017-09-30 18:46 ` [PATCH v2 4/6] doc: use modern "`"-style code fencing Taylor Blau
2017-09-30 18:46 ` [PATCH v2 5/6] ref-filter.c: use trailer_opts to format trailers Taylor Blau
2017-09-30 18:46 ` [PATCH v2 6/6] ref-filter.c: parse trailers arguments with %(contents) atom Taylor Blau
2017-10-01 0:06 ` [PATCH v2 0/6] Support %(trailers) arguments in for-each-ref(1) Taylor Blau
2017-10-01 0:10 ` [PATCH v3 1/6] pretty.c: delimit "%(trailers)" arguments with "," Taylor Blau
2017-10-01 0:10 ` [PATCH v3 2/6] t6300: refactor %(trailers) tests Taylor Blau
2017-10-01 0:10 ` [PATCH v3 3/6] doc: 'trailers' is the preferred way to format trailers Taylor Blau
2017-10-01 0:10 ` [PATCH v3 4/6] doc: use modern "`"-style code fencing Taylor Blau
2017-10-01 0:10 ` [PATCH v3 5/6] ref-filter.c: use trailer_opts to format trailers Taylor Blau
2017-10-01 0:10 ` [PATCH v3 6/6] ref-filter.c: parse trailers arguments with %(contents) atom Taylor Blau
2017-10-01 16:17 ` [PATCH v4 0/6] Support %(trailers) arguments in for-each-ref(1) Taylor Blau
2017-10-01 16:18 ` [PATCH v4 1/6] pretty.c: delimit "%(trailers)" arguments with "," Taylor Blau
2017-10-01 16:18 ` [PATCH v4 2/6] t6300: refactor %(trailers) tests Taylor Blau
2017-10-02 0:12 ` Junio C Hamano
2017-10-01 16:18 ` [PATCH v4 3/6] doc: 'trailers' is the preferred way to format trailers Taylor Blau
2017-10-01 16:18 ` [PATCH v4 4/6] doc: use modern "`"-style code fencing Taylor Blau
2017-10-01 23:55 ` Junio C Hamano
2017-10-02 0:06 ` Taylor Blau
2017-10-02 1:35 ` Junio C Hamano
2017-10-02 4:53 ` Jeff King
2017-10-01 16:18 ` [PATCH v4 5/6] ref-filter.c: use trailer_opts to format trailers Taylor Blau
2017-10-02 0:13 ` Junio C Hamano
2017-10-01 16:18 ` [PATCH v4 6/6] ref-filter.c: parse trailers arguments with %(contents) atom Taylor Blau
2017-10-02 0:19 ` Junio C Hamano
2017-10-02 0:11 ` [PATCH v4 1/6] pretty.c: delimit "%(trailers)" arguments with "," Junio C Hamano
2017-10-02 5:00 ` Jeff King
2017-10-02 0:31 ` [PATCH v5 0/6] Support %(trailers) arguments in for-each-ref(1) Taylor Blau
2017-10-02 0:32 ` [PATCH v5 1/6] pretty.c: delimit "%(trailers)" arguments with "," Taylor Blau
2017-10-02 0:33 ` [PATCH v5 2/6] t6300: refactor %(trailers) tests Taylor Blau
2017-10-02 0:33 ` [PATCH v5 3/6] doc: 'trailers' is the preferred way to format trailers Taylor Blau
2017-10-02 0:33 ` [PATCH v5 4/6] doc: use modern "`"-style code quoting Taylor Blau
2017-10-02 0:33 ` [PATCH v5 5/6] ref-filter.c: use trailer_opts to format trailers Taylor Blau
2017-10-02 0:33 ` [PATCH v5 6/6] ref-filter.c: parse trailers arguments with %(contents) atom Taylor Blau
2017-10-02 4:26 ` Junio C Hamano
2017-10-02 4:51 ` Junio C Hamano
2017-10-02 5:13 ` Taylor Blau
2017-10-02 5:03 ` Jeff King
2017-10-02 5:12 ` Taylor Blau
2017-10-02 5:14 ` Jeff King
2017-10-02 5:23 ` [PATCH v6 0/7] Support %(trailers) arguments in for-each-ref(1) Taylor Blau
2017-10-02 5:25 ` [PATCH v6 1/7] pretty.c: delimit "%(trailers)" arguments with "," Taylor Blau
2017-10-02 5:25 ` [PATCH v6 2/7] t4205: unfold across multiple lines Taylor Blau
2017-10-02 5:25 ` [PATCH v6 3/7] doc: 'trailers' is the preferred way to format trailers Taylor Blau
2017-10-02 5:25 ` [PATCH v6 4/7] doc: use modern "`"-style code quoting Taylor Blau
2017-10-02 5:25 ` [PATCH v6 5/7] t6300: refactor %(trailers) tests Taylor Blau
2017-10-02 5:25 ` [PATCH v6 6/7] ref-filter.c: use trailer_opts to format trailers Taylor Blau
2017-10-02 5:25 ` [PATCH v6 7/7] ref-filter.c: parse trailers arguments with %(contents) atom Taylor Blau
2017-10-02 6:51 ` Jeff King
2017-10-02 9:52 ` Junio C Hamano
2017-10-02 15:49 ` Taylor Blau
2017-10-02 23:44 ` Junio C Hamano
2017-10-02 6:56 ` [PATCH v6 0/7] Support %(trailers) arguments in for-each-ref(1) Jeff King
2017-10-03 6:24 ` Junio C Hamano
2017-10-03 6:36 ` Jeff King
2017-10-03 6:40 ` Junio C Hamano
2017-10-02 8:07 ` Junio C Hamano
2017-10-02 12:15 ` Junio C Hamano
2017-10-02 16:07 ` Taylor Blau
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=20170930073615.js3o57qmxlqnkpp5@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.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).