serialize collection of refs that contain submodule changes

We are iterating over each pushed ref and want to check whether it
contains changes to submodules. Instead of immediately checking each ref
lets first collect them and then do the check for all of them in one
revision walk.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/submodule.c b/submodule.c
index d2b29944e008821559adbf335b30eef3f5828b76..d07390bc5835c425d43ede5cce59b91ab090051d 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -522,6 +522,13 @@ static int has_remote(const char *refname, const struct object_id *oid,
        return 1;
 }
 
        return 1;
 }
 

+static int append_sha1_to_argv(const unsigned char sha1[20], void *data)
+{
+       struct argv_array *argv = data;
+       argv_array_push(argv, sha1_to_hex(sha1));
+       return 0;
+}
+

 static int submodule_needs_pushing(const char *path, const unsigned char sha1[20])
 {
        if (add_submodule_odb(path) || !lookup_commit_reference(sha1))
 static int submodule_needs_pushing(const char *path, const unsigned char sha1[20])
 {
        if (add_submodule_odb(path) || !lookup_commit_reference(sha1))


@@ -621,25 +628,24 @@ static void free_submodules_sha1s(struct string_list *submodules)
        string_list_clear(submodules, 1);
 }
 
        string_list_clear(submodules, 1);
 }
 

-int find_unpushed_submodules(unsigned char new_sha1[20],
+int find_unpushed_submodules(struct sha1_array *commits,

                const char *remotes_name, struct string_list *needs_pushing)
 {
        struct rev_info rev;
        struct commit *commit;
                const char *remotes_name, struct string_list *needs_pushing)
 {
        struct rev_info rev;
        struct commit *commit;

-       const char *argv[] = {NULL, NULL, "--not", "NULL", NULL};
-       int argc = ARRAY_SIZE(argv) - 1;
-       char *sha1_copy;

        struct string_list submodules = STRING_LIST_INIT_DUP;
        struct string_list_item *submodule;
        struct string_list submodules = STRING_LIST_INIT_DUP;
        struct string_list_item *submodule;

+       struct argv_array argv = ARGV_ARRAY_INIT;

 
 

-       struct strbuf remotes_arg = STRBUF_INIT;
-
-       strbuf_addf(&remotes_arg, "--remotes=%s", remotes_name);

        init_revisions(&rev, NULL);
        init_revisions(&rev, NULL);

-       sha1_copy = xstrdup(sha1_to_hex(new_sha1));
-       argv[1] = sha1_copy;
-       argv[3] = remotes_arg.buf;
-       setup_revisions(argc, argv, &rev, NULL);
+
+       /* argv.argv[0] will be ignored by setup_revisions */
+       argv_array_push(&argv, "find_unpushed_submodules");
+       sha1_array_for_each_unique(commits, append_sha1_to_argv, &argv);
+       argv_array_push(&argv, "--not");
+       argv_array_pushf(&argv, "--remotes=%s", remotes_name);
+
+       setup_revisions(argv.argc, argv.argv, &rev, NULL);

        if (prepare_revision_walk(&rev))
                die("revision walk setup failed");
 
        if (prepare_revision_walk(&rev))
                die("revision walk setup failed");
 


@@ -647,8 +653,7 @@ int find_unpushed_submodules(unsigned char new_sha1[20],
                find_unpushed_submodule_commits(commit, &submodules);
 
        reset_revision_walk();
                find_unpushed_submodule_commits(commit, &submodules);
 
        reset_revision_walk();

-       free(sha1_copy);
-       strbuf_release(&remotes_arg);
+       argv_array_clear(&argv);

 
        for_each_string_list_item(submodule, &submodules) {
                struct collect_submodule_from_sha1s_data data;
 
        for_each_string_list_item(submodule, &submodules) {
                struct collect_submodule_from_sha1s_data data;


@@ -685,12 +690,12 @@ static int push_submodule(const char *path)
        return 1;
 }
 
        return 1;
 }
 

-int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name)
+int push_unpushed_submodules(struct sha1_array *commits, const char *remotes_name)

 {
        int i, ret = 1;
        struct string_list needs_pushing = STRING_LIST_INIT_DUP;
 
 {
        int i, ret = 1;
        struct string_list needs_pushing = STRING_LIST_INIT_DUP;
 

-       if (!find_unpushed_submodules(new_sha1, remotes_name, &needs_pushing))
+       if (!find_unpushed_submodules(commits, remotes_name, &needs_pushing))

                return 1;
 
        for (i = 0; i < needs_pushing.nr; i++) {
                return 1;
 
        for (i = 0; i < needs_pushing.nr; i++) {

diff --git a/submodule.h b/submodule.h
index d9e197a948fdab44b7a5df4161a5df9c3a2938ff..9454806dc5df9a80aa4bf1f7c647404e9df1b3a7 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -3,6 +3,7 @@
 
 struct diff_options;
 struct argv_array;
 
 struct diff_options;
 struct argv_array;

+struct sha1_array;

 
 enum {
        RECURSE_SUBMODULES_CHECK = -4,
 
 enum {
        RECURSE_SUBMODULES_CHECK = -4,


@@ -62,9 +63,9 @@ int submodule_uses_gitfile(const char *path);
 int ok_to_remove_submodule(const char *path);
 int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
                    const unsigned char a[20], const unsigned char b[20], int search);
 int ok_to_remove_submodule(const char *path);
 int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
                    const unsigned char a[20], const unsigned char b[20], int search);

-int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name,
+int find_unpushed_submodules(struct sha1_array *commits, const char *remotes_name,

                struct string_list *needs_pushing);
                struct string_list *needs_pushing);

-int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name);
+int push_unpushed_submodules(struct sha1_array *commits, const char *remotes_name);

 void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
 int parallel_submodules(void);
 
 void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
 int parallel_submodules(void);
 

diff --git a/transport.c b/transport.c
index a85801042b012c2e2684cbb4e5e3dc1925e43582..c3fdd5d251319cd8eaa6d3680c6c626df590e543 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -915,23 +915,36 @@ int transport_push(struct transport *transport,
 
                if ((flags & TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND) && !is_bare_repository()) {
                        struct ref *ref = remote_refs;
 
                if ((flags & TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND) && !is_bare_repository()) {
                        struct ref *ref = remote_refs;

+                       struct sha1_array commits = SHA1_ARRAY_INIT;
+

                        for (; ref; ref = ref->next)
                        for (; ref; ref = ref->next)

-                               if (!is_null_oid(&ref->new_oid) &&
-                                   !push_unpushed_submodules(ref->new_oid.hash,
-                                           transport->remote->name))
-                                   die ("Failed to push all needed submodules!");
+                               if (!is_null_oid(&ref->new_oid))
+                                       sha1_array_append(&commits, ref->new_oid.hash);
+
+                       if (!push_unpushed_submodules(&commits, transport->remote->name)) {
+                               sha1_array_clear(&commits);
+                               die("Failed to push all needed submodules!");
+                       }
+                       sha1_array_clear(&commits);

                }
 
                if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
                              TRANSPORT_RECURSE_SUBMODULES_CHECK)) && !is_bare_repository()) {
                        struct ref *ref = remote_refs;
                        struct string_list needs_pushing = STRING_LIST_INIT_DUP;
                }
 
                if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
                              TRANSPORT_RECURSE_SUBMODULES_CHECK)) && !is_bare_repository()) {
                        struct ref *ref = remote_refs;
                        struct string_list needs_pushing = STRING_LIST_INIT_DUP;

+                       struct sha1_array commits = SHA1_ARRAY_INIT;

 
                        for (; ref; ref = ref->next)
 
                        for (; ref; ref = ref->next)

-                               if (!is_null_oid(&ref->new_oid) &&
-                                   find_unpushed_submodules(ref->new_oid.hash,
-                                           transport->remote->name, &needs_pushing))
-                                       die_with_unpushed_submodules(&needs_pushing);
+                               if (!is_null_oid(&ref->new_oid))
+                                       sha1_array_append(&commits, ref->new_oid.hash);
+
+                       if (find_unpushed_submodules(&commits, transport->remote->name,
+                                               &needs_pushing)) {
+                               sha1_array_clear(&commits);
+                               die_with_unpushed_submodules(&needs_pushing);
+                       }
+                       string_list_clear(&needs_pushing, 0);
+                       sha1_array_clear(&commits);

                }
 
                push_ret = transport->push_refs(transport, remote_refs, flags);
                }
 
                push_ret = transport->push_refs(transport, remote_refs, flags);