kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

config.c: remove current_parsing_scope 

Add ".parsing_scope" to "struct config_reader" and replace
"current_parsing_scope" with "the_reader.parsing_scope. Adjust the
comment slightly to make it clearer that the scope applies to the config
source (not the current value), and should only be set when parsing a
config source.

As such, ".parsing_scope" (only set when parsing config sources) and
".config_kvi" (only set when iterating a config set) should not be
set together, so enforce this with a setter function.

Unlike previous commits, "populate_remote_urls()" still needs to store
and restore the 'scope' value because it could have touched
"current_parsing_scope" ("config_with_options()" can set the scope).

Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Glen Choo 2023-03-28 17:51:52 +00:00 committed by Junio C Hamano
parent 9828453ff0
commit 5cdf18e7cd
1 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
config.c
View File

@ -70,6 +70,16 @@ struct config_reader {
*/
struct config_source *source;
struct key_value_info *config_kvi;
/*
* The "scope" of the current config source being parsed (repo, global,
* etc). Like "source", this is only set when parsing a config source.
* It's not part of "source" because it transcends a single file (i.e.,
* a file included from .git/config is still in "repo" scope).
*
* When iterating through a configset, the equivalent value is
* "config_kvi.scope" (see above).
*/
enum config_scope parsing_scope;
};
/*
* Where possible, prefer to accept "struct config_reader" as an arg than to use
@ -78,16 +88,6 @@ struct config_reader {
*/
static struct config_reader the_reader;

/*
* Similar to the variables above, this gives access to the "scope" of the
* current value (repo, global, etc). For cached values, it can be found via
* the current_config_kvi as above. During parsing, the current value can be
* found in this variable. It's not part of "cf_global" because it transcends a
* single file (i.e., a file included from .git/config is still in "repo"
* scope).
*/
static enum config_scope current_parsing_scope;

