From: Stefan Beller <sbeller@google.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>,
Jacob Keller <jacob.keller@gmail.com>, Jeff King <peff@peff.net>,
Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmail.com>,
Jens Lehmann <Jens.Lehmann@web.de>
Subject: Re: [PATCHv2 4/8] submodule-config: parse_config
Date: Fri, 30 Oct 2015 12:29:11 -0700 [thread overview]
Message-ID: <CAGZ79kbPkc_+g1QHxAoN2yYKG-Tft=yR=uJ-NCddRjrc5Wy20A@mail.gmail.com> (raw)
In-Reply-To: <CAPig+cRHy5iT940scnKyMNDx8zgXt50ZsFqF0tALVRpueKdo-A@mail.gmail.com>
On Thu, Oct 29, 2015 at 6:53 PM, Eric Sunshine <ericsunshine@gmail.com> wrote:
> On Wed, Oct 28, 2015 at 7:21 PM, Stefan Beller <sbeller@google.com> wrote:
>> submodule-config: parse_config
>
> Um, what?
submodule-config: Introduce parse_generic_submodule_config
>
>> This rewrites parse_config to distinguish between configs specific to
>> one submodule and configs which apply generically to all submodules.
>> We do not have generic submodule configs yet, but the next patch will
>> introduce "submodule.jobs".
>>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>>
>> # Conflicts:
>> # submodule-config.c
>
> Interesting.
fixed
>
> Minor: Are these 'key', 'value', 'var' arguments analogous to the
> like-named arguments of parse_generic_submodule_config()? If so, why
> is the order of arguments different?
Reordered. I thought how they made most sense individually, but consistency
across functions is better.
>
>> +{
>> + int ret = 0;
>> + struct submodule *submodule = lookup_or_create_by_name(me->cache,
>> + me->gitmodules_sha1,
>> + name);
>>
>> if (!strcmp(key, "path")) {
>> if (!value)
>> @@ -318,6 +314,30 @@ static int parse_config(const char *var, const char *value, void *data)
>> return ret;
>> }
>>
>> +static int parse_config(const char *var, const char *value, void *data)
>> +{
>> + struct parse_config_parameter *me = data;
>> +
>> + int subsection_len;
>> + const char *subsection, *key;
>> + char *name;
>> +
>> + if (parse_config_key(var, "submodule", &subsection,
>> + &subsection_len, &key) < 0)
>> + return 0;
>> +
>> + if (!subsection_len)
>> + return parse_generic_submodule_config(var, key, value);
>> + else {
>> + int ret;
>> + /* subsection is not null terminated */
>> + name = xmemdupz(subsection, subsection_len);
>> + ret = parse_specific_submodule_config(me, name, key, value, var);
>> + free(name);
>> + return ret;
>> + }
>> +}
>
> Minor: You could drop the 'else' and outdent its body, thus losing one
> indentation level.
By passing on the subsection, subsection_len, we only have one statement there
if (!subsection_len)
return parse_generic_submodule_config(key, var, value, me);
else
return parse_specific_submodule_config(subsection,
subsection_len, key,
var, value, me);
will do without dedenting I guess.
next prev parent reply other threads:[~2015-10-30 19:29 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-27 18:15 [PATCH 0/9] Expose the submodule parallelism to the user Stefan Beller
2015-10-27 18:15 ` [PATCH 1/9] submodule-config: "goto" removal in parse_config() Stefan Beller
2015-10-27 21:26 ` Jonathan Nieder
2015-10-27 21:39 ` Junio C Hamano
2015-10-27 18:15 ` [PATCH 2/9] submodule config: keep update strategy around Stefan Beller
2015-10-27 18:15 ` [PATCH 3/9] run_processes_parallel: Add output to tracing messages Stefan Beller
2015-10-27 18:15 ` [PATCH 4/9] git submodule update: have a dedicated helper for cloning Stefan Beller
2015-10-27 18:15 ` [PATCH 5/9] submodule update: expose parallelism to the user Stefan Beller
2015-10-27 20:59 ` Junio C Hamano
2015-10-28 21:40 ` Stefan Beller
2015-10-28 22:20 ` Junio C Hamano
2015-10-27 18:15 ` [PATCH 6/9] clone: allow an explicit argument for parallel submodule clones Stefan Beller
2015-10-27 20:57 ` Junio C Hamano
2015-10-28 20:50 ` Stefan Beller
2015-10-27 18:15 ` [PATCH 7/9] submodule config: remove name_and_item_from_var Stefan Beller
2015-10-27 18:15 ` [PATCH 8/9] submodule-config: parse_config Stefan Beller
2015-10-27 18:15 ` [PATCH 9/9] fetching submodules: Respect `submodule.jobs` config option Stefan Beller
2015-10-27 21:00 ` Junio C Hamano
2015-10-27 19:12 ` [PATCH 0/9] Expose the submodule parallelism to the user Junio C Hamano
2015-10-28 23:21 ` [PATCHv2 0/8] " Stefan Beller
2015-10-28 23:21 ` [PATCHv2 1/8] run_processes_parallel: Add output to tracing messages Stefan Beller
2015-10-30 1:10 ` Eric Sunshine
2015-10-30 17:32 ` Stefan Beller
2015-10-28 23:21 ` [PATCHv2 2/8] submodule config: keep update strategy around Stefan Beller
2015-10-30 1:14 ` Eric Sunshine
2015-10-30 17:38 ` Stefan Beller
2015-10-30 18:16 ` Eric Sunshine
2015-10-30 18:25 ` Stefan Beller
2015-10-28 23:21 ` [PATCHv2 3/8] submodule config: remove name_and_item_from_var Stefan Beller
2015-10-30 1:23 ` Eric Sunshine
2015-10-30 18:37 ` Stefan Beller
2015-10-28 23:21 ` [PATCHv2 4/8] submodule-config: parse_config Stefan Beller
2015-10-30 1:53 ` Eric Sunshine
2015-10-30 19:29 ` Stefan Beller [this message]
2015-10-28 23:21 ` [PATCHv2 5/8] fetching submodules: Respect `submodule.jobs` config option Stefan Beller
2015-10-30 2:17 ` Eric Sunshine
2015-10-28 23:21 ` [PATCHv2 6/8] git submodule update: have a dedicated helper for cloning Stefan Beller
2015-10-29 22:34 ` Junio C Hamano
2015-10-28 23:21 ` [PATCHv2 7/8] submodule update: expose parallelism to the user Stefan Beller
2015-10-28 23:21 ` [PATCHv2 8/8] clone: allow an explicit argument for parallel submodule clones Stefan Beller
2015-11-01 8:58 ` Eric Sunshine
2015-10-29 13:19 ` [PATCHv2 0/8] Expose the submodule parallelism to the user Ramsay Jones
2015-10-29 15:51 ` Stefan Beller
2015-10-29 17:23 ` Junio C Hamano
2015-10-29 17:30 ` Stefan Beller
2015-10-29 23:50 ` Ramsay Jones
2015-11-03 19:41 ` Stefan Beller
2015-10-29 20:12 ` Junio C Hamano
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='CAGZ79kbPkc_+g1QHxAoN2yYKG-Tft=yR=uJ-NCddRjrc5Wy20A@mail.gmail.com' \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=johannes.schindelin@gmail.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.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).