git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/1] config: add documentation to config.h
@ 2019-10-18  0:06 Heba Waly via GitGitGadget
  2019-10-18  0:06 ` [PATCH 1/1] " Heba Waly via GitGitGadget
  2019-10-22  7:05 ` [PATCH v2 0/1] [Outreachy] config: move " Heba Waly via GitGitGadget
  0 siblings, 2 replies; 16+ messages in thread
From: Heba Waly via GitGitGadget @ 2019-10-18  0:06 UTC (permalink / raw)
  To: git; +Cc: Heba Waly, Junio C Hamano

This commit is copying and summarizing the documentation from
documentation/technical/api-config.txt to comments in config.h

Signed-off-by: Heba Waly heba.waly@gmail.com [heba.waly@gmail.com]

Thanks for taking the time to contribute to Git! Please be advised that the
Git community does not use github.com for their contributions. Instead, we
use a mailing list (git@vger.kernel.org) for code submissions, code reviews,
and bug reports. Nevertheless, you can use GitGitGadget (
https://gitgitgadget.github.io/) to conveniently send your Pull Requests
commits to our mailing list.

Please read the "guidelines for contributing" linked above!

Heba Waly (1):
  config: add documentation to config.h

 config.h | 327 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 327 insertions(+)


base-commit: 108b97dc372828f0e72e56bbb40cae8e1e83ece6
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-405%2FHebaWaly%2Fconfig_documentation-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-405/HebaWaly/config_documentation-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/405
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 1/1] config: add documentation to config.h
  2019-10-18  0:06 [PATCH 0/1] config: add documentation to config.h Heba Waly via GitGitGadget
@ 2019-10-18  0:06 ` Heba Waly via GitGitGadget
  2019-10-18 22:07   ` Jonathan Tan
  2019-10-18 22:51   ` Emily Shaffer
  2019-10-22  7:05 ` [PATCH v2 0/1] [Outreachy] config: move " Heba Waly via GitGitGadget
  1 sibling, 2 replies; 16+ messages in thread
From: Heba Waly via GitGitGadget @ 2019-10-18  0:06 UTC (permalink / raw)
  To: git; +Cc: Heba Waly, Junio C Hamano, Heba Waly

From: Heba Waly <heba.waly@gmail.com>

This commit is copying and summarizing the documentation from
documentation/technical/api-config.txt to comments in config.h

Signed-off-by: Heba Waly <heba.waly@gmail.com>
---
 config.h | 327 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 327 insertions(+)

diff --git a/config.h b/config.h
index f0ed464004..fa999a2ba0 100644
--- a/config.h
+++ b/config.h
@@ -4,6 +4,40 @@
 #include "hashmap.h"
 #include "string-list.h"
 
+
+/**
+ * The config API gives callers a way to access Git configuration files
+ * (and files which have the same syntax). See linkgit:git-config[1] for a
+ * discussion of the config file syntax.
+ *
+ * General Usage
+ * -------------
+ *
+ * Config files are parsed linearly, and each variable found is passed to a
+ * caller-provided callback function. The callback function is responsible
+ * for any actions to be taken on the config option, and is free to ignore
+ * some options. It is not uncommon for the configuration to be parsed
+ * several times during the run of a Git program, with different callbacks
+ * picking out different variables useful to themselves.
+ *
+ * A config callback function takes three parameters:
+ *
+ * - the name of the parsed variable. This is in canonical "flat" form: the
+ *   section, subsection, and variable segments will be separated by dots,
+ *   and the section and variable segments will be all lowercase. E.g.,
+ *   `core.ignorecase`, `diff.SomeType.textconv`.
+ *
+ * - the value of the found variable, as a string. If the variable had no
+ *   value specified, the value will be NULL (typically this means it
+ *   should be interpreted as boolean true).
+ *
+ * - a void pointer passed in by the caller of the config API; this can
+ *   contain callback-specific data
+ *
+ * A config callback should return 0 for success, or -1 if the variable
+ * could not be parsed properly.
+ */
+
 struct object_id;
 
 /* git_config_parse_key() returns these negated: */
@@ -73,6 +107,11 @@ struct config_options {
 
 typedef int (*config_fn_t)(const char *, const char *, void *);
 int git_default_config(const char *, const char *, void *);
+
+/**
+ * Read a specific file in git-config format.
+ * This function takes the same callback and data parameters as `git_config`.
+ */
 int git_config_from_file(config_fn_t fn, const char *, void *);
 int git_config_from_file_with_options(config_fn_t fn, const char *,
 				      void *,
@@ -88,33 +127,152 @@ void git_config_push_parameter(const char *text);
 int git_config_from_parameters(config_fn_t fn, void *data);
 void read_early_config(config_fn_t cb, void *data);
 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.
+ *
+ * `git_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
+ * will first feed the user-wide one to the callback, and then the
+ * repo-specific one; by overwriting, the higher-priority repo-specific
+ * value is left at the end).
+ */
 void git_config(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"
+ * 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.
+ * It takes two extra parameters:
+ *
+ * `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
+ * 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`
+ * 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 config_options *opts);
+
+/**
+ * Value Parsing Helpers
+ * ---------------------
+ *
+ * To aid in parsing string values, the config API provides callbacks with
+ * a number of helper functions
+ */
+
 int git_parse_ssize_t(const char *, ssize_t *);
 int git_parse_ulong(const char *, unsigned long *);
+
+/**
+ * Same as `git_config_bool`, except that it returns -1 on error rather
+ * than dying.
+ */
 int git_parse_maybe_bool(const char *);
+
+/**
+ * Parse the string to an integer, including unit factors. Dies on error;
+ * otherwise, returns the parsed result.
+ */
 int git_config_int(const char *, const char *);
 int64_t git_config_int64(const char *, const char *);
+
+/**
+ * Identical to `git_config_int`, but for unsigned longs.
+ */
 unsigned long git_config_ulong(const char *, const char *);
 ssize_t git_config_ssize_t(const char *, const char *);
+
+/**
+ * Same as `git_config_bool`, except that integers are returned as-is, and
+ * an `is_bool` flag is unset.
+ */
 int git_config_bool_or_int(const char *, const char *, int *);
+
+/**
+ * Parse a string into a boolean value, respecting keywords like "true" and
+ * "false". Integer values are converted into true/false values (when they
+ * are non-zero or zero, respectively). Other values cause a die(). If
+ * parsing is successful, the return value is the result.
+ */
 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 *);
+
+/**
+ * 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_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 *);
+
+/**
+ * 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 *);
 int git_config_set_gently(const char *, const char *);
+
+/**
+ * write config values to `.git/config`
+ * takes a key/value pair as parameter.
+ */
 void git_config_set(const char *, const char *);
 int git_config_parse_key(const char *, char **, int *);
 int git_config_key_is_valid(const char *key);
 int git_config_set_multivar_gently(const char *, const char *, const char *, int);
 void git_config_set_multivar(const char *, const char *, const char *, int);
 int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, int);
+
+/**
+ * takes four parameters:
+ *
+ * - the name of the file, as a string, to which key/value pairs will be written.
+ *
+ * - the name of key, as a string. This is in canonical "flat" form: the section,
+ *   subsection, and variable segments will be separated by dots, and the section
+ *   and variable segments will be all lowercase.
+ *   E.g., `core.ignorecase`, `diff.SomeType.textconv`.
+ *
+ * - the value of the variable, as a string. If value is equal to NULL, it will
+ *   remove the matching key from the config file.
+ *
+ * - the value regex, as a string. It will disregard key/value pairs where value
+ *   does not match.
+ *
+ * - a multi_replace value, as an int. If value is equal to zero, nothing or only
+ *   one matching key/value is replaced, else all matching key/values (regardless
+ *   how many) are removed, before the new pair is written.
+ *
+ * It returns 0 on success.
+ */
 void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
+
+/**
+ * rename or remove sections in the config file
+ * parameters `old_name` and `new_name`
+ * 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 git_config_rename_section_in_file(const char *, const char *, const char *);
 int git_config_copy_section(const char *, const char *);
@@ -142,6 +300,30 @@ enum config_scope current_config_scope(void);
 const char *current_config_origin_type(void);
 const char *current_config_name(void);
 
+/**
+ * Include Directives
+ * ------------------
+ *
+ * By default, the config parser does not respect include directives.
+ * However, a caller can use the special `git_config_include` wrapper
+ * callback to support them. To do so, you simply wrap your "real" callback
+ * function and data pointer in a `struct config_include_data`, and pass
+ * the wrapper to the regular config-reading functions. For example:
+ *
+ * -------------------------------------------
+ * int read_file_with_include(const char *file, config_fn_t fn, void *data)
+ * {
+ * struct config_include_data inc = CONFIG_INCLUDE_INIT;
+ * inc.fn = fn;
+ * inc.data = data;
+ * return git_config_from_file(git_config_include, file, &inc);
+ * }
+ * -------------------------------------------
+ *
+ * `git_config` respects includes automatically. The lower-level
+ * `git_config_from_file` does not.
+ *
+ */
 struct config_include_data {
 	int depth;
 	config_fn_t fn;
@@ -169,6 +351,33 @@ int parse_config_key(const char *var,
 		     const char **subsection, int *subsection_len,
 		     const char **key);
 
+/**
+ * Custom Configsets
+ * -----------------
+ *
+ * A `config_set` can be used to construct an in-memory cache for
+ * config-like files that the caller specifies (i.e., files like `.gitmodules`,
+ * `~/.gitconfig` etc.). For example,
+ *
+ * ----------------------------------------
+ * struct config_set gm_config;
+ * git_configset_init(&gm_config);
+ * int b;
+ * //we add config files to the config_set
+ * git_configset_add_file(&gm_config, ".gitmodules");
+ * git_configset_add_file(&gm_config, ".gitmodules_alt");
+ *
+ * if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
+ * //hack hack hack
+ * }
+ *
+ * when we are done with the configset:
+ * git_configset_clear(&gm_config);
+ * ----------------------------------------
+ *
+ * Configset API provides functions for the above mentioned work flow
+ */
+
 struct config_set_element {
 	struct hashmap_entry ent;
 	char *key;
@@ -197,15 +406,45 @@ struct config_set {
 	struct configset_list list;
 };
 
+/**
+ * Initializes the config_set `cs`.
+ */
 void git_configset_init(struct config_set *cs);
+
+/**
+ * Parses the file and adds the variable-value pairs to the `config_set`,
+ * dies if there is an error in parsing the file. Returns 0 on success, or
+ * -1 if the file does not exist or is inaccessible. The user has to decide
+ * if he wants to free the incomplete configset or continue using it when
+ * the function returns -1.
+ */
 int git_configset_add_file(struct config_set *cs, const char *filename);
+
+/**
+ * Finds and returns the value list, sorted in order of increasing priority
+ * for the configuration variable `key` and config set `cs`. When the
+ * configuration variable `key` is not found, returns NULL. The caller
+ * should not free or modify the returned pointer, as it is owned by the cache.
+ */
 const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key);
+
+/**
+ * Clears `config_set` structure, removes all saved variable-value pairs.
+ */
 void git_configset_clear(struct config_set *cs);
 
 /*
  * These functions return 1 if not found, and 0 if found, leaving the found
  * value in the 'dest' pointer.
  */
+
+/*
+ * Finds the highest-priority value for the configuration variable `key`
+ * and config set `cs`, stores the pointer to it in `value` and returns 0.
+ * When the configuration variable `key` is not found, returns 1 without
+ * touching `value`. The caller should not free or modify `value`, as it
+ * is owned by the cache.
+ */
 int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
 int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest);
 int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
@@ -240,16 +479,92 @@ int repo_config_get_maybe_bool(struct repository *repo,
 int repo_config_get_pathname(struct repository *repo,
 			     const char *key, const char **dest);
 
+/**
+ * Querying For Specific Variables
+ * -------------------------------
+ *
+ * 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
+ * cache generated previously from reading the config files.
+ */
+
+/**
+ * Finds the highest-priority value for the configuration variable `key`,
+ * stores the pointer to it in `value` and returns 0. When the
+ * configuration variable `key` is not found, returns 1 without touching
+ * `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);
+
+/**
+ * Finds and returns the value list, sorted in order of increasing priority
+ * for the configuration variable `key`. When the configuration variable
+ * `key` is not found, returns NULL. The caller should not free or modify
+ * the returned pointer, as it is owned by the cache.
+ */
 const struct string_list *git_config_get_value_multi(const char *key);
+
+/**
+ * Resets and invalidates the config cache.
+ */
 void git_config_clear(void);
+
+/**
+ * Allocates and copies the retrieved string into the `dest` parameter for
+ * the configuration variable `key`; if NULL string is given, prints an
+ * error message and returns -1. When the configuration variable `key` is
+ * not found, returns 1 without touching `dest`.
+ */
 int git_config_get_string_const(const char *key, const char **dest);
+
+/**
+ * Similar to `git_config_get_string_const`, except that retrieved value
+ * copied into the `dest` parameter is a mutable string.
+ */
 int git_config_get_string(const char *key, char **dest);
+
+/**
+ * Finds and parses the value to an integer for the configuration variable
+ * `key`. Dies on error; otherwise, stores the value of the parsed integer in
+ * `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);
+
+/**
+ * Similar to `git_config_get_int` but for unsigned longs.
+ */
 int git_config_get_ulong(const char *key, unsigned long *dest);
+
+/**
+ * Finds and parses the value into a boolean value, for the configuration
+ * variable `key` respecting keywords like "true" and "false". Integer
+ * values are converted into true/false values (when they are non-zero or
+ * zero, respectively). Other values cause a die(). If parsing is successful,
+ * stores the value of the parsed result in `dest` and returns 0. When the
+ * configuration variable `key` is not found, returns 1 without touching
+ * `dest`.
+ */
 int git_config_get_bool(const char *key, int *dest);
+
+/**
+ * Similar to `git_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);
+
+/**
+ * Similar to `git_config_get_bool`, except that it returns -1 on error
+ * rather than dying.
+ */
 int git_config_get_maybe_bool(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_untracked_cache(void);
@@ -270,7 +585,19 @@ struct key_value_info {
 	enum config_scope scope;
 };
 
+/**
+ * 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)));
+
+/**
+ * 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
+ * for the desired value.
+ */
 NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
 
 #define LOOKUP_CONFIG(mapping, var) \
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 1/1] config: add documentation to config.h
  2019-10-18  0:06 ` [PATCH 1/1] " Heba Waly via GitGitGadget
@ 2019-10-18 22:07   ` Jonathan Tan
  2019-10-20  8:05     ` Heba Waly
  2019-10-18 22:51   ` Emily Shaffer
  1 sibling, 1 reply; 16+ messages in thread
From: Jonathan Tan @ 2019-10-18 22:07 UTC (permalink / raw)
  To: gitgitgadget; +Cc: git, heba.waly, gitster, Jonathan Tan

> From: Heba Waly <heba.waly@gmail.com>
> 
> This commit is copying and summarizing the documentation from
> documentation/technical/api-config.txt to comments in config.h

Thanks for this commit!

As for your commit message, as far as I know, the idea is to move the
documentation, not to copy it. Also, write this in imperative form,
e.g.:

  Move the documentation from Documentation/technical/api-config.txt
  into config.h.

Also change the title of the commit message accordingly, e.g.:

  config: move documentation to header file

Also, include the deletion of api-config.txt in this commit.

If you are doing any summarizing, describe what summarizing you are
doing in the commit message too.

> + * A config callback function takes three parameters:
> + *
> + * - the name of the parsed variable. This is in canonical "flat" form: the
> + *   section, subsection, and variable segments will be separated by dots,
> + *   and the section and variable segments will be all lowercase. E.g.,
> + *   `core.ignorecase`, `diff.SomeType.textconv`.
> + *
> + * - the value of the found variable, as a string. If the variable had no
> + *   value specified, the value will be NULL (typically this means it
> + *   should be interpreted as boolean true).
> + *
> + * - a void pointer passed in by the caller of the config API; this can
> + *   contain callback-specific data
> + *
> + * A config callback should return 0 for success, or -1 if the variable
> + * could not be parsed properly.
> + */
> +
>  struct object_id;
>  
>  /* git_config_parse_key() returns these negated: */
> @@ -73,6 +107,11 @@ struct config_options {
>  
>  typedef int (*config_fn_t)(const char *, const char *, void *);
>  int git_default_config(const char *, const char *, void *);

The config callback is config_fn_t so that documentation should be
placed above that typedef.

Other than that, this looks good to me. The result is perhaps not as
tidy as we would like (especially with some functions being documented
and others not) but I think, anyway, that a verbatim movement should be
done in one commit (this one) and improvements, in a subsequent commit.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 1/1] config: add documentation to config.h
  2019-10-18  0:06 ` [PATCH 1/1] " Heba Waly via GitGitGadget
  2019-10-18 22:07   ` Jonathan Tan
@ 2019-10-18 22:51   ` Emily Shaffer
  2019-10-20  8:35     ` Heba Waly
  1 sibling, 1 reply; 16+ messages in thread
From: Emily Shaffer @ 2019-10-18 22:51 UTC (permalink / raw)
  To: Heba Waly via GitGitGadget; +Cc: git, Heba Waly, Junio C Hamano

On Fri, Oct 18, 2019 at 12:06:59AM +0000, Heba Waly via GitGitGadget wrote:
> From: Heba Waly <heba.waly@gmail.com>

Hi Heba,

Thanks for the patch!

I'd like to highlight to the community that this is an Outreachy
applicant and microproject. Heba, when you send the next version, I
think you can add [Outreachy] manually to the PR subject line - that
should draw the attention of those in the community who are invested in
helping Outreachy applicants.

> 
> This commit is copying and summarizing the documentation from
> documentation/technical/api-config.txt to comments in config.h

I think in the GitGitGadget PR you've got some great comments from Dscho
about how to format your commit message; please take a look at those and
feel free to reach out to me if you're still not sure what's missing or
not.

> Signed-off-by: Heba Waly <heba.waly@gmail.com>

One thing I miss in this change is the removal of the contents of
Documentation/technical/api-config.txt (or maybe the removal of the file
itself). I'd prefer to see at least for api-config.txt to say something
like "Please refer to comments in 'config.h'"; or, more drastically, for
api-config.txt to be removed entirely.

Having both pieces of documentation standing independently means that
someone who's trying to add new information about the config API won't
know where to add it; eventually they'll add something to config.h but
not api-config.txt, or vice versa, and the two documents will go out of
sync. So we want to move the documentation, rather than copy it.

Plus, having the removed doc as part of this change means I can more
easily look at where the lines of content are coming from and see if you
made any significant changes from the old contents of api-config.txt.
Having a smaller amount of change to review means your review will be
quicker - I don't feel as strong a need to check the grammar, spelling,
etc, because that text has already been reviewed before, and can just
make sure that the placement of each piece of documentation makes sense.


> ---
>  config.h | 327 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 327 insertions(+)
> 
> diff --git a/config.h b/config.h
> index f0ed464004..fa999a2ba0 100644
> --- a/config.h
> +++ b/config.h
> @@ -4,6 +4,40 @@
>  #include "hashmap.h"
>  #include "string-list.h"
>  
> +
> +/**
> + * The config API gives callers a way to access Git configuration files
> + * (and files which have the same syntax). See linkgit:git-config[1] for a
> + * discussion of the config file syntax.
> + *
> + * General Usage
> + * -------------
> + *
> + * Config files are parsed linearly, and each variable found is passed to a
> + * caller-provided callback function. The callback function is responsible
> + * for any actions to be taken on the config option, and is free to ignore
> + * some options. It is not uncommon for the configuration to be parsed
> + * several times during the run of a Git program, with different callbacks
> + * picking out different variables useful to themselves.
> + *
> + * A config callback function takes three parameters:
> + *
> + * - the name of the parsed variable. This is in canonical "flat" form: the
> + *   section, subsection, and variable segments will be separated by dots,
> + *   and the section and variable segments will be all lowercase. E.g.,
> + *   `core.ignorecase`, `diff.SomeType.textconv`.
> + *
> + * - the value of the found variable, as a string. If the variable had no
> + *   value specified, the value will be NULL (typically this means it
> + *   should be interpreted as boolean true).
> + *
> + * - a void pointer passed in by the caller of the config API; this can
> + *   contain callback-specific data
> + *
> + * A config callback should return 0 for success, or -1 if the variable
> + * could not be parsed properly.
> + */
> +
>  struct object_id;
>  
>  /* git_config_parse_key() returns these negated: */
> @@ -73,6 +107,11 @@ struct config_options {
>  
>  typedef int (*config_fn_t)(const char *, const char *, void *);
>  int git_default_config(const char *, const char *, void *);
> +
> +/**
> + * Read a specific file in git-config format.
> + * This function takes the same callback and data parameters as `git_config`.
> + */
>  int git_config_from_file(config_fn_t fn, const char *, void *);
>  int git_config_from_file_with_options(config_fn_t fn, const char *,
>  				      void *,
> @@ -88,33 +127,152 @@ void git_config_push_parameter(const char *text);
>  int git_config_from_parameters(config_fn_t fn, void *data);
>  void read_early_config(config_fn_t cb, void *data);
>  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.
> + *
> + * `git_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
> + * will first feed the user-wide one to the callback, and then the
> + * repo-specific one; by overwriting, the higher-priority repo-specific
> + * value is left at the end).
> + */
>  void git_config(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"
> + * 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.
> + * It takes two extra parameters:
> + *
> + * `config_source`::

I think the wonky trailing "::" is for generating manpages/HTML out of
the asciidoc from the original api-config.txt. I expect it's OK to
remove them throughout this change and format this in a way that makes more
sense for comments which won't be converted into anything else.

> + * 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
> + * 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`
> + * 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 config_options *opts);
> +
> +/**
> + * Value Parsing Helpers
> + * ---------------------

It may not make sense to have the header here in the middle of the doc.

I wonder whether we need the headers at all anymore; or, whether it
makes more sense to put this header in the long comment at the top with
just the list of function names (so someone knows where to look), and
leave the per-function explanations inline with the function they
describe?

> + *
> + * To aid in parsing string values, the config API provides callbacks with
> + * a number of helper functions

In the copy paste, this lost some ending punctuation. I'd advocate
ending this with ":" to indicate "we are about to give the list of those
functions". Although, I wonder whether it makes more sense to rephrase
this into something like "The following helper functions aid in parsing
string values:"? Not sure.

> + */
> +
>  int git_parse_ssize_t(const char *, ssize_t *);
>  int git_parse_ulong(const char *, unsigned long *);
> +
> +/**
> + * Same as `git_config_bool`, except that it returns -1 on error rather
> + * than dying.
> + */
>  int git_parse_maybe_bool(const char *);
> +
> +/**
> + * Parse the string to an integer, including unit factors. Dies on error;
> + * otherwise, returns the parsed result.
> + */
>  int git_config_int(const char *, const char *);
>  int64_t git_config_int64(const char *, const char *);
> +
> +/**
> + * Identical to `git_config_int`, but for unsigned longs.
> + */
>  unsigned long git_config_ulong(const char *, const char *);
>  ssize_t git_config_ssize_t(const char *, const char *);
> +
> +/**
> + * Same as `git_config_bool`, except that integers are returned as-is, and
> + * an `is_bool` flag is unset.
> + */
>  int git_config_bool_or_int(const char *, const char *, int *);
> +
> +/**
> + * Parse a string into a boolean value, respecting keywords like "true" and
> + * "false". Integer values are converted into true/false values (when they
> + * are non-zero or zero, respectively). Other values cause a die(). If
> + * parsing is successful, the return value is the result.
> + */
>  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 *);
> +
> +/**
> + * 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 *);

I might like to see another space under this function so it's clear
that the description isn't talking about expiry, color, or
set_in_file_gently. There are other places where this comment applies,
too.

>  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 *);
> +
> +/**
> + * write config values to a specific config file
> + * takes a key/value pair as parameter.
> + */

You could reflow this comment and some others so that they extend closer
to the end of the 80c line width; in some cases you can condense the
comment to a single line this way :)

