config: change git_config_with_options() interface

We're going to have more options for config source.

Let's alter git_config_with_options() interface to accept struct with
all source options.

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/config.c b/builtin/config.c
index a7c55e68883ce0c8f6e8c535f7d140aa363ba740..de41ba50e9ca03d5348e407eaba44c2a93447938 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -21,8 +21,7 @@ static char key_delim = ' ';
 static char term = '\n';
 
 static int use_global_config, use_system_config, use_local_config;
 static char term = '\n';
 
 static int use_global_config, use_system_config, use_local_config;

-static const char *given_config_file;
-static const char *given_config_blob;
+static struct git_config_source given_config_source;

 static int actions, types;
 static const char *get_color_slot, *get_colorbool_slot;
 static int end_null;
 static int actions, types;
 static const char *get_color_slot, *get_colorbool_slot;
 static int end_null;


@@ -55,8 +54,8 @@ static struct option builtin_config_options[] = {
        OPT_BOOL(0, "global", &use_global_config, N_("use global config file")),
        OPT_BOOL(0, "system", &use_system_config, N_("use system config file")),
        OPT_BOOL(0, "local", &use_local_config, N_("use repository config file")),
        OPT_BOOL(0, "global", &use_global_config, N_("use global config file")),
        OPT_BOOL(0, "system", &use_system_config, N_("use system config file")),
        OPT_BOOL(0, "local", &use_local_config, N_("use repository config file")),

-       OPT_STRING('f', "file", &given_config_file, N_("file"), N_("use given config file")),
-       OPT_STRING(0, "blob", &given_config_blob, N_("blob-id"), N_("read config from given blob object")),
+       OPT_STRING('f', "file", &given_config_source.file, N_("file"), N_("use given config file")),
+       OPT_STRING(0, "blob", &given_config_source.blob, N_("blob-id"), N_("read config from given blob object")),

        OPT_GROUP(N_("Action")),
        OPT_BIT(0, "get", &actions, N_("get value: name [value-regex]"), ACTION_GET),
        OPT_BIT(0, "get-all", &actions, N_("get all values: key [value-regex]"), ACTION_GET_ALL),
        OPT_GROUP(N_("Action")),
        OPT_BIT(0, "get", &actions, N_("get value: name [value-regex]"), ACTION_GET),
        OPT_BIT(0, "get-all", &actions, N_("get all values: key [value-regex]"), ACTION_GET_ALL),


@@ -224,8 +223,7 @@ static int get_value(const char *key_, const char *regex_)
        }
 
        git_config_with_options(collect_config, &values,
        }
 
        git_config_with_options(collect_config, &values,

-                               given_config_file, given_config_blob,
-                               respect_includes);
+                               &given_config_source, respect_includes);

 
        ret = !values.nr;
 
 
        ret = !values.nr;
 


@@ -309,8 +307,7 @@ static void get_color(const char *def_color)
        get_color_found = 0;
        parsed_color[0] = '\0';
        git_config_with_options(git_get_color_config, NULL,
        get_color_found = 0;
        parsed_color[0] = '\0';
        git_config_with_options(git_get_color_config, NULL,

-                               given_config_file, given_config_blob,
-                               respect_includes);
+                               &given_config_source, respect_includes);

 
        if (!get_color_found && def_color)
                color_parse(def_color, "command line", parsed_color);
 
        if (!get_color_found && def_color)
                color_parse(def_color, "command line", parsed_color);


