10000 cli: add a `git config` command by ethomson · Pull Request #6616 · libgit2/libgit2 · GitHub
[go: up one dir, main page]
Skip to content

cli: add a git config command #6616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Aug 14, 2023
Merged

cli: add a git config command #6616

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
23ba7ae
config: complete entry during creation
ethomson Jul 19, 2023
1951864
config: rename config_entries to config_list
ethomson Jul 19, 2023
a8cac7f
config: drop entry payload; teach config_list about entries
ethomson Jul 19, 2023
d901220
config: provide origin in git_config_entry
ethomson Jul 20, 2023
1977a9a
config: memory backends have an optional type
ethomson Jul 20, 2023
21d3301
config: provide two memory-backed config backends
ethomson Jul 20, 2023
8779684
cli: add `config` command
ethomson Jul 21, 2023
1c381ac
cli: accept configuration on the command line
ethomson Jul 24, 2023
005bcce
cli: reorder arguments for subcommands
ethomson Jul 24, 2023
90d3cc6
cli: common options
ethomson Jul 24, 2023
4470ea3
cli: use cli_repository_open
ethomson Jul 25, 2023
a7512e6
cli: add file levels to config command
ethomson Jul 25, 2023
929ec75
cli: add `--add` and `--replace-all` to config
ethomson Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cli: reorder arguments for subcommands 
Instead of special casing `--help`, reorder the arguments for
subcommands so that it can handle "global" arguments like `--help`,
`-c key=value`, etc.
  • Loading branch information
@ethomson
ethomson committed Jul 26, 2023
commit 005bccea58e1e529e2af821f0d8f8c6423c0bb3e
53 changes: 30 additions & 23 deletions src/cli/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@ static char *command = NULL;
static char **args = NULL;

const cli_opt_spec cli_common_opts[] = {
{ CLI_OPT_TYPE_SWITCH, "help", 0, &show_help, 1,
CLI_OPT_USAGE_DEFAULT, NULL, "display help information" },
{ CLI_OPT_TYPE_SWITCH, "help", 0, &show_help, 1,
CLI_OPT_USAGE_DEFAULT, NULL, "display help information" },
{ CLI_OPT_TYPE_VALUE, NULL, 'c', NULL, 0,
CLI_OPT_USAGE_DEFAULT, "key=value", "add configuration value" },
{ CLI_OPT_TYPE_VALUE, "config-env", 0, NULL, 0,
CLI_OPT_USAGE_DEFAULT, "key=value", "set configuration value to environment variable" },
{ CLI_OPT_TYPE_SWITCH, "version", 0, &show_version, 1,
CLI_OPT_USAGE_DEFAULT, NULL, "display the version" },
{ CLI_OPT_TYPE_ARG, "command", 0, &command, 0,
Expand All @@ -36,14 +40,33 @@ const cli_cmd_spec cli_cmds[] = {
{ NULL }
};

/*
* Reorder the argv as it was given, since git has the notion of global
* options (like `--help` or `-c key=val`) that we want to pass to the
* subcommand, and that can appear early in the arguments, before the
* command name. Put the command-name in argv[1] to allow easier parsing.
*/
static void reorder_args(char **argv, size_t first)
{
char *tmp;
size_t i;

if (first == 1)
return;

tmp = argv[first];

for (i = first; i > 1; i--)
argv[i] = argv[i - 1];

argv[1] = tmp;
}

int main(int argc, char **argv)
{
const cli_cmd_spec *cmd;
cli_opt_parser optparser;
cli_opt opt;
char *help_args[3] = { NULL };
int help_args_len;
int args_len = 0;
int ret = 0;

if (git_libgit2_init() < 0) {
Expand All @@ -67,8 +90,7 @@ int main(int argc, char **argv)
* remaining arguments as args for the command itself.
*/
if (command) {
args = &argv[optparser.idx];
args_len = (int)(argc - optparser.idx);
reorder_args(argv, optparser.idx);
break;
}
}
Expand All @@ -78,28 +100,13 @@ int main(int argc, char **argv)
goto done;
}

/*
* If `--help <command>` is specified, delegate to that command's
* `--help` option. If no command is specified, run the `help`
* command. Do this by updating the args to emulate that behavior.
*/
if (!command || show_help) {
help_args[0] = command ? (char *)command : "help";
help_args[1] = command ? "--help" : NULL;
help_args_len = command ? 2 : 1;

command = help_args[0];
args = help_args;
args_len = help_args_len;
}

if ((cmd = cli_cmd_spec_byname(command)) == NULL) {
ret = cli_error("'%s' is not a %s command. See '%s help'.",
command, PROGRAM_NAME, PROGRAM_NAME);
goto done;
< 5043 /td> }

ret = cmd->fn(args_len, args);
ret = cmd->fn(argc - 1, &argv[1]);

done:
git_libgit2_shutdown();
Expand Down
0