* [PATCH v8 1/8] config.c: mark error and warnings strings for translation
2014-08-06 14:53 [PATCH v8 0/8] Rewrite `git_config()` using config-set API Tanay Abhra
@ 2014-08-06 14:53 ` Tanay Abhra
2014-08-06 14:53 ` [PATCH v8 2/8] config.c: fix accuracy of line number in errors Tanay Abhra
` (7 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Tanay Abhra @ 2014-08-06 14:53 UTC (permalink / raw)
To: git; +Cc: Matthieu Moy, Ramkumar Ramachandra, Matthieu Moy, Junio C Hamano
From: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
config.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/config.c b/config.c
index a191328..34940fd 100644
--- a/config.c
+++ b/config.c
@@ -457,9 +457,9 @@ static int git_parse_source(config_fn_t fn, void *data)
break;
}
if (cf->die_on_error)
- die("bad config file line %d in %s", cf->linenr, cf->name);
+ die(_("bad config file line %d in %s"), cf->linenr, cf->name);
else
- return error("bad config file line %d in %s", cf->linenr, cf->name);
+ return error(_("bad config file line %d in %s"), cf->linenr, cf->name);
}
static int parse_unit_factor(const char *end, uintmax_t *val)
@@ -575,9 +575,9 @@ static void die_bad_number(const char *name, const char *value)
value = "";
if (cf && cf->name)
- die("bad numeric config value '%s' for '%s' in %s: %s",
+ die(_("bad numeric config value '%s' for '%s' in %s: %s"),
value, name, cf->name, reason);
- die("bad numeric config value '%s' for '%s': %s", value, name, reason);
+ die(_("bad numeric config value '%s' for '%s': %s"), value, name, reason);
}
int git_config_int(const char *name, const char *value)
@@ -662,7 +662,7 @@ int git_config_pathname(const char **dest, const char *var, const char *value)
return config_error_nonbool(var);
*dest = expand_user_path(value);
if (!*dest)
- die("Failed to expand user dir in: '%s'", value);
+ die(_("failed to expand user dir in: '%s'"), value);
return 0;
}
@@ -740,7 +740,7 @@ static int git_default_core_config(const char *var, const char *value)
if (level == -1)
level = Z_DEFAULT_COMPRESSION;
else if (level < 0 || level > Z_BEST_COMPRESSION)
- die("bad zlib compression level %d", level);
+ die(_("bad zlib compression level %d"), level);
zlib_compression_level = level;
zlib_compression_seen = 1;
return 0;
@@ -751,7 +751,7 @@ static int git_default_core_config(const char *var, const char *value)
if (level == -1)
level = Z_DEFAULT_COMPRESSION;
else if (level < 0 || level > Z_BEST_COMPRESSION)
- die("bad zlib compression level %d", level);
+ die(_("bad zlib compression level %d"), level);
core_compression_level = level;
core_compression_seen = 1;
if (!zlib_compression_seen)
@@ -873,7 +873,7 @@ static int git_default_core_config(const char *var, const char *value)
else if (!strcmp(value, "link"))
object_creation_mode = OBJECT_CREATION_USES_HARDLINKS;
else
- die("Invalid mode for object creation: %s", value);
+ die(_("invalid mode for object creation: %s"), value);
return 0;
}
@@ -1173,7 +1173,7 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
switch (git_config_from_parameters(fn, data)) {
case -1: /* error */
- die("unable to parse command-line config");
+ die(_("unable to parse command-line config"));
break;
case 0: /* found nothing */
break;
@@ -1514,7 +1514,7 @@ static int store_aux(const char *key, const char *value, void *cb)
case KEY_SEEN:
if (matches(key, value)) {
if (store.seen == 1 && store.multi_replace == 0) {
- warning("%s has multiple values", key);
+ warning(_("%s has multiple values"), key);
}
ALLOC_GROW(store.offset, store.seen + 1,
--
1.9.0.GIT
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v8 2/8] config.c: fix accuracy of line number in errors
2014-08-06 14:53 [PATCH v8 0/8] Rewrite `git_config()` using config-set API Tanay Abhra
2014-08-06 14:53 ` [PATCH v8 1/8] config.c: mark error and warnings strings for translation Tanay Abhra
@ 2014-08-06 14:53 ` Tanay Abhra
2014-08-06 14:53 ` [PATCH v8 3/8] add line number and file name info to `config_set` Tanay Abhra
` (6 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Tanay Abhra @ 2014-08-06 14:53 UTC (permalink / raw)
To: git
Cc: Tanay Abhra, Ramkumar Ramachandra, Matthieu Moy, Junio C Hamano,
Matthieu Moy
From: Matthieu Moy <Matthieu.Moy@imag.fr>
If a callback returns a negative value to `git_config*()` family,
they call `die()` while printing the line number and the file name.
Currently the printed line number is off by one, thus printing the
wrong line number.
Make `linenr` point to the line we just parsed during the call
to callback to get accurate line number in error messages.
Commit-message-by: Tanay Abhra <tanayabh@gmail.com>
Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
config.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/config.c b/config.c
index 34940fd..bb4629e 100644
--- a/config.c
+++ b/config.c
@@ -244,6 +244,7 @@ static int get_next_char(void)
cf->linenr++;
if (c == EOF) {
cf->eof = 1;
+ cf->linenr++;
c = '\n';
}
return c;
@@ -319,6 +320,7 @@ static int get_value(config_fn_t fn, void *data, struct strbuf *name)
{
int c;
char *value;
+ int ret;
/* Get the full name */
for (;;) {
@@ -341,7 +343,15 @@ static int get_value(config_fn_t fn, void *data, struct strbuf *name)
if (!value)
return -1;
}
- return fn(name->buf, value, data);
+ /*
+ * We already consumed the \n, but we need linenr to point to
+ * the line we just parsed during the call to fn to get
+ * accurate line number in error messages.
+ */
+ cf->linenr--;
+ ret = fn(name->buf, value, data);
+ cf->linenr++;
+ return ret;
}
static int get_extended_base_var(struct strbuf *name, int c)
--
1.9.0.GIT
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v8 3/8] add line number and file name info to `config_set`
2014-08-06 14:53 [PATCH v8 0/8] Rewrite `git_config()` using config-set API Tanay Abhra
2014-08-06 14:53 ` [PATCH v8 1/8] config.c: mark error and warnings strings for translation Tanay Abhra
2014-08-06 14:53 ` [PATCH v8 2/8] config.c: fix accuracy of line number in errors Tanay Abhra
@ 2014-08-06 14:53 ` Tanay Abhra
2014-08-06 15:49 ` Ramsay Jones
2014-08-06 14:53 ` [PATCH v8 4/8] change `git_config()` return value to void Tanay Abhra
` (5 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: Tanay Abhra @ 2014-08-06 14:53 UTC (permalink / raw)
To: git; +Cc: Tanay Abhra, Ramkumar Ramachandra, Matthieu Moy, Junio C Hamano
Store file name and line number for each key-value pair in the cache
during parsing of the configuration files.
Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
---
cache.h | 5 +++++
config.c | 16 ++++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h
index 7292aef..0b1bdfd 100644
--- a/cache.h
+++ b/cache.h
@@ -1383,6 +1383,11 @@ extern int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest);
extern int git_config_get_maybe_bool(const char *key, int *dest);
extern int git_config_get_pathname(const char *key, const char **dest);
+struct key_value_info {
+ const char *filename;
+ int linenr;
+};
+
extern int committer_ident_sufficiently_given(void);
extern int author_ident_sufficiently_given(void);
diff --git a/config.c b/config.c
index bb4629e..e4d745e 100644
--- a/config.c
+++ b/config.c
@@ -1260,6 +1260,9 @@ static struct config_set_element *configset_find_element(struct config_set *cs,
static int configset_add_value(struct config_set *cs, const char *key, const char *value)
{
struct config_set_element *e;
+ struct string_list_item *si;
+ struct key_value_info *kv_info = xmalloc(sizeof(*kv_info));
+
e = configset_find_element(cs, key);
/*
* Since the keys are being fed by git_config*() callback mechanism, they
@@ -1272,7 +1275,16 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
string_list_init(&e->value_list, 1);
hashmap_add(&cs->config_hash, e);
}
- string_list_append_nodup(&e->value_list, value ? xstrdup(value) : NULL);
+ si = string_list_append_nodup(&e->value_list, value ? xstrdup(value) : NULL);
+ if (cf) {
+ kv_info->filename = strintern(cf->name);
+ kv_info->linenr = cf->linenr;
+ } else {
+ /* for values read from `git_config_from_parameters()` */
+ kv_info->filename = NULL;
+ kv_info->linenr = -1;
+ }
+ si->util = kv_info;
return 0;
}
@@ -1299,7 +1311,7 @@ void git_configset_clear(struct config_set *cs)
hashmap_iter_init(&cs->config_hash, &iter);
while ((entry = hashmap_iter_next(&iter))) {
free(entry->key);
- string_list_clear(&entry->value_list, 0);
+ string_list_clear(&entry->value_list, 1);
}
hashmap_free(&cs->config_hash, 1);
cs->hash_initialized = 0;
--
1.9.0.GIT
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v8 3/8] add line number and file name info to `config_set`
2014-08-06 14:53 ` [PATCH v8 3/8] add line number and file name info to `config_set` Tanay Abhra
@ 2014-08-06 15:49 ` Ramsay Jones
0 siblings, 0 replies; 22+ messages in thread
From: Ramsay Jones @ 2014-08-06 15:49 UTC (permalink / raw)
To: Tanay Abhra, git; +Cc: Ramkumar Ramachandra, Matthieu Moy, Junio C Hamano
On 06/08/14 15:53, Tanay Abhra wrote:
> Store file name and line number for each key-value pair in the cache
> during parsing of the configuration files.
>
> Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
> ---
> cache.h | 5 +++++
> config.c | 16 ++++++++++++++--
> 2 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/cache.h b/cache.h
> index 7292aef..0b1bdfd 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -1383,6 +1383,11 @@ extern int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest);
> extern int git_config_get_maybe_bool(const char *key, int *dest);
> extern int git_config_get_pathname(const char *key, const char **dest);
>
> +struct key_value_info {
> + const char *filename;
> + int linenr;
> +};
> +
Hmm, why was this moved here? As far as I can tell, it is
(still) not needed outside of config.c. What am I missing?
ATB,
Ramsay Jones
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v8 4/8] change `git_config()` return value to void
2014-08-06 14:53 [PATCH v8 0/8] Rewrite `git_config()` using config-set API Tanay Abhra
` (2 preceding siblings ...)
2014-08-06 14:53 ` [PATCH v8 3/8] add line number and file name info to `config_set` Tanay Abhra
@ 2014-08-06 14:53 ` Tanay Abhra
2014-08-06 14:53 ` [PATCH v8 5/8] config: add `git_die_config()` to the config-set API Tanay Abhra
` (4 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Tanay Abhra @ 2014-08-06 14:53 UTC (permalink / raw)
To: git; +Cc: Tanay Abhra, Ramkumar Ramachandra, Matthieu Moy, Junio C Hamano
Currently `git_config()` returns an integer signifying an error code.
During rewrites of the function most of the code was shifted to
`git_config_with_options()`. `git_config_with_options()` normally
returns positive values if its `config_source` parameter is set as NULL,
as most errors are fatal, and non-fatal potential errors are guarded
by "if" statements that are entered only when no error is possible.
Still a negative value can be returned in case of race condition between
`access_or_die()` & `git_config_from_file()`. Also, all callers of
`git_config()` ignore the return value except for one case in branch.c.
Change `git_config()` return value to void and make it die if it receives
a negative value from `git_config_with_options()`.
Original-patch-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
---
branch.c | 5 +----
cache.h | 2 +-
config.c | 16 ++++++++++++++--
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/branch.c b/branch.c
index 46e8aa8..735767d 100644
--- a/branch.c
+++ b/branch.c
@@ -161,10 +161,7 @@ int read_branch_desc(struct strbuf *buf, const char *branch_name)
strbuf_addf(&name, "branch.%s.description", branch_name);
cb.config_name = name.buf;
cb.value = NULL;
- if (git_config(read_branch_desc_cb, &cb) < 0) {
- strbuf_release(&name);
- return -1;
- }
+ git_config(read_branch_desc_cb, &cb);
if (cb.value)
strbuf_addstr(buf, cb.value);
strbuf_release(&name);
diff --git a/cache.h b/cache.h
index 0b1bdfd..f11ce41 100644
--- a/cache.h
+++ b/cache.h
@@ -1294,7 +1294,7 @@ extern int git_config_from_buf(config_fn_t fn, const char *name,
const char *buf, size_t len, void *data);
extern void git_config_push_parameter(const char *text);
extern int git_config_from_parameters(config_fn_t fn, void *data);
-extern int git_config(config_fn_t fn, void *);
+extern void git_config(config_fn_t fn, void *);
extern int git_config_with_options(config_fn_t fn, void *,
struct git_config_source *config_source,
int respect_includes);
diff --git a/config.c b/config.c
index e4d745e..4cefa25 100644
--- a/config.c
+++ b/config.c
@@ -1230,9 +1230,21 @@ int git_config_with_options(config_fn_t fn, void *data,
return ret;
}
-int git_config(config_fn_t fn, void *data)
+void git_config(config_fn_t fn, void *data)
{
- return git_config_with_options(fn, data, NULL, 1);
+ if (git_config_with_options(fn, data, NULL, 1) < 0)
+ /*
+ * git_config_with_options() normally returns only
+ * positive values, as most errors are fatal, and
+ * non-fatal potential errors are guarded by "if"
+ * statements that are entered only when no error is
+ * possible.
+ *
+ * If we ever encounter a non-fatal error, it means
+ * something went really wrong and we should stop
+ * immediately.
+ */
+ die(_("unknown error occured while reading the configuration files"));
}
static struct config_set_element *configset_find_element(struct config_set *cs, const char *key)
--
1.9.0.GIT
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v8 5/8] config: add `git_die_config()` to the config-set API
2014-08-06 14:53 [PATCH v8 0/8] Rewrite `git_config()` using config-set API Tanay Abhra
` (3 preceding siblings ...)
2014-08-06 14:53 ` [PATCH v8 4/8] change `git_config()` return value to void Tanay Abhra
@ 2014-08-06 14:53 ` Tanay Abhra
2014-08-06 14:53 ` [PATCH v8 6/8] rewrite git_config() to use " Tanay Abhra
` (3 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Tanay Abhra @ 2014-08-06 14:53 UTC (permalink / raw)
To: git; +Cc: Tanay Abhra, Ramkumar Ramachandra, Matthieu Moy, Junio C Hamano
Add `git_die_config` that dies printing the line number and the file name
of the highest priority value for the configuration variable `key`. A custom
error message is also printed before dying, specified by the caller, which can
be skipped if `err` argument is set to NULL.
It has usage in non-callback based config value retrieval where we can
raise an error and die if there is a semantic error.
For example,
if (!git_config_get_value(key, &value)){
if (!strcmp(value, "foo"))
git_config_die(key, "value: `%s` is illegal", value);
else
/* do work */
}
Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
---
Documentation/technical/api-config.txt | 13 ++++++++++++
cache.h | 3 +++
config.c | 39 ++++++++++++++++++++++++++++++++--
3 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
index 21f280c..0d8b99b 100644
--- a/Documentation/technical/api-config.txt
+++ b/Documentation/technical/api-config.txt
@@ -155,6 +155,19 @@ as well as retrieval for the queried variable, including:
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
diff --git a/cache.h b/cache.h
index f11ce41..89a0d51 100644
--- a/cache.h
+++ b/cache.h
@@ -1388,6 +1388,9 @@ struct key_value_info {
int linenr;
};
+extern NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3)));
+extern NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
+
extern int committer_ident_sufficiently_given(void);
extern int author_ident_sufficiently_given(void);
diff --git a/config.c b/config.c
index 4cefa25..5ae9ab0 100644
--- a/config.c
+++ b/config.c
@@ -1469,8 +1469,12 @@ const struct string_list *git_config_get_value_multi(const char *key)
int git_config_get_string_const(const char *key, const char **dest)
{
+ int ret;
git_config_check_init();
- return git_configset_get_string_const(&the_config_set, key, dest);
+ ret = git_configset_get_string_const(&the_config_set, key, dest);
+ if (ret < 0)
+ git_die_config(key, NULL);
+ return ret;
}
int git_config_get_string(const char *key, char **dest)
@@ -1511,8 +1515,39 @@ int git_config_get_maybe_bool(const char *key, int *dest)
int git_config_get_pathname(const char *key, const char **dest)
{
+ int ret;
git_config_check_init();
- return git_configset_get_pathname(&the_config_set, key, dest);
+ ret = git_configset_get_pathname(&the_config_set, key, dest);
+ if (ret < 0)
+ git_die_config(key, NULL);
+ return ret;
+}
+
+NORETURN
+void git_die_config_linenr(const char *key, const char *filename, int linenr)
+{
+ if (!filename)
+ die(_("unable to parse '%s' from command-line config"), key);
+ else
+ die(_("bad config variable '%s' in file '%s' at line %d"),
+ key, filename, linenr);
+}
+
+NORETURN __attribute__((format(printf, 2, 3)))
+void git_die_config(const char *key, const char *err, ...)
+{
+ const struct string_list *values;
+ struct key_value_info *kv_info;
+
+ if (err) {
+ va_list params;
+ va_start(params, err);
+ vreportf("error: ", err, params);
+ va_end(params);
+ }
+ values = git_config_get_value_multi(key);
+ kv_info = values->items[values->nr - 1].util;
+ git_die_config_linenr(key, kv_info->filename, kv_info->linenr);
}
/*
--
1.9.0.GIT
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v8 6/8] rewrite git_config() to use the config-set API
2014-08-06 14:53 [PATCH v8 0/8] Rewrite `git_config()` using config-set API Tanay Abhra
` (4 preceding siblings ...)
2014-08-06 14:53 ` [PATCH v8 5/8] config: add `git_die_config()` to the config-set API Tanay Abhra
@ 2014-08-06 14:53 ` Tanay Abhra
2014-08-06 14:53 ` [PATCH v8 7/8] add a test for semantic errors in config files Tanay Abhra
` (2 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Tanay Abhra @ 2014-08-06 14:53 UTC (permalink / raw)
To: git; +Cc: Tanay Abhra, Ramkumar Ramachandra, Matthieu Moy, Junio C Hamano
Of all the functions in `git_config*()` family, `git_config()` has the
most invocations in the whole code base. Each `git_config()` invocation
causes config file rereads which can be avoided using the config-set API.
Use the config-set API to rewrite `git_config()` to use the config caching
layer to avoid config file rereads on each invocation during a git process
lifetime. First invocation constructs the cache, and after that for each
successive invocation, `git_config()` feeds values from the config cache
instead of rereading the configuration files.
Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
---
cache.h | 24 +++++++++++++++++++++++
config.c | 51 +++++++++++++++++++++++++++++++++++++++++--------
t/t4055-diff-context.sh | 2 +-
3 files changed, 68 insertions(+), 9 deletions(-)
diff --git a/cache.h b/cache.h
index 89a0d51..2693a37 100644
--- a/cache.h
+++ b/cache.h
@@ -8,6 +8,7 @@
#include "gettext.h"
#include "convert.h"
#include "trace.h"
+#include "string-list.h"
#include SHA1_HEADER
#ifndef git_SHA_CTX
@@ -1351,9 +1352,32 @@ extern int parse_config_key(const char *var,
const char **subsection, int *subsection_len,
const char **key);
+struct config_set_element {
+ struct hashmap_entry ent;
+ char *key;
+ struct string_list value_list;
+};
+
+struct configset_list_item {
+ struct config_set_element *e;
+ int value_index;
+};
+
+/*
+ * the contents of the list are ordered according to their
+ * position in the config files and order of parsing the files.
+ * (i.e. key-value pair at the last position of .git/config will
+ * be at the last item of the list)
+ */
+struct configset_list {
+ struct configset_list_item *items;
+ unsigned int nr, alloc;
+};
+
struct config_set {
struct hashmap config_hash;
int hash_initialized;
+ struct configset_list list;
};
extern void git_configset_init(struct config_set *cs);
diff --git a/config.c b/config.c
index 5ae9ab0..427850a 100644
--- a/config.c
+++ b/config.c
@@ -35,12 +35,6 @@ struct config_source {
long (*do_ftell)(struct config_source *c);
};
-struct config_set_element {
- struct hashmap_entry ent;
- char *key;
- struct string_list value_list;
-};
-
static struct config_source *cf;
static int zlib_compression_seen;
@@ -1230,7 +1224,7 @@ int git_config_with_options(config_fn_t fn, void *data,
return ret;
}
-void git_config(config_fn_t fn, void *data)
+static void git_config_raw(config_fn_t fn, void *data)
{
if (git_config_with_options(fn, data, NULL, 1) < 0)
/*
@@ -1247,6 +1241,33 @@ void git_config(config_fn_t fn, void *data)
die(_("unknown error occured while reading the configuration files"));
}
+static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
+{
+ int i, value_index;
+ struct string_list *values;
+ struct config_set_element *entry;
+ struct configset_list *list = &cs->list;
+ struct key_value_info *kv_info;
+
+ for (i = 0; i < list->nr; i++) {
+ entry = list->items[i].e;
+ value_index = list->items[i].value_index;
+ values = &entry->value_list;
+ if (fn(entry->key, values->items[value_index].string, data) < 0) {
+ kv_info = values->items[value_index].util;
+ git_die_config_linenr(entry->key, kv_info->filename, kv_info->linenr);
+ }
+ }
+}
+
+static void git_config_check_init(void);
+
+void git_config(config_fn_t fn, void *data)
+{
+ git_config_check_init();
+ configset_iter(&the_config_set, fn, data);
+}
+
static struct config_set_element *configset_find_element(struct config_set *cs, const char *key)
{
struct config_set_element k;
@@ -1273,6 +1294,7 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
{
struct config_set_element *e;
struct string_list_item *si;
+ struct configset_list_item *l_item;
struct key_value_info *kv_info = xmalloc(sizeof(*kv_info));
e = configset_find_element(cs, key);
@@ -1288,6 +1310,12 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
hashmap_add(&cs->config_hash, e);
}
si = string_list_append_nodup(&e->value_list, value ? xstrdup(value) : NULL);
+
+ ALLOC_GROW(cs->list.items, cs->list.nr + 1, cs->list.alloc);
+ l_item = &cs->list.items[cs->list.nr++];
+ l_item->e = e;
+ l_item->value_index = e->value_list.nr - 1;
+
if (cf) {
kv_info->filename = strintern(cf->name);
kv_info->linenr = cf->linenr;
@@ -1311,6 +1339,9 @@ void git_configset_init(struct config_set *cs)
{
hashmap_init(&cs->config_hash, (hashmap_cmp_fn)config_set_element_cmp, 0);
cs->hash_initialized = 1;
+ cs->list.nr = 0;
+ cs->list.alloc = 0;
+ cs->list.items = NULL;
}
void git_configset_clear(struct config_set *cs)
@@ -1327,6 +1358,10 @@ void git_configset_clear(struct config_set *cs)
}
hashmap_free(&cs->config_hash, 1);
cs->hash_initialized = 0;
+ free(cs->list.items);
+ cs->list.nr = 0;
+ cs->list.alloc = 0;
+ cs->list.items = NULL;
}
static int config_set_callback(const char *key, const char *value, void *cb)
@@ -1445,7 +1480,7 @@ static void git_config_check_init(void)
if (the_config_set.hash_initialized)
return;
git_configset_init(&the_config_set);
- git_config(config_set_callback, &the_config_set);
+ git_config_raw(config_set_callback, &the_config_set);
}
void git_config_clear(void)
diff --git a/t/t4055-diff-context.sh b/t/t4055-diff-context.sh
index cd04543..741e080 100755
--- a/t/t4055-diff-context.sh
+++ b/t/t4055-diff-context.sh
@@ -79,7 +79,7 @@ test_expect_success 'non-integer config parsing' '
test_expect_success 'negative integer config parsing' '
git config diff.context -1 &&
test_must_fail git diff 2>output &&
- test_i18ngrep "bad config file" output
+ test_i18ngrep "bad config variable" output
'
test_expect_success '-U0 is valid, so is diff.context=0' '
--
1.9.0.GIT
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v8 7/8] add a test for semantic errors in config files
2014-08-06 14:53 [PATCH v8 0/8] Rewrite `git_config()` using config-set API Tanay Abhra
` (5 preceding siblings ...)
2014-08-06 14:53 ` [PATCH v8 6/8] rewrite git_config() to use " Tanay Abhra
@ 2014-08-06 14:53 ` Tanay Abhra
2014-08-06 14:53 ` [PATCH v8 8/8] add tests for `git_config_get_string_const()` Tanay Abhra
2014-08-06 15:26 ` [PATCH v8 0/8] Rewrite `git_config()` using config-set API Matthieu Moy
8 siblings, 0 replies; 22+ messages in thread
From: Tanay Abhra @ 2014-08-06 14:53 UTC (permalink / raw)
To: git; +Cc: Tanay Abhra, Ramkumar Ramachandra, Matthieu Moy, Junio C Hamano
Semantic errors (for example, for alias.* variables NULL values are
not allowed) in configuration files cause a die printing the line
number and file name of the offending value.
Add a test documenting that such errors cause a die printing the
accurate line number and file name.
Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
---
t/t1308-config-set.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 7fdf840..5ea0aa4 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -197,4 +197,15 @@ test_expect_success 'proper error on error in custom config files' '
test_cmp expect actual
'
+test_expect_success 'check line errors for malformed values' '
+ mv .git/config .git/config.old &&
+ test_when_finished "mv .git/config.old .git/config" &&
+ cat >.git/config <<-\EOF &&
+ [alias]
+ br
+ EOF
+ test_expect_code 128 git br 2>result &&
+ grep "line 2.*.git/config\|.git/config.*line 2" result
+'
+
test_done
--
1.9.0.GIT
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH v8 8/8] add tests for `git_config_get_string_const()`
2014-08-06 14:53 [PATCH v8 0/8] Rewrite `git_config()` using config-set API Tanay Abhra
` (6 preceding siblings ...)
2014-08-06 14:53 ` [PATCH v8 7/8] add a test for semantic errors in config files Tanay Abhra
@ 2014-08-06 14:53 ` Tanay Abhra
2014-08-06 15:32 ` Matthieu Moy
2014-08-06 15:26 ` [PATCH v8 0/8] Rewrite `git_config()` using config-set API Matthieu Moy
8 siblings, 1 reply; 22+ messages in thread
From: Tanay Abhra @ 2014-08-06 14:53 UTC (permalink / raw)
To: git; +Cc: Tanay Abhra, Ramkumar Ramachandra, Matthieu Moy, Junio C Hamano
Add tests for `git_config_get_string_const()`, check whether it
dies printing the line number and the file name if a NULL
value is retrieved for the given key.
Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
---
t/t1308-config-set.sh | 10 ++++++++++
test-config.c | 10 ++++++++++
2 files changed, 20 insertions(+)
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 5ea0aa4..ecc757a 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -119,6 +119,16 @@ test_expect_success 'find integer value for a key' '
check_config get_int lamb.chop 65
'
+test_expect_success 'find string value for a key' '
+ check_config get_string case.baz hask &&
+ check_config expect_code 1 get_string case.ba "Value not found for \"case.ba\""
+'
+
+test_expect_success 'check line error when NULL string is queried' '
+ test_expect_code 128 test-config get_string case.foo 2>result &&
+ grep "line 7.*.git/config\|.git/config.*line 7" result
+'
+
test_expect_success 'find integer if value is non parse-able' '
check_config expect_code 128 get_int lamb.head
'
diff --git a/test-config.c b/test-config.c
index 9dd1b22..6a77552 100644
--- a/test-config.c
+++ b/test-config.c
@@ -16,6 +16,8 @@
*
* get_bool -> print bool value for the entered key or die
*
+ * get_string -> print string value for the entered key or die
+ *
* configset_get_value -> returns value with the highest priority for the entered key
* from a config_set constructed from files entered as arguments.
*
@@ -84,6 +86,14 @@ int main(int argc, char **argv)
printf("Value not found for \"%s\"\n", argv[2]);
goto exit1;
}
+ } else if (argc == 3 && !strcmp(argv[1], "get_string")) {
+ if (!git_config_get_string_const(argv[2], &v)) {
+ printf("%s\n", v);
+ goto exit0;
+ } else {
+ printf("Value not found for \"%s\"\n", argv[2]);
+ goto exit1;
+ }
} else if (!strcmp(argv[1], "configset_get_value")) {
for (i = 3; i < argc; i++) {
int err;
--
1.9.0.GIT
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v8 8/8] add tests for `git_config_get_string_const()`
2014-08-06 14:53 ` [PATCH v8 8/8] add tests for `git_config_get_string_const()` Tanay Abhra
@ 2014-08-06 15:32 ` Matthieu Moy
2014-08-06 15:44 ` Tanay Abhra
2014-08-06 21:22 ` Junio C Hamano
0 siblings, 2 replies; 22+ messages in thread
From: Matthieu Moy @ 2014-08-06 15:32 UTC (permalink / raw)
To: Tanay Abhra; +Cc: git, Ramkumar Ramachandra, Junio C Hamano
Tanay Abhra <tanayabh@gmail.com> writes:
> +test_expect_success 'find string value for a key' '
> + check_config get_string case.baz hask &&
> + check_config expect_code 1 get_string case.ba "Value not found for \"case.ba\""
> +'
> +
> +test_expect_success 'check line error when NULL string is queried' '
> + test_expect_code 128 test-config get_string case.foo 2>result &&
> + grep "line 7.*.git/config\|.git/config.*line 7" result
> +'
This is still dependant on the locale ("line" is translated). You need
to use test_i18ngrep instead of grep here (see its definition and
comment in t/test-lib.sh).
I don't think you need these two alternatives OTOH.
BTW, Junio, I don't understand your remark "This test is too tight (the
full string)" in the previous iteration. Can you elaborate?
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v8 8/8] add tests for `git_config_get_string_const()`
2014-08-06 15:32 ` Matthieu Moy
@ 2014-08-06 15:44 ` Tanay Abhra
2014-08-06 21:22 ` Junio C Hamano
1 sibling, 0 replies; 22+ messages in thread
From: Tanay Abhra @ 2014-08-06 15:44 UTC (permalink / raw)
To: Matthieu Moy; +Cc: git, Ramkumar Ramachandra, Junio C Hamano
On 8/6/2014 9:02 PM, Matthieu Moy wrote:
> Tanay Abhra <tanayabh@gmail.com> writes:
>
>> +test_expect_success 'find string value for a key' '
>> + check_config get_string case.baz hask &&
>> + check_config expect_code 1 get_string case.ba "Value not found for \"case.ba\""
>> +'
>> +
>> +test_expect_success 'check line error when NULL string is queried' '
>> + test_expect_code 128 test-config get_string case.foo 2>result &&
>> + grep "line 7.*.git/config\|.git/config.*line 7" result
>> +'
>
> This is still dependant on the locale ("line" is translated). You need
> to use test_i18ngrep instead of grep here (see its definition and
> comment in t/test-lib.sh).
>
Oh, and I was searching t/README for a hint. Maybe we should add a line there
to hint future readers.
Thanks. :)
> I don't think you need these two alternatives OTOH.
>
> BTW, Junio, I don't understand your remark "This test is too tight (the
> full string)" in the previous iteration. Can you elaborate?
>
I think he meant we must search for the relevant snippets instead of the whole string.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v8 8/8] add tests for `git_config_get_string_const()`
2014-08-06 15:32 ` Matthieu Moy
2014-08-06 15:44 ` Tanay Abhra
@ 2014-08-06 21:22 ` Junio C Hamano
2014-08-07 8:30 ` Matthieu Moy
1 sibling, 1 reply; 22+ messages in thread
From: Junio C Hamano @ 2014-08-06 21:22 UTC (permalink / raw)
To: Matthieu Moy; +Cc: Tanay Abhra, git, Ramkumar Ramachandra
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> Tanay Abhra <tanayabh@gmail.com> writes:
>
>> ...
>> + grep "line 7.*.git/config\|.git/config.*line 7" result
>> +'
>
> This is still dependant on the locale ("line" is translated). You need
> to use test_i18ngrep instead of grep here (see its definition and
> comment in t/test-lib.sh).
>
> I don't think you need these two alternatives OTOH.
>
> BTW, Junio, I don't understand your remark "This test is too tight (the
> full string)" in the previous iteration. Can you elaborate?
The original test was trying to match the string fully, i.e.
> + grep "fatal: bad config variable '\''alias.br'\'' at file line 2 in .git/config" result
As I already was feeling funny about seeing the phrase "file line"
in the message and expecting it to be corrected, I thought I should
encourage a check that does not depend on minor phrasing changes, if
it can be done without bending backwards.
I do agree with you that using "\|" in "grep" a pattern to trigger
ERE Alternation counts as "bending backwards" as that is a GNU
extension and not portable.
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v8 8/8] add tests for `git_config_get_string_const()`
2014-08-06 21:22 ` Junio C Hamano
@ 2014-08-07 8:30 ` Matthieu Moy
0 siblings, 0 replies; 22+ messages in thread
From: Matthieu Moy @ 2014-08-07 8:30 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Tanay Abhra, git, Ramkumar Ramachandra
Junio C Hamano <gitster@pobox.com> writes:
> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>
>> Tanay Abhra <tanayabh@gmail.com> writes:
>>
>>> ...
>>> + grep "line 7.*.git/config\|.git/config.*line 7" result
>>> +'
>>
>> This is still dependant on the locale ("line" is translated). You need
>> to use test_i18ngrep instead of grep here (see its definition and
>> comment in t/test-lib.sh).
>>
>> I don't think you need these two alternatives OTOH.
>>
>> BTW, Junio, I don't understand your remark "This test is too tight (the
>> full string)" in the previous iteration. Can you elaborate?
>
> The original test was trying to match the string fully, i.e.
>
>> + grep "fatal: bad config variable '\''alias.br'\'' at file line 2 in .git/config" result
>
> As I already was feeling funny about seeing the phrase "file line"
> in the message and expecting it to be corrected, I thought I should
> encourage a check that does not depend on minor phrasing changes, if
> it can be done without bending backwards.
OK.
I personally prefer tight tests in this case, as the patch doing the
rephrase "sees" what changed by running the tests, and documents the
visible change by changing the expected in the tests scripts. But no
strong opinion here, I'd be fine with e.g.
test_i18ngrep "fatal: .* alias.br.*line 2 in .git/config" result
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v8 0/8] Rewrite `git_config()` using config-set API
2014-08-06 14:53 [PATCH v8 0/8] Rewrite `git_config()` using config-set API Tanay Abhra
` (7 preceding siblings ...)
2014-08-06 14:53 ` [PATCH v8 8/8] add tests for `git_config_get_string_const()` Tanay Abhra
@ 2014-08-06 15:26 ` Matthieu Moy
2014-08-07 19:03 ` Junio C Hamano
8 siblings, 1 reply; 22+ messages in thread
From: Matthieu Moy @ 2014-08-06 15:26 UTC (permalink / raw)
To: Tanay Abhra; +Cc: git, Ramkumar Ramachandra, Junio C Hamano
Tanay Abhra <tanayabh@gmail.com> writes:
> --- a/cache.h
> +++ b/cache.h
> @@ -1406,8 +1406,14 @@ extern int git_config_get_bool(const char *key, int *dest);
[...]
> +struct key_value_info {
> + const char *filename;
> + int linenr;
> +};
[...]
> diff --git a/config.c b/config.c
> index cf9124f..427850a 100644
> --- a/config.c
> +++ b/config.c
> @@ -1224,11 +1224,6 @@ int git_config_with_options(config_fn_t fn, void *data,
> return ret;
> }
>
> -struct key_value_info {
> - const char *filename;
> - int linenr;
> -};
> -
Why is this needed? Are you now using key_value_info outside config.c?
Or is it a leftover from a previous experiment?
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v8 0/8] Rewrite `git_config()` using config-set API
2014-08-06 15:26 ` [PATCH v8 0/8] Rewrite `git_config()` using config-set API Matthieu Moy
@ 2014-08-07 19:03 ` Junio C Hamano
2014-08-07 19:35 ` Matthieu Moy
0 siblings, 1 reply; 22+ messages in thread
From: Junio C Hamano @ 2014-08-07 19:03 UTC (permalink / raw)
To: Matthieu Moy; +Cc: Tanay Abhra, git, Ramkumar Ramachandra
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> Tanay Abhra <tanayabh@gmail.com> writes:
>
>> --- a/cache.h
>> +++ b/cache.h
>> @@ -1406,8 +1406,14 @@ extern int git_config_get_bool(const char *key, int *dest);
> [...]
>> +struct key_value_info {
>> + const char *filename;
>> + int linenr;
>> +};
> [...]
>> diff --git a/config.c b/config.c
>> index cf9124f..427850a 100644
>> --- a/config.c
>> +++ b/config.c
>> @@ -1224,11 +1224,6 @@ int git_config_with_options(config_fn_t fn, void *data,
>> return ret;
>> }
>>
>> -struct key_value_info {
>> - const char *filename;
>> - int linenr;
>> -};
>> -
>
> Why is this needed? Are you now using key_value_info outside config.c?
> Or is it a leftover from a previous experiment?
Has this been resolved in the new round?
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v8 0/8] Rewrite `git_config()` using config-set API
2014-08-07 19:03 ` Junio C Hamano
@ 2014-08-07 19:35 ` Matthieu Moy
2014-08-07 20:31 ` Junio C Hamano
0 siblings, 1 reply; 22+ messages in thread
From: Matthieu Moy @ 2014-08-07 19:35 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Tanay Abhra, git, Ramkumar Ramachandra
Junio C Hamano <gitster@pobox.com> writes:
> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>
>> Tanay Abhra <tanayabh@gmail.com> writes:
>>
>>> --- a/cache.h
>>> +++ b/cache.h
>>> @@ -1406,8 +1406,14 @@ extern int git_config_get_bool(const char *key, int *dest);
>> [...]
>>> +struct key_value_info {
>>> + const char *filename;
>>> + int linenr;
>>> +};
>> [...]
>>> diff --git a/config.c b/config.c
>>> index cf9124f..427850a 100644
>>> --- a/config.c
>>> +++ b/config.c
>>> @@ -1224,11 +1224,6 @@ int git_config_with_options(config_fn_t fn, void *data,
>>> return ret;
>>> }
>>>
>>> -struct key_value_info {
>>> - const char *filename;
>>> - int linenr;
>>> -};
>>> -
>>
>> Why is this needed? Are you now using key_value_info outside config.c?
>> Or is it a leftover from a previous experiment?
>
> Has this been resolved in the new round?
Tanay explained in another subthread why this was needed. For callers
iterating over the string_list who want to get the file/line info, they
need to be able to cast the void * pointer to struct key_value_info *.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH v8 0/8] Rewrite `git_config()` using config-set API
2014-08-07 19:35 ` Matthieu Moy
@ 2014-08-07 20:31 ` Junio C Hamano
2014-08-08 14:07 ` Tanay Abhra
0 siblings, 1 reply; 22+ messages in thread
From: Junio C Hamano @ 2014-08-07 20:31 UTC (permalink / raw)
To: Matthieu Moy; +Cc: Tanay Abhra, git, Ramkumar Ramachandra
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>>> Why is this needed? Are you now using key_value_info outside config.c?
>>> Or is it a leftover from a previous experiment?
>>
>> Has this been resolved in the new round?
>
> Tanay explained in another subthread why this was needed. For callers
> iterating over the string_list who want to get the file/line info, they
> need to be able to cast the void * pointer to struct key_value_info *.
For callers that want to see all the multi-values, it would be
preferrable for the iterator to pass the filename and the linenumber
to the callback function, instead of exposing its implementation
detail as a single string list and telling them to pick it apart,
no?
Not a very convincing argument, but OK for now in the sense that we
can fix it later if we wanted to before it gets too late.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v8 0/8] Rewrite `git_config()` using config-set API
2014-08-07 20:31 ` Junio C Hamano
@ 2014-08-08 14:07 ` Tanay Abhra
2014-08-08 14:32 ` Ramsay Jones
0 siblings, 1 reply; 22+ messages in thread
From: Tanay Abhra @ 2014-08-08 14:07 UTC (permalink / raw)
To: Junio C Hamano, Matthieu Moy; +Cc: git, Ramkumar Ramachandra, Ramsay Jones
On 8/8/2014 2:01 AM, Junio C Hamano wrote:
> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>
>>>> Why is this needed? Are you now using key_value_info outside config.c?
>>>> Or is it a leftover from a previous experiment?
>>>
>>> Has this been resolved in the new round?
>>
>> Tanay explained in another subthread why this was needed. For callers
>> iterating over the string_list who want to get the file/line info, they
>> need to be able to cast the void * pointer to struct key_value_info *.
>
> For callers that want to see all the multi-values, it would be
> preferrable for the iterator to pass the filename and the linenumber
> to the callback function, instead of exposing its implementation
> detail as a single string list and telling them to pick it apart,
> no?
>
> Not a very convincing argument, but OK for now in the sense that we
> can fix it later if we wanted to before it gets too late.
>
(cc to Ramsay)
The discussion in both threads (v8 and v9), boils down to this,
is the `key_value_info` struct really required to be declared public or should be
just an implementation detail. I will give you the context,
The usage of the above mentioned struct is only required for
git_config_get_value_multi(). With the public struct, the code flow would look
like,
-- 8< --
diff --git a/notes.c b/notes.c
index 5fe691d..b7ab115 100644
--- a/notes.c
+++ b/notes.c
@@ -961,19 +961,6 @@ void string_list_add_refs_from_colon_sep(struct string_list *list,
free(globs_copy);
}
-static int notes_display_config(const char *k, const char *v, void *cb)
-{
- int *load_refs = cb;
-
- if (*load_refs && !strcmp(k, "notes.displayref")) {
- if (!v)
- config_error_nonbool(k);
- string_list_add_refs_by_glob(&display_notes_refs, v);
- }
-
- return 0;
-}
-
const char *default_notes_ref(void)
{
const char *notes_ref = NULL;
@@ -1041,7 +1028,9 @@ struct notes_tree **load_notes_trees(struct string_list *refs)
void init_display_notes(struct display_notes_opt *opt)
{
char *display_ref_env;
- int load_config_refs = 0;
+ const struct string_list *values;
+ struct key_value_info *kv_info;
+ int load_config_refs = 0, i;
display_notes_refs.strdup_strings = 1;
assert(!display_notes_trees);
@@ -1058,7 +1047,21 @@ void init_display_notes(struct display_notes_opt *opt)
load_config_refs = 1;
}
- git_config(notes_display_config, &load_config_refs);
+ if (load_config_refs) {
+ values = git_config_get_value_multi("notes.displayref");
+ if (values) {
+ for (i = 0; i < values->nr; i++) {
+ if (!values->items[i].string) {
+ kv_info = values->items[i].util;
+ config_error_nonbool("notes.displayref");
+ git_die_config_linenr("notes.displayref", kv_info->filename, kv_info->linenr);
+ }
+ else
+ string_list_add_refs_by_glob(&display_notes_refs,
+ values->items[i].string);
+ }
+ }
+ }
if (opt) {
struct string_list_item *item;
-- 8< --
We cannot use git_die_config() here because it is applicable to the last
value for a given variable.
Alternative solution to the problem can be a helper function like this,
git_die_config_index(key, value_index, err_msg, ...) which needs the value_index for a multi valued one,
+ values = git_config_get_value_multi("notes.displayref");
+ if (values) {
+ for (i = 0; i < values->nr; i++) {
+ if (!values->items[i].string)
+ git_die_config_linenr("notes.displayref", i, "no null values allowed for :'%s'", "notes.displayref");
+ else ; /* do stuff */
+ }
A callback iterator which supplies the linenr and filename to the callback
function is not helpful, because there are many variable checks in a
git_config() call where multi valued and single valued both reside, so we cannot
use a callback iterator without adding more code cruft.
What do you think, which way seems least obtrusive, or is there an another way out?
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH v8 0/8] Rewrite `git_config()` using config-set API
2014-08-08 14:07 ` Tanay Abhra
@ 2014-08-08 14:32 ` Ramsay Jones
2014-08-10 17:29 ` Junio C Hamano
0 siblings, 1 reply; 22+ messages in thread
From: Ramsay Jones @ 2014-08-08 14:32 UTC (permalink / raw)
To: Tanay Abhra, Junio C Hamano, Matthieu Moy; +Cc: git, Ramkumar Ramachandra
On 08/08/14 15:07, Tanay Abhra wrote:
> On 8/8/2014 2:01 AM, Junio C Hamano wrote:
>> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>>
>>>>> Why is this needed? Are you now using key_value_info outside config.c?
>>>>> Or is it a leftover from a previous experiment?
>>>>
>>>> Has this been resolved in the new round?
>>>
>>> Tanay explained in another subthread why this was needed. For callers
>>> iterating over the string_list who want to get the file/line info, they
>>> need to be able to cast the void * pointer to struct key_value_info *.
>>
>> For callers that want to see all the multi-values, it would be
>> preferrable for the iterator to pass the filename and the linenumber
>> to the callback function, instead of exposing its implementation
>> detail as a single string list and telling them to pick it apart,
>> no?
>>
>> Not a very convincing argument, but OK for now in the sense that we
>> can fix it later if we wanted to before it gets too late.
>>
>
> (cc to Ramsay)
>
> The discussion in both threads (v8 and v9), boils down to this,
> is the `key_value_info` struct really required to be declared public or should be
> just an implementation detail. I will give you the context,
No, this is not the issue for me. The patch which introduces the
struct in cache.h does not make use of that struct in any interface.
It *is* an implementation detail of some code in config.c only.
I do not know how that structure will be used in future patches. ;-)
ATB,
Ramsay Jones
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v8 0/8] Rewrite `git_config()` using config-set API
2014-08-08 14:32 ` Ramsay Jones
@ 2014-08-10 17:29 ` Junio C Hamano
2014-08-11 9:59 ` Ramsay Jones
0 siblings, 1 reply; 22+ messages in thread
From: Junio C Hamano @ 2014-08-10 17:29 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Tanay Abhra, Matthieu Moy, git, Ramkumar Ramachandra
Ramsay Jones <ramsay@ramsay1.demon.co.uk> writes:
> On 08/08/14 15:07, Tanay Abhra wrote:
> ...
>> (cc to Ramsay)
>>
>> The discussion in both threads (v8 and v9), boils down to this,
>> is the `key_value_info` struct really required to be declared public or should be
>> just an implementation detail. I will give you the context,
>
> No, this is not the issue for me. The patch which introduces the
> struct in cache.h does not make use of that struct in any interface.
> It *is* an implementation detail of some code in config.c only.
>
> I do not know how that structure will be used in future patches. ;-)
It is debatable if it is a good API that tells the users "In the
data I return to you, there is a structure hanging there with these
two fields. Feel free to peek into it if you need what is recorded
in them". But the contract between the the endgame "API" and its
callers can include such a direct access, and then you can say that
it is a part of the API, not just an implementation detail.
I think you and Tanay are both right (and I am wrong ;-).
You are right in that the "API" is giving more than the callers
converted to it at this point in the series.
Tanay is right in that the way the struct will be used, which is
illustrated by the example in the message you are responding to,
should be in the part of this series that gives the implementation
of the API before presenting the converted users, as the series
deems it part of the API to let the users peek into the struct.
It may turn out that we have to abstract it further when we need a
more elaborate data structure kept in the kv-info in the future. At
that point it will become undesirable to keep giving the callers
direct access to it, because direct struct access means that the
particular aspect of the implementaiton detail will be cast in stone
and would not allow to be replaced with some other representation
that is more efficient for the implementation.
But as I said, what we see in this series can do for now. The
future can come later ;-)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v8 0/8] Rewrite `git_config()` using config-set API
2014-08-10 17:29 ` Junio C Hamano
@ 2014-08-11 9:59 ` Ramsay Jones
0 siblings, 0 replies; 22+ messages in thread
From: Ramsay Jones @ 2014-08-11 9:59 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Tanay Abhra, Matthieu Moy, git, Ramkumar Ramachandra
On 10/08/14 18:29, Junio C Hamano wrote:
> Ramsay Jones <ramsay@ramsay1.demon.co.uk> writes:
>
>> On 08/08/14 15:07, Tanay Abhra wrote:
>> ...
>>> (cc to Ramsay)
>>>
>>> The discussion in both threads (v8 and v9), boils down to this,
>>> is the `key_value_info` struct really required to be declared public or should be
>>> just an implementation detail. I will give you the context,
>>
>> No, this is not the issue for me. The patch which introduces the
>> struct in cache.h does not make use of that struct in any interface.
>> It *is* an implementation detail of some code in config.c only.
>>
>> I do not know how that structure will be used in future patches. ;-)
>
> It is debatable if it is a good API that tells the users "In the
> data I return to you, there is a structure hanging there with these
> two fields. Feel free to peek into it if you need what is recorded
> in them".
There is no debate in my mind. ;-)
In this future patch, the movement of the structure out of config.c would
be plain for everyone to see, and (hopefully) debate the merits of such
an 'interface'. Along with checking that it is properly documented. (which
patch should the documentation be in?) Where should it be documented?
> But the contract between the the endgame "API" and its
> callers can include such a direct access, and then you can say that
> it is a part of the API, not just an implementation detail.
Sure. It's just a question of timing and allowing reviewers to see the
actual change in one patch.
> I think you and Tanay are both right (and I am wrong ;-).
;-)
I don't have *very* strong feelings about this, which is why I didn't
respond to the earlier replies by Tanay and Matthieu, but since I was
cc-ed on this thread ... (It seemed to me that my comments had been
misunderstood).
So yes, I think this "API" is ugly and could be improved upon, but I
don't care sufficiently to make any further comment. :-D
ATB,
Ramsay Jones
^ permalink raw reply [flat|nested] 22+ messages in thread