From: Junio C Hamano <gitster@pobox.com>
To: Anders Waldenborg <anders@0x63.nu>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Olga Telezhnaya <olyatelezhnaya@gmail.com>
Subject: Re: [PATCH v4 4/7] pretty: allow showing specific trailers
Date: Mon, 10 Dec 2018 17:56:01 +0900 [thread overview]
Message-ID: <xmqqy38xiwv2.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20181208163647.19538-5-anders@0x63.nu> (Anders Waldenborg's message of "Sat, 8 Dec 2018 17:36:44 +0100")
Anders Waldenborg <anders@0x63.nu> writes:
> -static int match_placeholder_arg(const char *to_parse, const char *candidate,
> - const char **end)
> +static int match_placeholder_arg_value(const char *to_parse, const char *candidate,
> + const char **end, const char **valuestart, size_t *valuelen)
> {
> const char *p;
>
> if (!(skip_prefix(to_parse, candidate, &p)))
> return 0;
> + if (valuestart) {
> + if (*p != '=')
> + return 0;
> + *valuestart = p + 1;
> + *valuelen = strcspn(*valuestart, ",)");
> + p = *valuestart + *valuelen;
> + }
> if (*p == ',') {
> *end = p + 1;
> return 1;
> @@ -1074,6 +1081,12 @@ static int match_placeholder_arg(const char *to_parse, const char *candidate,
> return 0;
> }
>
> +static int match_placeholder_arg(const char *to_parse, const char *candidate,
> + const char **end)
> +{
> + return match_placeholder_arg_value(to_parse, candidate, end, NULL, NULL);
> +}
> +
OK. The unified parsing of boolean value I mentioned on an earlier
step can naturally be done using martch_placeholder_arg_value(), I
think, in match_placeholder_bool_arg().
> +static int format_trailer_match_cb(const struct strbuf *key, void *ud)
> +{
> + const struct string_list *list = ud;
> + const struct string_list_item *item;
> +
> + for_each_string_list_item (item, list) {
> + if (key->len == (uintptr_t)item->util &&
> + !strncasecmp (item->string, key->buf, key->len))
Remove SP after strncasecmp.
We won't have too many elements in this string list, so O(N*M)
search like this one would be OK.
> + return 1;
> + }
> return 0;
> }
>
> @@ -1337,6 +1362,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
>
> if (skip_prefix(placeholder, "(trailers", &arg)) {
> struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
> + struct string_list filter_list = STRING_LIST_INIT_NODUP;
> size_t ret = 0;
>
> opts.no_divider = 1;
> @@ -1344,8 +1370,20 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
> if (*arg == ':') {
> arg++;
> for (;;) {
> - if (!match_placeholder_bool_arg(arg, "only", &arg, &opts.only_trailers) &&
> - !match_placeholder_bool_arg(arg, "unfold", &arg, &opts.unfold))
> + const char *argval;
> + size_t arglen;
> +
> + if (match_placeholder_arg_value(arg, "key", &arg, &argval, &arglen)) {
> + uintptr_t len = arglen;
> + if (len && argval[len - 1] == ':')
> + len--;
> + string_list_append(&filter_list, argval)->util = (char *)len;
> +
> + opts.filter = format_trailer_match_cb;
> + opts.filter_data = &filter_list;
> + opts.only_trailers = 1;
> + } else if (!match_placeholder_bool_arg(arg, "only", &arg, &opts.only_trailers) &&
> + !match_placeholder_bool_arg(arg, "unfold", &arg, &opts.unfold))
> break;
> }
> }
> @@ -1353,6 +1391,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
> format_trailers_from_commit(sb, msg + c->subject_off, &opts);
> ret = arg - placeholder + 1;
> }
> + string_list_clear (&filter_list, 0);
Remove SP after string_list_clear.
> return ret;
> }
>
next prev parent reply other threads:[~2018-12-10 8:56 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-28 12:50 [PATCH] pretty: Add %(trailer:X) to display single trailer Anders Waldenborg
2018-10-29 4:49 ` Junio C Hamano
2018-10-29 14:14 ` Jeff King
2018-10-29 17:05 ` Anders Waldenborg
2018-10-31 20:27 ` Jeff King
2018-10-31 23:01 ` Anders Waldenborg
2018-11-01 18:42 ` Jeff King
2018-11-04 15:22 ` [PATCH v2 0/5] %(trailers) improvements in pretty format Anders Waldenborg
2018-11-04 15:22 ` [PATCH v2 1/5] pretty: single return path in %(trailers) handling Anders Waldenborg
2018-11-04 15:22 ` [PATCH v2 2/5] pretty: allow showing specific trailers Anders Waldenborg
2018-11-04 18:14 ` Eric Sunshine
2018-11-05 3:48 ` Junio C Hamano
2018-11-05 3:52 ` Eric Sunshine
2018-11-05 8:26 ` Anders Waldenborg
2018-11-05 9:00 ` Eric Sunshine
2018-11-05 5:14 ` Junio C Hamano
2018-11-04 15:22 ` [PATCH v2 3/5] pretty: add support for "nokey" option in %(trailers) Anders Waldenborg
2018-11-04 15:22 ` [PATCH v2 4/5] pretty: extract fundamental placeholders to separate function Anders Waldenborg
2018-11-05 2:06 ` Junio C Hamano
2018-11-05 8:32 ` Anders Waldenborg
2018-11-06 1:46 ` Junio C Hamano
2018-11-04 15:22 ` [PATCH v2 5/5] pretty: add support for separator option in %(trailers) Anders Waldenborg
2018-11-05 2:10 ` Junio C Hamano
2018-11-05 18:24 ` Anders Waldenborg
2018-11-06 1:48 ` Junio C Hamano
2018-11-05 5:18 ` Junio C Hamano
2018-11-04 17:40 ` [PATCH v2 0/5] %(trailers) improvements in pretty format Eric Sunshine
2018-11-05 7:09 ` Anders Waldenborg
2018-11-18 11:44 ` [PATCH v3 " Anders Waldenborg
2018-11-18 11:44 ` [PATCH v3 1/5] pretty: single return path in %(trailers) handling Anders Waldenborg
2018-11-18 11:44 ` [PATCH v3 2/5] pretty: allow showing specific trailers Anders Waldenborg
2018-11-20 5:45 ` Junio C Hamano
2018-11-20 5:59 ` Junio C Hamano
2018-11-25 23:02 ` Anders Waldenborg
2018-11-26 3:13 ` Junio C Hamano
2018-11-26 6:56 ` Anders Waldenborg
2018-11-26 7:52 ` Junio C Hamano
2018-11-18 11:44 ` [PATCH v3 3/5] pretty: add support for "valueonly" option in %(trailers) Anders Waldenborg
2018-11-20 8:14 ` Eric Sunshine
2018-11-18 11:44 ` [PATCH v3 4/5] strbuf: separate callback for strbuf_expand:ing literals Anders Waldenborg
2018-11-18 11:44 ` [PATCH v3 5/5] pretty: add support for separator option in %(trailers) Anders Waldenborg
2018-11-20 8:25 ` Eric Sunshine
2018-12-08 16:36 ` [PATCH v4 0/7] %(trailers) improvements in pretty format Anders Waldenborg
2018-12-08 16:36 ` [PATCH v4 1/7] doc: group pretty-format.txt placeholders descriptions Anders Waldenborg
2018-12-08 16:36 ` [PATCH v4 2/7] pretty: allow %(trailers) options with explicit value Anders Waldenborg
2018-12-10 8:45 ` Junio C Hamano
2018-12-18 21:30 ` Anders Waldenborg
2019-01-29 16:55 ` Jeff King
2019-01-29 21:23 ` Anders Waldenborg
[not found] ` <CAL21Bmmx=EO+R2t+KviNekDhU3fc0wjCcmUmbzLa14bb0PAmHA@mail.gmail.com>
2019-01-31 18:46 ` Anders Waldenborg
2019-02-02 9:14 ` Оля Тележная
2018-12-08 16:36 ` [PATCH v4 3/7] pretty: single return path in %(trailers) handling Anders Waldenborg
2018-12-08 16:36 ` [PATCH v4 4/7] pretty: allow showing specific trailers Anders Waldenborg
2018-12-10 8:56 ` Junio C Hamano [this message]
2018-12-08 16:36 ` [PATCH v4 5/7] pretty: add support for "valueonly" option in %(trailers) Anders Waldenborg
2018-12-08 16:36 ` [PATCH v4 6/7] strbuf: separate callback for strbuf_expand:ing literals Anders Waldenborg
2018-12-08 16:36 ` [PATCH v4 7/7] pretty: add support for separator option in %(trailers) Anders Waldenborg
2019-01-28 21:33 ` [PATCH v5 0/7] %(trailers) improvements in pretty format Anders Waldenborg
2019-01-28 21:33 ` [PATCH v5 1/7] doc: group pretty-format.txt placeholders descriptions Anders Waldenborg
2019-01-28 21:33 ` [PATCH v5 2/7] pretty: Allow %(trailers) options with explicit value Anders Waldenborg
2019-01-28 22:38 ` Junio C Hamano
2019-01-29 6:45 ` Anders Waldenborg
2019-01-29 16:57 ` Jeff King
2019-01-29 6:49 ` [PATCH v5 2/7 update] pretty: allow " Anders Waldenborg
2019-01-28 21:33 ` [PATCH v5 3/7] pretty: single return path in %(trailers) handling Anders Waldenborg
2019-01-28 21:33 ` [PATCH v5 4/7] pretty: allow showing specific trailers Anders Waldenborg
2019-01-28 21:33 ` [PATCH v5 5/7] pretty: add support for "valueonly" option in %(trailers) Anders Waldenborg
2019-01-28 21:33 ` [PATCH v5 6/7] strbuf: separate callback for strbuf_expand:ing literals Anders Waldenborg
2019-01-28 21:33 ` [PATCH v5 7/7] pretty: add support for separator option in %(trailers) Anders Waldenborg
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=xmqqy38xiwv2.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=anders@0x63.nu \
--cc=git@vger.kernel.org \
--cc=olyatelezhnaya@gmail.com \
--cc=peff@peff.net \
/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).