>  void git_config_set_in_file(const char *, const char *, const char *);
>  int git_config_set_gently(const char *, const char *);
> +
> +/**
> + * write config values to `.git/config`
> + * takes a key/value pair as parameter.
> + */
>  void git_config_set(const char *, const char *);
>  int git_config_parse_key(const char *, char **, int *);
>  int git_config_key_is_valid(const char *key);
>  int git_config_set_multivar_gently(const char *, const char *, const char *, int);
>  void git_config_set_multivar(const char *, const char *, const char *, int);
>  int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, int);
> +
> +/**
> + * takes four parameters:
> + *
> + * - the name of the file, as a string, to which key/value pairs will be written.
> + *
> + * - the name of key, as a string. This is in canonical "flat" form: the section,
> + *   subsection, and variable segments will be separated by dots, and the section
> + *   and variable segments will be all lowercase.
> + *   E.g., `core.ignorecase`, `diff.SomeType.textconv`.
> + *
> + * - the value of the variable, as a string. If value is equal to NULL, it will
> + *   remove the matching key from the config file.
> + *
> + * - the value regex, as a string. It will disregard key/value pairs where value
> + *   does not match.
> + *
> + * - a multi_replace value, as an int. If value is equal to zero, nothing or only
> + *   one matching key/value is replaced, else all matching key/values (regardless
> + *   how many) are removed, before the new pair is written.
> + *
> + * It returns 0 on success.
> + */
>  void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
> +
> +/**
> + * rename or remove sections in the config file
> + * parameters `old_name` and `new_name`
> + * 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 git_config_rename_section_in_file(const char *, const char *, const char *);
>  int git_config_copy_section(const char *, const char *);
> @@ -142,6 +300,30 @@ enum config_scope current_config_scope(void);
>  const char *current_config_origin_type(void);
>  const char *current_config_name(void);
>  
> +/**
> + * Include Directives
> + * ------------------
> + *
> + * By default, the config parser does not respect include directives.
> + * However, a caller can use the special `git_config_include` wrapper
> + * callback to support them. To do so, you simply wrap your "real" callback
> + * function and data pointer in a `struct config_include_data`, and pass
> + * the wrapper to the regular config-reading functions. For example:
> + *
> + * -------------------------------------------
> + * int read_file_with_include(const char *file, config_fn_t fn, void *data)
> + * {
> + * struct config_include_data inc = CONFIG_INCLUDE_INIT;
> + * inc.fn = fn;
> + * inc.data = data;
> + * return git_config_from_file(git_config_include, file, &inc);
> + * }
> + * -------------------------------------------
> + *
> + * `git_config` respects includes automatically. The lower-level
> + * `git_config_from_file` does not.
> + *
> + */
>  struct config_include_data {
>  	int depth;
>  	config_fn_t fn;
> @@ -169,6 +351,33 @@ int parse_config_key(const char *var,
>  		     const char **subsection, int *subsection_len,
>  		     const char **key);
>  
> +/**
> + * Custom Configsets
> + * -----------------
> + *
> + * A `config_set` can be used to construct an in-memory cache for
> + * config-like files that the caller specifies (i.e., files like `.gitmodules`,
> + * `~/.gitconfig` etc.). For example,
> + *
> + * ----------------------------------------
> + * struct config_set gm_config;
> + * git_configset_init(&gm_config);
> + * int b;
> + * //we add config files to the config_set
> + * git_configset_add_file(&gm_config, ".gitmodules");
> + * git_configset_add_file(&gm_config, ".gitmodules_alt");
> + *
> + * if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
> + * //hack hack hack
> + * }
> + *
> + * when we are done with the configset:
> + * git_configset_clear(&gm_config);
> + * ----------------------------------------
> + *
> + * Configset API provides functions for the above mentioned work flow
> + */
> +
>  struct config_set_element {
>  	struct hashmap_entry ent;
>  	char *key;
> @@ -197,15 +406,45 @@ struct config_set {
>  	struct configset_list list;
>  };
>  
> +/**
> + * Initializes the config_set `cs`.
> + */
>  void git_configset_init(struct config_set *cs);
> +
> +/**
> + * Parses the file and adds the variable-value pairs to the `config_set`,
> + * dies if there is an error in parsing the file. Returns 0 on success, or
> + * -1 if the file does not exist or is inaccessible. The user has to decide
> + * if he wants to free the incomplete configset or continue using it when
> + * the function returns -1.
> + */
>  int git_configset_add_file(struct config_set *cs, const char *filename);
> +
> +/**
> + * Finds and returns the value list, sorted in order of increasing priority
> + * for the configuration variable `key` and config set `cs`. When the
> + * configuration variable `key` is not found, returns NULL. The caller
> + * should not free or modify the returned pointer, as it is owned by the cache.
> + */
>  const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key);
> +
> +/**
> + * Clears `config_set` structure, removes all saved variable-value pairs.
> + */
>  void git_configset_clear(struct config_set *cs);
>  
>  /*
>   * These functions return 1 if not found, and 0 if found, leaving the found
>   * value in the 'dest' pointer.
>   */
> +
> +/*
> + * Finds the highest-priority value for the configuration variable `key`
> + * and config set `cs`, stores the pointer to it in `value` and returns 0.
> + * When the configuration variable `key` is not found, returns 1 without
> + * touching `value`. The caller should not free or modify `value`, as it
> + * is owned by the cache.
> + */
>  int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
>  int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest);
>  int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
> @@ -240,16 +479,92 @@ int repo_config_get_maybe_bool(struct repository *repo,
>  int repo_config_get_pathname(struct repository *repo,
>  			     const char *key, const char **dest);
>  
> +/**
> + * Querying For Specific Variables
> + * -------------------------------
> + *
> + * 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
> + * cache generated previously from reading the config files.
> + */
> +
> +/**
> + * Finds the highest-priority value for the configuration variable `key`,
> + * stores the pointer to it in `value` and returns 0. When the
> + * configuration variable `key` is not found, returns 1 without touching
> + * `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);
> +
> +/**
> + * Finds and returns the value list, sorted in order of increasing priority
> + * for the configuration variable `key`. When the configuration variable
> + * `key` is not found, returns NULL. The caller should not free or modify
> + * the returned pointer, as it is owned by the cache.
> + */
>  const struct string_list *git_config_get_value_multi(const char *key);
> +
> +/**
> + * Resets and invalidates the config cache.
> + */
>  void git_config_clear(void);
> +
> +/**
> + * Allocates and copies the retrieved string into the `dest` parameter for
> + * the configuration variable `key`; if NULL string is given, prints an
> + * error message and returns -1. When the configuration variable `key` is
> + * not found, returns 1 without touching `dest`.
> + */
>  int git_config_get_string_const(const char *key, const char **dest);
> +
> +/**
> + * Similar to `git_config_get_string_const`, except that retrieved value
> + * copied into the `dest` parameter is a mutable string.
> + */
>  int git_config_get_string(const char *key, char **dest);
> +
> +/**
> + * Finds and parses the value to an integer for the configuration variable
> + * `key`. Dies on error; otherwise, stores the value of the parsed integer in
> + * `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);
> +
> +/**
> + * Similar to `git_config_get_int` but for unsigned longs.
> + */
>  int git_config_get_ulong(const char *key, unsigned long *dest);
> +
> +/**
> + * Finds and parses the value into a boolean value, for the configuration
> + * variable `key` respecting keywords like "true" and "false". Integer
> + * values are converted into true/false values (when they are non-zero or
> + * zero, respectively). Other values cause a die(). If parsing is successful,
> + * stores the value of the parsed result in `dest` and returns 0. When the
> + * configuration variable `key` is not found, returns 1 without touching
> + * `dest`.
> + */
>  int git_config_get_bool(const char *key, int *dest);
> +
> +/**
> + * Similar to `git_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);
> +
> +/**
> + * Similar to `git_config_get_bool`, except that it returns -1 on error
> + * rather than dying.
> + */
>  int git_config_get_maybe_bool(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_untracked_cache(void);
> @@ -270,7 +585,19 @@ struct key_value_info {
>  	enum config_scope scope;
>  };
>  
> +/**
> + * 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)));
> +
> +/**
> + * 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
> + * for the desired value.
> + */
>  NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
>  
>  #define LOOKUP_CONFIG(mapping, var) \
> -- 
> gitgitgadget

I made a couple of smallish comments about general formatting, but I'm
also interested to know whether you were able to move the entire
contents of api-config.txt across to here. Was there anything that you
couldn't find a place for?

Thanks a lot for this change, and congrats on getting your first review
out! Welcome! :)

 - Emily


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 1/1] config: add documentation to config.h
  2019-10-18 22:07   ` Jonathan Tan
@ 2019-10-20  8:05     ` Heba Waly
  0 siblings, 0 replies; 16+ messages in thread
From: Heba Waly @ 2019-10-20  8:05 UTC (permalink / raw)
  To: Jonathan Tan; +Cc: gitgitgadget, git, gitster