@@ -339,8 +336,7 @@ static int get_colorbool(int print)
        get_diff_color_found = -1;
        get_color_ui_found = -1;
        git_config_with_options(git_get_colorbool_config, NULL,
        get_diff_color_found = -1;
        get_color_ui_found = -1;
        git_config_with_options(git_get_colorbool_config, NULL,

-                               given_config_file, given_config_blob,
-                               respect_includes);
+                               &given_config_source, respect_includes);

 
        if (get_colorbool_found < 0) {
                if (!strcmp(get_colorbool_slot, "color.diff"))
 
        if (get_colorbool_found < 0) {
                if (!strcmp(get_colorbool_slot, "color.diff"))


@@ -364,7 +360,7 @@ static int get_colorbool(int print)
 
 static void check_write(void)
 {
 
 static void check_write(void)
 {

-       if (given_config_blob)
+       if (given_config_source.blob)

                die("writing config blobs is not supported");
 }
 
                die("writing config blobs is not supported");
 }
 


@@ -435,7 +431,7 @@ static int get_urlmatch(const char *var, const char *url)
        }
 
        git_config_with_options(urlmatch_config_entry, &config,
        }
 
        git_config_with_options(urlmatch_config_entry, &config,

-                               given_config_file, NULL, respect_includes);
+                               &given_config_source, respect_includes);

 
        for_each_string_list_item(item, &values) {
                struct urlmatch_current_candidate_value *matched = item->util;
 
        for_each_string_list_item(item, &values) {
                struct urlmatch_current_candidate_value *matched = item->util;


@@ -464,14 +460,14 @@ int cmd_config(int argc, const char **argv, const char *prefix)
        int nongit = !startup_info->have_repository;
        char *value;
 
        int nongit = !startup_info->have_repository;
        char *value;
 

-       given_config_file = getenv(CONFIG_ENVIRONMENT);
+       given_config_source.file = getenv(CONFIG_ENVIRONMENT);

 
        argc = parse_options(argc, argv, prefix, builtin_config_options,
                             builtin_config_usage,
                             PARSE_OPT_STOP_AT_NON_OPTION);
 
        if (use_global_config + use_system_config + use_local_config +
 
        argc = parse_options(argc, argv, prefix, builtin_config_options,
                             builtin_config_usage,
                             PARSE_OPT_STOP_AT_NON_OPTION);
 
        if (use_global_config + use_system_config + use_local_config +

-           !!given_config_file + !!given_config_blob > 1) {
+           !!given_config_source.file + !!given_config_source.blob > 1) {

                error("only one config file at a time.");
                usage_with_options(builtin_config_usage, builtin_config_options);
        }
                error("only one config file at a time.");
                usage_with_options(builtin_config_usage, builtin_config_options);
        }


@@ -493,24 +489,24 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 
                if (access_or_warn(user_config, R_OK, 0) &&
                    xdg_config && !access_or_warn(xdg_config, R_OK, 0))
 
                if (access_or_warn(user_config, R_OK, 0) &&
                    xdg_config && !access_or_warn(xdg_config, R_OK, 0))

-                       given_config_file = xdg_config;
+                       given_config_source.file = xdg_config;

                else
                else

-                       given_config_file = user_config;
+                       given_config_source.file = user_config;

        }
        else if (use_system_config)
        }
        else if (use_system_config)

-               given_config_file = git_etc_gitconfig();
+               given_config_source.file = git_etc_gitconfig();

        else if (use_local_config)
        else if (use_local_config)

-               given_config_file = git_pathdup("config");
-       else if (given_config_file) {
-               if (!is_absolute_path(given_config_file) && prefix)
-                       given_config_file =
+               given_config_source.file = git_pathdup("config");
+       else if (given_config_source.file) {
+               if (!is_absolute_path(given_config_source.file) && prefix)
+                       given_config_source.file =

                                xstrdup(prefix_filename(prefix,
                                                        strlen(prefix),
                                xstrdup(prefix_filename(prefix,
                                                        strlen(prefix),

-                                                       given_config_file));
+                                                       given_config_source.file));

        }
 
        if (respect_includes == -1)
        }
 
        if (respect_includes == -1)

