mirror of
https://github.com/git/git.git
synced 2024-11-08 12:59:54 +01: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>
293 lines
7.0 KiB
C
293 lines
7.0 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "git-compat-util.h"
|
|
#include "gettext.h"
|
|
#include "hex.h"
|
|
#include "object-store-ll.h"
|
|
#include "promisor-remote.h"
|
|
#include "config.h"
|
|
#include "trace2.h"
|
|
#include "transport.h"
|
|
#include "strvec.h"
|
|
#include "packfile.h"
|
|
#include "environment.h"
|
|
|
|
struct promisor_remote_config {
|
|
struct promisor_remote *promisors;
|
|
struct promisor_remote **promisors_tail;
|
|
};
|
|
|
|
static int fetch_objects(struct repository *repo,
|
|
const char *remote_name,
|
|
const struct object_id *oids,
|
|
int oid_nr)
|
|
{
|
|
struct child_process child = CHILD_PROCESS_INIT;
|
|
int i;
|
|
FILE *child_in;
|
|
int quiet;
|
|
|
|
if (git_env_bool(NO_LAZY_FETCH_ENVIRONMENT, 0)) {
|
|
static int warning_shown;
|
|
if (!warning_shown) {
|
|
warning_shown = 1;
|
|
warning(_("lazy fetching disabled; some objects may not be available"));
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
child.git_cmd = 1;
|
|
child.in = -1;
|
|
if (repo != the_repository)
|
|
prepare_other_repo_env(&child.env, repo->gitdir);
|
|
strvec_pushl(&child.args, "-c", "fetch.negotiationAlgorithm=noop",
|
|
"fetch", remote_name, "--no-tags",
|
|
"--no-write-fetch-head", "--recurse-submodules=no",
|
|
"--filter=blob:none", "--stdin", NULL);
|
|
if (!git_config_get_bool("promisor.quiet", &quiet) && quiet)
|
|
strvec_push(&child.args, "--quiet");
|
|
if (start_command(&child))
|
|
die(_("promisor-remote: unable to fork off fetch subprocess"));
|
|
child_in = xfdopen(child.in, "w");
|
|
|
|
trace2_data_intmax("promisor", repo, "fetch_count", oid_nr);
|
|
|
|
for (i = 0; i < oid_nr; i++) {
|
|
if (fputs(oid_to_hex(&oids[i]), child_in) < 0)
|
|
die_errno(_("promisor-remote: could not write to fetch subprocess"));
|
|
if (fputc('\n', child_in) < 0)
|
|
die_errno(_("promisor-remote: could not write to fetch subprocess"));
|
|
}
|
|
|
|
if (fclose(child_in) < 0)
|
|
die_errno(_("promisor-remote: could not close stdin to fetch subprocess"));
|
|
return finish_command(&child) ? -1 : 0;
|
|
}
|
|
|
|
static struct promisor_remote *promisor_remote_new(struct promisor_remote_config *config,
|
|
const char *remote_name)
|
|
{
|
|
struct promisor_remote *r;
|
|
|
|
if (*remote_name == '/') {
|
|
warning(_("promisor remote name cannot begin with '/': %s"),
|
|
remote_name);
|
|
return NULL;
|
|
}
|
|
|
|
FLEX_ALLOC_STR(r, name, remote_name);
|
|
|
|
*config->promisors_tail = r;
|
|
config->promisors_tail = &r->next;
|
|
|
|
return r;
|
|
}
|
|
|
|
static struct promisor_remote *promisor_remote_lookup(struct promisor_remote_config *config,
|
|
const char *remote_name,
|
|
struct promisor_remote **previous)
|
|
{
|
|
struct promisor_remote *r, *p;
|
|
|
|
for (p = NULL, r = config->promisors; r; p = r, r = r->next)
|
|
if (!strcmp(r->name, remote_name)) {
|
|
if (previous)
|
|
*previous = p;
|
|
return r;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static void promisor_remote_move_to_tail(struct promisor_remote_config *config,
|
|
struct promisor_remote *r,
|
|
struct promisor_remote *previous)
|
|
{
|
|
if (!r->next)
|
|
return;
|
|
|
|
if (previous)
|
|
previous->next = r->next;
|
|
else
|
|
config->promisors = r->next ? r->next : r;
|
|
r->next = NULL;
|
|
*config->promisors_tail = r;
|
|
config->promisors_tail = &r->next;
|
|
}
|
|
|
|
static int promisor_remote_config(const char *var, const char *value,
|
|
const struct config_context *ctx UNUSED,
|
|
void *data)
|
|
{
|
|
struct promisor_remote_config *config = data;
|
|
const char *name;
|
|
size_t namelen;
|
|
const char *subkey;
|
|
|
|
if (parse_config_key(var, "remote", &name, &namelen, &subkey) < 0)
|
|
return 0;
|
|
|
|
if (!strcmp(subkey, "promisor")) {
|
|
char *remote_name;
|
|
|
|
if (!git_config_bool(var, value))
|
|
return 0;
|
|
|
|
remote_name = xmemdupz(name, namelen);
|
|
|
|
if (!promisor_remote_lookup(config, remote_name, NULL))
|
|
promisor_remote_new(config, remote_name);
|
|
|
|
free(remote_name);
|
|
return 0;
|
|
}
|
|
if (!strcmp(subkey, "partialclonefilter")) {
|
|
struct promisor_remote *r;
|
|
char *remote_name = xmemdupz(name, namelen);
|
|
|
|
r = promisor_remote_lookup(config, remote_name, NULL);
|
|
if (!r)
|
|
r = promisor_remote_new(config, remote_name);
|
|
|
|
free(remote_name);
|
|
|
|
if (!r)
|
|
return 0;
|
|
|
|
return git_config_string(&r->partial_clone_filter, var, value);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void promisor_remote_init(struct repository *r)
|
|
{
|
|
struct promisor_remote_config *config;
|
|
|
|
if (r->promisor_remote_config)
|
|
return;
|
|
config = r->promisor_remote_config =
|
|
xcalloc(1, sizeof(*r->promisor_remote_config));
|
|
config->promisors_tail = &config->promisors;
|
|
|
|
repo_config(r, promisor_remote_config, config);
|
|
|
|
if (r->repository_format_partial_clone) {
|
|
struct promisor_remote *o, *previous;
|
|
|
|
o = promisor_remote_lookup(config,
|
|
r->repository_format_partial_clone,
|
|
&previous);
|
|
if (o)
|
|
promisor_remote_move_to_tail(config, o, previous);
|
|
else
|
|
promisor_remote_new(config, r->repository_format_partial_clone);
|
|
}
|
|
}
|
|
|
|
void promisor_remote_clear(struct promisor_remote_config *config)
|
|
{
|
|
while (config->promisors) {
|
|
struct promisor_remote *r = config->promisors;
|
|
config->promisors = config->promisors->next;
|
|
free(r);
|
|
}
|
|
|
|
config->promisors_tail = &config->promisors;
|
|
}
|
|
|
|
void repo_promisor_remote_reinit(struct repository *r)
|
|
{
|
|
promisor_remote_clear(r->promisor_remote_config);
|
|
FREE_AND_NULL(r->promisor_remote_config);
|
|
promisor_remote_init(r);
|
|
}
|
|
|
|
struct promisor_remote *repo_promisor_remote_find(struct repository *r,
|
|
const char *remote_name)
|
|
{
|
|
promisor_remote_init(r);
|
|
|
|
if (!remote_name)
|
|
return r->promisor_remote_config->promisors;
|
|
|
|
return promisor_remote_lookup(r->promisor_remote_config, remote_name, NULL);
|
|
}
|
|
|
|
int repo_has_promisor_remote(struct repository *r)
|
|
{
|
|
return !!repo_promisor_remote_find(r, NULL);
|
|
}
|
|
|
|
static int remove_fetched_oids(struct repository *repo,
|
|
struct object_id **oids,
|
|
int oid_nr, int to_free)
|
|
{
|
|
int i, remaining_nr = 0;
|
|
int *remaining = xcalloc(oid_nr, sizeof(*remaining));
|
|
struct object_id *old_oids = *oids;
|
|
struct object_id *new_oids;
|
|
|
|
for (i = 0; i < oid_nr; i++)
|
|
if (oid_object_info_extended(repo, &old_oids[i], NULL,
|
|
OBJECT_INFO_SKIP_FETCH_OBJECT)) {
|
|
remaining[i] = 1;
|
|
remaining_nr++;
|
|
}
|
|
|
|
if (remaining_nr) {
|
|
int j = 0;
|
|
CALLOC_ARRAY(new_oids, remaining_nr);
|
|
for (i = 0; i < oid_nr; i++)
|
|
if (remaining[i])
|
|
oidcpy(&new_oids[j++], &old_oids[i]);
|
|
*oids = new_oids;
|
|
if (to_free)
|
|
free(old_oids);
|
|
}
|
|
|
|
free(remaining);
|
|
|
|
return remaining_nr;
|
|
}
|
|
|
|
void promisor_remote_get_direct(struct repository *repo,
|
|
const struct object_id *oids,
|
|
int oid_nr)
|
|
{
|
|
struct promisor_remote *r;
|
|
struct object_id *remaining_oids = (struct object_id *)oids;
|
|
int remaining_nr = oid_nr;
|
|
int to_free = 0;
|
|
int i;
|
|
|
|
if (oid_nr == 0)
|
|
return;
|
|
|
|
promisor_remote_init(repo);
|
|
|
|
for (r = repo->promisor_remote_config->promisors; r; r = r->next) {
|
|
if (fetch_objects(repo, r->name, remaining_oids, remaining_nr) < 0) {
|
|
if (remaining_nr == 1)
|
|
continue;
|
|
remaining_nr = remove_fetched_oids(repo, &remaining_oids,
|
|
remaining_nr, to_free);
|
|
if (remaining_nr) {
|
|
to_free = 1;
|
|
continue;
|
|
}
|
|
}
|
|
goto all_fetched;
|
|
}
|
|
|
|
for (i = 0; i < remaining_nr; i++) {
|
|
if (is_promisor_object(&remaining_oids[i]))
|
|
die(_("could not fetch %s from promisor remote"),
|
|
oid_to_hex(&remaining_oids[i]));
|
|
}
|
|
|
|
all_fetched:
|
|
if (to_free)
|
|
free(remaining_oids);
|
|
}
|