On Sat, Oct 19, 2019 at 11:07 AM Jonathan Tan <jonathantanmy@google.com> wrote:
>
> > From: Heba Waly <heba.waly@gmail.com>
> >
> > This commit is copying and summarizing the documentation from
> > documentation/technical/api-config.txt to comments in config.h
>
> Thanks for this commit!
>
> As for your commit message, as far as I know, the idea is to move the
> documentation, not to copy it. Also, write this in imperative form,
> e.g.:
>
>   Move the documentation from Documentation/technical/api-config.txt
>   into config.h.
>
> Also change the title of the commit message accordingly, e.g.:
>
>   config: move documentation to header file
>
Ok.
> Also, include the deletion of api-config.txt in this commit.
I wasn't sure if the api-config.txt should be removed or not so I
decided to keep it
and wait for feedback. I assume I'll need to delete api-config.html as well?

> If you are doing any summarizing, describe what summarizing you are
> doing in the commit message too.
Ok, will do so.

> > + * A config callback function takes three parameters:
> > + *
> > + * - the name of the parsed variable. This is in canonical "flat" form: the
> > + *   section, subsection, and variable segments will be separated by dots,
> > + *   and the section and variable segments will be all lowercase. E.g.,
> > + *   `core.ignorecase`, `diff.SomeType.textconv`.
> > + *
> > + * - the value of the found variable, as a string. If the variable had no
> > + *   value specified, the value will be NULL (typically this means it
> > + *   should be interpreted as boolean true).
> > + *
> > + * - a void pointer passed in by the caller of the config API; this can
> > + *   contain callback-specific data
> > + *
> > + * A config callback should return 0 for success, or -1 if the variable
> > + * could not be parsed properly.
> > + */
> > +
> >  struct object_id;
> >
> >  /* git_config_parse_key() returns these negated: */
> > @@ -73,6 +107,11 @@ struct config_options {
> >
> >  typedef int (*config_fn_t)(const char *, const char *, void *);
> >  int git_default_config(const char *, const char *, void *);
>
> The config callback is config_fn_t so that documentation should be
> placed above that typedef.
>
Cool, I couldn't find it, thanks!

> Other than that, this looks good to me. The result is perhaps not as
> tidy as we would like (especially with some functions being documented
> and others not) but I think, anyway, that a verbatim movement should be
> done in one commit (this one) and improvements, in a subsequent commit.
You're right, I would have loved to get all the functions documented, but that's
something I'm not able to do right now as I'm still getting familiar
with the code base.
But it's a good start!
I agree with you about moving the documentation and deleting the file
in one commit.
Will do so.

Thank you for the feedback!

Heba

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 1/1] config: add documentation to config.h
  2019-10-18 22:51   ` Emily Shaffer
@ 2019-10-20  8:35     ` Heba Waly
  2019-10-22 20:42       ` Emily Shaffer
  0 siblings, 1 reply; 16+ messages in thread
From: Heba Waly @ 2019-10-20  8:35 UTC (permalink / raw)
  To: Emily Shaffer; +Cc: Heba Waly via GitGitGadget, git, Junio C Hamano

On Sat, Oct 19, 2019 at 11:52 AM Emily Shaffer <emilyshaffer@google.com> wrote:
>
> On Fri, Oct 18, 2019 at 12:06:59AM +0000, Heba Waly via GitGitGadget wrote:
> > From: Heba Waly <heba.waly@gmail.com>
>
> Hi Heba,
>
> Thanks for the patch!
>
> I'd like to highlight to the community that this is an Outreachy
> applicant and microproject. Heba, when you send the next version, I
> think you can add [Outreachy] manually to the PR subject line - that
> should draw the attention of those in the community who are invested in
> helping Outreachy applicants.
Good idea! I wanted to add it to the email subject but as I decided to
use gitgadget
I had no control over the subject.
> >
> > This commit is copying and summarizing the documentation from
> > documentation/technical/api-config.txt to comments in config.h
>
> I think in the GitGitGadget PR you've got some great comments from Dscho
> about how to format your commit message; please take a look at those and
> feel free to reach out to me if you're still not sure what's missing or
> not.
Will do.
> > Signed-off-by: Heba Waly <heba.waly@gmail.com>
>
> One thing I miss in this change is the removal of the contents of
> Documentation/technical/api-config.txt (or maybe the removal of the file
> itself). I'd prefer to see at least for api-config.txt to say something
> like "Please refer to comments in 'config.h'"; or, more drastically, for
> api-config.txt to be removed entirely.
>
> Having both pieces of documentation standing independently means that
> someone who's trying to add new information about the config API won't
> know where to add it; eventually they'll add something to config.h but
> not api-config.txt, or vice versa, and the two documents will go out of
> sync. So we want to move the documentation, rather than copy it.
That makes sense, thanks for the explanation.
I wasn't sure if it should be removed or not so I decided to leave it
until I'm asked otherwise.
So I assume api-config.html will be removed too?
> Plus, having the removed doc as part of this change means I can more
> easily look at where the lines of content are coming from and see if you
> made any significant changes from the old contents of api-config.txt.
> Having a smaller amount of change to review means your review will be
> quicker - I don't feel as strong a need to check the grammar, spelling,
> etc, because that text has already been reviewed before, and can just
> make sure that the placement of each piece of documentation makes sense.
yes!
>
> > ---
> >  config.h | 327 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 327 insertions(+)
> >
> > diff --git a/config.h b/config.h
> > index f0ed464004..fa999a2ba0 100644
> > --- a/config.h
> > +++ b/config.h
> > @@ -4,6 +4,40 @@
> >  #include "hashmap.h"
> >  #include "string-list.h"
> >
> > +
> > +/**
> > + * The config API gives callers a way to access Git configuration files
> > + * (and files which have the same syntax). See linkgit:git-config[1] for a
> > + * discussion of the config file syntax.
> > + *
> > + * General Usage
> > + * -------------
> > + *
> > + * Config files are parsed linearly, and each variable found is passed to a
> > + * caller-provided callback function. The callback function is responsible
> > + * for any actions to be taken on the config option, and is free to ignore
> > + * some options. It is not uncommon for the configuration to be parsed
> > + * several times during the run of a Git program, with different callbacks
> > + * picking out different variables useful to themselves.
> > + *
> > + * A config callback function takes three parameters:
> > + *
> > + * - the name of the parsed variable. This is in canonical "flat" form: the
> > + *   section, subsection, and variable segments will be separated by dots,
> > + *   and the section and variable segments will be all lowercase. E.g.,
> > + *   `core.ignorecase`, `diff.SomeType.textconv`.
> > + *
> > + * - the value of the found variable, as a string. If the variable had no
> > + *   value specified, the value will be NULL (typically this means it
> > + *   should be interpreted as boolean true).
> > + *
> > + * - a void pointer passed in by the caller of the config API; this can
> > + *   contain callback-specific data
> > + *
> > + * A config callback should return 0 for success, or -1 if the variable
> > + * could not be parsed properly.
> > + */
> > +
> >  struct object_id;
> >
> >  /* git_config_parse_key() returns these negated: */
> > @@ -73,6 +107,11 @@ struct config_options {
> >
> >  typedef int (*config_fn_t)(const char *, const char *, void *);
> >  int git_default_config(const char *, const char *, void *);
> > +
> > +/**
> > + * Read a specific file in git-config format.
> > + * This function takes the same callback and data parameters as `git_config`.
> > + */
> >  int git_config_from_file(config_fn_t fn, const char *, void *);
> >  int git_config_from_file_with_options(config_fn_t fn, const char *,
> >                                     void *,
> > @@ -88,33 +127,152 @@ void git_config_push_parameter(const char *text);
> >  int git_config_from_parameters(config_fn_t fn, void *data);
> >  void read_early_config(config_fn_t cb, void *data);
> >  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.
> > + *
> > + * `git_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
> > + * will first feed the user-wide one to the callback, and then the
> > + * repo-specific one; by overwriting, the higher-priority repo-specific
> > + * value is left at the end).
> > + */
> >  void git_config(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"
> > + * 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.
> > + * It takes two extra parameters:
> > + *
> > + * `config_source`::
>
> I think the wonky trailing "::" is for generating manpages/HTML out of
> the asciidoc from the original api-config.txt. I expect it's OK to
> remove them throughout this change and format this in a way that makes more
> sense for comments which won't be converted into anything else.
Good catch! thanks, will change that.

> > + * 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
> > + * 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`
> > + * 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 config_options *opts);
> > +
> > +/**
> > + * Value Parsing Helpers
> > + * ---------------------
>
> It may not make sense to have the header here in the middle of the doc.
>
> I wonder whether we need the headers at all anymore; or, whether it
> makes more sense to put this header in the long comment at the top with
> just the list of function names (so someone knows where to look), and
> leave the per-function explanations inline with the function they
> describe?
I see your point Emily, but in the CodingGuidelines file it was
advised to refer to strbuf.h
as a model for documentation, I noticed that strbuf.h used headers
this way so I decided
to replicate that.
> > + *
> > + * To aid in parsing string values, the config API provides callbacks with
> > + * a number of helper functions
>
> In the copy paste, this lost some ending punctuation. I'd advocate
> ending this with ":" to indicate "we are about to give the list of those
> functions". Although, I wonder whether it makes more sense to rephrase
> this into something like "The following helper functions aid in parsing
> string values:"? Not sure.
I like that. will rephrase it.
> > + */
> > +
> >  int git_parse_ssize_t(const char *, ssize_t *);
> >  int git_parse_ulong(const char *, unsigned long *);
> > +
> > +/**
> > + * Same as `git_config_bool`, except that it returns -1 on error rather
> > + * than dying.
> > + */
> >  int git_parse_maybe_bool(const char *);
> > +
> > +/**
> > + * Parse the string to an integer, including unit factors. Dies on error;
> > + * otherwise, returns the parsed result.
> > + */
> >  int git_config_int(const char *, const char *);
> >  int64_t git_config_int64(const char *, const char *);
> > +
> > +/**
> > + * Identical to `git_config_int`, but for unsigned longs.
> > + */
> >  unsigned long git_config_ulong(const char *, const char *);
> >  ssize_t git_config_ssize_t(const char *, const char *);
> > +
> > +/**
> > + * Same as `git_config_bool`, except that integers are returned as-is, and
> > + * an `is_bool` flag is unset.
> > + */
> >  int git_config_bool_or_int(const char *, const char *, int *);
> > +
> > +/**
> > + * Parse a string into a boolean value, respecting keywords like "true" and
> > + * "false". Integer values are converted into true/false values (when they
> > + * are non-zero or zero, respectively). Other values cause a die(). If
> > + * parsing is successful, the return value is the result.
> > + */
> >  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 *);
> > +
> > +/**
> > + * 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 *);
>
> I might like to see another space under this function so it's clear
> that the description isn't talking about expiry, color, or
> set_in_file_gently. There are other places where this comment applies,
> too.
Yes.
> >  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 *);
> > +
> > +/**
> > + * write config values to a specific config file
> > + * takes a key/value pair as parameter.
> > + */
>
> You could reflow this comment and some others so that they extend closer
> to the end of the 80c line width; in some cases you can condense the
> comment to a single line this way :)
Ok.
> >  void git_config_set_in_file(const char *, const char *, const char *);
> >  int git_config_set_gently(const char *, const char *);
> > +
> > +/**
> > + * write config values to `.git/config`
> > + * takes a key/value pair as parameter.
> > + */
> >  void git_config_set(const char *, const char *);
> >  int git_config_parse_key(const char *, char **, int *);
> >  int git_config_key_is_valid(const char *key);
> >  int git_config_set_multivar_gently(const char *, const char *, const char *, int);
> >  void git_config_set_multivar(const char *, const char *, const char *, int);
> >  int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, int);
> > +
> > +/**
> > + * takes four parameters:
> > + *
> > + * - the name of the file, as a string, to which key/value pairs will be written.
> > + *
> > + * - the name of key, as a string. This is in canonical "flat" form: the section,
> > + *   subsection, and variable segments will be separated by dots, and the section
> > + *   and variable segments will be all lowercase.
> > + *   E.g., `core.ignorecase`, `diff.SomeType.textconv`.
> > + *
> > + * - the value of the variable, as a string. If value is equal to NULL, it will
> > + *   remove the matching key from the config file.
> > + *
> > + * - the value regex, as a string. It will disregard key/value pairs where value
> > + *   does not match.
> > + *
> > + * - a multi_replace value, as an int. If value is equal to zero, nothing or only
> > + *   one matching key/value is replaced, else all matching key/values (regardless
> > + *   how many) are removed, before the new pair is written.
> > + *
> > + * It returns 0 on success.
> > + */
> >  void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
> > +
> > +/**
> > + * rename or remove sections in the config file
> > + * parameters `old_name` and `new_name`
> > + * 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 git_config_rename_section_in_file(const char *, const char *, const char *);
> >  int git_config_copy_section(const char *, const char *);
> > @@ -142,6 +300,30 @@ enum config_scope current_config_scope(void);
> >  const char *current_config_origin_type(void);
> >  const char *current_config_name(void);
> >
> > +/**
> > + * Include Directives
> > + * ------------------
> > + *
> > + * By default, the config parser does not respect include directives.
> > + * However, a caller can use the special `git_config_include` wrapper
> > + * callback to support them. To do so, you simply wrap your "real" callback
> > + * function and data pointer in a `struct config_include_data`, and pass
> > + * the wrapper to the regular config-reading functions. For example:
> > + *
> > + * -------------------------------------------
> > + * int read_file_with_include(const char *file, config_fn_t fn, void *data)
> > + * {
> > + * struct config_include_data inc = CONFIG_INCLUDE_INIT;
> > + * inc.fn = fn;
> > + * inc.data = data;
> > + * return git_config_from_file(git_config_include, file, &inc);
> > + * }
> > + * -------------------------------------------
> > + *
> > + * `git_config` respects includes automatically. The lower-level
> > + * `git_config_from_file` does not.
> > + *
> > + */
> >  struct config_include_data {
> >       int depth;
> >       config_fn_t fn;
> > @@ -169,6 +351,33 @@ int parse_config_key(const char *var,
> >                    const char **subsection, int *subsection_len,
> >                    const char **key);
> >
> > +/**
> > + * Custom Configsets
> > + * -----------------
> > + *
> > + * A `config_set` can be used to construct an in-memory cache for
> > + * config-like files that the caller specifies (i.e., files like `.gitmodules`,
> > + * `~/.gitconfig` etc.). For example,
> > + *
> > + * ----------------------------------------
> > + * struct config_set gm_config;
> > + * git_configset_init(&gm_config);
> > + * int b;
> > + * //we add config files to the config_set
> > + * git_configset_add_file(&gm_config, ".gitmodules");
> > + * git_configset_add_file(&gm_config, ".gitmodules_alt");
> > + *
> > + * if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
> > + * //hack hack hack
> > + * }
> > + *
> > + * when we are done with the configset:
> > + * git_configset_clear(&gm_config);
> > + * ----------------------------------------
> > + *
> > + * Configset API provides functions for the above mentioned work flow
> > + */
> > +
> >  struct config_set_element {
> >       struct hashmap_entry ent;
> >       char *key;
> > @@ -197,15 +406,45 @@ struct config_set {
> >       struct configset_list list;
> >  };
> >
> > +/**
> > + * Initializes the config_set `cs`.
> > + */
> >  void git_configset_init(struct config_set *cs);
> > +
> > +/**
> > + * Parses the file and adds the variable-value pairs to the `config_set`,
> > + * dies if there is an error in parsing the file. Returns 0 on success, or
> > + * -1 if the file does not exist or is inaccessible. The user has to decide
> > + * if he wants to free the incomplete configset or continue using it when
> > + * the function returns -1.
> > + */
> >  int git_configset_add_file(struct config_set *cs, const char *filename);
> > +
> > +/**
> > + * Finds and returns the value list, sorted in order of increasing priority
> > + * for the configuration variable `key` and config set `cs`. When the
> > + * configuration variable `key` is not found, returns NULL. The caller
> > + * should not free or modify the returned pointer, as it is owned by the cache.
> > + */
> >  const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key);
> > +
> > +/**
> > + * Clears `config_set` structure, removes all saved variable-value pairs.
> > + */
> >  void git_configset_clear(struct config_set *cs);
> >
> >  /*
> >   * These functions return 1 if not found, and 0 if found, leaving the found
> >   * value in the 'dest' pointer.
> >   */
> > +
> > +/*
> > + * Finds the highest-priority value for the configuration variable `key`
> > + * and config set `cs`, stores the pointer to it in `value` and returns 0.
> > + * When the configuration variable `key` is not found, returns 1 without
> > + * touching `value`. The caller should not free or modify `value`, as it
> > + * is owned by the cache.
> > + */
> >  int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
> >  int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest);
> >  int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
> > @@ -240,16 +479,92 @@ int repo_config_get_maybe_bool(struct repository *repo,
> >  int repo_config_get_pathname(struct repository *repo,
> >                            const char *key, const char **dest);
> >
> > +/**
> > + * Querying For Specific Variables
> > + * -------------------------------
> > + *
> > + * 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
> > + * cache generated previously from reading the config files.
> > + */
> > +
> > +/**
> > + * Finds the highest-priority value for the configuration variable `key`,
> > + * stores the pointer to it in `value` and returns 0. When the
> > + * configuration variable `key` is not found, returns 1 without touching
> > + * `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);
> > +
> > +/**
> > + * Finds and returns the value list, sorted in order of increasing priority
> > + * for the configuration variable `key`. When the configuration variable
> > + * `key` is not found, returns NULL. The caller should not free or modify
> > + * the returned pointer, as it is owned by the cache.
> > + */
> >  const struct string_list *git_config_get_value_multi(const char *key);
> > +
> > +/**
> > + * Resets and invalidates the config cache.
> > + */
> >  void git_config_clear(void);
> > +
> > +/**
> > + * Allocates and copies the retrieved string into the `dest` parameter for
> > + * the configuration variable `key`; if NULL string is given, prints an
> > + * error message and returns -1. When the configuration variable `key` is
> > + * not found, returns 1 without touching `dest`.
> > + */
> >  int git_config_get_string_const(const char *key, const char **dest);
> > +
> > +/**
> > + * Similar to `git_config_get_string_const`, except that retrieved value
> > + * copied into the `dest` parameter is a mutable string.
> > + */
> >  int git_config_get_string(const char *key, char **dest);
> > +
> > +/**
> > + * Finds and parses the value to an integer for the configuration variable
> > + * `key`. Dies on error; otherwise, stores the value of the parsed integer in
> > + * `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);
> > +
> > +/**
> > + * Similar to `git_config_get_int` but for unsigned longs.
> > + */
> >  int git_config_get_ulong(const char *key, unsigned long *dest);
> > +
> > +/**
> > + * Finds and parses the value into a boolean value, for the configuration
> > + * variable `key` respecting keywords like "true" and "false". Integer
> > + * values are converted into true/false values (when they are non-zero or
> > + * zero, respectively). Other values cause a die(). If parsing is successful,
> > + * stores the value of the parsed result in `dest` and returns 0. When the
> > + * configuration variable `key` is not found, returns 1 without touching
> > + * `dest`.
> > + */
> >  int git_config_get_bool(const char *key, int *dest);
> > +
> > +/**
> > + * Similar to `git_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);
> > +
> > +/**
> > + * Similar to `git_config_get_bool`, except that it returns -1 on error
> > + * rather than dying.
> > + */
> >  int git_config_get_maybe_bool(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_untracked_cache(void);
> > @@ -270,7 +585,19 @@ struct key_value_info {
> >       enum config_scope scope;
> >  };
> >
> > +/**
> > + * 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)));
> > +
> > +/**
> > + * 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
> > + * for the desired value.
> > + */
> >  NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
> >
> >  #define LOOKUP_CONFIG(mapping, var) \
> > --
> > gitgitgadget
>
> I made a couple of smallish comments about general formatting, but I'm
> also interested to know whether you were able to move the entire
> contents of api-config.txt across to here. Was there anything that you
> couldn't find a place for?
Yes, everything is moved.
> Thanks a lot for this change, and congrats on getting your first review
> out! Welcome! :)
>
>  - Emily
>
Thanks a lot Emily for the detailed and helpful feedback!

