From: Brandon Williams <bmwill@google.com>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: git@vger.kernel.org, sbeller@google.com, jrnieder@gmail.com,
Jens.Lehmann@web.de
Subject: Re: [RFC PATCH v2 2/2] submodule: simplify decision tree whether to or not to fetch
Date: Mon, 18 Sep 2017 09:47:09 -0700 [thread overview]
Message-ID: <20170918164709.GB144331@google.com> (raw)
In-Reply-To: <20170915132021.GB99666@book.hvoigt.net>
On 09/15, Heiko Voigt wrote:
> To make extending this logic later easier.
>
> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
I like the result of this patch, its much cleaner.
> ---
> submodule.c | 74 ++++++++++++++++++++++++++++++-------------------------------
> 1 file changed, 37 insertions(+), 37 deletions(-)
>
> diff --git a/submodule.c b/submodule.c
> index 38b9905e43..fa44fc59f2 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -1118,6 +1118,31 @@ struct submodule_parallel_fetch {
> };
> #define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0}
>
> +static int get_fetch_recurse_config(const struct submodule *submodule,
> + struct submodule_parallel_fetch *spf)
> +{
> + if (spf->command_line_option != RECURSE_SUBMODULES_DEFAULT)
> + return spf->command_line_option;
> +
> + if (submodule) {
> + char *key;
> + const char *value;
> +
> + int fetch_recurse = submodule->fetch_recurse;
> + key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name);
> + if (!repo_config_get_string_const(the_repository, key, &value)) {
> + fetch_recurse = parse_fetch_recurse_submodules_arg(key, value);
> + }
> + free(key);
> +
> + if (fetch_recurse != RECURSE_SUBMODULES_NONE)
> + /* local config overrules everything except commandline */
> + return fetch_recurse;
> + }
> +
> + return spf->default_option;
> +}
> +
> static int get_next_submodule(struct child_process *cp,
> struct strbuf *err, void *data, void **task_cb)
> {
> @@ -1137,46 +1162,21 @@ static int get_next_submodule(struct child_process *cp,
>
> submodule = submodule_from_path(&null_oid, ce->name);
>
> - default_argv = "yes";
> - if (spf->command_line_option == RECURSE_SUBMODULES_DEFAULT) {
> - int fetch_recurse = RECURSE_SUBMODULES_NONE;
> -
> - if (submodule) {
> - char *key;
> - const char *value;
> -
> - fetch_recurse = submodule->fetch_recurse;
> - key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name);
> - if (!repo_config_get_string_const(the_repository, key, &value)) {
> - fetch_recurse = parse_fetch_recurse_submodules_arg(key, value);
> - }
> - free(key);
> - }
> -
> - if (fetch_recurse != RECURSE_SUBMODULES_NONE) {
> - if (fetch_recurse == RECURSE_SUBMODULES_OFF)
> - continue;
> - if (fetch_recurse == RECURSE_SUBMODULES_ON_DEMAND) {
> - if (!unsorted_string_list_lookup(&changed_submodule_names,
> - submodule->name))
> - continue;
> - default_argv = "on-demand";
> - }
> - } else {
> - if (spf->default_option == RECURSE_SUBMODULES_OFF)
> - continue;
> - if (spf->default_option == RECURSE_SUBMODULES_ON_DEMAND) {
> - if (!unsorted_string_list_lookup(&changed_submodule_names,
> - submodule->name))
> - continue;
> - default_argv = "on-demand";
> - }
> - }
> - } else if (spf->command_line_option == RECURSE_SUBMODULES_ON_DEMAND) {
> - if (!unsorted_string_list_lookup(&changed_submodule_names,
> + switch (get_fetch_recurse_config(submodule, spf))
> + {
> + default:
> + case RECURSE_SUBMODULES_DEFAULT:
> + case RECURSE_SUBMODULES_ON_DEMAND:
> + if (!submodule || !unsorted_string_list_lookup(&changed_submodule_names,
> submodule->name))
> continue;
> default_argv = "on-demand";
> + break;
> + case RECURSE_SUBMODULES_ON:
> + default_argv = "yes";
> + break;
> + case RECURSE_SUBMODULES_OFF:
> + continue;
> }
>
> strbuf_addf(&submodule_path, "%s/%s", spf->work_tree, ce->name);
> --
> 2.14.1.145.gb3622a4
>
--
Brandon Williams
next prev parent reply other threads:[~2017-09-18 16:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-17 10:53 [RFC PATCH 1/2] implement fetching of moved submodules Heiko Voigt
2017-08-17 11:00 ` [RFC PATCH 2/2] submodule: simplify decision tree whether to or not to fetch Heiko Voigt
2017-08-17 17:24 ` Stefan Beller
2017-08-17 17:50 ` Brandon Williams
2017-08-18 16:06 ` Heiko Voigt
2017-08-17 17:20 ` [RFC PATCH 1/2] implement fetching of moved submodules Stefan Beller
2017-08-18 16:06 ` Heiko Voigt
2017-09-15 13:18 ` [RFC PATCH v2 " Heiko Voigt
2017-09-15 13:20 ` [RFC PATCH v2 2/2] submodule: simplify decision tree whether to or not to fetch Heiko Voigt
2017-09-18 16:47 ` Brandon Williams [this message]
2017-09-18 16:49 ` [RFC PATCH v2 1/2] implement fetching of moved submodules Brandon Williams
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=20170918164709.GB144331@google.com \
--to=bmwill@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.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).