e7da938570
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>
83 lines
2.5 KiB
C
83 lines
2.5 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "test-lib.h"
|
|
#include "object.h"
|
|
#include "decorate.h"
|
|
#include "repository.h"
|
|
|
|
struct test_vars {
|
|
struct object *one, *two, *three;
|
|
struct decoration n;
|
|
int decoration_a, decoration_b;
|
|
};
|
|
|
|
static void t_add(struct test_vars *vars)
|
|
{
|
|
void *ret = add_decoration(&vars->n, vars->one, &vars->decoration_a);
|
|
|
|
if (!check(ret == NULL))
|
|
test_msg("when adding a brand-new object, NULL should be returned");
|
|
ret = add_decoration(&vars->n, vars->two, NULL);
|
|
if (!check(ret == NULL))
|
|
test_msg("when adding a brand-new object, NULL should be returned");
|
|
}
|
|
|
|
static void t_readd(struct test_vars *vars)
|
|
{
|
|
void *ret = add_decoration(&vars->n, vars->one, NULL);
|
|
|
|
if (!check(ret == &vars->decoration_a))
|
|
test_msg("when readding an already existing object, existing decoration should be returned");
|
|
ret = add_decoration(&vars->n, vars->two, &vars->decoration_b);
|
|
if (!check(ret == NULL))
|
|
test_msg("when readding an already existing object, existing decoration should be returned");
|
|
}
|
|
|
|
static void t_lookup(struct test_vars *vars)
|
|
{
|
|
void *ret = lookup_decoration(&vars->n, vars->one);
|
|
|
|
if (!check(ret == NULL))
|
|
test_msg("lookup should return added declaration");
|
|
ret = lookup_decoration(&vars->n, vars->two);
|
|
if (!check(ret == &vars->decoration_b))
|
|
test_msg("lookup should return added declaration");
|
|
ret = lookup_decoration(&vars->n, vars->three);
|
|
if (!check(ret == NULL))
|
|
test_msg("lookup for unknown object should return NULL");
|
|
}
|
|
|
|
static void t_loop(struct test_vars *vars)
|
|
{
|
|
int i, objects_noticed = 0;
|
|
|
|
for (i = 0; i < vars->n.size; i++) {
|
|
if (vars->n.entries[i].base)
|
|
objects_noticed++;
|
|
}
|
|
if (!check_int(objects_noticed, ==, 2))
|
|
test_msg("should have 2 objects");
|
|
}
|
|
|
|
int cmd_main(int argc UNUSED, const char **argv UNUSED)
|
|
{
|
|
struct object_id one_oid = { { 1 } }, two_oid = { { 2 } }, three_oid = { { 3 } };
|
|
struct test_vars vars = { 0 };
|
|
|
|
vars.one = lookup_unknown_object(the_repository, &one_oid);
|
|
vars.two = lookup_unknown_object(the_repository, &two_oid);
|
|
vars.three = lookup_unknown_object(the_repository, &three_oid);
|
|
|
|
TEST(t_add(&vars),
|
|
"Add 2 objects, one with a non-NULL decoration and one with a NULL decoration.");
|
|
TEST(t_readd(&vars),
|
|
"When re-adding an already existing object, the old decoration is returned.");
|
|
TEST(t_lookup(&vars),
|
|
"Lookup returns the added declarations, or NULL if the object was never added.");
|
|
TEST(t_loop(&vars), "The user can also loop through all entries.");
|
|
|
|
clear_decoration(&vars.n, NULL);
|
|
|
|
return test_done();
|
|
}
|