Heba

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v2 0/1] [Outreachy] config: move documentation to config.h
  2019-10-18  0:06 [PATCH 0/1] config: add documentation to config.h Heba Waly via GitGitGadget
  2019-10-18  0:06 ` [PATCH 1/1] " Heba Waly via GitGitGadget
@ 2019-10-22  7:05 ` Heba Waly via GitGitGadget
  2019-10-22  7:05   ` [PATCH v2 1/1] " Heba Waly via GitGitGadget
  2019-10-23  5:30   ` [PATCH v3 0/1] [Outreachy] " Heba Waly via GitGitGadget
  1 sibling, 2 replies; 16+ messages in thread
From: Heba Waly via GitGitGadget @ 2019-10-22  7:05 UTC (permalink / raw)
  To: git; +Cc: Heba Waly, Junio C Hamano

Move the documentation from Documentation/technical/api-config.txt into
config.h

Signed-off-by: Heba Waly heba.waly@gmail.com [heba.waly@gmail.com]

Thanks for taking the time to contribute to Git! Please be advised that the
Git community does not use github.com for their contributions. Instead, we
use a mailing list (git@vger.kernel.org) for code submissions, code reviews,
and bug reports. Nevertheless, you can use GitGitGadget (
https://gitgitgadget.github.io/) to conveniently send your Pull Requests
commits to our mailing list.

Please read the "guidelines for contributing" linked above!

Heba Waly (1):
  config: move documentation to config.h

 Documentation/technical/api-config.txt | 319 -----------------------
 config.h                               | 336 +++++++++++++++++++++++++
 2 files changed, 336 insertions(+), 319 deletions(-)
 delete mode 100644 Documentation/technical/api-config.txt


base-commit: 108b97dc372828f0e72e56bbb40cae8e1e83ece6
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-405%2FHebaWaly%2Fconfig_documentation-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-405/HebaWaly/config_documentation-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/405

Range-diff vs v1:

 1:  2e42eafb5d ! 1:  1a9aa33b46 config: add documentation to config.h
     @@ -1,12 +1,336 @@
      Author: Heba Waly <heba.waly@gmail.com>
      
     -    config: add documentation to config.h
     -
     -    This commit is copying and summarizing the documentation from
     -    documentation/technical/api-config.txt to comments in config.h
     +    config: move documentation to config.h
      
     +    Move the documentation from Documentation/technical/api-config.txt into
     +    config.h
          Signed-off-by: Heba Waly <heba.waly@gmail.com>
      
     + diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
     + deleted file mode 100644
     + --- a/Documentation/technical/api-config.txt
     + +++ /dev/null
     +@@
     +-config API
     +-==========
     +-
     +-The config API gives callers a way to access Git configuration files
     +-(and files which have the same syntax). See linkgit:git-config[1] for a
     +-discussion of the config file syntax.
     +-
     +-General Usage
     +--------------
     +-
     +-Config files are parsed linearly, and each variable found is passed to a
     +-caller-provided callback function. The callback function is responsible
     +-for any actions to be taken on the config option, and is free to ignore
     +-some options. It is not uncommon for the configuration to be parsed
     +-several times during the run of a Git program, with different callbacks
     +-picking out different variables useful to themselves.
     +-
     +-A config callback function takes three parameters:
     +-
     +-- the name of the parsed variable. This is in canonical "flat" form: the
     +-  section, subsection, and variable segments will be separated by dots,
     +-  and the section and variable segments will be all lowercase. E.g.,
     +-  `core.ignorecase`, `diff.SomeType.textconv`.
     +-
     +-- the value of the found variable, as a string. If the variable had no
     +-  value specified, the value will be NULL (typically this means it
     +-  should be interpreted as boolean true).
     +-
     +-- a void pointer passed in by the caller of the config API; this can
     +-  contain callback-specific data
     +-
     +-A config callback should return 0 for success, or -1 if the variable
     +-could not be parsed properly.
     +-
     +-Basic Config Querying
     +----------------------
     +-
     +-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.
     +-
     +-`git_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
     +-will first feed the user-wide one to the callback, and then the
     +-repo-specific one; by overwriting, the higher-priority repo-specific
     +-value is left at the end).
     +-
     +-The `config_with_options` function lets the caller examine config
     +-while adjusting some of the default behavior of `git_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. It takes two extra parameters:
     +-
     +-`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
     +-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`
     +-sets `opts.respect_includes` to `1` by default.
     +-
     +-Reading Specific Files
     +-----------------------
     +-
     +-To read a specific file in git-config format, use
     +-`git_config_from_file`. This takes the same callback and data parameters
     +-as `git_config`.
     +-
     +-Querying For Specific Variables
     +--------------------------------
     +-
     +-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
     +-cache generated previously from reading the config files.
     +-
     +-`int git_config_get_value(const char *key, const char **value)`::
     +-
     +-	Finds the highest-priority value for the configuration variable `key`,
     +-	stores the pointer to it in `value` and returns 0. When the
     +-	configuration variable `key` is not found, returns 1 without touching
     +-	`value`. The caller should not free or modify `value`, as it is owned
     +-	by the cache.
     +-
     +-`const struct string_list *git_config_get_value_multi(const char *key)`::
     +-
     +-	Finds and returns the value list, sorted in order of increasing priority
     +-	for the configuration variable `key`. When the configuration variable
     +-	`key` is not found, returns NULL. The caller should not free or modify
     +-	the returned pointer, as it is owned by the cache.
     +-
     +-`void git_config_clear(void)`::
     +-
     +-	Resets and invalidates the config cache.
     +-
     +-The config API also provides type specific API functions which do conversion
     +-as well as retrieval for the queried variable, including:
     +-
     +-`int git_config_get_int(const char *key, int *dest)`::
     +-
     +-	Finds and parses the value to an integer for the configuration variable
     +-	`key`. Dies on error; otherwise, stores the value of the parsed integer in
     +-	`dest` and returns 0. When the configuration variable `key` is not found,
     +-	returns 1 without touching `dest`.
     +-
     +-`int git_config_get_ulong(const char *key, unsigned long *dest)`::
     +-
     +-	Similar to `git_config_get_int` but for unsigned longs.
     +-
     +-`int git_config_get_bool(const char *key, int *dest)`::
     +-
     +-	Finds and parses the value into a boolean value, for the configuration
     +-	variable `key` respecting keywords like "true" and "false". Integer
     +-	values are converted into true/false values (when they are non-zero or
     +-	zero, respectively). Other values cause a die(). If parsing is successful,
     +-	stores the value of the parsed result in `dest` and returns 0. When the
     +-	configuration variable `key` is not found, returns 1 without touching
     +-	`dest`.
     +-
     +-`int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest)`::
     +-
     +-	Similar to `git_config_get_bool`, except that integers are copied as-is,
     +-	and `is_bool` flag is unset.
     +-
     +-`int git_config_get_maybe_bool(const char *key, int *dest)`::
     +-
     +-	Similar to `git_config_get_bool`, except that it returns -1 on error
     +-	rather than dying.
     +-
     +-`int git_config_get_string_const(const char *key, const char **dest)`::
     +-
     +-	Allocates and copies the retrieved string into the `dest` parameter for
     +-	the configuration variable `key`; if NULL string is given, prints an
     +-	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)`::
     +-
     +-	Similar to `git_config_get_string_const`, except that retrieved value
     +-	copied into the `dest` parameter is a mutable string.
     +-
     +-`int git_config_get_pathname(const char *key, const char **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.
     +-
     +-`git_die_config(const char *key, const char *err, ...)`::
     +-
     +-	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`.
     +-
     +-`void git_die_config_linenr(const char *key, const char *filename, int linenr)`::
     +-
     +-	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
     +-	for the desired value.
     +-
     +-See test-config.c for usage examples.
     +-
     +-Value Parsing Helpers
     +----------------------
     +-
     +-To aid in parsing string values, the config API provides callbacks with
     +-a number of helper functions, including:
     +-
     +-`git_config_int`::
     +-Parse the string to an integer, including unit factors. Dies on error;
     +-otherwise, returns the parsed result.
     +-
     +-`git_config_ulong`::
     +-Identical to `git_config_int`, but for unsigned longs.
     +-
     +-`git_config_bool`::
     +-Parse a string into a boolean value, respecting keywords like "true" and
     +-"false". Integer values are converted into true/false values (when they
     +-are non-zero or zero, respectively). Other values cause a die(). If
     +-parsing is successful, the return value is the result.
     +-
     +-`git_config_bool_or_int`::
     +-Same as `git_config_bool`, except that integers are returned as-is, and
     +-an `is_bool` flag is unset.
     +-
     +-`git_parse_maybe_bool`::
     +-Same as `git_config_bool`, except that it returns -1 on error rather
     +-than dying.
     +-
     +-`git_config_string`::
     +-Allocates and copies the value string into the `dest` parameter; if no
     +-string is given, prints an error message and returns -1.
     +-
     +-`git_config_pathname`::
     +-Similar to `git_config_string`, but expands `~` or `~user` into the
     +-user's home directory when found at the beginning of the path.
     +-
     +-Include Directives
     +-------------------
     +-
     +-By default, the config parser does not respect include directives.
     +-However, a caller can use the special `git_config_include` wrapper
     +-callback to support them. To do so, you simply wrap your "real" callback
     +-function and data pointer in a `struct config_include_data`, and pass
     +-the wrapper to the regular config-reading functions. For example:
     +-
     +--------------------------------------------
     +-int read_file_with_include(const char *file, config_fn_t fn, void *data)
     +-{
     +-	struct config_include_data inc = CONFIG_INCLUDE_INIT;
     +-	inc.fn = fn;
     +-	inc.data = data;
     +-	return git_config_from_file(git_config_include, file, &inc);
     +-}
     +--------------------------------------------
     +-
     +-`git_config` respects includes automatically. The lower-level
     +-`git_config_from_file` does not.
     +-
     +-Custom Configsets
     +------------------
     +-
     +-A `config_set` can be used to construct an in-memory cache for
     +-config-like files that the caller specifies (i.e., files like `.gitmodules`,
     +-`~/.gitconfig` etc.). For example,
     +-
     +-----------------------------------------
     +-struct config_set gm_config;
     +-git_configset_init(&gm_config);
     +-int b;
     +-/* we add config files to the config_set */
     +-git_configset_add_file(&gm_config, ".gitmodules");
     +-git_configset_add_file(&gm_config, ".gitmodules_alt");
     +-
     +-if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
     +-	/* hack hack hack */
     +-}
     +-
     +-/* when we are done with the configset */
     +-git_configset_clear(&gm_config);
     +-----------------------------------------
     +-
     +-Configset API provides functions for the above mentioned work flow, including:
     +-
     +-`void git_configset_init(struct config_set *cs)`::
     +-
     +-	Initializes the config_set `cs`.
     +-
     +-`int git_configset_add_file(struct config_set *cs, const char *filename)`::
     +-
     +-	Parses the file and adds the variable-value pairs to the `config_set`,
     +-	dies if there is an error in parsing the file. Returns 0 on success, or
     +-	-1 if the file does not exist or is inaccessible. The user has to decide
     +-	if he wants to free the incomplete configset or continue using it when
     +-	the function returns -1.
     +-
     +-`int git_configset_get_value(struct config_set *cs, const char *key, const char **value)`::
     +-
     +-	Finds the highest-priority value for the configuration variable `key`
     +-	and config set `cs`, stores the pointer to it in `value` and returns 0.
     +-	When the configuration variable `key` is not found, returns 1 without
     +-	touching `value`. The caller should not free or modify `value`, as it
     +-	is owned by the cache.
     +-
     +-`const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key)`::
     +-
     +-	Finds and returns the value list, sorted in order of increasing priority
     +-	for the configuration variable `key` and config set `cs`. When the
     +-	configuration variable `key` is not found, returns NULL. The caller
     +-	should not free or modify the returned pointer, as it is owned by the cache.
     +-
     +-`void git_configset_clear(struct config_set *cs)`::
     +-
     +-	Clears `config_set` structure, removes all saved variable-value pairs.
     +-
     +-In addition to above functions, the `config_set` API provides type specific
     +-functions in the vein of `git_config_get_int` and family but with an extra
     +-parameter, pointer to struct `config_set`.
     +-They all behave similarly to the `git_config_get*()` family described in
     +-"Querying For Specific Variables" above.
     +-
     +-Writing Config Files
     +---------------------
     +-
     +-Git gives multiple entry points in the Config API to write config values to
     +-files namely `git_config_set_in_file` and `git_config_set`, which write to
     +-a specific config file or to `.git/config` respectively. They both take a
     +-key/value pair as parameter.
     +-In the end they both call `git_config_set_multivar_in_file` which takes four
     +-parameters:
     +-
     +-- the name of the file, as a string, to which key/value pairs will be written.
     +-
     +-- the name of key, as a string. This is in canonical "flat" form: the section,
     +-  subsection, and variable segments will be separated by dots, and the section
     +-  and variable segments will be all lowercase.
     +-  E.g., `core.ignorecase`, `diff.SomeType.textconv`.
     +-
     +-- the value of the variable, as a string. If value is equal to NULL, it will
     +-  remove the matching key from the config file.
     +-
     +-- the value regex, as a string. It will disregard key/value pairs where value
     +-  does not match.
     +-
     +-- a multi_replace value, as an int. If value is equal to zero, nothing or only
     +-  one matching key/value is replaced, else all matching key/values (regardless
     +-  how many) are removed, before the new pair is written.
     +-
     +-It returns 0 on success.
     +-
     +-Also, there are functions `git_config_rename_section` and
     +-`git_config_rename_section_in_file` with parameters `old_name` and `new_name`
     +-for renaming or removing sections in the config files. If NULL is passed
     +-through `new_name` parameter, the section will be removed from the config file.
     +
       diff --git a/config.h b/config.h
       --- a/config.h
       +++ b/config.h
     @@ -29,7 +353,16 @@
      + * some options. It is not uncommon for the configuration to be parsed
      + * several times during the run of a Git program, with different callbacks
      + * picking out different variables useful to themselves.
     -+ *
     ++ */
     ++
     + struct object_id;
     + 
     + /* git_config_parse_key() returns these negated: */
     +@@
     + 	} error_action;
     + };
     + 
     ++/**
      + * A config callback function takes three parameters:
      + *
      + * - the name of the parsed variable. This is in canonical "flat" form: the
     @@ -47,13 +380,8 @@
      + * A config callback should return 0 for success, or -1 if the variable
      + * could not be parsed properly.
      + */
     -+
     - struct object_id;
     - 
     - /* git_config_parse_key() returns these negated: */
     -@@
     - 
       typedef int (*config_fn_t)(const char *, const char *, void *);
     ++
       int git_default_config(const char *, const char *, void *);
      +
      +/**
     @@ -61,8 +389,10 @@
      + * This function takes the same callback and data parameters as `git_config`.
      + */
       int git_config_from_file(config_fn_t fn, const char *, void *);
     ++
       int git_config_from_file_with_options(config_fn_t fn, const char *,
       				      void *,
     + 				      const struct config_options *);
      @@
       int git_config_from_parameters(config_fn_t fn, void *data);
       void read_early_config(config_fn_t cb, void *data);
     @@ -91,13 +421,13 @@
      + * intentionally tweaking the normal config-lookup process.
      + * It takes two extra parameters:
      + *
     -+ * `config_source`::
     ++ * - `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
      + * to `NULL`.
      + *
     -+ * `opts`::
     ++ * - `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`
      + * sets `opts.respect_includes` to `1` by default.
     @@ -110,8 +440,7 @@
      + * Value Parsing Helpers
      + * ---------------------
      + *
     -+ * To aid in parsing string values, the config API provides callbacks with
     -+ * a number of helper functions
     ++ * The following helper functions aid in parsing string values
      + */
      +
       int git_parse_ssize_t(const char *, ssize_t *);
     @@ -128,12 +457,14 @@
      + * otherwise, returns the parsed result.
      + */
       int git_config_int(const char *, const char *);
     ++
       int64_t git_config_int64(const char *, const char *);
      +
      +/**
      + * Identical to `git_config_int`, but for unsigned longs.
      + */
       unsigned long git_config_ulong(const char *, const char *);
     ++
       ssize_t git_config_ssize_t(const char *, const char *);
      +
      +/**
     @@ -161,22 +492,24 @@
      + * 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_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 *);
      +
      +/**
     -+ * write config values to a specific config file
     -+ * takes a key/value pair as parameter.
     ++ * 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 *);
     ++
       int git_config_set_gently(const char *, const char *);
      +
      +/**
     -+ * write config values to `.git/config`
     -+ * takes a key/value pair as parameter.
     ++ * write config values to `.git/config`, takes a key/value pair as parameter.
      + */
       void git_config_set(const char *, const char *);
     ++
       int git_config_parse_key(const char *, char **, int *);
       int git_config_key_is_valid(const char *key);
       int git_config_set_multivar_gently(const char *, const char *, const char *, int);
     @@ -214,8 +547,10 @@
      + * the section will be removed from the config file.
      + */
       int git_config_rename_section(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 *);
      @@
       const char *current_config_origin_type(void);
       const char *current_config_name(void);
     @@ -325,8 +660,10 @@
      + * is owned by the cache.
      + */
       int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
     ++
       int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest);
       int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
     + int git_configset_get_int(struct config_set *cs, const char *key, int *dest);
      @@
       int repo_config_get_pathname(struct repository *repo,
       			     const char *key, const char **dest);
     @@ -418,8 +755,10 @@
      + * 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_untracked_cache(void);
     + int git_config_get_split_index(void);
      @@
       	enum config_scope scope;
       };

