mirror of
https://github.com/git/git.git
synced 2024-11-27 03:53:55 +08:00
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>
104 lines
2.0 KiB
C
104 lines
2.0 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "git-compat-util.h"
|
|
#include "oid-array.h"
|
|
#include "hash-lookup.h"
|
|
|
|
void oid_array_append(struct oid_array *array, const struct object_id *oid)
|
|
{
|
|
ALLOC_GROW(array->oid, array->nr + 1, array->alloc);
|
|
oidcpy(&array->oid[array->nr++], oid);
|
|
if (!oid->algo)
|
|
oid_set_algo(&array->oid[array->nr - 1], the_hash_algo);
|
|
array->sorted = 0;
|
|
}
|
|
|
|
static int void_hashcmp(const void *va, const void *vb)
|
|
{
|
|
const struct object_id *a = va, *b = vb;
|
|
int ret;
|
|
if (a->algo == b->algo)
|
|
ret = oidcmp(a, b);
|
|
else
|
|
ret = a->algo > b->algo ? 1 : -1;
|
|
return ret;
|
|
}
|
|
|
|
void oid_array_sort(struct oid_array *array)
|
|
{
|
|
if (array->sorted)
|
|
return;
|
|
QSORT(array->oid, array->nr, void_hashcmp);
|
|
array->sorted = 1;
|
|
}
|
|
|
|
static const struct object_id *oid_access(size_t index, const void *table)
|
|
{
|
|
const struct object_id *array = table;
|
|
return &array[index];
|
|
}
|
|
|
|
int oid_array_lookup(struct oid_array *array, const struct object_id *oid)
|
|
{
|
|
oid_array_sort(array);
|
|
return oid_pos(oid, array->oid, array->nr, oid_access);
|
|
}
|
|
|
|
void oid_array_clear(struct oid_array *array)
|
|
{
|
|
FREE_AND_NULL(array->oid);
|
|
array->nr = 0;
|
|
array->alloc = 0;
|
|
array->sorted = 0;
|
|
}
|
|
|
|
|
|
int oid_array_for_each(struct oid_array *array,
|
|
for_each_oid_fn fn,
|
|
void *data)
|
|
{
|
|
size_t i;
|
|
|
|
/* No oid_array_sort() here! See oid-array.h */
|
|
|
|
for (i = 0; i < array->nr; i++) {
|
|
int ret = fn(array->oid + i, data);
|
|
if (ret)
|
|
return ret;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int oid_array_for_each_unique(struct oid_array *array,
|
|
for_each_oid_fn fn,
|
|
void *data)
|
|
{
|
|
size_t i;
|
|
|
|
oid_array_sort(array);
|
|
|
|
for (i = 0; i < array->nr; i = oid_array_next_unique(array, i)) {
|
|
int ret = fn(array->oid + i, data);
|
|
if (ret)
|
|
return ret;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void oid_array_filter(struct oid_array *array,
|
|
for_each_oid_fn want,
|
|
void *cb_data)
|
|
{
|
|
size_t nr = array->nr, src, dst;
|
|
struct object_id *oids = array->oid;
|
|
|
|
for (src = dst = 0; src < nr; src++) {
|
|
if (want(&oids[src], cb_data)) {
|
|
if (src != dst)
|
|
oidcpy(&oids[dst], &oids[src]);
|
|
dst++;
|
|
}
|
|
}
|
|
array->nr = dst;
|
|
}
|