mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
fa83cc834d
Several Git commands have subcommands to implement mutually exclusive "operation modes", and they usually parse their subcommand argument with a bunch of if-else if statements. Teach parse-options to handle subcommands as well, which will result in shorter and simpler code with consistent error handling and error messages on unknown or missing subcommand, and it will also make possible for our Bash completion script to handle subcommands programmatically. The approach is guided by the following observations: - Most subcommands [1] are implemented in dedicated functions, and most of those functions [2] either have a signature matching the 'int cmd_foo(int argc, const char **argc, const char *prefix)' signature of builtin commands or can be trivially converted to that signature, because they miss only that last prefix parameter or have no parameters at all. - Subcommand arguments only have long form, and they have no double dash prefix, no negated form, and no description, and they don't take any arguments, and can't be abbreviated. - There must be exactly one subcommand among the arguments, or zero if the command has a default operation mode. - All arguments following the subcommand are considered to be arguments of the subcommand, and, conversely, arguments meant for the subcommand may not preceed the subcommand. So in the end subcommand declaration and parsing would look something like this: parse_opt_subcommand_fn *fn = NULL; struct option builtin_commit_graph_options[] = { OPT_STRING(0, "object-dir", &opts.obj_dir, N_("dir"), N_("the object directory to store the graph")), OPT_SUBCOMMAND("verify", &fn, graph_verify), OPT_SUBCOMMAND("write", &fn, graph_write), OPT_END(), }; argc = parse_options(argc, argv, prefix, options, builtin_commit_graph_usage, 0); return fn(argc, argv, prefix); Here each OPT_SUBCOMMAND specifies the name of the subcommand and the function implementing it, and the address of the same 'fn' subcommand function pointer. parse_options() then processes the arguments until it finds the first argument matching one of the subcommands, sets 'fn' to the function associated with that subcommand, and returns, leaving the rest of the arguments unprocessed. If none of the listed subcommands is found among the arguments, parse_options() will show usage and abort. If a command has a default operation mode, 'fn' should be initialized to the function implementing that mode, and parse_options() should be invoked with the PARSE_OPT_SUBCOMMAND_OPTIONAL flag. In this case parse_options() won't error out when not finding any subcommands, but will return leaving 'fn' unchanged. Note that if that default operation mode has any --options, then the PARSE_OPT_KEEP_UNKNOWN_OPT flag is necessary as well (otherwise parse_options() would error out upon seeing the unknown option meant to the default operation mode). Some thoughts about the implementation: - The same pointer to 'fn' must be specified as 'value' for each OPT_SUBCOMMAND, because there can be only one set of mutually exclusive subcommands; parse_options() will BUG() otherwise. There are other ways to tell parse_options() where to put the function associated with the subcommand given on the command line, but I didn't like them: - Change parse_options()'s signature by adding a pointer to subcommand function to be set to the function associated with the given subcommand, affecting all callsites, even those that don't have subcommands. - Introduce a specific parse_options_and_subcommand() variant with that extra funcion parameter. - I decided against automatically calling the subcommand function from within parse_options(), because: - There are commands that have to perform additional actions after option parsing but before calling the function implementing the specified subcommand. - The return code of the subcommand is usually the return code of the git command, but preserving the return code of the automatically called subcommand function would have made the API awkward. - Also add a OPT_SUBCOMMAND_F() variant to allow specifying an option flag: we have two subcommands that are purposefully excluded from completion ('git remote rm' and 'git stash save'), so they'll have to be specified with the PARSE_OPT_NOCOMPLETE flag. - Some of the 'parse_opt_flags' don't make sense with subcommands, and using them is probably just an oversight or misunderstanding. Therefore parse_options() will BUG() when invoked with any of the following flags while the options array contains at least one OPT_SUBCOMMAND: - PARSE_OPT_KEEP_DASHDASH: parse_options() stops parsing arguments when encountering a "--" argument, so it doesn't make sense to expect and keep one before a subcommand, because it would prevent the parsing of the subcommand. However, this flag is allowed in combination with the PARSE_OPT_SUBCOMMAND_OPTIONAL flag, because the double dash might be meaningful for the command's default operation mode, e.g. to disambiguate refs and pathspecs. - PARSE_OPT_STOP_AT_NON_OPTION: As its name suggests, this flag tells parse_options() to stop as soon as it encouners a non-option argument, but subcommands are by definition not options... so how could they be parsed, then?! - PARSE_OPT_KEEP_UNKNOWN: This flag can be used to collect any unknown --options and then pass them to a different command or subsystem. Surely if a command has subcommands, then this functionality should rather be delegated to one of those subcommands, and not performed by the command itself. However, this flag is allowed in combination with the PARSE_OPT_SUBCOMMAND_OPTIONAL flag, making possible to pass --options to the default operation mode. - If the command with subcommands has a default operation mode, then all arguments to the command must preceed the arguments of the subcommand. AFAICT we don't have any commands where this makes a difference, because in those commands either only the command accepts any arguments ('notes' and 'remote'), or only the default subcommand ('reflog' and 'stash'), but never both. - The 'argv' array passed to subcommand functions currently starts with the name of the subcommand. Keep this behavior. AFAICT no subcommand functions depend on the actual content of 'argv[0]', but the parse_options() call handling their options expects that the options start at argv[1]. - To support handling subcommands programmatically in our Bash completion script, 'git cmd --git-completion-helper' will now list both subcommands and regular --options, if any. This means that the completion script will have to separate subcommands (i.e. words without a double dash prefix) from --options on its own, but that's rather easy to do, and it's not much work either, because the number of subcommands a command might have is rather low, and those commands accept only a single --option or none at all. An alternative would be to introduce a separate option that lists only subcommands, but then the completion script would need not one but two git invocations and command substitutions for commands with subcommands. Note that this change doesn't affect the behavior of our Bash completion script, because when completing the --option of a command with subcommands, e.g. for 'git notes --<TAB>', then all subcommands will be filtered out anyway, as none of them will match the word to be completed starting with that double dash prefix. [1] Except 'git rerere', because many of its subcommands are implemented in the bodies of the if-else if statements parsing the command's subcommand argument. [2] Except 'credential', 'credential-store' and 'fsmonitor--daemon', because some of the functions implementing their subcommands take special parameters. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
321 lines
9.1 KiB
C
321 lines
9.1 KiB
C
#include "test-tool.h"
|
|
#include "cache.h"
|
|
#include "parse-options.h"
|
|
#include "string-list.h"
|
|
#include "trace2.h"
|
|
|
|
static int boolean = 0;
|
|
static int integer = 0;
|
|
static unsigned long magnitude = 0;
|
|
static timestamp_t timestamp;
|
|
static int abbrev = 7;
|
|
static int verbose = -1; /* unspecified */
|
|
static int dry_run = 0, quiet = 0;
|
|
static char *string = NULL;
|
|
static char *file = NULL;
|
|
static int ambiguous;
|
|
|
|
static struct {
|
|
int called;
|
|
const char *arg;
|
|
int unset;
|
|
} length_cb;
|
|
|
|
static int length_callback(const struct option *opt, const char *arg, int unset)
|
|
{
|
|
length_cb.called = 1;
|
|
length_cb.arg = arg;
|
|
length_cb.unset = unset;
|
|
|
|
if (unset)
|
|
return 1; /* do not support unset */
|
|
|
|
*(int *)opt->value = strlen(arg);
|
|
return 0;
|
|
}
|
|
|
|
static int number_callback(const struct option *opt, const char *arg, int unset)
|
|
{
|
|
BUG_ON_OPT_NEG(unset);
|
|
*(int *)opt->value = strtol(arg, NULL, 10);
|
|
return 0;
|
|
}
|
|
|
|
static int collect_expect(const struct option *opt, const char *arg, int unset)
|
|
{
|
|
struct string_list *expect;
|
|
struct string_list_item *item;
|
|
struct strbuf label = STRBUF_INIT;
|
|
const char *colon;
|
|
|
|
if (!arg || unset)
|
|
die("malformed --expect option");
|
|
|
|
expect = (struct string_list *)opt->value;
|
|
colon = strchr(arg, ':');
|
|
if (!colon)
|
|
die("malformed --expect option, lacking a colon");
|
|
strbuf_add(&label, arg, colon - arg);
|
|
item = string_list_insert(expect, strbuf_detach(&label, NULL));
|
|
if (item->util)
|
|
die("malformed --expect option, duplicate %s", label.buf);
|
|
item->util = (void *)arg;
|
|
return 0;
|
|
}
|
|
|
|
__attribute__((format (printf,3,4)))
|
|
static void show(struct string_list *expect, int *status, const char *fmt, ...)
|
|
{
|
|
struct string_list_item *item;
|
|
struct strbuf buf = STRBUF_INIT;
|
|
va_list args;
|
|
|
|
va_start(args, fmt);
|
|
strbuf_vaddf(&buf, fmt, args);
|
|
va_end(args);
|
|
|
|
if (!expect->nr)
|
|
printf("%s\n", buf.buf);
|
|
else {
|
|
char *colon = strchr(buf.buf, ':');
|
|
if (!colon)
|
|
die("malformed output format, output lacking colon: %s", fmt);
|
|
*colon = '\0';
|
|
item = string_list_lookup(expect, buf.buf);
|
|
*colon = ':';
|
|
if (!item)
|
|
; /* not among entries being checked */
|
|
else {
|
|
if (strcmp((const char *)item->util, buf.buf)) {
|
|
printf("-%s\n", (char *)item->util);
|
|
printf("+%s\n", buf.buf);
|
|
*status = 1;
|
|
}
|
|
}
|
|
}
|
|
strbuf_release(&buf);
|
|
}
|
|
|
|
int cmd__parse_options(int argc, const char **argv)
|
|
{
|
|
const char *prefix = "prefix/";
|
|
const char *usage[] = {
|
|
"test-tool parse-options <options>",
|
|
"",
|
|
"A helper function for the parse-options API.",
|
|
NULL
|
|
};
|
|
struct string_list expect = STRING_LIST_INIT_NODUP;
|
|
struct string_list list = STRING_LIST_INIT_NODUP;
|
|
|
|
struct option options[] = {
|
|
OPT_BOOL(0, "yes", &boolean, "get a boolean"),
|
|
OPT_BOOL('D', "no-doubt", &boolean, "begins with 'no-'"),
|
|
{ OPTION_SET_INT, 'B', "no-fear", &boolean, NULL,
|
|
"be brave", PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
|
|
OPT_COUNTUP('b', "boolean", &boolean, "increment by one"),
|
|
OPT_BIT('4', "or4", &boolean,
|
|
"bitwise-or boolean with ...0100", 4),
|
|
OPT_NEGBIT(0, "neg-or4", &boolean, "same as --no-or4", 4),
|
|
OPT_GROUP(""),
|
|
OPT_INTEGER('i', "integer", &integer, "get a integer"),
|
|
OPT_INTEGER('j', NULL, &integer, "get a integer, too"),
|
|
OPT_MAGNITUDE('m', "magnitude", &magnitude, "get a magnitude"),
|
|
OPT_SET_INT(0, "set23", &integer, "set integer to 23", 23),
|
|
OPT_CMDMODE(0, "mode1", &integer, "set integer to 1 (cmdmode option)", 1),
|
|
OPT_CMDMODE(0, "mode2", &integer, "set integer to 2 (cmdmode option)", 2),
|
|
OPT_CALLBACK('L', "length", &integer, "str",
|
|
"get length of <str>", length_callback),
|
|
OPT_FILENAME('F', "file", &file, "set file to <file>"),
|
|
OPT_GROUP("String options"),
|
|
OPT_STRING('s', "string", &string, "string", "get a string"),
|
|
OPT_STRING(0, "string2", &string, "str", "get another string"),
|
|
OPT_STRING(0, "st", &string, "st", "get another string (pervert ordering)"),
|
|
OPT_STRING('o', NULL, &string, "str", "get another string"),
|
|
OPT_NOOP_NOARG(0, "obsolete"),
|
|
OPT_STRING_LIST(0, "list", &list, "str", "add str to list"),
|
|
OPT_GROUP("Magic arguments"),
|
|
OPT_NUMBER_CALLBACK(&integer, "set integer to NUM",
|
|
number_callback),
|
|
{ OPTION_COUNTUP, '+', NULL, &boolean, NULL, "same as -b",
|
|
PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH },
|
|
{ OPTION_COUNTUP, 0, "ambiguous", &ambiguous, NULL,
|
|
"positive ambiguity", PARSE_OPT_NOARG | PARSE_OPT_NONEG },
|
|
{ OPTION_COUNTUP, 0, "no-ambiguous", &ambiguous, NULL,
|
|
"negative ambiguity", PARSE_OPT_NOARG | PARSE_OPT_NONEG },
|
|
OPT_GROUP("Standard options"),
|
|
OPT__ABBREV(&abbrev),
|
|
OPT__VERBOSE(&verbose, "be verbose"),
|
|
OPT__DRY_RUN(&dry_run, "dry run"),
|
|
OPT__QUIET(&quiet, "be quiet"),
|
|
OPT_CALLBACK(0, "expect", &expect, "string",
|
|
"expected output in the variable dump",
|
|
collect_expect),
|
|
OPT_GROUP("Alias"),
|
|
OPT_STRING('A', "alias-source", &string, "string", "get a string"),
|
|
OPT_ALIAS('Z', "alias-target", "alias-source"),
|
|
OPT_END(),
|
|
};
|
|
int i;
|
|
int ret = 0;
|
|
|
|
trace2_cmd_name("_parse_");
|
|
|
|
argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0);
|
|
|
|
if (length_cb.called) {
|
|
const char *arg = length_cb.arg;
|
|
int unset = length_cb.unset;
|
|
show(&expect, &ret, "Callback: \"%s\", %d",
|
|
(arg ? arg : "not set"), unset);
|
|
}
|
|
show(&expect, &ret, "boolean: %d", boolean);
|
|
show(&expect, &ret, "integer: %d", integer);
|
|
show(&expect, &ret, "magnitude: %lu", magnitude);
|
|
show(&expect, &ret, "timestamp: %"PRItime, timestamp);
|
|
show(&expect, &ret, "string: %s", string ? string : "(not set)");
|
|
show(&expect, &ret, "abbrev: %d", abbrev);
|
|
show(&expect, &ret, "verbose: %d", verbose);
|
|
show(&expect, &ret, "quiet: %d", quiet);
|
|
show(&expect, &ret, "dry run: %s", dry_run ? "yes" : "no");
|
|
show(&expect, &ret, "file: %s", file ? file : "(not set)");
|
|
|
|
for (i = 0; i < list.nr; i++)
|
|
show(&expect, &ret, "list: %s", list.items[i].string);
|
|
|
|
for (i = 0; i < argc; i++)
|
|
show(&expect, &ret, "arg %02d: %s", i, argv[i]);
|
|
|
|
expect.strdup_strings = 1;
|
|
string_list_clear(&expect, 0);
|
|
string_list_clear(&list, 0);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void print_args(int argc, const char **argv)
|
|
{
|
|
for (int i = 0; i < argc; i++)
|
|
printf("arg %02d: %s\n", i, argv[i]);
|
|
}
|
|
|
|
static int parse_options_flags__cmd(int argc, const char **argv,
|
|
enum parse_opt_flags test_flags)
|
|
{
|
|
const char *usage[] = {
|
|
"<...> cmd [options]",
|
|
NULL
|
|
};
|
|
int opt = 0;
|
|
const struct option options[] = {
|
|
OPT_INTEGER('o', "opt", &opt, "an integer option"),
|
|
OPT_END()
|
|
};
|
|
|
|
argc = parse_options(argc, argv, NULL, options, usage, test_flags);
|
|
|
|
printf("opt: %d\n", opt);
|
|
print_args(argc, argv);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static enum parse_opt_flags test_flags = 0;
|
|
static const struct option test_flag_options[] = {
|
|
OPT_GROUP("flag-options:"),
|
|
OPT_BIT(0, "keep-dashdash", &test_flags,
|
|
"pass PARSE_OPT_KEEP_DASHDASH to parse_options()",
|
|
PARSE_OPT_KEEP_DASHDASH),
|
|
OPT_BIT(0, "stop-at-non-option", &test_flags,
|
|
"pass PARSE_OPT_STOP_AT_NON_OPTION to parse_options()",
|
|
PARSE_OPT_STOP_AT_NON_OPTION),
|
|
OPT_BIT(0, "keep-argv0", &test_flags,
|
|
"pass PARSE_OPT_KEEP_ARGV0 to parse_options()",
|
|
PARSE_OPT_KEEP_ARGV0),
|
|
OPT_BIT(0, "keep-unknown-opt", &test_flags,
|
|
"pass PARSE_OPT_KEEP_UNKNOWN_OPT to parse_options()",
|
|
PARSE_OPT_KEEP_UNKNOWN_OPT),
|
|
OPT_BIT(0, "no-internal-help", &test_flags,
|
|
"pass PARSE_OPT_NO_INTERNAL_HELP to parse_options()",
|
|
PARSE_OPT_NO_INTERNAL_HELP),
|
|
OPT_BIT(0, "subcommand-optional", &test_flags,
|
|
"pass PARSE_OPT_SUBCOMMAND_OPTIONAL to parse_options()",
|
|
PARSE_OPT_SUBCOMMAND_OPTIONAL),
|
|
OPT_END()
|
|
};
|
|
|
|
int cmd__parse_options_flags(int argc, const char **argv)
|
|
{
|
|
const char *usage[] = {
|
|
"test-tool parse-options-flags [flag-options] cmd [options]",
|
|
NULL
|
|
};
|
|
|
|
argc = parse_options(argc, argv, NULL, test_flag_options, usage,
|
|
PARSE_OPT_STOP_AT_NON_OPTION);
|
|
|
|
if (argc == 0 || strcmp(argv[0], "cmd")) {
|
|
error("'cmd' is mandatory");
|
|
usage_with_options(usage, test_flag_options);
|
|
}
|
|
|
|
return parse_options_flags__cmd(argc, argv, test_flags);
|
|
}
|
|
|
|
static int subcmd_one(int argc, const char **argv, const char *prefix)
|
|
{
|
|
printf("fn: subcmd_one\n");
|
|
print_args(argc, argv);
|
|
return 0;
|
|
}
|
|
|
|
static int subcmd_two(int argc, const char **argv, const char *prefix)
|
|
{
|
|
printf("fn: subcmd_two\n");
|
|
print_args(argc, argv);
|
|
return 0;
|
|
}
|
|
|
|
static int parse_subcommand__cmd(int argc, const char **argv,
|
|
enum parse_opt_flags test_flags)
|
|
{
|
|
const char *usage[] = {
|
|
"<...> cmd subcmd-one",
|
|
"<...> cmd subcmd-two",
|
|
NULL
|
|
};
|
|
parse_opt_subcommand_fn *fn = NULL;
|
|
int opt = 0;
|
|
struct option options[] = {
|
|
OPT_SUBCOMMAND("subcmd-one", &fn, subcmd_one),
|
|
OPT_SUBCOMMAND("subcmd-two", &fn, subcmd_two),
|
|
OPT_INTEGER('o', "opt", &opt, "an integer option"),
|
|
OPT_END()
|
|
};
|
|
|
|
if (test_flags & PARSE_OPT_SUBCOMMAND_OPTIONAL)
|
|
fn = subcmd_one;
|
|
argc = parse_options(argc, argv, NULL, options, usage, test_flags);
|
|
|
|
printf("opt: %d\n", opt);
|
|
|
|
return fn(argc, argv, NULL);
|
|
}
|
|
|
|
int cmd__parse_subcommand(int argc, const char **argv)
|
|
{
|
|
const char *usage[] = {
|
|
"test-tool parse-subcommand [flag-options] cmd <subcommand>",
|
|
NULL
|
|
};
|
|
|
|
argc = parse_options(argc, argv, NULL, test_flag_options, usage,
|
|
PARSE_OPT_STOP_AT_NON_OPTION);
|
|
|
|
if (argc == 0 || strcmp(argv[0], "cmd")) {
|
|
error("'cmd' is mandatory");
|
|
usage_with_options(usage, test_flag_options);
|
|
}
|
|
|
|
return parse_subcommand__cmd(argc, argv, test_flags);
|
|
}
|