-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v2 1/1] config: move documentation to config.h
  2019-10-22  7:05 ` [PATCH v2 0/1] [Outreachy] config: move " Heba Waly via GitGitGadget
@ 2019-10-22  7:05   ` Heba Waly via GitGitGadget
  2019-10-22 20:59     ` Emily Shaffer
  2019-10-23  5:30   ` [PATCH v3 0/1] [Outreachy] " Heba Waly via GitGitGadget
  1 sibling, 1 reply; 16+ messages in thread
From: Heba Waly via GitGitGadget @ 2019-10-22  7:05 UTC (permalink / raw)
  To: git; +Cc: Heba Waly, Junio C Hamano, Heba Waly

From: Heba Waly <heba.waly@gmail.com>

Move the documentation from Documentation/technical/api-config.txt into
config.h
Signed-off-by: Heba Waly <heba.waly@gmail.com>
---
 Documentation/technical/api-config.txt | 319 -----------------------
 config.h                               | 336 +++++++++++++++++++++++++
 2 files changed, 336 insertions(+), 319 deletions(-)
 delete mode 100644 Documentation/technical/api-config.txt

diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
deleted file mode 100644
index 7d20716c32..0000000000
--- a/Documentation/technical/api-config.txt
+++ /dev/null
@@ -1,319 +0,0 @@
-config API
-==========
-
-The config API gives callers a way to access Git configuration files
-(and files which have the same syntax). See linkgit:git-config[1] for a
-discussion of the config file syntax.
-
-General Usage
--------------
-
-Config files are parsed linearly, and each variable found is passed to a
-caller-provided callback function. The callback function is responsible
-for any actions to be taken on the config option, and is free to ignore
-some options. It is not uncommon for the configuration to be parsed
-several times during the run of a Git program, with different callbacks
-picking out different variables useful to themselves.
-
-A config callback function takes three parameters:
-
-- the name of the parsed variable. This is in canonical "flat" form: the
-  section, subsection, and variable segments will be separated by dots,
-  and the section and variable segments will be all lowercase. E.g.,
-  `core.ignorecase`, `diff.SomeType.textconv`.
-
-- the value of the found variable, as a string. If the variable had no
-  value specified, the value will be NULL (typically this means it
-  should be interpreted as boolean true).
-
-- a void pointer passed in by the caller of the config API; this can
-  contain callback-specific data
-
-A config callback should return 0 for success, or -1 if the variable
-could not be parsed properly.
-
-Basic Config Querying
----------------------
-
-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.
-
-`git_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
-will first feed the user-wide one to the callback, and then the
-repo-specific one; by overwriting, the higher-priority repo-specific
-value is left at the end).
-
-The `config_with_options` function lets the caller examine config
-while adjusting some of the default behavior of `git_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. It takes two extra parameters:
-
-`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
-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`
-sets `opts.respect_includes` to `1` by default.
-
-Reading Specific Files
-----------------------
-
-To read a specific file in git-config format, use
-`git_config_from_file`. This takes the same callback and data parameters
-as `git_config`.
-
-Querying For Specific Variables
--------------------------------
-
-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
-cache generated previously from reading the config files.
-
-`int git_config_get_value(const char *key, const char **value)`::
-
-	Finds the highest-priority value for the configuration variable `key`,
-	stores the pointer to it in `value` and returns 0. When the
-	configuration variable `key` is not found, returns 1 without touching
-	`value`. The caller should not free or modify `value`, as it is owned
-	by the cache.
-
-`const struct string_list *git_config_get_value_multi(const char *key)`::
-
-	Finds and returns the value list, sorted in order of increasing priority
-	for the configuration variable `key`. When the configuration variable
-	`key` is not found, returns NULL. The caller should not free or modify
-	the returned pointer, as it is owned by the cache.
-
-`void git_config_clear(void)`::
-
-	Resets and invalidates the config cache.
-
-The config API also provides type specific API functions which do conversion
-as well as retrieval for the queried variable, including:
-
-`int git_config_get_int(const char *key, int *dest)`::
-
-	Finds and parses the value to an integer for the configuration variable
-	`key`. Dies on error; otherwise, stores the value of the parsed integer in
-	`dest` and returns 0. When the configuration variable `key` is not found,
-	returns 1 without touching `dest`.
-
-`int git_config_get_ulong(const char *key, unsigned long *dest)`::
-
-	Similar to `git_config_get_int` but for unsigned longs.
-
-`int git_config_get_bool(const char *key, int *dest)`::
-
-	Finds and parses the value into a boolean value, for the configuration
-	variable `key` respecting keywords like "true" and "false". Integer
-	values are converted into true/false values (when they are non-zero or
-	zero, respectively). Other values cause a die(). If parsing is successful,
-	stores the value of the parsed result in `dest` and returns 0. When the
-	configuration variable `key` is not found, returns 1 without touching
-	`dest`.
-
-`int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest)`::
-
-	Similar to `git_config_get_bool`, except that integers are copied as-is,
-	and `is_bool` flag is unset.
-
-`int git_config_get_maybe_bool(const char *key, int *dest)`::
-
-	Similar to `git_config_get_bool`, except that it returns -1 on error
-	rather than dying.
-
-`int git_config_get_string_const(const char *key, const char **dest)`::
-
-	Allocates and copies the retrieved string into the `dest` parameter for
-	the configuration variable `key`; if NULL string is given, prints an
-	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)`::
-
-	Similar to `git_config_get_string_const`, except that retrieved value
-	copied into the `dest` parameter is a mutable string.
-
-`int git_config_get_pathname(const char *key, const char **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.
-
-`git_die_config(const char *key, const char *err, ...)`::
-
-	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`.
-
-`void git_die_config_linenr(const char *key, const char *filename, int linenr)`::
-
-	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
-	for the desired value.
-
-See test-config.c for usage examples.
-
-Value Parsing Helpers
----------------------
-
-To aid in parsing string values, the config API provides callbacks with
-a number of helper functions, including:
-
-`git_config_int`::
-Parse the string to an integer, including unit factors. Dies on error;
-otherwise, returns the parsed result.
-
-`git_config_ulong`::
-Identical to `git_config_int`, but for unsigned longs.
-
-`git_config_bool`::
-Parse a string into a boolean value, respecting keywords like "true" and
-"false". Integer values are converted into true/false values (when they
-are non-zero or zero, respectively). Other values cause a die(). If
-parsing is successful, the return value is the result.
-
-`git_config_bool_or_int`::
-Same as `git_config_bool`, except that integers are returned as-is, and
-an `is_bool` flag is unset.
-
-`git_parse_maybe_bool`::
-Same as `git_config_bool`, except that it returns -1 on error rather
-than dying.
-
-`git_config_string`::
-Allocates and copies the value string into the `dest` parameter; if no
-string is given, prints an error message and returns -1.
-
-`git_config_pathname`::
-Similar to `git_config_string`, but expands `~` or `~user` into the
-user's home directory when found at the beginning of the path.
-
-Include Directives
-------------------
-
-By default, the config parser does not respect include directives.
-However, a caller can use the special `git_config_include` wrapper
-callback to support them. To do so, you simply wrap your "real" callback
-function and data pointer in a `struct config_include_data`, and pass
-the wrapper to the regular config-reading functions. For example:
-
--------------------------------------------
-int read_file_with_include(const char *file, config_fn_t fn, void *data)
-{
-	struct config_include_data inc = CONFIG_INCLUDE_INIT;
-	inc.fn = fn;
-	inc.data = data;
-	return git_config_from_file(git_config_include, file, &inc);
-}
--------------------------------------------
-
-`git_config` respects includes automatically. The lower-level
-`git_config_from_file` does not.
-
-Custom Configsets
------------------
-
-A `config_set` can be used to construct an in-memory cache for
-config-like files that the caller specifies (i.e., files like `.gitmodules`,
-`~/.gitconfig` etc.). For example,
-
-----------------------------------------
-struct config_set gm_config;
-git_configset_init(&gm_config);
-int b;
-/* we add config files to the config_set */
-git_configset_add_file(&gm_config, ".gitmodules");
-git_configset_add_file(&gm_config, ".gitmodules_alt");
-
-if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
-	/* hack hack hack */
-}
-
-/* when we are done with the configset */
-git_configset_clear(&gm_config);
-----------------------------------------
-
-Configset API provides functions for the above mentioned work flow, including:
-
-`void git_configset_init(struct config_set *cs)`::
-
-	Initializes the config_set `cs`.
-
-`int git_configset_add_file(struct config_set *cs, const char *filename)`::
-
-	Parses the file and adds the variable-value pairs to the `config_set`,
-	dies if there is an error in parsing the file. Returns 0 on success, or
-	-1 if the file does not exist or is inaccessible. The user has to decide
-	if he wants to free the incomplete configset or continue using it when
-	the function returns -1.
-
-`int git_configset_get_value(struct config_set *cs, const char *key, const char **value)`::
-
-	Finds the highest-priority value for the configuration variable `key`
-	and config set `cs`, stores the pointer to it in `value` and returns 0.
-	When the configuration variable `key` is not found, returns 1 without
-	touching `value`. The caller should not free or modify `value`, as it
-	is owned by the cache.
-
-`const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key)`::
-
-	Finds and returns the value list, sorted in order of increasing priority
-	for the configuration variable `key` and config set `cs`. When the
-	configuration variable `key` is not found, returns NULL. The caller
-	should not free or modify the returned pointer, as it is owned by the cache.
-
-`void git_configset_clear(struct config_set *cs)`::
-
-	Clears `config_set` structure, removes all saved variable-value pairs.
-
-In addition to above functions, the `config_set` API provides type specific
-functions in the vein of `git_config_get_int` and family but with an extra
-parameter, pointer to struct `config_set`.
-They all behave similarly to the `git_config_get*()` family described in
-"Querying For Specific Variables" above.
-
-Writing Config Files
---------------------
-
-Git gives multiple entry points in the Config API to write config values to
-files namely `git_config_set_in_file` and `git_config_set`, which write to
-a specific config file or to `.git/config` respectively. They both take a
-key/value pair as parameter.
-In the end they both call `git_config_set_multivar_in_file` which takes four
-parameters:
-
-- the name of the file, as a string, to which key/value pairs will be written.
-
-- the name of key, as a string. This is in canonical "flat" form: the section,
-  subsection, and variable segments will be separated by dots, and the section
-  and variable segments will be all lowercase.
-  E.g., `core.ignorecase`, `diff.SomeType.textconv`.
-
-- the value of the variable, as a string. If value is equal to NULL, it will
-  remove the matching key from the config file.
-
-- the value regex, as a string. It will disregard key/value pairs where value
-  does not match.
-
-- a multi_replace value, as an int. If value is equal to zero, nothing or only
-  one matching key/value is replaced, else all matching key/values (regardless
-  how many) are removed, before the new pair is written.
-
-It returns 0 on success.
-
-Also, there are functions `git_config_rename_section` and
-`git_config_rename_section_in_file` with parameters `old_name` and `new_name`
-for renaming or removing sections in the config files. If NULL is passed
-through `new_name` parameter, the section will be removed from the config file.
diff --git a/config.h b/config.h
index f0ed464004..02f78ffc2b 100644
--- a/config.h
+++ b/config.h
@@ -4,6 +4,23 @@
 #include "hashmap.h"
 #include "string-list.h"
 
+
+/**
+ * The config API gives callers a way to access Git configuration files
+ * (and files which have the same syntax). See linkgit:git-config[1] for a
+ * discussion of the config file syntax.
+ *
+ * General Usage
+ * -------------
+ *
+ * Config files are parsed linearly, and each variable found is passed to a
+ * caller-provided callback function. The callback function is responsible
+ * for any actions to be taken on the config option, and is free to ignore
+ * some options. It is not uncommon for the configuration to be parsed
+ * several times during the run of a Git program, with different callbacks
+ * picking out different variables useful to themselves.
+ */
+
 struct object_id;
 
 /* git_config_parse_key() returns these negated: */
@@ -71,9 +88,34 @@ struct config_options {
 	} error_action;
 };
 
+/**
+ * A config callback function takes three parameters:
+ *
+ * - the name of the parsed variable. This is in canonical "flat" form: the
+ *   section, subsection, and variable segments will be separated by dots,
+ *   and the section and variable segments will be all lowercase. E.g.,
+ *   `core.ignorecase`, `diff.SomeType.textconv`.
+ *
+ * - the value of the found variable, as a string. If the variable had no
+ *   value specified, the value will be NULL (typically this means it
+ *   should be interpreted as boolean true).
+ *
+ * - a void pointer passed in by the caller of the config API; this can
+ *   contain callback-specific data
+ *
+ * A config callback should return 0 for success, or -1 if the variable
+ * could not be parsed properly.
+ */
 typedef int (*config_fn_t)(const char *, const char *, void *);
+
 int git_default_config(const char *, const char *, void *);
+
+/**
+ * Read a specific file in git-config format.
+ * This function takes the same callback and data parameters as `git_config`.
+ */
 int git_config_from_file(config_fn_t fn, const char *, void *);
+
 int git_config_from_file_with_options(config_fn_t fn, const char *,
 				      void *,
 				      const struct config_options *);
@@ -88,34 +130,157 @@ void git_config_push_parameter(const char *text);
 int git_config_from_parameters(config_fn_t fn, void *data);
 void read_early_config(config_fn_t cb, void *data);
 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.
+ *
+ * `git_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
+ * will first feed the user-wide one to the callback, and then the
+ * repo-specific one; by overwriting, the higher-priority repo-specific
+ * value is left at the end).
+ */
 void git_config(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"
+ * 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.
+ * It takes two extra parameters:
+ *
+ * - `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
+ * 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`
+ * 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 config_options *opts);
+
+/**
+ * Value Parsing Helpers
+ * ---------------------
+ *
+ * The following helper functions aid in parsing string values
+ */
+
 int git_parse_ssize_t(const char *, ssize_t *);
 int git_parse_ulong(const char *, unsigned long *);
