From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Martin Ågren" <martin.agren@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH] merge: use skip_prefix to parse config key
Date: Fri, 10 Apr 2020 12:56:44 -0400 [thread overview]
Message-ID: <20200410165644.GA79836@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqqo8rzjnnb.fsf@gitster.c.googlers.com>
On Fri, Apr 10, 2020 at 09:44:56AM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > In general, parsing subsections accurately involves looking from both
> > the start and the end of the string, pulling out the section and key and
> > leaving the rest in the middle. But I think we can get away with this
> > left-to-right parsing because we're only interested in matching a
> > _specific_ subsection name, and a specific key. So there are no cases it
> > will handle incorrectly.
>
> In other words, if k were "branch.A.B.mergeoptions", it can only be
> the 'branch.*.mergeoptions' variable attached to branch "A.B", but
> when checking for branch=="A", the first two skip_prefix() would
> pass and the only thing that protects us from misparsing is that
> "B.mergeoptions" is not what we are looking for.
Yes, exactly.
> > The more general form would be:
> [...]
> Yes, but even with such a helper, i.e.
> [...]
> what Martin wrote, especially if it is reflowed to match the above, i.e.
> [...]
> I find it just as, if not more, easy to read.
Yeah, sorry if I was unclear; I think the left-to-right is perfectly
fine for this case.
> Where the parse_config_key() helper shines, I think, is when we do
> not have the middle level to compare against, and in that case, we
> must work only from the given key, scanning from both ends for dot.
Agreed.
Another option for known-value cases like this is to do it outside of
the callback handler, like:
char *key = xstrfmt("branch.%s.mergeoptions");
const char *value;
if (!git_config_get_string_const(key, &value))
...
free(key);
The allocation is a bit awkward, though we could hide that with a clever
helper.
Shifting from "iterate over and store config keys" to "look up config
keys on demand" is a much bigger change, though. I would only do it if
it made the rest of the code flow easier.
-Peff
next prev parent reply other threads:[~2020-04-10 16:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-10 15:10 [PATCH] merge: use skip_prefix to parse config key Martin Ågren
2020-04-10 15:58 ` Jeff King
2020-04-10 16:44 ` Junio C Hamano
2020-04-10 16:56 ` Jeff King [this message]
2020-04-10 17:12 ` Junio C Hamano
2020-04-11 7:11 ` [PATCH v2] " Martin Ågren
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=20200410165644.GA79836@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).