
Use of the `the_repository` variable is deprecated nowadays, and we slowly but steadily convert the codebase to not use it anymore. Instead, callers should be passing down the repository to work on via parameters. It is hard though to prove that a given code unit does not use this variable anymore. The most trivial case, merely demonstrating that there is no direct use of `the_repository`, is already a bit of a pain during code reviews as the reviewer needs to manually verify claims made by the patch author. The bigger problem though is that we have many interfaces that implicitly rely on `the_repository`. Introduce a new `USE_THE_REPOSITORY_VARIABLE` macro that allows code units to opt into usage of `the_repository`. The intent of this macro is to demonstrate that a certain code unit does not use this variable anymore, and to keep it from new dependencies on it in future changes, be it explicit or implicit For now, the macro only guards `the_repository` itself as well as `the_hash_algo`. There are many more known interfaces where we have an implicit dependency on `the_repository`, but those are not guarded at the current point in time. Over time though, we should start to add guards as required (or even better, just remove them). Define the macro as required in our code units. As expected, most of our code still relies on the global variable. Nearly all of our builtins rely on the variable as there is no way yet to pass `the_repository` to their entry point. For now, declare the macro in "biultin.h" to keep the required changes at least a little bit more contained. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
245 lines
5.8 KiB
C
245 lines
5.8 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "test-tool.h"
|
|
#include "test-tool-utils.h"
|
|
#include "parse-options.h"
|
|
#include "remote.h"
|
|
#include "repository.h"
|
|
#include "setup.h"
|
|
#include "strbuf.h"
|
|
#include "submodule-config.h"
|
|
#include "submodule.h"
|
|
|
|
#define TEST_TOOL_CHECK_NAME_USAGE \
|
|
"test-tool submodule check-name"
|
|
static const char *submodule_check_name_usage[] = {
|
|
TEST_TOOL_CHECK_NAME_USAGE,
|
|
NULL
|
|
};
|
|
|
|
#define TEST_TOOL_CHECK_URL_USAGE \
|
|
"test-tool submodule check-url"
|
|
static const char *submodule_check_url_usage[] = {
|
|
TEST_TOOL_CHECK_URL_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_CHECK_URL_USAGE,
|
|
TEST_TOOL_IS_ACTIVE_USAGE,
|
|
TEST_TOOL_RESOLVE_RELATIVE_URL_USAGE,
|
|
NULL
|
|
};
|
|
|
|
typedef int (*check_fn_t)(const char *);
|
|
|
|
/*
|
|
* Apply 'check_fn' to each line of stdin, printing values that pass the check
|
|
* to stdout.
|
|
*/
|
|
static int check_submodule(check_fn_t check_fn)
|
|
{
|
|
struct strbuf buf = STRBUF_INIT;
|
|
while (strbuf_getline(&buf, stdin) != EOF) {
|
|
if (!check_fn(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_submodule(check_submodule_name);
|
|
}
|
|
|
|
static int cmd__submodule_check_url(int argc, const char **argv)
|
|
{
|
|
struct option options[] = {
|
|
OPT_END()
|
|
};
|
|
argc = parse_options(argc, argv, "test-tools", options,
|
|
submodule_check_url_usage, 0);
|
|
if (argc)
|
|
usage_with_options(submodule_check_url_usage, options);
|
|
|
|
return check_submodule(check_submodule_url);
|
|
}
|
|
|
|
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 UNUSED)
|
|
{
|
|
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 },
|
|
{ "check-url", cmd__submodule_check_url },
|
|
{ "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;
|
|
}
|