From: Jens Lehmann <Jens.Lehmann@web.de>
To: Stefan Beller <sbeller@google.com>, gitster@pobox.com
Cc: git@vger.kernel.org, hvoigt@hvoigt.net
Subject: Re: [PATCH 2/4] submodule: implement `module_name` as a builtin helper
Date: Wed, 5 Aug 2015 21:06:35 +0200 [thread overview]
Message-ID: <55C25EBB.2000304@web.de> (raw)
In-Reply-To: <1438733070-15805-2-git-send-email-sbeller@google.com>
Am 05.08.2015 um 02:04 schrieb Stefan Beller:
> The goal of this series being rewriting `git submodule update`,
> we don't want to call out to the shell script for config lookups.
>
> So reimplement the lookup of the submodule name in C.
Cool. This brings down the duration of the test suite from 3:13
to 3:12 for me (best of three).
You might wanna have a look into submodule.c: after initially
calling gitmodules_config() one can lookup the submodule name
in the static "config_name_for_path" string_list. If you'd add
a public method to submodule.c which accesses that string_list
and returns the name for the given path, you won't need your
two new functions ... or am I missing something?
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>
> When I started to implement git submodule add in the helper, I realized
> the very first thing to be done would be module_name translated to C,
> so I did that separately. Maybe we need to split this up as well into two
> separate steps for processing and I/O, such that it can be reused better
> from a future "git submodule--helper update" function
>
> builtin/submodule--helper.c | 47 +++++++++++++++++++++++++++++++++++++++++++++
> git-submodule.sh | 32 +++++++-----------------------
> 2 files changed, 54 insertions(+), 25 deletions(-)
>
> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
> index cb18ddf..dd5635f 100644
> --- a/builtin/submodule--helper.c
> +++ b/builtin/submodule--helper.c
> @@ -5,6 +5,8 @@
> #include "pathspec.h"
> #include "dir.h"
> #include "utf8.h"
> +#include "run-command.h"
> +#include "string-list.h"
>
> static char *ps_matched;
> static const struct cache_entry **ce_entries;
> @@ -98,6 +100,48 @@ static int module_list(int argc, const char **argv, const char *prefix)
> return 0;
> }
>
> +
> +static int collect_module_names(const char *key, const char *value, void *cb)
> +{
> + size_t len;
> + struct string_list *sl = cb;
> +
> + if (starts_with(key, "submodule.")
> + && strip_suffix(key, ".path", &len)) {
> + struct strbuf sb = STRBUF_INIT;
> + strbuf_add(&sb, key + strlen("submodule."),
> + len - strlen("submodule."));
> + string_list_insert(sl, value)->util = strbuf_detach(&sb, NULL);
> + strbuf_release(&sb);
> + }
> +
> + return 0;
> +}
> +
> +static int module_name(int argc, const char **argv, const char *prefix)
> +{
> + struct string_list_item *item;
> + struct git_config_source config_source;
> + struct string_list values = STRING_LIST_INIT_DUP;
> +
> + if (!argc)
> + usage("git submodule--helper module_name <path>\n");
> +
> + memset(&config_source, 0, sizeof(config_source));
> + config_source.file = ".gitmodules";
> +
> + if (git_config_with_options(collect_module_names, &values,
> + &config_source, 1) < 0)
> + die(_("unknown error occured while reading the git modules file"));
> +
> + item = string_list_lookup(&values, argv[0]);
> + if (item)
> + printf("%s\n", (char*)item->util);
> + else
> + die("No submodule mapping found in .gitmodules for path '%s'", argv[0]);
> + return 0;
> +}
> +
> int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
> {
> if (argc < 2)
> @@ -106,6 +150,9 @@ int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
> if (!strcmp(argv[1], "module_list"))
> return module_list(argc - 1, argv + 1, prefix);
>
> + if (!strcmp(argv[1], "module_name"))
> + return module_name(argc - 2, argv + 2, prefix);
> +
> usage:
> usage("git submodule--helper module_list\n");
> }
> diff --git a/git-submodule.sh b/git-submodule.sh
> index af9ecef..e6ff38d 100755
> --- a/git-submodule.sh
> +++ b/git-submodule.sh
> @@ -178,24 +178,6 @@ get_submodule_config () {
> printf '%s' "${value:-$default}"
> }
>
> -
> -#
> -# Map submodule path to submodule name
> -#
> -# $1 = path
> -#
> -module_name()
> -{
> - # Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
> - sm_path="$1"
> - re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
> - name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
> - sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
> - test -z "$name" &&
> - die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$sm_path'")"
> - printf '%s\n' "$name"
> -}
> -
> #
> # Clone a submodule
> #
> @@ -498,7 +480,7 @@ cmd_foreach()
> then
> displaypath=$(relative_path "$sm_path")
> say "$(eval_gettext "Entering '\$prefix\$displaypath'")"
> - name=$(module_name "$sm_path")
> + name=$(git submodule--helper module_name "$sm_path")
> (
> prefix="$prefix$sm_path/"
> clear_local_git_env
> @@ -554,7 +536,7 @@ cmd_init()
> while read mode sha1 stage sm_path
> do
> die_if_unmatched "$mode"
> - name=$(module_name "$sm_path") || exit
> + name=$(git submodule--helper module_name "$sm_path") || exit
>
> displaypath=$(relative_path "$sm_path")
>
> @@ -636,7 +618,7 @@ cmd_deinit()
> while read mode sha1 stage sm_path
> do
> die_if_unmatched "$mode"
> - name=$(module_name "$sm_path") || exit
> + name=$(git submodule--helper module_name "$sm_path") || exit
>
> displaypath=$(relative_path "$sm_path")
>
> @@ -758,7 +740,7 @@ cmd_update()
> echo >&2 "Skipping unmerged submodule $prefix$sm_path"
> continue
> fi
> - name=$(module_name "$sm_path") || exit
> + name=$(git submodule--helper module_name "$sm_path") || exit
> url=$(git config submodule."$name".url)
> branch=$(get_submodule_config "$name" branch master)
> if ! test -z "$update"
> @@ -1022,7 +1004,7 @@ cmd_summary() {
> # Respect the ignore setting for --for-status.
> if test -n "$for_status"
> then
> - name=$(module_name "$sm_path")
> + name=$(git submodule--helper module_name "$sm_path")
> ignore_config=$(get_submodule_config "$name" ignore none)
> test $status != A && test $ignore_config = all && continue
> fi
> @@ -1184,7 +1166,7 @@ cmd_status()
> while read mode sha1 stage sm_path
> do
> die_if_unmatched "$mode"
> - name=$(module_name "$sm_path") || exit
> + name=$(git submodule--helper module_name "$sm_path") || exit
> url=$(git config submodule."$name".url)
> displaypath=$(relative_path "$prefix$sm_path")
> if test "$stage" = U
> @@ -1261,7 +1243,7 @@ cmd_sync()
> while read mode sha1 stage sm_path
> do
> die_if_unmatched "$mode"
> - name=$(module_name "$sm_path")
> + name=$(git submodule--helper module_name "$sm_path")
> url=$(git config -f .gitmodules --get submodule."$name".url)
>
> # Possibly a url relative to parent
>
next prev parent reply other threads:[~2015-08-05 19:06 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-05 0:04 [PATCH 1/4] submodule: implement `module_list` as a builtin helper Stefan Beller
2015-08-05 0:04 ` [PATCH 2/4] submodule: implement `module_name` " Stefan Beller
2015-08-05 0:05 ` Stefan Beller
2015-08-05 0:58 ` Eric Sunshine
2015-08-05 16:29 ` Stefan Beller
2015-08-05 19:06 ` Jens Lehmann [this message]
2015-08-05 19:55 ` Stefan Beller
2015-08-05 21:08 ` [PATCH] " Stefan Beller
2015-08-06 19:49 ` Jens Lehmann
2015-08-06 21:38 ` Stefan Beller
2015-08-07 20:03 ` Junio C Hamano
2015-08-07 20:54 ` Stefan Beller
2015-08-07 20:17 ` Junio C Hamano
2015-08-07 20:49 ` Stefan Beller
2015-08-07 21:14 ` Junio C Hamano
2015-08-07 21:21 ` Stefan Beller
2015-08-07 21:32 ` Junio C Hamano
2015-08-07 22:04 ` Stefan Beller
2015-08-07 22:18 ` Junio C Hamano
2015-08-07 23:12 ` Stefan Beller
2015-08-07 22:42 ` Junio C Hamano
2015-08-07 23:19 ` Stefan Beller
2015-08-08 0:21 ` Junio C Hamano
2015-08-08 6:20 ` Junio C Hamano
2015-08-10 17:03 ` Stefan Beller
2015-08-05 18:31 ` [PATCH 1/4] submodule: implement `module_list` " Jens Lehmann
2015-08-07 19:53 ` 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=55C25EBB.2000304@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--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).