On Sat, Mar 25, 2017 at 05:47:49PM +0100, Ævar Arnfjörð Bjarmason wrote:
> After looking at some of the internal APIs I'm thinking of replacing
> this pattern with a hashmap.c hashmap where the keys are a
> sprintf("%d:%s", short_name, long_name) to uniquely identify the
> option. There's no other obvious way to uniquely address an option. I
> guess I could just equivalently and more cheaply use the memory
> address of each option to identify them, but that seems a bit hacky.
Rather than bolt this onto the parse-options code, what if it were a
separate mechanism that mapped config keys to options. E.g., imagine
something like:
struct {
const char *config;
const char *option;
enum {
CONFIG_CMDLINE_BOOL,
CONFIG_CMDLINE_MAYBE_BOOL,
CONFIG_CMDLINE_VALUE
} type;
} config_cmdline_map[] = {
{ "foo.one", "one", CONFIG_CMDLINE_BOOL },
{ "foo.two", "two", CONFIG_CMDLINE_VALUE },
};
And then you "apply" that mapping by finding each item that's set in the
config, and then pretending that "--one" or "--two=<value>" was set on
the command-line, before anything the user has said. This works as long
as the options use the normal last-one-wins rules, the user can
countermand with "--no-one", etc.
You have to write one line for each config/option mapping, but I think
we would need some amount of per-option anyway (i.e., I think the
decision was that options would have to be manually approved for use in
the system). So rather than a flag in the options struct, it becomes a
line in this mapping.
And you get two extra pieces of flexibility:
1. The config names can map to option names however makes sense; we're
not constrained by some programmatic rule (I think we _would_
follow some general guidelines, but there are probably special
cases for historic config, etc).
2. A command can choose to apply one or more mappings, or not. So
porcelain like git-log would call:
struct option options[] = {...};
apply_config_cmdline_map(revision_config_mapping, options);
apply_config_cmdline_map(diff_config_mapping, options);
apply_config_cmdline_map(log_mapping, options);
but plumbing like git-diff-tree wouldn't call any of those.
I had in mind that apply_config_cmdline_map() would just call
parse_options, but I think even that is too constricting. The revision
and diff options don't use parse_options at all. So really, it would
probably be more like:
struct argv_array fake_args = ARGV_ARRAY_INIT;
apply_config_cmdline_map(revision_config_mapping, &fake_args);
apply_config_cmdline_map(diff_config_mapping, &fake_args);
apply_config_cmdline_map(log_mapping, &fake_args);
argv_array_pushv(&fake_args, argv); /* add the real ones */
At this point we've recreated internally the related suggestion:
[options]
log = --one --two=whatever
which is the same as:
[log]
one = true
two = whatever
So hopefully it's clear that the two are functionally equivalent, and
differ only in syntax (in this case we manually decided which options
are safe to pull from the config, but we'd have to parse the options.log
string, too, and we could make the same decision there).
-Peff