[PATCH 32/32] object-file-convert: Implement repo_submodule_oid_to_algop
- From
Eric W. Biederman <ebiederm@xmission.com>
- Date
- Sep 8, 2023, 23:10 UTC
- Message-ID
- <20230908231049.2035003-32-ebiederm@xmission.com>
- In-Reply-To
- <87sf7ol0z3.fsf@email.froward.int.ebiederm.org>
From time to time git tree objects contain gitlinks. These gitlinks contain the oid of an object in another git repository. To succesfully translate these oids it is necessary to look at the mapping tables in the submodules where the mapping tables live.
Limiting myself to submodule interfaces I can see in the code repo_submodule_oid_to_algop is the best I can figure out how to do, for a gitlink agnostic implementation.
The big downsides are that the code as implemented is not thread safe, it depends upon a worktree, and it always walks through all of the submodules.
There are interfaces in the code to lookup the submodule for an individual gitlink. As such iterating all of the submodules could be avoided if care was taken to compute the path to the gitlink and to recognizes the code is translating a gitlink.
The dependency on a worktree, and the thread safety issues I do not see a solution to short of reworking how git deals with submodules.
For now repo_oid_to_algop does not call repo_submodule_oid_to_algop to allow avoiding the thread safety issues.
Update callers of repo_oid_to_algop that can benefit from a submodule translation to also call repo_sumodule_oid_to_algop.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> --- builtin/fast-import.c | 5 ++++- builtin/index-pack.c | 4 +++- object-file-convert.c | 45 +++++++++++++++++++++++++++++++++++++++++++ object-file-convert.h | 5 +++++ 4 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/builtin/fast-import.c b/builtin/fast-import.c index f1c250dd3c8f..66c471bc730e 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -1070,7 +1070,10 @@ static int store_object( else if (pobj) break; else if (repo_oid_to_algop(repo, &state.oid, compat, - &state.mapped_oid)) + &state.mapped_oid) && + repo_submodule_oid_to_algop(repo, &state.oid, + compat, + &state.mapped_oid)) break; } convert_object_file_end(&state, ret); diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 6827d14b91ce..4100fd56a845 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -2093,7 +2093,9 @@ static void compute_compat_oid(struct object_entry *obj) else if (pobj) cco = cco_push(cco, pobj); else if (repo_oid_to_algop(repo, &cco->state.oid, compat, - &cco->state.mapped_oid)) + &cco->state.mapped_oid) && + repo_submodule_oid_to_algop(repo, &cco->state.oid, compat, + &cco->state.mapped_oid)) die(_("When converting %s no mapping for oid %s to %s\n"), oid_to_hex(&cco->obj->idx.oid), oid_to_hex(&cco->state.oid), diff --git a/object-file-convert.c b/object-file-convert.c index 3fd080ebc112..2306e17dd57e 100644 --- a/object-file-convert.c +++ b/object-file-convert.c @@ -11,6 +11,45 @@ #include "gpg-interface.h" #include "pack-compat-map.h" #include "object-file-convert.h" +#include "read-cache.h" +#include "submodule-config.h" + +int repo_submodule_oid_to_algop(struct repository *repo, + const struct object_id *src, + const struct git_hash_algo *to, + struct object_id *dest) +{ + int i; + + if (repo_read_index(repo) < 0) + die(_("index file corrupt")); + + for (i = 0; i < repo->index->cache_nr; i++) { + const struct cache_entry *ce = repo->index->cache[i]; + struct repository subrepo = {}; + int ret; + + if (!S_ISGITLINK(ce->ce_mode)) + continue; + + while (i + 1 < repo->index->cache_nr && + !strcmp(ce->name, repo->index->cache[i + 1]->name)) + /* + * Skip entries with the same name in different stages + * to make sure an entry is returned only once. + */ + i++; + + if (repo_submodule_init(&subrepo, repo, ce->name, null_oid())) + continue; + + ret = repo_oid_to_algop(&subrepo, src, to, dest); + repo_clear(&subrepo); + if (ret == 0) + return 0; + } + return -1; +} int repo_oid_to_algop(struct repository *repo, const struct object_id *src, const struct git_hash_algo *to, struct object_id *dest) @@ -34,6 +73,7 @@ int repo_oid_to_algop(struct repository *repo, const struct object_id *src, */ if (!repo_packed_oid_to_algop(repo, src, to, dest)) return 0; + /* * We may have loaded the object map at repo initialization but * another process (perhaps upstream of a pipe from us) may have @@ -306,6 +346,11 @@ int convert_object_file(struct strbuf *outbuf, break; ret = repo_oid_to_algop(the_repository, &state.oid, state.to, &state.mapped_oid); + if (ret) + ret = repo_submodule_oid_to_algop(the_repository, + &state.oid, + state.to, + &state.mapped_oid); if (ret) { error(_("failed to map %s entry for %s"), type_name(type), oid_to_hex(&state.oid)); diff --git a/object-file-convert.h b/object-file-convert.h index da032d7a91ef..7a19feda5f0c 100644 --- a/object-file-convert.h +++ b/object-file-convert.h @@ -10,6 +10,11 @@ struct strbuf; int repo_oid_to_algop(struct repository *repo, const struct object_id *src, const struct git_hash_algo *to, struct object_id *dest); +int repo_submodule_oid_to_algop(struct repository *repo, + const struct object_id *src, + const struct git_hash_algo *to, + struct object_id *dest); + struct object_file_convert_state { struct strbuf *outbuf; const struct git_hash_algo *from;
-- 2.41.0