+
+/**
+ * Same as `git_config_bool`, except that it returns -1 on error rather
+ * than dying.
+ */
 int git_parse_maybe_bool(const char *);
+
+/**
+ * Parse the string to an integer, including unit factors. Dies on error;
+ * otherwise, returns the parsed result.
+ */
 int git_config_int(const char *, const char *);
+
 int64_t git_config_int64(const char *, const char *);
+
+/**
+ * Identical to `git_config_int`, but for unsigned longs.
+ */
 unsigned long git_config_ulong(const char *, const char *);
+
 ssize_t git_config_ssize_t(const char *, const char *);
+
+/**
+ * Same as `git_config_bool`, except that integers are returned as-is, and
+ * an `is_bool` flag is unset.
+ */
 int git_config_bool_or_int(const char *, const char *, int *);
+
+/**
+ * Parse a string into a boolean value, respecting keywords like "true" and
+ * "false". Integer values are converted into true/false values (when they
+ * are non-zero or zero, respectively). Other values cause a die(). If
+ * parsing is successful, the return value is the result.
+ */
 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 *);
+
+/**
+ * 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_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 *);
+
+/**
+ * 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 *);
+
 int git_config_set_gently(const char *, const char *);
+
+/**
+ * write config values to `.git/config`, takes a key/value pair as parameter.
+ */
 void git_config_set(const char *, const char *);
+
 int git_config_parse_key(const char *, char **, int *);
 int git_config_key_is_valid(const char *key);
 int git_config_set_multivar_gently(const char *, const char *, const char *, int);
 void git_config_set_multivar(const char *, const char *, const char *, int);
 int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, int);
+
+/**
+ * takes four parameters:
+ *
+ * - the name of the file, as a string, to which key/value pairs will be written.
+ *
+ * - the name of key, as a string. This is in canonical "flat" form: the section,
+ *   subsection, and variable segments will be separated by dots, and the section
+ *   and variable segments will be all lowercase.
+ *   E.g., `core.ignorecase`, `diff.SomeType.textconv`.
+ *
+ * - the value of the variable, as a string. If value is equal to NULL, it will
+ *   remove the matching key from the config file.
+ *
+ * - the value regex, as a string. It will disregard key/value pairs where value
+ *   does not match.
+ *
+ * - a multi_replace value, as an int. If value is equal to zero, nothing or only
+ *   one matching key/value is replaced, else all matching key/values (regardless
+ *   how many) are removed, before the new pair is written.
+ *
+ * It returns 0 on success.
+ */
 void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
+
+/**
+ * rename or remove sections in the config file
+ * parameters `old_name` and `new_name`
+ * 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 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 *);
@@ -142,6 +307,30 @@ enum config_scope current_config_scope(void);
 const char *current_config_origin_type(void);
 const char *current_config_name(void);
 
+/**
+ * Include Directives
+ * ------------------
+ *
+ * By default, the config parser does not respect include directives.
+ * However, a caller can use the special `git_config_include` wrapper
+ * callback to support them. To do so, you simply wrap your "real" callback
+ * function and data pointer in a `struct config_include_data`, and pass
+ * the wrapper to the regular config-reading functions. For example:
+ *
+ * -------------------------------------------
+ * int read_file_with_include(const char *file, config_fn_t fn, void *data)
+ * {
+ * struct config_include_data inc = CONFIG_INCLUDE_INIT;
+ * inc.fn = fn;
+ * inc.data = data;
+ * return git_config_from_file(git_config_include, file, &inc);
+ * }
+ * -------------------------------------------
+ *
+ * `git_config` respects includes automatically. The lower-level
+ * `git_config_from_file` does not.
+ *
+ */
 struct config_include_data {
 	int depth;
 	config_fn_t fn;
@@ -169,6 +358,33 @@ int parse_config_key(const char *var,
 		     const char **subsection, int *subsection_len,
 		     const char **key);
 
+/**
+ * Custom Configsets
+ * -----------------
+ *
+ * A `config_set` can be used to construct an in-memory cache for
+ * config-like files that the caller specifies (i.e., files like `.gitmodules`,
+ * `~/.gitconfig` etc.). For example,
+ *
+ * ----------------------------------------
+ * struct config_set gm_config;
+ * git_configset_init(&gm_config);
+ * int b;
+ * //we add config files to the config_set
+ * git_configset_add_file(&gm_config, ".gitmodules");
+ * git_configset_add_file(&gm_config, ".gitmodules_alt");
+ *
+ * if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
+ * //hack hack hack
+ * }
+ *
+ * when we are done with the configset:
+ * git_configset_clear(&gm_config);
+ * ----------------------------------------
+ *
+ * Configset API provides functions for the above mentioned work flow
+ */
+
 struct config_set_element {
 	struct hashmap_entry ent;
 	char *key;
@@ -197,16 +413,47 @@ struct config_set {
 	struct configset_list list;
 };
 
+/**
+ * Initializes the config_set `cs`.
+ */
 void git_configset_init(struct config_set *cs);
+
+/**
+ * Parses the file and adds the variable-value pairs to the `config_set`,
+ * dies if there is an error in parsing the file. Returns 0 on success, or
+ * -1 if the file does not exist or is inaccessible. The user has to decide
+ * if he wants to free the incomplete configset or continue using it when
+ * the function returns -1.
+ */
 int git_configset_add_file(struct config_set *cs, const char *filename);
+
+/**
+ * Finds and returns the value list, sorted in order of increasing priority
+ * for the configuration variable `key` and config set `cs`. When the
+ * configuration variable `key` is not found, returns NULL. The caller
+ * should not free or modify the returned pointer, as it is owned by the cache.
+ */
 const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key);
+
+/**
+ * Clears `config_set` structure, removes all saved variable-value pairs.
+ */
 void git_configset_clear(struct config_set *cs);
 
 /*
  * These functions return 1 if not found, and 0 if found, leaving the found
  * value in the 'dest' pointer.
  */
+
+/*
+ * Finds the highest-priority value for the configuration variable `key`
+ * and config set `cs`, stores the pointer to it in `value` and returns 0.
+ * When the configuration variable `key` is not found, returns 1 without
+ * touching `value`. The caller should not free or modify `value`, as it
+ * is owned by the cache.
+ */
 int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
+
 int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest);
 int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
 int git_configset_get_int(struct config_set *cs, const char *key, int *dest);
@@ -240,17 +487,94 @@ int repo_config_get_maybe_bool(struct repository *repo,
 int repo_config_get_pathname(struct repository *repo,
 			     const char *key, const char **dest);
 
+/**
+ * Querying For Specific Variables
+ * -------------------------------
+ *
+ * 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
+ * cache generated previously from reading the config files.
+ */
+
+/**
+ * Finds the highest-priority value for the configuration variable `key`,
+ * stores the pointer to it in `value` and returns 0. When the
+ * configuration variable `key` is not found, returns 1 without touching
+ * `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);
+
+/**
+ * Finds and returns the value list, sorted in order of increasing priority
+ * for the configuration variable `key`. When the configuration variable
+ * `key` is not found, returns NULL. The caller should not free or modify
+ * the returned pointer, as it is owned by the cache.
+ */
 const struct string_list *git_config_get_value_multi(const char *key);
+
+/**
+ * Resets and invalidates the config cache.
+ */
 void git_config_clear(void);
+
+/**
+ * Allocates and copies the retrieved string into the `dest` parameter for
+ * the configuration variable `key`; if NULL string is given, prints an
+ * error message and returns -1. When the configuration variable `key` is
+ * not found, returns 1 without touching `dest`.
+ */
 int git_config_get_string_const(const char *key, const char **dest);
+
+/**
+ * Similar to `git_config_get_string_const`, except that retrieved value
+ * copied into the `dest` parameter is a mutable string.
+ */
 int git_config_get_string(const char *key, char **dest);
+
+/**
+ * Finds and parses the value to an integer for the configuration variable
+ * `key`. Dies on error; otherwise, stores the value of the parsed integer in
+ * `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);
+
+/**
+ * Similar to `git_config_get_int` but for unsigned longs.
+ */
 int git_config_get_ulong(const char *key, unsigned long *dest);
+
+/**
+ * Finds and parses the value into a boolean value, for the configuration
+ * variable `key` respecting keywords like "true" and "false". Integer
+ * values are converted into true/false values (when they are non-zero or
+ * zero, respectively). Other values cause a die(). If parsing is successful,
+ * stores the value of the parsed result in `dest` and returns 0. When the
+ * configuration variable `key` is not found, returns 1 without touching
+ * `dest`.
+ */
 int git_config_get_bool(const char *key, int *dest);
+
+/**
+ * Similar to `git_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);
+
+/**
+ * Similar to `git_config_get_bool`, except that it returns -1 on error
+ * rather than dying.
+ */
 int git_config_get_maybe_bool(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_untracked_cache(void);
 int git_config_get_split_index(void);
@@ -270,7 +594,19 @@ struct key_value_info {
 	enum config_scope scope;
 };
 
+/**
+ * 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)));
+
+/**
+ * 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
+ * for the desired value.
+ */
 NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
 
 #define LOOKUP_CONFIG(mapping, var) \
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 1/1] config: add documentation to config.h
  2019-10-20  8:35     ` Heba Waly
@ 2019-10-22 20:42       ` Emily Shaffer
  0 siblings, 0 replies; 16+ messages in thread
From: Emily Shaffer @ 2019-10-22 20:42 UTC (permalink / raw)
  To: Heba Waly; +Cc: Heba Waly via GitGitGadget, git, Junio C Hamano

On Sun, Oct 20, 2019 at 09:35:17PM +1300, Heba Waly wrote:
> On Sat, Oct 19, 2019 at 11:52 AM Emily Shaffer <emilyshaffer@google.com> wrote:
> >
> > On Fri, Oct 18, 2019 at 12:06:59AM +0000, Heba Waly via GitGitGadget wrote:
> > > From: Heba Waly <heba.waly@gmail.com>
> >
> > Hi Heba,
> >
> > Thanks for the patch!
> >
> > I'd like to highlight to the community that this is an Outreachy
> > applicant and microproject. Heba, when you send the next version, I
> > think you can add [Outreachy] manually to the PR subject line - that
> > should draw the attention of those in the community who are invested in
> > helping Outreachy applicants.
> Good idea! I wanted to add it to the email subject but as I decided to
> use gitgadget
> I had no control over the subject.

Hm, it looks like you already figured out how to add it to the title of
the PR. :)

> > >
> > > This commit is copying and summarizing the documentation from
> > > documentation/technical/api-config.txt to comments in config.h
> >
> > I think in the GitGitGadget PR you've got some great comments from Dscho
> > about how to format your commit message; please take a look at those and
> > feel free to reach out to me if you're still not sure what's missing or
> > not.
> Will do.
> > > Signed-off-by: Heba Waly <heba.waly@gmail.com>
> >
> > One thing I miss in this change is the removal of the contents of
> > Documentation/technical/api-config.txt (or maybe the removal of the file
> > itself). I'd prefer to see at least for api-config.txt to say something
> > like "Please refer to comments in 'config.h'"; or, more drastically, for
> > api-config.txt to be removed entirely.
> >
> > Having both pieces of documentation standing independently means that
> > someone who's trying to add new information about the config API won't
> > know where to add it; eventually they'll add something to config.h but
> > not api-config.txt, or vice versa, and the two documents will go out of
> > sync. So we want to move the documentation, rather than copy it.
> That makes sense, thanks for the explanation.
> I wasn't sure if it should be removed or not so I decided to leave it
> until I'm asked otherwise.
> So I assume api-config.html will be removed too?

That shouldn't be tracked - this is generated from api-config.txt as
part of the build. So don't worry about this part.

