From: "Guillaume G. via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Guillaume G." <guillaume.galeazzi@gmail.com>
Subject: [PATCH v2 0/3] submodule--helper.c: add only-active to foreach
Date: Sun, 17 May 2020 06:30:20 +0000 [thread overview]
Message-ID: <pull.631.v2.git.1589697023.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.631.git.1589099162707.gitgitgadget@gmail.com>
On repository with multiple submodules, one may need to run a command based
on submodule trait.
This changes add flags to submodule--helper foreachto fulfill this need by:
Adding the flag --[no-]active to filter submodule based on the active state.
Adding the flag --[no-]populated to filter submodule based on the fact that
it is populated or not. Adding the flag -b|--branch <branch> to filter
submodule based on the tracking branch.
Signed-off-by: Guillaume Galeazzi guillaume.galeazzi@gmail.com
[guillaume.galeazzi@gmail.com]
Guillaume Galeazzi (3):
submodule--helper.c: add active to foreach
submodule--helper.c: add populated to foreach
submodule--helper.c: add branch to foreach
builtin/submodule--helper.c | 60 ++++++++++++++++++++++++++++++------
t/t7407-submodule-foreach.sh | 60 ++++++++++++++++++++++++++++++++++++
2 files changed, 110 insertions(+), 10 deletions(-)
base-commit: b994622632154fc3b17fb40a38819ad954a5fb88
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-631%2Fgzzi%2Fsubmodule-only-active-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-631/gzzi/submodule-only-active-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/631
Range-diff vs v1:
1: 77bb291af5d ! 1: 90defeb5a75 submodule--helper.c: add only-active to foreach
@@ Metadata
Author: Guillaume Galeazzi <guillaume.galeazzi@gmail.com>
## Commit message ##
- submodule--helper.c: add only-active to foreach
-
- On repository with some submodule not active, it could be needed to run
- a command only for active submodule. Today it can be achived with the
- command:
+ submodule--helper.c: add active to foreach
+ On a repository with some submodules not active, one may need to run a
+ command only for an active submodule or vice-versa. To achieve this,
+ one may use:
git submodule foreach 'git -C $toplevel submodule--helper is-active \
$sm_path && pwd || :'
- Goal of this change is to make it more accessible by adding the flag
- --only-active to the submodule--helper command. Previous example
- become:
-
- git submodule--helper foreach --only-active pwd
+ Simplify this expression to make it more readable and easy-to-use by
+ adding the flat `--[no-]active` to subcommand `foreach` of `git
+ submodule`. Thus, simplifying the above command to:
+ git submodule--helper foreach --active pwd
Signed-off-by: Guillaume Galeazzi <guillaume.galeazzi@gmail.com>
@@ builtin/submodule--helper.c: struct foreach_cb {
const char *prefix;
int quiet;
int recursive;
-+ int only_active;
++ int active_only;
};
- #define FOREACH_CB_INIT { 0 }
+-#define FOREACH_CB_INIT { 0 }
+
+-static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
+- void *cb_data)
++#define FOREACH_BOOL_FILTER_NOT_SET -1
++
++#define FOREACH_CB_INIT { .active_only=FOREACH_BOOL_FILTER_NOT_SET }
++
++static void runcommand_in_submodule(const struct cache_entry *list_item,
++ struct foreach_cb *info)
+ {
+- struct foreach_cb *info = cb_data;
+ const char *path = list_item->name;
+ const struct object_id *ce_oid = &list_item->oid;
@@ builtin/submodule--helper.c: static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
- struct child_process cp = CHILD_PROCESS_INIT;
- char *displaypath;
+ free(displaypath);
+ }
-+ if (info->only_active && !is_submodule_active(the_repository, path))
-+ return;
++static void runcommand_in_submodule_filtered_cb(const struct cache_entry *list_item,
++ void *cb_data)
++{
++ const char *path = list_item->name;
++ struct foreach_cb *info = cb_data;
++ int is_active;
+
- displaypath = get_submodule_displaypath(path, info->prefix);
-
- sub = submodule_from_path(the_repository, &null_oid, path);
++ if (info->active_only != FOREACH_BOOL_FILTER_NOT_SET) {
++ is_active = is_submodule_active(the_repository, path);
++ if (is_active != info->active_only)
++ return;
++ }
++
++ runcommand_in_submodule(list_item, info);
++}
++
+ static int module_foreach(int argc, const char **argv, const char *prefix)
+ {
+ struct foreach_cb info = FOREACH_CB_INIT;
@@ builtin/submodule--helper.c: static int module_foreach(int argc, const char **argv, const char *prefix)
OPT__QUIET(&info.quiet, N_("Suppress output of entering each submodule command")),
OPT_BOOL(0, "recursive", &info.recursive,
N_("Recurse into nested submodules")),
-+ OPT_BOOL(0, "only-active", &info.only_active,
-+ N_("Call command only for active submodules")),
++ OPT_BOOL(0, "active", &info.active_only,
++ N_("Call command depending on submodule active state")),
OPT_END()
};
const char *const git_submodule_helper_usage[] = {
- N_("git submodule--helper foreach [--quiet] [--recursive] [--] <command>"),
-+ N_("git submodule--helper foreach [--quiet] [--recursive] [--only-active] [--] <command>"),
++ N_("git submodule--helper foreach [--quiet] [--recursive] [--[no-]active] [--] <command>"),
NULL
};
+@@ builtin/submodule--helper.c: static int module_foreach(int argc, const char **argv, const char *prefix)
+ info.argv = argv;
+ info.prefix = prefix;
+
+- for_each_listed_submodule(&list, runcommand_in_submodule_cb, &info);
++ for_each_listed_submodule(&list, runcommand_in_submodule_filtered_cb, &info);
+
+ return 0;
+ }
## t/t7407-submodule-foreach.sh ##
@@ t/t7407-submodule-foreach.sh: test_expect_success 'test basic "submodule foreach" usage' '
test_i18ncmp expect actual
'
-+sub3sha1=$(cd super/sub3 && git rev-parse HEAD)
+cat > expect <<EOF
+Entering 'sub3'
+$pwd/clone-foo3-sub3-$sub3sha1
+EOF
+
-+test_expect_success 'test "submodule--helper foreach --only-active" usage' '
++test_expect_success 'test "submodule--helper foreach --active" usage' '
++ test_when_finished "git -C clone config --unset submodule.foo1.active" &&
++ (
++ cd clone &&
++ git config --bool submodule.foo1.active "false" &&
++ git submodule--helper foreach --active "echo \$toplevel-\$name-\$path-\$sha1" > ../actual
++ ) &&
++ test_i18ncmp expect actual
++'
++
++cat > expect <<EOF
++Entering 'sub1'
++$pwd/clone-foo1-sub1-$sub1sha1
++EOF
++
++test_expect_success 'test "submodule--helper foreach --no-active" usage' '
+ test_when_finished "git -C clone config --unset submodule.foo1.active" &&
+ (
+ cd clone &&
+ git config --bool submodule.foo1.active "false" &&
-+ git submodule--helper foreach --only-active "echo \$toplevel-\$name-\$path-\$sha1" > ../actual
++ git submodule--helper foreach --no-active "echo \$toplevel-\$name-\$path-\$sha1" > ../actual
+ ) &&
+ test_i18ncmp expect actual
+'
-: ----------- > 2: f9cbdcdeacf submodule--helper.c: add populated to foreach
-: ----------- > 3: 65504cb780a submodule--helper.c: add branch to foreach
--
gitgitgadget
next prev parent reply other threads:[~2020-05-17 6:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-10 8:26 [PATCH] submodule--helper.c: add only-active to foreach Guillaume G. via GitGitGadget
2020-05-10 16:44 ` Shourya Shukla
2020-05-10 21:51 ` Guillaume Galeazzi
2020-05-10 22:42 ` Eric Sunshine
2020-05-15 16:29 ` Guillaume Galeazzi
2020-05-12 14:15 ` Shourya Shukla
2020-05-15 16:51 ` Guillaume Galeazzi
2020-05-15 17:03 ` Junio C Hamano
2020-05-15 18:53 ` Guillaume Galeazzi
2020-05-12 18:53 ` Junio C Hamano
2020-05-13 5:17 ` Guillaume Galeazzi
2020-05-13 15:35 ` Junio C Hamano
2020-05-13 20:07 ` Guillaume Galeazzi
2020-05-13 20:35 ` Junio C Hamano
2020-05-15 11:04 ` Guillaume Galeazzi
2020-05-17 6:30 ` Guillaume G. via GitGitGadget [this message]
2020-05-17 6:30 ` [PATCH v2 1/3] submodule--helper.c: add active " Guillaume Galeazzi via GitGitGadget
2020-05-17 6:30 ` [PATCH v2 2/3] submodule--helper.c: add populated " Guillaume Galeazzi via GitGitGadget
2020-05-17 6:30 ` [PATCH v2 3/3] submodule--helper.c: add branch " Guillaume Galeazzi via GitGitGadget
2020-05-17 15:46 ` [PATCH v2 0/3] submodule--helper.c: add only-active " Junio C Hamano
2020-05-17 19:47 ` Guillaume Galeazzi
2020-08-18 15:57 ` Guillaume Galeazzi
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=pull.631.v2.git.1589697023.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=guillaume.galeazzi@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).