Merge branch 'jc/am-state-fix'
[git/git.git] / submodule.c
index 4549c1b..245ed4d 100644 (file)
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "submodule-config.h"
 #include "submodule.h"
 #include "dir.h"
 #include "diff.h"
@@ -12,9 +13,6 @@
 #include "argv-array.h"
 #include "blob.h"
 
-static struct string_list config_name_for_path;
-static struct string_list config_fetch_recurse_submodules_for_name;
-static struct string_list config_ignore_for_name;
 static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
 static struct string_list changed_submodule_paths;
 static int initialized_fetch_ref_tips;
@@ -41,7 +39,6 @@ static int gitmodules_is_unmerged;
  */
 static int gitmodules_is_modified;
 
-
 int is_staging_gitmodules_ok(void)
 {
        return !gitmodules_is_modified;
@@ -55,7 +52,7 @@ int is_staging_gitmodules_ok(void)
 int update_path_in_gitmodules(const char *oldpath, const char *newpath)
 {
        struct strbuf entry = STRBUF_INIT;
-       struct string_list_item *path_option;
+       const struct submodule *submodule;
 
        if (!file_exists(".gitmodules")) /* Do nothing without .gitmodules */
                return -1;
@@ -63,13 +60,13 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath)
        if (gitmodules_is_unmerged)
                die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
 
-       path_option = unsorted_string_list_lookup(&config_name_for_path, oldpath);
-       if (!path_option) {
+       submodule = submodule_from_path(null_sha1, oldpath);
+       if (!submodule || !submodule->name) {
                warning(_("Could not find section in .gitmodules where path=%s"), oldpath);
                return -1;
        }
        strbuf_addstr(&entry, "submodule.");
-       strbuf_addstr(&entry, path_option->util);
+       strbuf_addstr(&entry, submodule->name);
        strbuf_addstr(&entry, ".path");
        if (git_config_set_in_file(".gitmodules", entry.buf, newpath) < 0) {
                /* Maybe the user already did that, don't error out here */
@@ -89,7 +86,7 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath)
 int remove_path_from_gitmodules(const char *path)
 {
        struct strbuf sect = STRBUF_INIT;
-       struct string_list_item *path_option;
+       const struct submodule *submodule;
 
        if (!file_exists(".gitmodules")) /* Do nothing without .gitmodules */
                return -1;
@@ -97,13 +94,13 @@ int remove_path_from_gitmodules(const char *path)
        if (gitmodules_is_unmerged)
                die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
 
-       path_option = unsorted_string_list_lookup(&config_name_for_path, path);
-       if (!path_option) {
+       submodule = submodule_from_path(null_sha1, path);
+       if (!submodule || !submodule->name) {
                warning(_("Could not find section in .gitmodules where path=%s"), path);
                return -1;
        }
        strbuf_addstr(&sect, "submodule.");
-       strbuf_addstr(&sect, path_option->util);
+       strbuf_addstr(&sect, submodule->name);
        if (git_config_rename_section_in_file(".gitmodules", sect.buf, NULL) < 0) {
                /* Maybe the user already did that, don't error out here */
                warning(_("Could not remove .gitmodules entry for %s"), path);
@@ -165,12 +162,10 @@ done:
 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
                                             const char *path)
 {
-       struct string_list_item *path_option, *ignore_option;
-       path_option = unsorted_string_list_lookup(&config_name_for_path, path);
-       if (path_option) {
-               ignore_option = unsorted_string_list_lookup(&config_ignore_for_name, path_option->util);
-               if (ignore_option)
-                       handle_ignore_submodules_arg(diffopt, ignore_option->util);
+       const struct submodule *submodule = submodule_from_path(null_sha1, path);
+       if (submodule) {
+               if (submodule->ignore)
+                       handle_ignore_submodules_arg(diffopt, submodule->ignore);
                else if (gitmodules_is_unmerged)
                        DIFF_OPT_SET(diffopt, IGNORE_SUBMODULES);
        }
@@ -219,58 +214,6 @@ void gitmodules_config(void)
        }
 }
 
-int parse_submodule_config_option(const char *var, const char *value)
-{
-       struct string_list_item *config;
-       const char *name, *key;
-       int namelen;
-
-       if (parse_config_key(var, "submodule", &name, &namelen, &key) < 0 || !name)
-               return 0;
-
-       if (!strcmp(key, "path")) {
-               if (!value)
-                       return config_error_nonbool(var);
-
-               config = unsorted_string_list_lookup(&config_name_for_path, value);
-               if (config)
-                       free(config->util);
-               else
-                       config = string_list_append(&config_name_for_path, xstrdup(value));
-               config->util = xmemdupz(name, namelen);
-       } else if (!strcmp(key, "fetchrecursesubmodules")) {
-               char *name_cstr = xmemdupz(name, namelen);
-               config = unsorted_string_list_lookup(&config_fetch_recurse_submodules_for_name, name_cstr);
-               if (!config)
-                       config = string_list_append(&config_fetch_recurse_submodules_for_name, name_cstr);
-               else
-                       free(name_cstr);
-               config->util = (void *)(intptr_t)parse_fetch_recurse_submodules_arg(var, value);
-       } else if (!strcmp(key, "ignore")) {
-               char *name_cstr;
-
-               if (!value)
-                       return config_error_nonbool(var);
-
-               if (strcmp(value, "untracked") && strcmp(value, "dirty") &&
-                   strcmp(value, "all") && strcmp(value, "none")) {
-                       warning("Invalid parameter \"%s\" for config option \"submodule.%s.ignore\"", value, var);
-                       return 0;
-               }
-
-               name_cstr = xmemdupz(name, namelen);
-               config = unsorted_string_list_lookup(&config_ignore_for_name, name_cstr);
-               if (config) {
-                       free(config->util);
-                       free(name_cstr);
-               } else
-                       config = string_list_append(&config_ignore_for_name, name_cstr);
-               config->util = xstrdup(value);
-               return 0;
-       }
-       return 0;
-}
-
 void handle_ignore_submodules_arg(struct diff_options *diffopt,
                                  const char *arg)
 {
@@ -345,20 +288,6 @@ static void print_submodule_summary(struct rev_info *rev, FILE *f,
        strbuf_release(&sb);
 }
 
-int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg)
-{
-       switch (git_config_maybe_bool(opt, arg)) {
-       case 1:
-               return RECURSE_SUBMODULES_ON;
-       case 0:
-               return RECURSE_SUBMODULES_OFF;
-       default:
-               if (!strcmp(arg, "on-demand"))
-                       return RECURSE_SUBMODULES_ON_DEMAND;
-               die("bad %s argument: %s", opt, arg);
-       }
-}
-
 void show_submodule_summary(FILE *f, const char *path,
                const char *line_prefix,
                unsigned char one[20], unsigned char two[20],
@@ -646,7 +575,7 @@ static void calculate_changed_submodule_paths(void)
        struct argv_array argv = ARGV_ARRAY_INIT;
 
        /* No need to check if there are no submodules configured */
-       if (!config_name_for_path.nr)
+       if (!submodule_from_path(NULL, NULL))
                return;
 
        init_revisions(&rev, NULL);
@@ -693,7 +622,6 @@ int fetch_populated_submodules(const struct argv_array *options,
        int i, result = 0;
        struct child_process cp = CHILD_PROCESS_INIT;
        struct argv_array argv = ARGV_ARRAY_INIT;
-       struct string_list_item *name_for_path;
        const char *work_tree = get_git_work_tree();
        if (!work_tree)
                goto out;
@@ -718,24 +646,26 @@ int fetch_populated_submodules(const struct argv_array *options,
                struct strbuf submodule_git_dir = STRBUF_INIT;
                struct strbuf submodule_prefix = STRBUF_INIT;
                const struct cache_entry *ce = active_cache[i];
-               const char *git_dir, *name, *default_argv;
+               const char *git_dir, *default_argv;
+               const struct submodule *submodule;
 
                if (!S_ISGITLINK(ce->ce_mode))
                        continue;
 
-               name = ce->name;
-               name_for_path = unsorted_string_list_lookup(&config_name_for_path, ce->name);
-               if (name_for_path)
-                       name = name_for_path->util;
+               submodule = submodule_from_path(null_sha1, ce->name);
+               if (!submodule)
+                       submodule = submodule_from_name(null_sha1, ce->name);
 
                default_argv = "yes";
                if (command_line_option == RECURSE_SUBMODULES_DEFAULT) {
-                       struct string_list_item *fetch_recurse_submodules_option;
-                       fetch_recurse_submodules_option = unsorted_string_list_lookup(&config_fetch_recurse_submodules_for_name, name);
-                       if (fetch_recurse_submodules_option) {
-                               if ((intptr_t)fetch_recurse_submodules_option->util == RECURSE_SUBMODULES_OFF)
+                       if (submodule &&
+                           submodule->fetch_recurse !=
+                                               RECURSE_SUBMODULES_NONE) {
+                               if (submodule->fetch_recurse ==
+                                               RECURSE_SUBMODULES_OFF)
                                        continue;
-                               if ((intptr_t)fetch_recurse_submodules_option->util == RECURSE_SUBMODULES_ON_DEMAND) {
+                               if (submodule->fetch_recurse ==
+                                               RECURSE_SUBMODULES_ON_DEMAND) {
                                        if (!unsorted_string_list_lookup(&changed_submodule_paths, ce->name))
                                                continue;
                                        default_argv = "on-demand";