> > > +
> > > +/**
> > > + * Value Parsing Helpers
> > > + * ---------------------
> >
> > It may not make sense to have the header here in the middle of the doc.
> >
> > I wonder whether we need the headers at all anymore; or, whether it
> > makes more sense to put this header in the long comment at the top with
> > just the list of function names (so someone knows where to look), and
> > leave the per-function explanations inline with the function they
> > describe?
> I see your point Emily, but in the CodingGuidelines file it was
> advised to refer to strbuf.h
> as a model for documentation, I noticed that strbuf.h used headers
> this way so I decided
> to replicate that.

Ok! Sure.

> > I made a couple of smallish comments about general formatting, but I'm
> > also interested to know whether you were able to move the entire
> > contents of api-config.txt across to here. Was there anything that you
> > couldn't find a place for?
> Yes, everything is moved.
> > Thanks a lot for this change, and congrats on getting your first review
> > out! Welcome! :)
> >
> >  - Emily
> >
> Thanks a lot Emily for the detailed and helpful feedback!
> 
> Heba

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v2 1/1] config: move documentation to config.h
  2019-10-22  7:05   ` [PATCH v2 1/1] " Heba Waly via GitGitGadget
@ 2019-10-22 20:59     ` Emily Shaffer
  2019-10-23  2:14       ` Junio C Hamano
  2019-10-23  4:55       ` Heba Waly
  0 siblings, 2 replies; 16+ messages in thread
From: Emily Shaffer @ 2019-10-22 20:59 UTC (permalink / raw)
  To: Heba Waly via GitGitGadget; +Cc: git, Heba Waly, Junio C Hamano

On Tue, Oct 22, 2019 at 07:05:06AM +0000, Heba Waly via GitGitGadget wrote:
> From: Heba Waly <heba.waly@gmail.com>
> 
> Move the documentation from Documentation/technical/api-config.txt into
> config.h

This is still a little thin for what we usually want from commit
messages. Try to imagine that five years from now, you find this commit
by running `git blame` on config.h and then examining the commit which
introduced all these comments with `git show <commit-id>` - what would
you want to know?

Typically we want to know "why" the change was made, because the diff
shows "what". We can see from the diff that you're moving comments from
A to B, but if you explain why you did so (not "because my Outreachy
mentor told me to" ;) but "because it is useful to see usage information
next to code" or "this is best practice as described by blah blah") - I
wouldn't be able to know that reasoning just from looking at your diff.


> diff --git a/config.h b/config.h
> index f0ed464004..02f78ffc2b 100644
> --- a/config.h
> +++ b/config.h
> @@ -4,6 +4,23 @@
>  #include "hashmap.h"
>  #include "string-list.h"
>  
> +
> +/**
> + * The config API gives callers a way to access Git configuration files
> + * (and files which have the same syntax). See linkgit:git-config[1] for a

Ah, here's another place where the Asciidoc link isn't going to do
anything anymore.

Otherwise I didn't still see anything jumping out. When the commit
message is cleaned up I'm ready to add my Reviewed-by line.

 - Emily

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v2 1/1] config: move documentation to config.h
  2019-10-22 20:59     ` Emily Shaffer
@ 2019-10-23  2:14       ` Junio C Hamano
  2019-10-23  4:55       ` Heba Waly
  1 sibling, 0 replies; 16+ messages in thread
From: Junio C Hamano @ 2019-10-23  2:14 UTC (permalink / raw)
  To: Emily Shaffer; +Cc: Heba Waly via GitGitGadget, git, Heba Waly

Emily Shaffer <emilyshaffer@google.com> writes:

>> ...
>> +/**
>> + * The config API gives callers a way to access Git configuration files
>> + * (and files which have the same syntax). See linkgit:git-config[1] for a
>
> Ah, here's another place where the Asciidoc link isn't going to do
> anything anymore.
>
> Otherwise I didn't still see anything jumping out. When the commit
> message is cleaned up I'm ready to add my Reviewed-by line.

Thanks.  Your review(s) have been quite sensible and helpful.



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v2 1/1] config: move documentation to config.h
  2019-10-22 20:59     ` Emily Shaffer
  2019-10-23  2:14       ` Junio C Hamano
@ 2019-10-23  4:55       ` Heba Waly
  1 sibling, 0 replies; 16+ messages in thread
From: Heba Waly @ 2019-10-23  4:55 UTC (permalink / raw)
  To: Emily Shaffer; +Cc: Heba Waly via GitGitGadget, git, Junio C Hamano

On Wed, Oct 23, 2019 at 9:59 AM Emily Shaffer <emilyshaffer@google.com> wrote:
>
> On Tue, Oct 22, 2019 at 07:05:06AM +0000, Heba Waly via GitGitGadget wrote:
> > From: Heba Waly <heba.waly@gmail.com>
> >
> > Move the documentation from Documentation/technical/api-config.txt into
> > config.h
>
> This is still a little thin for what we usually want from commit
> messages. Try to imagine that five years from now, you find this commit
> by running `git blame` on config.h and then examining the commit which
> introduced all these comments with `git show <commit-id>` - what would
> you want to know?
>
> Typically we want to know "why" the change was made, because the diff
> shows "what". We can see from the diff that you're moving comments from
> A to B, but if you explain why you did so (not "because my Outreachy
> mentor told me to" ;) but "because it is useful to see usage information
> next to code" or "this is best practice as described by blah blah") - I
> wouldn't be able to know that reasoning just from looking at your diff.
Ok, got it.

>
> > diff --git a/config.h b/config.h
> > index f0ed464004..02f78ffc2b 100644
> > --- a/config.h
> > +++ b/config.h
> > @@ -4,6 +4,23 @@
> >  #include "hashmap.h"
> >  #include "string-list.h"
> >
> > +
> > +/**
> > + * The config API gives callers a way to access Git configuration files
> > + * (and files which have the same syntax). See linkgit:git-config[1] for a
>
> Ah, here's another place where the Asciidoc link isn't going to do
> anything anymore.
yep!
> Otherwise I didn't still see anything jumping out. When the commit
> message is cleaned up I'm ready to add my Reviewed-by line.
great!

>  - Emily

Thanks :)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v3 0/1] [Outreachy] config: move documentation to config.h
  2019-10-22  7:05 ` [PATCH v2 0/1] [Outreachy] config: move " Heba Waly via GitGitGadget
  2019-10-22  7:05   ` [PATCH v2 1/1] " Heba Waly via GitGitGadget
@ 2019-10-23  5:30   ` Heba Waly via GitGitGadget
  2019-10-23  5:30     ` [PATCH v3 1/1] " Heba Waly via GitGitGadget
  1 sibling, 1 reply; 16+ messages in thread
From: Heba Waly via GitGitGadget @ 2019-10-23  5:30 UTC (permalink / raw)
  To: git; +Cc: Heba Waly, Junio C Hamano

Move the documentation from Documentation/technical/api-config.txt into
config.h as it's easier for the developers to find the usage information
beside the code instead of looking for it in another doc file, also
documentation/technical/api-config.txt is removed because the information it
has is now redundant and it'll be hard to keep it up to date and
synchronized with the documentation in config.h

Signed-off-by: Heba Waly heba.waly@gmail.com [heba.waly@gmail.com]

Heba Waly (1):
  config: move documentation to config.h

 Documentation/technical/api-config.txt | 319 -----------------------
 config.h                               | 335 +++++++++++++++++++++++++
 2 files changed, 335 insertions(+), 319 deletions(-)
 delete mode 100644 Documentation/technical/api-config.txt


base-commit: 108b97dc372828f0e72e56bbb40cae8e1e83ece6
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-405%2FHebaWaly%2Fconfig_documentation-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-405/HebaWaly/config_documentation-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/405

Range-diff vs v2:

 1:  1a9aa33b46 ! 1:  d6cbb3197a config: move documentation to config.h
     @@ -3,7 +3,12 @@
          config: move documentation to config.h
      
          Move the documentation from Documentation/technical/api-config.txt into
     -    config.h
     +    config.h as it's easier for the developers to find the usage information
     +    beside the code instead of looking for it in another doc file, also
     +    documentation/technical/api-config.txt is removed because the information
     +    it has is now redundant and it'll be hard to keep it up to date and
     +    syncronized with the documentation in config.h
     +
          Signed-off-by: Heba Waly <heba.waly@gmail.com>
      
       diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
     @@ -341,8 +346,7 @@
      +
      +/**
      + * The config API gives callers a way to access Git configuration files
     -+ * (and files which have the same syntax). See linkgit:git-config[1] for a
     -+ * discussion of the config file syntax.
     ++ * (and files which have the same syntax).
      + *
      + * General Usage
      + * -------------

-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v3 1/1] config: move documentation to config.h
  2019-10-23  5:30   ` [PATCH v3 0/1] [Outreachy] " Heba Waly via GitGitGadget
@ 2019-10-23  5:30     ` Heba Waly via GitGitGadget
  2019-10-23 21:38       ` Emily Shaffer
  0 siblings, 1 reply; 16+ messages in thread
From: Heba Waly via GitGitGadget @ 2019-10-23  5:30 UTC (permalink / raw)
  To: git; +Cc: Heba Waly, Junio C Hamano, Heba Waly

From: Heba Waly <heba.waly@gmail.com>

Move the documentation from Documentation/technical/api-config.txt into
config.h as it's easier for the developers to find the usage information
beside the code instead of looking for it in another doc file, also
documentation/technical/api-config.txt is removed because the information
it has is now redundant and it'll be hard to keep it up to date and
syncronized with the documentation in config.h

Signed-off-by: Heba Waly <heba.waly@gmail.com>
---
 Documentation/technical/api-config.txt | 319 -----------------------
 config.h                               | 335 +++++++++++++++++++++++++
 2 files changed, 335 insertions(+), 319 deletions(-)
 delete mode 100644 Documentation/technical/api-config.txt

diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
deleted file mode 100644
index 7d20716c32..0000000000
--- a/Documentation/technical/api-config.txt
+++ /dev/null
@@ -1,319 +0,0 @@
-config API
-==========
-
-The config API gives callers a way to access Git configuration files
-(and files which have the same syntax). See linkgit:git-config[1] for a
-discussion of the config file syntax.
-
-General Usage
--------------
-
-Config files are parsed linearly, and each variable found is passed to a
-caller-provided callback function. The callback function is responsible
-for any actions to be taken on the config option, and is free to ignore
-some options. It is not uncommon for the configuration to be parsed
-several times during the run of a Git program, with different callbacks
-picking out different variables useful to themselves.
-
-A config callback function takes three parameters:
-
-- the name of the parsed variable. This is in canonical "flat" form: the
-  section, subsection, and variable segments will be separated by dots,
-  and the section and variable segments will be all lowercase. E.g.,
-  `core.ignorecase`, `diff.SomeType.textconv`.
-
-- the value of the found variable, as a string. If the variable had no
-  value specified, the value will be NULL (typically this means it
-  should be interpreted as boolean true).
-
-- a void pointer passed in by the caller of the config API; this can
-  contain callback-specific data
-
-A config callback should return 0 for success, or -1 if the variable
-could not be parsed properly.
-
-Basic Config Querying
----------------------
-
-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.
-
-`git_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
-will first feed the user-wide one to the callback, and then the
-repo-specific one; by overwriting, the higher-priority repo-specific
-value is left at the end).
-
-The `config_with_options` function lets the caller examine config
-while adjusting some of the default behavior of `git_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. It takes two extra parameters:
-
-`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
-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`
-sets `opts.respect_includes` to `1` by default.
-
-Reading Specific Files
-----------------------
-
-To read a specific file in git-config format, use
-`git_config_from_file`. This takes the same callback and data parameters
-as `git_config`.
-
-Querying For Specific Variables
--------------------------------
-
-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
-cache generated previously from reading the config files.
-
-`int git_config_get_value(const char *key, const char **value)`::
-
-	Finds the highest-priority value for the configuration variable `key`,
-	stores the pointer to it in `value` and returns 0. When the
-	configuration variable `key` is not found, returns 1 without touching
-	`value`. The caller should not free or modify `value`, as it is owned
-	by the cache.
-
-`const struct string_list *git_config_get_value_multi(const char *key)`::
-
-	Finds and returns the value list, sorted in order of increasing priority
-	for the configuration variable `key`. When the configuration variable
-	`key` is not found, returns NULL. The caller should not free or modify
-	the returned pointer, as it is owned by the cache.
-
-`void git_config_clear(void)`::
-
-	Resets and invalidates the config cache.
-
-The config API also provides type specific API functions which do conversion
-as well as retrieval for the queried variable, including:
-
-`int git_config_get_int(const char *key, int *dest)`::
-
-	Finds and parses the value to an integer for the configuration variable
-	`key`. Dies on error; otherwise, stores the value of the parsed integer in
-	`dest` and returns 0. When the configuration variable `key` is not found,
-	returns 1 without touching `dest`.
-
-`int git_config_get_ulong(const char *key, unsigned long *dest)`::
-
-	Similar to `git_config_get_int` but for unsigned longs.
-
-`int git_config_get_bool(const char *key, int *dest)`::
-
-	Finds and parses the value into a boolean value, for the configuration
-	variable `key` respecting keywords like "true" and "false". Integer
-	values are converted into true/false values (when they are non-zero or
-	zero, respectively). Other values cause a die(). If parsing is successful,
-	stores the value of the parsed result in `dest` and returns 0. When the
-	configuration variable `key` is not found, returns 1 without touching
-	`dest`.
-
-`int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest)`::
-
-	Similar to `git_config_get_bool`, except that integers are copied as-is,
-	and `is_bool` flag is unset.
-
-`int git_config_get_maybe_bool(const char *key, int *dest)`::
-
-	Similar to `git_config_get_bool`, except that it returns -1 on error
-	rather than dying.
-
-`int git_config_get_string_const(const char *key, const char **dest)`::
-
-	Allocates and copies the retrieved string into the `dest` parameter for
-	the configuration variable `key`; if NULL string is given, prints an
-	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)`::
-
-	Similar to `git_config_get_string_const`, except that retrieved value
-	copied into the `dest` parameter is a mutable string.
-
-`int git_config_get_pathname(const char *key, const char **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.
-
-`git_die_config(const char *key, const char *err, ...)`::
-
-	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`.
-
-`void git_die_config_linenr(const char *key, const char *filename, int linenr)`::
-
-	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
-	for the desired value.
-
-See test-config.c for usage examples.
-
-Value Parsing Helpers
----------------------
-
-To aid in parsing string values, the config API provides callbacks with
-a number of helper functions, including:
-
-`git_config_int`::
-Parse the string to an integer, including unit factors. Dies on error;
-otherwise, returns the parsed result.
-
-`git_config_ulong`::
-Identical to `git_config_int`, but for unsigned longs.
-
-`git_config_bool`::
-Parse a string into a boolean value, respecting keywords like "true" and
-"false". Integer values are converted into true/false values (when they
-are non-zero or zero, respectively). Other values cause a die(). If
-parsing is successful, the return value is the result.
-
-`git_config_bool_or_int`::
-Same as `git_config_bool`, except that integers are returned as-is, and
-an `is_bool` flag is unset.
-
-`git_parse_maybe_bool`::
-Same as `git_config_bool`, except that it returns -1 on error rather
-than dying.
-
-`git_config_string`::
-Allocates and copies the value string into the `dest` parameter; if no
-string is given, prints an error message and returns -1.
-
-`git_config_pathname`::
-Similar to `git_config_string`, but expands `~` or `~user` into the
-user's home directory when found at the beginning of the path.
-
-Include Directives
-------------------
-
-By default, the config parser does not respect include directives.
-However, a caller can use the special `git_config_include` wrapper
-callback to support them. To do so, you simply wrap your "real" callback
-function and data pointer in a `struct config_include_data`, and pass
-the wrapper to the regular config-reading functions. For example:
-
--------------------------------------------
-int read_file_with_include(const char *file, config_fn_t fn, void *data)
-{
-	struct config_include_data inc = CONFIG_INCLUDE_INIT;
-	inc.fn = fn;
-	inc.data = data;
-	return git_config_from_file(git_config_include, file, &inc);
-}
--------------------------------------------
-
-`git_config` respects includes automatically. The lower-level
-`git_config_from_file` does not.
-
-Custom Configsets
------------------
-
-A `config_set` can be used to construct an in-memory cache for
-config-like files that the caller specifies (i.e., files like `.gitmodules`,
-`~/.gitconfig` etc.). For example,
-
-----------------------------------------
-struct config_set gm_config;
-git_configset_init(&gm_config);
-int b;
-/* we add config files to the config_set */
-git_configset_add_file(&gm_config, ".gitmodules");
-git_configset_add_file(&gm_config, ".gitmodules_alt");
-
-if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
-	/* hack hack hack */
-}
-
-/* when we are done with the configset */
-git_configset_clear(&gm_config);
-----------------------------------------
-
-Configset API provides functions for the above mentioned work flow, including:
-
-`void git_configset_init(struct config_set *cs)`::
-
-	Initializes the config_set `cs`.
-
-`int git_configset_add_file(struct config_set *cs, const char *filename)`::
-
-	Parses the file and adds the variable-value pairs to the `config_set`,
-	dies if there is an error in parsing the file. Returns 0 on success, or
-	-1 if the file does not exist or is inaccessible. The user has to decide
-	if he wants to free the incomplete configset or continue using it when
-	the function returns -1.
-
-`int git_configset_get_value(struct config_set *cs, const char *key, const char **value)`::
-
-	Finds the highest-priority value for the configuration variable `key`
-	and config set `cs`, stores the pointer to it in `value` and returns 0.
-	When the configuration variable `key` is not found, returns 1 without
-	touching `value`. The caller should not free or modify `value`, as it
-	is owned by the cache.
-
-`const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key)`::
-
-	Finds and returns the value list, sorted in order of increasing priority
-	for the configuration variable `key` and config set `cs`. When the
-	configuration variable `key` is not found, returns NULL. The caller
-	should not free or modify the returned pointer, as it is owned by the cache.
-
-`void git_configset_clear(struct config_set *cs)`::
-
-	Clears `config_set` structure, removes all saved variable-value pairs.
-
-In addition to above functions, the `config_set` API provides type specific
-functions in the vein of `git_config_get_int` and family but with an extra
-parameter, pointer to struct `config_set`.
-They all behave similarly to the `git_config_get*()` family described in
-"Querying For Specific Variables" above.
-
-Writing Config Files
---------------------
-
-Git gives multiple entry points in the Config API to write config values to
-files namely `git_config_set_in_file` and `git_config_set`, which write to
-a specific config file or to `.git/config` respectively. They both take a
-key/value pair as parameter.
-In the end they both call `git_config_set_multivar_in_file` which takes four
-parameters:
-
-- the name of the file, as a string, to which key/value pairs will be written.
-
-- the name of key, as a string. This is in canonical "flat" form: the section,
-  subsection, and variable segments will be separated by dots, and the section
-  and variable segments will be all lowercase.
-  E.g., `core.ignorecase`, `diff.SomeType.textconv`.
-
-- the value of the variable, as a string. If value is equal to NULL, it will
-  remove the matching key from the config file.
-
-- the value regex, as a string. It will disregard key/value pairs where value
-  does not match.
-
-- a multi_replace value, as an int. If value is equal to zero, nothing or only
-  one matching key/value is replaced, else all matching key/values (regardless
-  how many) are removed, before the new pair is written.
-
-It returns 0 on success.
-
-Also, there are functions `git_config_rename_section` and
-`git_config_rename_section_in_file` with parameters `old_name` and `new_name`
-for renaming or removing sections in the config files. If NULL is passed
-through `new_name` parameter, the section will be removed from the config file.
diff --git a/config.h b/config.h
index f0ed464004..91fd4c5e96 100644
--- a/config.h
+++ b/config.h
@@ -4,6 +4,22 @@
 #include "hashmap.h"
 #include "string-list.h"
 