-               respect_includes = !given_config_file;
+               respect_includes = !given_config_source.file;

 
        if (end_null) {
                term = '\0';
 
        if (end_null) {
                term = '\0';


@@ -549,25 +545,24 @@ int cmd_config(int argc, const char **argv, const char *prefix)
        if (actions == ACTION_LIST) {
                check_argc(argc, 0, 0);
                if (git_config_with_options(show_all_config, NULL,
        if (actions == ACTION_LIST) {
                check_argc(argc, 0, 0);
                if (git_config_with_options(show_all_config, NULL,

-                                           given_config_file,
-                                           given_config_blob,
+                                           &given_config_source,

                                            respect_includes) < 0) {
                                            respect_includes) < 0) {

-                       if (given_config_file)
+                       if (given_config_source.file)

                                die_errno("unable to read config file '%s'",
                                die_errno("unable to read config file '%s'",

-                                         given_config_file);
+                                         given_config_source.file);

                        else
                                die("error processing config file(s)");
                }
        }
        else if (actions == ACTION_EDIT) {
                check_argc(argc, 0, 0);
                        else
                                die("error processing config file(s)");
                }
        }
        else if (actions == ACTION_EDIT) {
                check_argc(argc, 0, 0);

-               if (!given_config_file && nongit)
+               if (!given_config_source.file && nongit)

                        die("not in a git directory");
                        die("not in a git directory");

-               if (given_config_blob)
+               if (given_config_source.blob)

                        die("editing blobs is not supported");
                git_config(git_default_config, NULL);
                        die("editing blobs is not supported");
                git_config(git_default_config, NULL);

-               launch_editor(given_config_file ?
-                             given_config_file : git_path("config"),
+               launch_editor(given_config_source.file ?
+                             given_config_source.file : git_path("config"),

                              NULL, NULL);
        }
        else if (actions == ACTION_SET) {
                              NULL, NULL);
        }
        else if (actions == ACTION_SET) {


@@ -575,7 +570,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                check_write();
                check_argc(argc, 2, 2);
                value = normalize_value(argv[0], argv[1]);
                check_write();
                check_argc(argc, 2, 2);
                value = normalize_value(argv[0], argv[1]);

-               ret = git_config_set_in_file(given_config_file, argv[0], value);
+               ret = git_config_set_in_file(given_config_source.file, argv[0], value);

                if (ret == CONFIG_NOTHING_SET)
                        error("cannot overwrite multiple values with a single value\n"
                        "       Use a regexp, --add or --replace-all to change %s.", argv[0]);
                if (ret == CONFIG_NOTHING_SET)
                        error("cannot overwrite multiple values with a single value\n"
                        "       Use a regexp, --add or --replace-all to change %s.", argv[0]);


@@ -585,21 +580,21 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                check_write();
                check_argc(argc, 2, 3);
                value = normalize_value(argv[0], argv[1]);
                check_write();
                check_argc(argc, 2, 3);
                value = normalize_value(argv[0], argv[1]);

-               return git_config_set_multivar_in_file(given_config_file,
+               return git_config_set_multivar_in_file(given_config_source.file,

                                                       argv[0], value, argv[2], 0);
        }
        else if (actions == ACTION_ADD) {
                check_write();
                check_argc(argc, 2, 2);
                value = normalize_value(argv[0], argv[1]);
                                                       argv[0], value, argv[2], 0);
        }
        else if (actions == ACTION_ADD) {
                check_write();
                check_argc(argc, 2, 2);
                value = normalize_value(argv[0], argv[1]);

-               return git_config_set_multivar_in_file(given_config_file,
+               return git_config_set_multivar_in_file(given_config_source.file,

                                                       argv[0], value, "^$", 0);
        }
        else if (actions == ACTION_REPLACE_ALL) {
                check_write();
                check_argc(argc, 2, 3);
                value = normalize_value(argv[0], argv[1]);
                                                       argv[0], value, "^$", 0);
        }
        else if (actions == ACTION_REPLACE_ALL) {
                check_write();
                check_argc(argc, 2, 3);
                value = normalize_value(argv[0], argv[1]);

-               return git_config_set_multivar_in_file(given_config_file,
+               return git_config_set_multivar_in_file(given_config_source.file,

                                                       argv[0], value, argv[2], 1);
        }
        else if (actions == ACTION_GET) {
                                                       argv[0], value, argv[2], 1);
        }
        else if (actions == ACTION_GET) {


@@ -626,23 +621,23 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                check_write();
                check_argc(argc, 1, 2);
                if (argc == 2)
                check_write();
                check_argc(argc, 1, 2);
                if (argc == 2)

-                       return git_config_set_multivar_in_file(given_config_file,
+                       return git_config_set_multivar_in_file(given_config_source.file,

                                                               argv[0], NULL, argv[1], 0);
                else
                                                               argv[0], NULL, argv[1], 0);
                else

-                       return git_config_set_in_file(given_config_file,
+                       return git_config_set_in_file(given_config_source.file,

                                                      argv[0], NULL);
        }
        else if (actions == ACTION_UNSET_ALL) {
                check_write();
                check_argc(argc, 1, 2);
                                                      argv[0], NULL);
        }
        else if (actions == ACTION_UNSET_ALL) {
                check_write();
                check_argc(argc, 1, 2);

-               return git_config_set_multivar_in_file(given_config_file,
+               return git_config_set_multivar_in_file(given_config_source.file,

                                                       argv[0], NULL, argv[1], 1);
        }
        else if (actions == ACTION_RENAME_SECTION) {
                int ret;
                check_write();
                check_argc(argc, 2, 2);
                                                       argv[0], NULL, argv[1], 1);
        }
        else if (actions == ACTION_RENAME_SECTION) {
                int ret;
                check_write();
                check_argc(argc, 2, 2);

-               ret = git_config_rename_section_in_file(given_config_file,
+               ret = git_config_rename_section_in_file(given_config_source.file,

                                                        argv[0], argv[1]);
                if (ret < 0)
                        return ret;
                                                        argv[0], argv[1]);
                if (ret < 0)
                        return ret;


@@ -653,7 +648,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                int ret;
                check_write();
                check_argc(argc, 1, 1);
                int ret;
                check_write();
                check_argc(argc, 1, 1);

-               ret = git_config_rename_section_in_file(given_config_file,
+               ret = git_config_rename_section_in_file(given_config_source.file,

                                                        argv[0], NULL);
                if (ret < 0)
                        return ret;
                                                        argv[0], NULL);
                if (ret < 0)
                        return ret;

diff --git a/cache.h b/cache.h
index dc040fb1aa99b7970e85e5b175e60f862ff6a74a..9d94bd69f7db9dde851683e610a0ffe5da775646 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1146,6 +1146,11 @@ extern int update_server_info(int);
 #define CONFIG_INVALID_PATTERN 6
 #define CONFIG_GENERIC_ERROR 7
 
 #define CONFIG_INVALID_PATTERN 6
 #define CONFIG_GENERIC_ERROR 7
 

+struct git_config_source {
+       const char *file;
+       const char *blob;
+};
+

 typedef int (*config_fn_t)(const char *, const char *, void *);
 extern int git_default_config(const char *, const char *, void *);
 extern int git_config_from_file(config_fn_t fn, const char *, void *);
 typedef int (*config_fn_t)(const char *, const char *, void *);
 extern int git_default_config(const char *, const char *, void *);
 extern int git_config_from_file(config_fn_t fn, const char *, void *);


@@ -1155,8 +1160,7 @@ extern void git_config_push_parameter(const char *text);
 extern int git_config_from_parameters(config_fn_t fn, void *data);
 extern int git_config(config_fn_t fn, void *);
 extern int git_config_with_options(config_fn_t fn, void *,
 extern int git_config_from_parameters(config_fn_t fn, void *data);
 extern int git_config(config_fn_t fn, void *);
 extern int git_config_with_options(config_fn_t fn, void *,

-                                  const char *filename,
-                                  const char *blob_ref,
+                                  struct git_config_source *config_source,

                                   int respect_includes);
 extern int git_config_early(config_fn_t fn, void *, const char *repo_config);
 extern int git_parse_ulong(const char *, unsigned long *);
                                   int respect_includes);
 extern int git_config_early(config_fn_t fn, void *, const char *repo_config);
 extern int git_parse_ulong(const char *, unsigned long *);

diff --git a/config.c b/config.c
index b295310d3c22433b46533a902dd9f4f3e60a2423..a21b0ddadecc3d288ea50339e9b39765a1227aec 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1172,8 +1172,7 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
 }
 
 int git_config_with_options(config_fn_t fn, void *data,
 }
 
 int git_config_with_options(config_fn_t fn, void *data,

-                           const char *filename,
-                           const char *blob_ref,
+                           struct git_config_source *config_source,

                            int respect_includes)
 {
        char *repo_config = NULL;
                            int respect_includes)
 {
        char *repo_config = NULL;


@@ -1191,10 +1190,10 @@ int git_config_with_options(config_fn_t fn, void *data,
         * If we have a specific filename, use it. Otherwise, follow the
         * regular lookup sequence.
         */
         * If we have a specific filename, use it. Otherwise, follow the
         * regular lookup sequence.
         */

-       if (filename)
-               return git_config_from_file(fn, filename, data);
-       else if (blob_ref)
-               return git_config_from_blob_ref(fn, blob_ref, data);
+       if (config_source && config_source->file)
+               return git_config_from_file(fn, config_source->file, data);
+       else if (config_source && config_source->blob)
+               return git_config_from_blob_ref(fn, config_source->blob, data);

 
        repo_config = git_pathdup("config");
        ret = git_config_early(fn, data, repo_config);
 
        repo_config = git_pathdup("config");
        ret = git_config_early(fn, data, repo_config);


@@ -1205,7 +1204,7 @@ int git_config_with_options(config_fn_t fn, void *data,
 
 int git_config(config_fn_t fn, void *data)
 {
 
 int git_config(config_fn_t fn, void *data)
 {

-       return git_config_with_options(fn, data, NULL, NULL, 1);
+       return git_config_with_options(fn, data, NULL, 1);

 }
 
 /*
 }
 
 /*