cc74a4ac72
As with other moves to "test-tool" inf322e9f51b
(Merge branch 'ab/submodule-helper-prep', 2022-09-13) the "config" sub-command was only used by our own tests. It was last used by "git submodule" itself in code that went away witha6226fd772
(submodule--helper: convert the bulk of cmd_add() to C, 2021-08-10). Let's move it over, and while doing so make it easier to reason about by splitting up the various uses for it into separate sub-commands, so that we don't need to count arguments to see what it does. This also has the advantage that we stop wasting future translator time on this command, currently the usage information for this internal-only tool has been translated into several languages. The use of the "_" function has also been removed from the "please make sure..." message. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>
225 lines
5.3 KiB
C
225 lines
5.3 KiB
C
#include "test-tool.h"
|
|
#include "test-tool-utils.h"
|
|
#include "cache.h"
|
|
#include "parse-options.h"
|
|
#include "remote.h"
|
|
#include "submodule-config.h"
|
|
#include "submodule.h"
|
|
|
|
#define TEST_TOOL_CHECK_NAME_USAGE \
|
|
"test-tool submodule check-name <name>"
|
|
static const char *submodule_check_name_usage[] = {
|
|
TEST_TOOL_CHECK_NAME_USAGE,
|
|
NULL
|
|
};
|
|
|
|
#define TEST_TOOL_IS_ACTIVE_USAGE \
|
|
"test-tool submodule is-active <name>"
|
|
static const char *submodule_is_active_usage[] = {
|
|
TEST_TOOL_IS_ACTIVE_USAGE,
|
|
NULL
|
|
};
|
|
|
|
#define TEST_TOOL_RESOLVE_RELATIVE_URL_USAGE \
|
|
"test-tool submodule resolve-relative-url <up_path> <remoteurl> <url>"
|
|
static const char *submodule_resolve_relative_url_usage[] = {
|
|
TEST_TOOL_RESOLVE_RELATIVE_URL_USAGE,
|
|
NULL,
|
|
};
|
|
|
|
static const char *submodule_usage[] = {
|
|
TEST_TOOL_CHECK_NAME_USAGE,
|
|
TEST_TOOL_IS_ACTIVE_USAGE,
|
|
TEST_TOOL_RESOLVE_RELATIVE_URL_USAGE,
|
|
NULL
|
|
};
|
|
|
|
/*
|
|
* Exit non-zero if any of the submodule names given on the command line is
|
|
* invalid. If no names are given, filter stdin to print only valid names
|
|
* (which is primarily intended for testing).
|
|
*/
|
|
static int check_name(int argc, const char **argv)
|
|
{
|
|
if (argc > 1) {
|
|
while (*++argv) {
|
|
if (check_submodule_name(*argv) < 0)
|
|
return 1;
|
|
}
|
|
} else {
|
|
struct strbuf buf = STRBUF_INIT;
|
|
while (strbuf_getline(&buf, stdin) != EOF) {
|
|
if (!check_submodule_name(buf.buf))
|
|
printf("%s\n", buf.buf);
|
|
}
|
|
strbuf_release(&buf);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int cmd__submodule_check_name(int argc, const char **argv)
|
|
{
|
|
struct option options[] = {
|
|
OPT_END()
|
|
};
|
|
argc = parse_options(argc, argv, "test-tools", options,
|
|
submodule_check_name_usage, 0);
|
|
if (argc)
|
|
usage_with_options(submodule_check_name_usage, options);
|
|
|
|
return check_name(argc, argv);
|
|
}
|
|
|
|
static int cmd__submodule_is_active(int argc, const char **argv)
|
|
{
|
|
struct option options[] = {
|
|
OPT_END()
|
|
};
|
|
argc = parse_options(argc, argv, "test-tools", options,
|
|
submodule_is_active_usage, 0);
|
|
if (argc != 1)
|
|
usage_with_options(submodule_is_active_usage, options);
|
|
|
|
setup_git_directory();
|
|
|
|
return !is_submodule_active(the_repository, argv[0]);
|
|
}
|
|
|
|
static int cmd__submodule_resolve_relative_url(int argc, const char **argv)
|
|
{
|
|
char *remoteurl, *res;
|
|
const char *up_path, *url;
|
|
struct option options[] = {
|
|
OPT_END()
|
|
};
|
|
argc = parse_options(argc, argv, "test-tools", options,
|
|
submodule_resolve_relative_url_usage, 0);
|
|
if (argc != 3)
|
|
usage_with_options(submodule_resolve_relative_url_usage, options);
|
|
|
|
up_path = argv[0];
|
|
remoteurl = xstrdup(argv[1]);
|
|
url = argv[2];
|
|
|
|
if (!strcmp(up_path, "(null)"))
|
|
up_path = NULL;
|
|
|
|
res = relative_url(remoteurl, url, up_path);
|
|
puts(res);
|
|
free(res);
|
|
free(remoteurl);
|
|
return 0;
|
|
}
|
|
|
|
static int cmd__submodule_config_list(int argc, const char **argv)
|
|
{
|
|
struct option options[] = {
|
|
OPT_END()
|
|
};
|
|
const char *const usage[] = {
|
|
"test-tool submodule config-list <key>",
|
|
NULL
|
|
};
|
|
argc = parse_options(argc, argv, "test-tools", options, usage,
|
|
PARSE_OPT_KEEP_ARGV0);
|
|
|
|
setup_git_directory();
|
|
|
|
if (argc == 2)
|
|
return print_config_from_gitmodules(the_repository, argv[1]);
|
|
usage_with_options(usage, options);
|
|
}
|
|
|
|
static int cmd__submodule_config_set(int argc, const char **argv)
|
|
{
|
|
struct option options[] = {
|
|
OPT_END()
|
|
};
|
|
const char *const usage[] = {
|
|
"test-tool submodule config-set <key> <value>",
|
|
NULL
|
|
};
|
|
argc = parse_options(argc, argv, "test-tools", options, usage,
|
|
PARSE_OPT_KEEP_ARGV0);
|
|
|
|
setup_git_directory();
|
|
|
|
/* Equivalent to ACTION_SET in builtin/config.c */
|
|
if (argc == 3) {
|
|
if (!is_writing_gitmodules_ok())
|
|
die("please make sure that the .gitmodules file is in the working tree");
|
|
|
|
return config_set_in_gitmodules_file_gently(argv[1], argv[2]);
|
|
}
|
|
usage_with_options(usage, options);
|
|
}
|
|
|
|
static int cmd__submodule_config_unset(int argc, const char **argv)
|
|
{
|
|
struct option options[] = {
|
|
OPT_END()
|
|
};
|
|
const char *const usage[] = {
|
|
"test-tool submodule config-unset <key>",
|
|
NULL
|
|
};
|
|
|
|
setup_git_directory();
|
|
|
|
if (argc == 2) {
|
|
if (!is_writing_gitmodules_ok())
|
|
die("please make sure that the .gitmodules file is in the working tree");
|
|
return config_set_in_gitmodules_file_gently(argv[1], NULL);
|
|
}
|
|
usage_with_options(usage, options);
|
|
}
|
|
|
|
static int cmd__submodule_config_writeable(int argc, const char **argv)
|
|
{
|
|
struct option options[] = {
|
|
OPT_END()
|
|
};
|
|
const char *const usage[] = {
|
|
"test-tool submodule config-writeable",
|
|
NULL
|
|
};
|
|
setup_git_directory();
|
|
|
|
if (argc == 1)
|
|
return is_writing_gitmodules_ok() ? 0 : -1;
|
|
|
|
usage_with_options(usage, options);
|
|
}
|
|
|
|
static struct test_cmd cmds[] = {
|
|
{ "check-name", cmd__submodule_check_name },
|
|
{ "is-active", cmd__submodule_is_active },
|
|
{ "resolve-relative-url", cmd__submodule_resolve_relative_url},
|
|
{ "config-list", cmd__submodule_config_list },
|
|
{ "config-set", cmd__submodule_config_set },
|
|
{ "config-unset", cmd__submodule_config_unset },
|
|
{ "config-writeable", cmd__submodule_config_writeable },
|
|
};
|
|
|
|
int cmd__submodule(int argc, const char **argv)
|
|
{
|
|
struct option options[] = {
|
|
OPT_END()
|
|
};
|
|
size_t i;
|
|
|
|
argc = parse_options(argc, argv, "test-tools", options, submodule_usage,
|
|
PARSE_OPT_STOP_AT_NON_OPTION);
|
|
if (argc < 1)
|
|
usage_with_options(submodule_usage, options);
|
|
|
|
for (i = 0; i < ARRAY_SIZE(cmds); i++)
|
|
if (!strcmp(cmds[i].name, argv[0]))
|
|
return cmds[i].fn(argc, argv);
|
|
|
|
usage_msg_optf("unknown subcommand '%s'", submodule_usage, options,
|
|
argv[0]);
|
|
|
|
return 0;
|
|
}
|