+
+/**
+ * The config API gives callers a way to access Git configuration files
+ * (and files which have the same syntax).
+ *
+ * General Usage
+ * -------------
+ *
+ * Config files are parsed linearly, and each variable found is passed to a
+ * caller-provided callback function. The callback function is responsible
+ * for any actions to be taken on the config option, and is free to ignore
+ * some options. It is not uncommon for the configuration to be parsed
+ * several times during the run of a Git program, with different callbacks
+ * picking out different variables useful to themselves.
+ */
+
 struct object_id;
 
 /* git_config_parse_key() returns these negated: */
@@ -71,9 +87,34 @@ struct config_options {
 	} error_action;
 };
 
+/**
+ * A config callback function takes three parameters:
+ *
+ * - the name of the parsed variable. This is in canonical "flat" form: the
+ *   section, subsection, and variable segments will be separated by dots,
+ *   and the section and variable segments will be all lowercase. E.g.,
+ *   `core.ignorecase`, `diff.SomeType.textconv`.
+ *
+ * - the value of the found variable, as a string. If the variable had no
+ *   value specified, the value will be NULL (typically this means it
+ *   should be interpreted as boolean true).
+ *
+ * - a void pointer passed in by the caller of the config API; this can
+ *   contain callback-specific data
+ *
+ * A config callback should return 0 for success, or -1 if the variable
+ * could not be parsed properly.
+ */
 typedef int (*config_fn_t)(const char *, const char *, void *);
+
 int git_default_config(const char *, const char *, void *);
+
+/**
+ * Read a specific file in git-config format.
+ * This function takes the same callback and data parameters as `git_config`.
+ */
 int git_config_from_file(config_fn_t fn, const char *, void *);
+
 int git_config_from_file_with_options(config_fn_t fn, const char *,
 				      void *,
 				      const struct config_options *);
@@ -88,34 +129,157 @@ void git_config_push_parameter(const char *text);
 int git_config_from_parameters(config_fn_t fn, void *data);
 void read_early_config(config_fn_t cb, void *data);
 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.
+ *
+ * `git_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
+ * will first feed the user-wide one to the callback, and then the
+ * repo-specific one; by overwriting, the higher-priority repo-specific
+ * value is left at the end).
+ */
 void git_config(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"
+ * 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.
+ * It takes two extra parameters:
+ *
+ * - `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
+ * 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`
+ * 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 config_options *opts);
+
+/**
+ * Value Parsing Helpers
+ * ---------------------
+ *
+ * The following helper functions aid in parsing string values
+ */
+
 int git_parse_ssize_t(const char *, ssize_t *);
 int git_parse_ulong(const char *, unsigned long *);
+
+/**
+ * Same as `git_config_bool`, except that it returns -1 on error rather
+ * than dying.
+ */
 int git_parse_maybe_bool(const char *);
+
+/**
+ * Parse the string to an integer, including unit factors. Dies on error;
+ * otherwise, returns the parsed result.
+ */
 int git_config_int(const char *, const char *);
+
 int64_t git_config_int64(const char *, const char *);
+
+/**
+ * Identical to `git_config_int`, but for unsigned longs.
+ */
 unsigned long git_config_ulong(const char *, const char *);
+
 ssize_t git_config_ssize_t(const char *, const char *);
+
+/**
+ * Same as `git_config_bool`, except that integers are returned as-is, and
+ * an `is_bool` flag is unset.
+ */
 int git_config_bool_or_int(const char *, const char *, int *);
+
+/**
+ * Parse a string into a boolean value, respecting keywords like "true" and
+ * "false". Integer values are converted into true/false values (when they
+ * are non-zero or zero, respectively). Other values cause a die(). If
+ * parsing is successful, the return value is the result.
+ */
 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 *);
+
+/**
+ * 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_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 *);
+
+/**
+ * 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 *);
+
 int git_config_set_gently(const char *, const char *);
+
+/**
+ * write config values to `.git/config`, takes a key/value pair as parameter.
+ */
 void git_config_set(const char *, const char *);
+
 int git_config_parse_key(const char *, char **, int *);
 int git_config_key_is_valid(const char *key);
 int git_config_set_multivar_gently(const char *, const char *, const char *, int);
 void git_config_set_multivar(const char *, const char *, const char *, int);
 int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, int);
+
+/**
+ * takes four parameters:
+ *
+ * - the name of the file, as a string, to which key/value pairs will be written.
+ *
+ * - the name of key, as a string. This is in canonical "flat" form: the section,
+ *   subsection, and variable segments will be separated by dots, and the section
+ *   and variable segments will be all lowercase.
+ *   E.g., `core.ignorecase`, `diff.SomeType.textconv`.
+ *
+ * - the value of the variable, as a string. If value is equal to NULL, it will
+ *   remove the matching key from the config file.
+ *
+ * - the value regex, as a string. It will disregard key/value pairs where value
+ *   does not match.
+ *
+ * - a multi_replace value, as an int. If value is equal to zero, nothing or only
+ *   one matching key/value is replaced, else all matching key/values (regardless
+ *   how many) are removed, before the new pair is written.
+ *
+ * It returns 0 on success.
+ */
 void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
+
+/**
+ * rename or remove sections in the config file
+ * parameters `old_name` and `new_name`
+ * 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 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 *);
@@ -142,6 +306,30 @@ enum config_scope current_config_scope(void);
 const char *current_config_origin_type(void);
 const char *current_config_name(void);
 
+/**
+ * Include Directives
+ * ------------------
+ *
+ * By default, the config parser does not respect include directives.
+ * However, a caller can use the special `git_config_include` wrapper
+ * callback to support them. To do so, you simply wrap your "real" callback
+ * function and data pointer in a `struct config_include_data`, and pass
+ * the wrapper to the regular config-reading functions. For example:
+ *
+ * -------------------------------------------
+ * int read_file_with_include(const char *file, config_fn_t fn, void *data)
+ * {
+ * struct config_include_data inc = CONFIG_INCLUDE_INIT;
+ * inc.fn = fn;
+ * inc.data = data;
+ * return git_config_from_file(git_config_include, file, &inc);
+ * }
+ * -------------------------------------------
+ *
+ * `git_config` respects includes automatically. The lower-level
+ * `git_config_from_file` does not.
+ *
+ */
 struct config_include_data {
 	int depth;
 	config_fn_t fn;
@@ -169,6 +357,33 @@ int parse_config_key(const char *var,
 		     const char **subsection, int *subsection_len,
 		     const char **key);
 
+/**
+ * Custom Configsets
+ * -----------------
+ *
+ * A `config_set` can be used to construct an in-memory cache for
+ * config-like files that the caller specifies (i.e., files like `.gitmodules`,
+ * `~/.gitconfig` etc.). For example,
+ *
+ * ----------------------------------------
+ * struct config_set gm_config;
+ * git_configset_init(&gm_config);
+ * int b;
+ * //we add config files to the config_set
+ * git_configset_add_file(&gm_config, ".gitmodules");
+ * git_configset_add_file(&gm_config, ".gitmodules_alt");
+ *
+ * if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
+ * //hack hack hack
+ * }
+ *
+ * when we are done with the configset:
+ * git_configset_clear(&gm_config);
+ * ----------------------------------------
+ *
+ * Configset API provides functions for the above mentioned work flow
+ */
+
 struct config_set_element {
 	struct hashmap_entry ent;
 	char *key;
@@ -197,16 +412,47 @@ struct config_set {
 	struct configset_list list;
 };
 
+/**
+ * Initializes the config_set `cs`.
+ */
 void git_configset_init(struct config_set *cs);
+
+/**
+ * Parses the file and adds the variable-value pairs to the `config_set`,
+ * dies if there is an error in parsing the file. Returns 0 on success, or
+ * -1 if the file does not exist or is inaccessible. The user has to decide
+ * if he wants to free the incomplete configset or continue using it when
+ * the function returns -1.
+ */
 int git_configset_add_file(struct config_set *cs, const char *filename);
+
+/**
+ * Finds and returns the value list, sorted in order of increasing priority
+ * for the configuration variable `key` and config set `cs`. When the
+ * configuration variable `key` is not found, returns NULL. The caller
+ * should not free or modify the returned pointer, as it is owned by the cache.
+ */
 const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key);
+
+/**
+ * Clears `config_set` structure, removes all saved variable-value pairs.
+ */
 void git_configset_clear(struct config_set *cs);
 
 /*
  * These functions return 1 if not found, and 0 if found, leaving the found
  * value in the 'dest' pointer.
  */
+
+/*
+ * Finds the highest-priority value for the configuration variable `key`
+ * and config set `cs`, stores the pointer to it in `value` and returns 0.
+ * When the configuration variable `key` is not found, returns 1 without
+ * touching `value`. The caller should not free or modify `value`, as it
+ * is owned by the cache.
+ */
 int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
+
 int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest);
 int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
 int git_configset_get_int(struct config_set *cs, const char *key, int *dest);
@@ -240,17 +486,94 @@ int repo_config_get_maybe_bool(struct repository *repo,
 int repo_config_get_pathname(struct repository *repo,
 			     const char *key, const char **dest);
 
+/**
+ * Querying For Specific Variables
+ * -------------------------------
+ *
+ * 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
+ * cache generated previously from reading the config files.
+ */
+
+/**
+ * Finds the highest-priority value for the configuration variable `key`,
+ * stores the pointer to it in `value` and returns 0. When the
+ * configuration variable `key` is not found, returns 1 without touching
+ * `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);
+
+/**
+ * Finds and returns the value list, sorted in order of increasing priority
+ * for the configuration variable `key`. When the configuration variable
+ * `key` is not found, returns NULL. The caller should not free or modify
+ * the returned pointer, as it is owned by the cache.
+ */
 const struct string_list *git_config_get_value_multi(const char *key);
+
+/**
+ * Resets and invalidates the config cache.
+ */
 void git_config_clear(void);
+
+/**
+ * Allocates and copies the retrieved string into the `dest` parameter for
+ * the configuration variable `key`; if NULL string is given, prints an
+ * error message and returns -1. When the configuration variable `key` is
+ * not found, returns 1 without touching `dest`.
+ */
 int git_config_get_string_const(const char *key, const char **dest);
+
+/**
+ * Similar to `git_config_get_string_const`, except that retrieved value
+ * copied into the `dest` parameter is a mutable string.
+ */
 int git_config_get_string(const char *key, char **dest);
+
+/**
+ * Finds and parses the value to an integer for the configuration variable
+ * `key`. Dies on error; otherwise, stores the value of the parsed integer in
+ * `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);
+
+/**
+ * Similar to `git_config_get_int` but for unsigned longs.
+ */
 int git_config_get_ulong(const char *key, unsigned long *dest);
+
+/**
+ * Finds and parses the value into a boolean value, for the configuration
+ * variable `key` respecting keywords like "true" and "false". Integer
+ * values are converted into true/false values (when they are non-zero or
+ * zero, respectively). Other values cause a die(). If parsing is successful,
+ * stores the value of the parsed result in `dest` and returns 0. When the
+ * configuration variable `key` is not found, returns 1 without touching
+ * `dest`.
+ */
 int git_config_get_bool(const char *key, int *dest);
+
+/**
+ * Similar to `git_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);
+
+/**
+ * Similar to `git_config_get_bool`, except that it returns -1 on error
+ * rather than dying.
+ */
 int git_config_get_maybe_bool(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_untracked_cache(void);
 int git_config_get_split_index(void);
@@ -270,7 +593,19 @@ struct key_value_info {
 	enum config_scope scope;
 };
 
+/**
+ * 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)));
+
+/**
+ * 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
+ * for the desired value.
+ */
 NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
 
 #define LOOKUP_CONFIG(mapping, var) \
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/1] config: move documentation to config.h
  2019-10-23  5:30     ` [PATCH v3 1/1] " Heba Waly via GitGitGadget
@ 2019-10-23 21:38       ` Emily Shaffer
  2019-10-24  2:14         ` Junio C Hamano
  0 siblings, 1 reply; 16+ messages in thread
From: Emily Shaffer @ 2019-10-23 21:38 UTC (permalink / raw)
  To: Heba Waly via GitGitGadget; +Cc: git, Heba Waly, Junio C Hamano

On Wed, Oct 23, 2019 at 05:30:52AM +0000, Heba Waly via GitGitGadget wrote:
> From: Heba Waly <heba.waly@gmail.com>
> 
> Move the documentation from Documentation/technical/api-config.txt into
> config.h as it's easier for the developers to find the usage information
> beside the code instead of looking for it in another doc file, also
> documentation/technical/api-config.txt is removed because the information
> it has is now redundant and it'll be hard to keep it up to date and
> syncronized with the documentation in config.h
> 
> Signed-off-by: Heba Waly <heba.waly@gmail.com>

Reviewed-by: Emily Shaffer <emilyshaffer@google.com>

Thanks for the effort, Heba. (I guess you are an expert on git-config
now!)

 - Emily

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/1] config: move documentation to config.h
  2019-10-23 21:38       ` Emily Shaffer
@ 2019-10-24  2:14         ` Junio C Hamano
  0 siblings, 0 replies; 16+ messages in thread
From: Junio C Hamano @ 2019-10-24  2:14 UTC (permalink / raw)
  To: Emily Shaffer; +Cc: Heba Waly via GitGitGadget, git, Heba Waly

Emily Shaffer <emilyshaffer@google.com> writes:

> On Wed, Oct 23, 2019 at 05:30:52AM +0000, Heba Waly via GitGitGadget wrote:
>> From: Heba Waly <heba.waly@gmail.com>
>> 
>> Move the documentation from Documentation/technical/api-config.txt into
>> config.h as it's easier for the developers to find the usage information
>> beside the code instead of looking for it in another doc file, also
>> documentation/technical/api-config.txt is removed because the information
>> it has is now redundant and it'll be hard to keep it up to date and
>> syncronized with the documentation in config.h
>> 
>> Signed-off-by: Heba Waly <heba.waly@gmail.com>
>
> Reviewed-by: Emily Shaffer <emilyshaffer@google.com>
>
> Thanks for the effort, Heba. (I guess you are an expert on git-config
> now!)

Thanks, both.  Will queue.

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2019-10-24  2:14 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-18  0:06 [PATCH 0/1] config: add documentation to config.h Heba Waly via GitGitGadget
2019-10-18  0:06 ` [PATCH 1/1] " Heba Waly via GitGitGadget
2019-10-18 22:07   ` Jonathan Tan
2019-10-20  8:05     ` Heba Waly
2019-10-18 22:51   ` Emily Shaffer
2019-10-20  8:35     ` Heba Waly
2019-10-22 20:42       ` Emily Shaffer
2019-10-22  7:05 ` [PATCH v2 0/1] [Outreachy] config: move " Heba Waly via GitGitGadget
2019-10-22  7:05   ` [PATCH v2 1/1] " Heba Waly via GitGitGadget
2019-10-22 20:59     ` Emily Shaffer
2019-10-23  2:14       ` Junio C Hamano
2019-10-23  4:55       ` Heba Waly
2019-10-23  5:30   ` [PATCH v3 0/1] [Outreachy] " Heba Waly via GitGitGadget
2019-10-23  5:30     ` [PATCH v3 1/1] " Heba Waly via GitGitGadget
2019-10-23 21:38       ` Emily Shaffer
2019-10-24  2:14         ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).