X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config.h;h=f0ed464004da601a26d574b1cdc158abb50ae2bc;hb=HEAD;hp=f4966e374948a59cbe95af6f999f0e70d44aa1e9;hpb=372aabe91285b8c50eaf513488fa2c3c529c1eec;p=thirdparty%2Fgit.git diff --git a/config.h b/config.h index f4966e3749..5c730c4f89 100644 --- a/config.h +++ b/config.h @@ -26,7 +26,7 @@ struct object_id; /* git_config_parse_key() returns these negated: */ #define CONFIG_INVALID_KEY 1 #define CONFIG_NO_SECTION_OR_NAME 2 -/* git_config_set_gently(), git_config_set_multivar_gently() return the above or these: */ +/* repo_config_set_gently(), repo_config_set_multivar_gently() return the above or these: */ #define CONFIG_NO_LOCK -1 #define CONFIG_INVALID_FILE 3 #define CONFIG_NO_WRITE 4 @@ -170,9 +170,9 @@ int git_default_config(const char *, const char *, /** * Read a specific file in git-config format. - * This function takes the same callback and data parameters as `git_config`. + * This function takes the same callback and data parameters as `repo_config`. * - * Unlike git_config(), this function does not respect includes. + * Unlike repo_config(), this function does not respect includes. */ int git_config_from_file(config_fn_t fn, const char *, void *); @@ -192,15 +192,26 @@ int git_config_from_blob_oid(config_fn_t fn, const char *name, void git_config_push_parameter(const char *text); void git_config_push_env(const char *spec); int git_config_from_parameters(config_fn_t fn, void *data); -void read_early_config(config_fn_t cb, void *data); + +/* + * Read config when the Git directory has not yet been set up. In case + * `the_repository` has not yet been set up, try to discover the Git + * directory to read the configuration from. + */ +void read_early_config(struct repository *repo, config_fn_t cb, void *data); + +/* + * Read config but only enumerate system and global settings. + * Omit any repo-local, worktree-local, or command-line settings. + */ void read_very_early_config(config_fn_t cb, void *data); /** * Most programs will simply want to look up variables in all config files * that Git knows about, using the normal precedence rules. To do this, - * call `git_config` with a callback function and void data pointer. + * call `repo_config` with a callback function and void data pointer. * - * `git_config` will read all config sources in order of increasing + * `repo_config` will read all config sources in order of increasing * priority. Thus a callback should typically overwrite previously-seen * entries with new ones (e.g., if both the user-wide `~/.gitconfig` and * repo-specific `.git/config` contain `color.ui`, the config machinery @@ -210,11 +221,11 @@ void read_very_early_config(config_fn_t cb, void *data); * * Unlike git_config_from_file(), this function respects includes. */ -void git_config(config_fn_t fn, void *); +void repo_config(struct repository *r, config_fn_t fn, void *); /** * Lets the caller examine config while adjusting some of the default - * behavior of `git_config`. It should almost never be used by "regular" + * behavior of `repo_config`. It should almost never be used by "regular" * Git code that is looking up configuration variables. * It is intended for advanced callers like `git-config`, which are * intentionally tweaking the normal config-lookup process. @@ -223,16 +234,16 @@ void git_config(config_fn_t fn, void *); * - `config_source` * If this parameter is non-NULL, it specifies the source to parse for * configuration, rather than looking in the usual files. See `struct - * git_config_source` in `config.h` for details. Regular `git_config` defaults + * git_config_source` in `config.h` for details. Regular `repo_config` defaults * to `NULL`. * * - `opts` * Specify options to adjust the behavior of parsing config files. See `struct - * config_options` in `config.h` for details. As an example: regular `git_config` + * config_options` in `config.h` for details. As an example: regular `repo_config` * sets `opts.respect_includes` to `1` by default. */ int config_with_options(config_fn_t fn, void *, - struct git_config_source *config_source, + const struct git_config_source *config_source, struct repository *repo, const struct config_options *opts); @@ -261,6 +272,13 @@ unsigned long git_config_ulong(const char *, const char *, ssize_t git_config_ssize_t(const char *, const char *, const struct key_value_info *); +/** + * Identically to `git_config_double`, but for double-precision floating point + * values. + */ +double git_config_double(const char *, const char *, + const struct key_value_info *); + /** * Same as `git_config_bool`, except that integers are returned as-is, and * an `is_bool` flag is unset. @@ -280,25 +298,26 @@ int git_config_bool(const char *, const char *); * Allocates and copies the value string into the `dest` parameter; if no * string is given, prints an error message and returns -1. */ -int git_config_string(const char **, const char *, const char *); +int git_config_string(char **, const char *, const char *); /** * Similar to `git_config_string`, but expands `~` or `~user` into the * user's home directory when found at the beginning of the path. */ -int git_config_pathname(const char **, const char *, const char *); +int git_config_pathname(char **, const char *, const char *); int git_config_expiry_date(timestamp_t *, const char *, const char *); int git_config_color(char *, const char *, const char *); -int git_config_set_in_file_gently(const char *, const char *, const char *, const char *); +int repo_config_set_in_file_gently(struct repository *r, const char *config_filename, + const char *key, const char *comment, const char *value); /** * write config values to a specific config file, takes a key/value pair as * parameter. */ -void git_config_set_in_file(const char *, const char *, const char *); +void repo_config_set_in_file(struct repository *, const char *, const char *, const char *); -int git_config_set_gently(const char *, const char *); +int repo_config_set_gently(struct repository *r, const char *, const char *); /** * Write a config value that should apply to the current worktree. If @@ -310,13 +329,13 @@ int repo_config_set_worktree_gently(struct repository *, const char *, const cha /** * write config values to `.git/config`, takes a key/value pair as parameter. */ -void git_config_set(const char *, const char *); +void repo_config_set(struct repository *, const char *, const char *); int git_config_parse_key(const char *, char **, size_t *); /* * The following macros specify flag bits that alter the behavior - * of the git_config_set_multivar*() methods. + * of the repo_config_set_multivar*() methods. */ /* @@ -333,12 +352,11 @@ int git_config_parse_key(const char *, char **, size_t *); */ #define CONFIG_FLAGS_FIXED_VALUE (1 << 1) -int git_config_set_multivar_gently(const char *, const char *, const char *, unsigned); -void git_config_set_multivar(const char *, const char *, const char *, unsigned); int repo_config_set_multivar_gently(struct repository *, const char *, const char *, const char *, unsigned); -int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, const char *, unsigned); +void repo_config_set_multivar(struct repository *r, const char *, const char *, const char *, unsigned); +int repo_config_set_multivar_in_file_gently(struct repository *, const char *, const char *, const char *, const char *, const char *, unsigned); -const char *git_config_prepare_comment_string(const char *); +char *git_config_prepare_comment_string(const char *); /** * takes four parameters: @@ -360,11 +378,12 @@ const char *git_config_prepare_comment_string(const char *); * * It returns 0 on success. */ -void git_config_set_multivar_in_file(const char *config_filename, - const char *key, - const char *value, - const char *value_pattern, - unsigned flags); +void repo_config_set_multivar_in_file(struct repository *r, + const char *config_filename, + const char *key, + const char *value, + const char *value_pattern, + unsigned flags); /** * rename or remove sections in the config file @@ -372,11 +391,11 @@ void git_config_set_multivar_in_file(const char *config_filename, * If NULL is passed through `new_name` parameter, * the section will be removed from the config file. */ -int git_config_rename_section(const char *, const char *); +int repo_config_rename_section(struct repository *, const char *, const char *); -int git_config_rename_section_in_file(const char *, const char *, const char *); -int git_config_copy_section(const char *, const char *); -int git_config_copy_section_in_file(const char *, const char *, const char *); +int repo_config_rename_section_in_file(struct repository *, const char *, const char *, const char *); +int repo_config_copy_section(struct repository *, const char *, const char *); +int repo_config_copy_section_in_file(struct repository *, const char *, const char *, const char *); int git_config_system(void); int config_error_nonbool(const char *); #if defined(__GNUC__) @@ -541,43 +560,15 @@ int git_configset_get_ulong(struct config_set *cs, const char *key, unsigned lon int git_configset_get_bool(struct config_set *cs, const char *key, int *dest); int git_configset_get_bool_or_int(struct config_set *cs, const char *key, int *is_bool, int *dest); int git_configset_get_maybe_bool(struct config_set *cs, const char *key, int *dest); -int git_configset_get_pathname(struct config_set *cs, const char *key, const char **dest); - -/* Functions for reading a repository's config */ -struct repository; -void repo_config(struct repository *repo, config_fn_t fn, void *data); +int git_configset_get_pathname(struct config_set *cs, const char *key, char **dest); /** * Run only the discover part of the repo_config_get_*() functions * below, in addition to 1 if not found, returns negative values on * error (e.g. if the key itself is invalid). */ -RESULT_MUST_BE_USED -int repo_config_get(struct repository *repo, const char *key); -int repo_config_get_value(struct repository *repo, - const char *key, const char **value); -RESULT_MUST_BE_USED -int repo_config_get_value_multi(struct repository *repo, const char *key, - const struct string_list **dest); -RESULT_MUST_BE_USED -int repo_config_get_string_multi(struct repository *repo, const char *key, - const struct string_list **dest); -int repo_config_get_string(struct repository *repo, - const char *key, char **dest); -int repo_config_get_string_tmp(struct repository *repo, - const char *key, const char **dest); -int repo_config_get_int(struct repository *repo, - const char *key, int *dest); -int repo_config_get_ulong(struct repository *repo, - const char *key, unsigned long *dest); -int repo_config_get_bool(struct repository *repo, - const char *key, int *dest); -int repo_config_get_bool_or_int(struct repository *repo, - const char *key, int *is_bool, int *dest); -int repo_config_get_maybe_bool(struct repository *repo, - const char *key, int *dest); int repo_config_get_pathname(struct repository *repo, - const char *key, const char **dest); + const char *key, char **dest); /* * Functions for reading protected config. By definition, protected @@ -591,17 +582,17 @@ void git_protected_config(config_fn_t fn, void *data); * ------------------------------- * * For programs wanting to query for specific variables in a non-callback - * manner, the config API provides two functions `git_config_get_value` - * and `git_config_get_value_multi`. They both read values from an internal + * manner, the config API provides two functions `repo_config_get_value` + * and `repo_config_get_value_multi`. They both read values from an internal * cache generated previously from reading the config files. * - * For those git_config_get*() functions that aren't documented, + * For those repo_config_get*() functions that aren't documented, * consult the corresponding repo_config_get*() function's * documentation. */ RESULT_MUST_BE_USED -int git_config_get(const char *key); +int repo_config_get(struct repository *r, const char *key); /** * Finds the highest-priority value for the configuration variable `key`, @@ -610,7 +601,7 @@ int git_config_get(const char *key); * `value`. The caller should not free or modify `value`, as it is owned * by the cache. */ -int git_config_get_value(const char *key, const char **value); +int repo_config_get_value(struct repository *r, const char *key, const char **value); /** * Finds and returns the value list, sorted in order of increasing priority @@ -621,16 +612,16 @@ int git_config_get_value(const char *key, const char **value); * owned by the cache. */ RESULT_MUST_BE_USED -int git_config_get_value_multi(const char *key, - const struct string_list **dest); -RESULT_MUST_BE_USED -int git_config_get_string_multi(const char *key, +int repo_config_get_value_multi(struct repository *r, const char *key, const struct string_list **dest); +RESULT_MUST_BE_USED +int repo_config_get_string_multi(struct repository *r, const char *key, + const struct string_list **dest); /** * Resets and invalidates the config cache. */ -void git_config_clear(void); +void repo_config_clear(struct repository *repo); /** * Allocates and copies the retrieved string into the `dest` parameter for @@ -638,14 +629,15 @@ void git_config_clear(void); * error message and returns -1. When the configuration variable `key` is * not found, returns 1 without touching `dest`. */ -int git_config_get_string(const char *key, char **dest); +int repo_config_get_string(struct repository *r, const char *key, char **dest); /** - * Similar to `git_config_get_string`, but does not allocate any new + * Similar to `repo_config_get_string`, but does not allocate any new * memory; on success `dest` will point to memory owned by the config * machinery, which could be invalidated if it is discarded and reloaded. */ -int git_config_get_string_tmp(const char *key, const char **dest); +int repo_config_get_string_tmp(struct repository *r, + const char *key, const char **dest); /** * Finds and parses the value to an integer for the configuration variable @@ -653,12 +645,13 @@ int git_config_get_string_tmp(const char *key, const char **dest); * `dest` and returns 0. When the configuration variable `key` is not found, * returns 1 without touching `dest`. */ -int git_config_get_int(const char *key, int *dest); +int repo_config_get_int(struct repository *r, const char *key, int *dest); /** - * Similar to `git_config_get_int` but for unsigned longs. + * Similar to `repo_config_get_int` but for unsigned longs. */ -int git_config_get_ulong(const char *key, unsigned long *dest); +int repo_config_get_ulong(struct repository *r, + const char *key, unsigned long *dest); /** * Finds and parses the value into a boolean value, for the configuration @@ -669,47 +662,45 @@ int git_config_get_ulong(const char *key, unsigned long *dest); * configuration variable `key` is not found, returns 1 without touching * `dest`. */ -int git_config_get_bool(const char *key, int *dest); +int repo_config_get_bool(struct repository *r, const char *key, int *dest); /** - * Similar to `git_config_get_bool`, except that integers are copied as-is, + * Similar to `repo_config_get_bool`, except that integers are copied as-is, * and `is_bool` flag is unset. */ -int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest); +int repo_config_get_bool_or_int(struct repository *r, const char *key, + int *is_bool, int *dest); /** - * Similar to `git_config_get_bool`, except that it returns -1 on error + * Similar to `repo_config_get_bool`, except that it returns -1 on error * rather than dying. */ -int git_config_get_maybe_bool(const char *key, int *dest); +int repo_config_get_maybe_bool(struct repository *r, + const char *key, int *dest); -/** - * Similar to `git_config_get_string`, but expands `~` or `~user` into - * the user's home directory when found at the beginning of the path. - */ -int git_config_get_pathname(const char *key, const char **dest); - -int git_config_get_index_threads(int *dest); -int git_config_get_split_index(void); -int git_config_get_max_percent_split_change(void); +int repo_config_get_index_threads(struct repository *r, int *dest); +int repo_config_get_split_index(struct repository *r); +int repo_config_get_max_percent_split_change(struct repository *r); /* This dies if the configured or default date is in the future */ -int git_config_get_expiry(const char *key, const char **output); +int repo_config_get_expiry(struct repository *r, const char *key, char **output); /* parse either "this many days" integer, or "5.days.ago" approxidate */ -int git_config_get_expiry_in_days(const char *key, timestamp_t *, timestamp_t now); +int repo_config_get_expiry_in_days(struct repository *r, const char *key, + timestamp_t *, timestamp_t now); /** * First prints the error message specified by the caller in `err` and then * dies printing the line number and the file name of the highest priority * value for the configuration variable `key`. */ -NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3))); +NORETURN void git_die_config(struct repository *r, const char *key, const char *err, ...) + __attribute__((format(printf, 3, 4))); /** * Helper function which formats the die error message according to the * parameters entered. Used by `git_die_config()`. It can be used by callers - * handling `git_config_get_value_multi()` to print the correct error message + * handling `repo_config_get_value_multi()` to print the correct error message * for the desired value. */ NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr); @@ -718,4 +709,140 @@ NORETURN void git_die_config_linenr(const char *key, const char *filename, int l lookup_config(mapping, ARRAY_SIZE(mapping), var) int lookup_config(const char **mapping, int nr_mapping, const char *var); +# ifdef USE_THE_REPOSITORY_VARIABLE +static inline void git_config(config_fn_t fn, void *data) +{ + repo_config(the_repository, fn, data); +} + +static inline void git_config_clear(void) +{ + repo_config_clear(the_repository); +} + +static inline int git_config_get(const char *key) +{ + return repo_config_get(the_repository, key); +} + +static inline int git_config_get_value(const char *key, const char **value) +{ + return repo_config_get_value(the_repository, key, value); +} + +static inline int git_config_get_value_multi(const char *key, const struct string_list **dest) +{ + return repo_config_get_value_multi(the_repository, key, dest); +} + +static inline int git_config_get_string_multi(const char *key, + const struct string_list **dest) +{ + return repo_config_get_string_multi(the_repository, key, dest); +} + +static inline int git_config_get_string(const char *key, char **dest) +{ + return repo_config_get_string(the_repository, key, dest); +} + +static inline int git_config_get_string_tmp(const char *key, const char **dest) +{ + return repo_config_get_string_tmp(the_repository, key, dest); +} + +static inline int git_config_get_int(const char *key, int *dest) +{ + return repo_config_get_int(the_repository, key, dest); +} + +static inline int git_config_get_ulong(const char *key, unsigned long *dest) +{ + return repo_config_get_ulong(the_repository, key, dest); +} + +static inline int git_config_get_bool(const char *key, int *dest) +{ + return repo_config_get_bool(the_repository, key, dest); +} + +static inline int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest) +{ + return repo_config_get_bool_or_int(the_repository, key, is_bool, dest); +} + +static inline int git_config_get_maybe_bool(const char *key, int *dest) +{ + return repo_config_get_maybe_bool(the_repository, key, dest); +} + +static inline int git_config_get_pathname(const char *key, char **dest) +{ + return repo_config_get_pathname(the_repository, key, dest); +} + +static inline void git_config_set_in_file(const char *config_filename, + const char *key, const char *value) +{ + repo_config_set_in_file(the_repository, config_filename, key, value); +} + +static inline int git_config_set_gently(const char *key, const char *value) +{ + return repo_config_set_gently(the_repository, key, value); +} + +static inline void git_config_set(const char *key, const char *value) +{ + repo_config_set(the_repository, key, value); +} + +static inline int git_config_set_in_file_gently( + const char *config_filename, + const char *key, + const char *comment, + const char *value) +{ + return repo_config_set_in_file_gently(the_repository, config_filename, + key, comment, value); +} + +static inline int git_config_set_multivar_in_file_gently( + const char *config_filename, + const char *key, const char *value, + const char *value_pattern, + const char *comment, + unsigned flags) +{ + return repo_config_set_multivar_in_file_gently(the_repository, config_filename, + key, value, value_pattern, + comment, flags); +} + +static inline void git_config_set_multivar_in_file( + const char *config_filename, + const char *key, + const char *value, + const char *value_pattern, + unsigned flags) +{ + repo_config_set_multivar_in_file(the_repository, config_filename, + key, value, value_pattern, flags); +} + +static inline int git_config_set_multivar_gently(const char *key, const char *value, + const char *value_pattern, unsigned flags) +{ + return repo_config_set_multivar_gently(the_repository, key, value, + value_pattern, flags); +} + +static inline void git_config_set_multivar(const char *key, const char *value, + const char *value_pattern, unsigned flags) +{ + repo_config_set_multivar(the_repository, key, value, + value_pattern, flags); +} +# endif /* USE_THE_REPOSITORY_VARIABLE */ + #endif /* CONFIG_H */