static inline void config_reader_push_source(struct config_reader *reader,
struct config_source *top)
{
@ -110,11 +110,19 @@ static inline struct config_source *config_reader_pop_source(struct config_reade
static inline void config_reader_set_kvi(struct config_reader *reader,
struct key_value_info *kvi)
{
if (kvi && reader->source)
if (kvi && (reader->source || reader->parsing_scope))
BUG("kvi should not be set while parsing a config source");
reader->config_kvi = kvi;
}

static inline void config_reader_set_scope(struct config_reader *reader,
enum config_scope scope)
{
if (scope && reader->config_kvi)
BUG("scope should only be set when iterating through a config source");
reader->parsing_scope = scope;
}

static int pack_compression_seen;
static int zlib_compression_seen;

@ -383,18 +391,18 @@ static void populate_remote_urls(struct config_include_data *inc)
{
struct config_options opts;

enum config_scope store_scope = current_parsing_scope;
enum config_scope store_scope = inc->config_reader->parsing_scope;

opts = *inc->opts;
opts.unconditional_remote_url = 1;

current_parsing_scope = 0;
config_reader_set_scope(inc->config_reader, 0);

inc->remote_urls = xmalloc(sizeof(*inc->remote_urls));
string_list_init_dup(inc->remote_urls);
config_with_options(add_remote_url, inc->remote_urls, inc->config_source, &opts);

current_parsing_scope = store_scope;
config_reader_set_scope(inc->config_reader, store_scope);
}

static int forbid_remote_url(const char *var, const char *value UNUSED,
@ -2159,7 +2167,8 @@ int git_config_system(void)
return !git_env_bool("GIT_CONFIG_NOSYSTEM", 0);
}

static int do_git_config_sequence(const struct config_options *opts,
static int do_git_config_sequence(struct config_reader *reader,
const struct config_options *opts,
config_fn_t fn, void *data)
{
int ret = 0;
@ -2167,7 +2176,7 @@ static int do_git_config_sequence(const struct config_options *opts,
char *xdg_config = NULL;
char *user_config = NULL;
char *repo_config;
enum config_scope prev_parsing_scope = current_parsing_scope;
enum config_scope prev_parsing_scope = reader->parsing_scope;

if (opts->commondir)
repo_config = mkpathdup("%s/config", opts->commondir);
@ -2176,13 +2185,13 @@ static int do_git_config_sequence(const struct config_options *opts,
else
repo_config = NULL;

current_parsing_scope = CONFIG_SCOPE_SYSTEM;
config_reader_set_scope(reader, CONFIG_SCOPE_SYSTEM);
if (git_config_system() && system_config &&
!access_or_die(system_config, R_OK,
opts->system_gently ? ACCESS_EACCES_OK : 0))
ret += git_config_from_file(fn, system_config, data);

current_parsing_scope = CONFIG_SCOPE_GLOBAL;
config_reader_set_scope(reader, CONFIG_SCOPE_GLOBAL);
git_global_config(&user_config, &xdg_config);

if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK))
@ -2191,12 +2200,12 @@ static int do_git_config_sequence(const struct config_options *opts,
if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK))
ret += git_config_from_file(fn, user_config, data);

current_parsing_scope = CONFIG_SCOPE_LOCAL;
config_reader_set_scope(reader, CONFIG_SCOPE_LOCAL);
if (!opts->ignore_repo && repo_config &&
!access_or_die(repo_config, R_OK, 0))
ret += git_config_from_file(fn, repo_config, data);

current_parsing_scope = CONFIG_SCOPE_WORKTREE;
config_reader_set_scope(reader, CONFIG_SCOPE_WORKTREE);
if (!opts->ignore_worktree && repository_format_worktree_config) {
char *path = git_pathdup("config.worktree");
if (!access_or_die(path, R_OK, 0))
@ -2204,11 +2213,11 @@ static int do_git_config_sequence(const struct config_options *opts,
free(path);
}

current_parsing_scope = CONFIG_SCOPE_COMMAND;
config_reader_set_scope(reader, CONFIG_SCOPE_COMMAND);
if (!opts->ignore_cmdline && git_config_from_parameters(fn, data) < 0)
die(_("unable to parse command-line config"));

current_parsing_scope = prev_parsing_scope;
config_reader_set_scope(reader, prev_parsing_scope);
free(system_config);
free(xdg_config);
free(user_config);
@ -2221,6 +2230,7 @@ int config_with_options(config_fn_t fn, void *data,
const struct config_options *opts)
{
struct config_include_data inc = CONFIG_INCLUDE_INIT;
enum config_scope prev_scope = the_reader.parsing_scope;
int ret;

if (opts->respect_includes) {
@ -2234,7 +2244,7 @@ int config_with_options(config_fn_t fn, void *data,
}

if (config_source)
current_parsing_scope = config_source->scope;
config_reader_set_scope(&the_reader, config_source->scope);

/*
* If we have a specific filename, use it. Otherwise, follow the
@ -2250,13 +2260,14 @@ int config_with_options(config_fn_t fn, void *data,
ret = git_config_from_blob_ref(fn, repo, config_source->blob,
data);
} else {
ret = do_git_config_sequence(opts, fn, data);
ret = do_git_config_sequence(&the_reader, opts, fn, data);
}

if (inc.remote_urls) {
string_list_clear(inc.remote_urls, 0);
FREE_AND_NULL(inc.remote_urls);
}
config_reader_set_scope(&the_reader, prev_scope);
return ret;
}

@ -2390,7 +2401,7 @@ static int configset_add_value(struct config_reader *reader,
kv_info->linenr = -1;
kv_info->origin_type = CONFIG_ORIGIN_CMDLINE;
}
kv_info->scope = current_parsing_scope;
kv_info->scope = reader->parsing_scope;
si->util = kv_info;

return 0;
@ -3891,7 +3902,7 @@ enum config_scope current_config_scope(void)
if (the_reader.config_kvi)
return the_reader.config_kvi->scope;
else
return current_parsing_scope;
return the_reader.parsing_scope;
}

int current_config_line(void)