[PATCH 04/20] packfile: pass down repository to `add_packed_git`
- From
Karthik Nayak <karthik.188@gmail.com>
- Date
- Oct 21, 2024, 09:57 UTC
- Message-ID
- <d7d5d236921ac6da281620ed22e5fef307175473.1729504641.git.karthik.188@gmail.com>
- In-Reply-To
- <cover.1729504640.git.karthik.188@gmail.com>
The function `add_packed_git` currently relies on the global variable `the_repository`. To eliminate global variable usage in `packfile.c`, we should progressively shift the dependency on the_repository to higher layers. Let's remove its usage from this function and any related ones.
Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- builtin/fast-import.c | 2 +- builtin/index-pack.c | 6 ++++-- builtin/pack-objects.c | 2 +- commit-graph.c | 2 +- connected.c | 2 +- midx-write.c | 2 +- midx.c | 2 +- packfile.c | 21 +++++++++++---------- packfile.h | 6 ++++-- 9 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/builtin/fast-import.c b/builtin/fast-import.c index 7ad950627c..51d1cc0deb 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -888,7 +888,7 @@ static void end_packfile(void) idx_name = keep_pack(create_index()); /* Register the packfile with core git's machinery. */ - new_p = add_packed_git(idx_name, strlen(idx_name), 1); + new_p = add_packed_git(the_repository, idx_name, strlen(idx_name), 1); if (!new_p) die("core git rejected index %s", idx_name); all_packs[pack_id] = new_p; diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 97afc69625..eaefb41761 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1552,7 +1552,8 @@ static void final(const char *final_pack_name, const char *curr_pack_name, if (do_fsck_object) { struct packed_git *p; - p = add_packed_git(final_index_name, strlen(final_index_name), 0); + p = add_packed_git(the_repository, final_index_name, + strlen(final_index_name), 0); if (p) install_packed_git(the_repository, p); } @@ -1650,7 +1651,8 @@ static void read_v2_anomalous_offsets(struct packed_git *p, static void read_idx_option(struct pack_idx_option *opts, const char *pack_name) { - struct packed_git *p = add_packed_git(pack_name, strlen(pack_name), 1); + struct packed_git *p = add_packed_git(the_repository, pack_name, + strlen(pack_name), 1); if (!p) die(_("Cannot open existing pack file '%s'"), pack_name); diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index ec321da8dc..26e3090c85 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2174,7 +2174,7 @@ static void check_object(struct object_entry *entry, uint32_t object_index) * object size from the delta header. */ delta_pos = entry->in_pack_offset + entry->in_pack_header_size; - canonical_size = get_size_from_delta(p, &w_curs, delta_pos); + canonical_size = get_size_from_delta(the_repository, p, &w_curs, delta_pos); if (canonical_size == 0) goto give_up; SET_SIZE(entry, canonical_size); diff --git a/commit-graph.c b/commit-graph.c index 5bd89c0acd..1c333a9c52 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1914,7 +1914,7 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx, struct packed_git *p; strbuf_setlen(&packname, dirlen); strbuf_addstr(&packname, pack_indexes->items[i].string); - p = add_packed_git(packname.buf, packname.len, 1); + p = add_packed_git(the_repository, packname.buf, packname.len, 1); if (!p) { ret = error(_("error adding pack %s"), packname.buf); goto cleanup; diff --git a/connected.c b/connected.c index 87cc4b57a1..235890efd0 100644 --- a/connected.c +++ b/connected.c @@ -54,7 +54,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data, strbuf_add(&idx_file, transport->pack_lockfiles.items[0].string, base_len); strbuf_addstr(&idx_file, ".idx"); - new_pack = add_packed_git(idx_file.buf, idx_file.len, 1); + new_pack = add_packed_git(the_repository, idx_file.buf, idx_file.len, 1); strbuf_release(&idx_file); } diff --git a/midx-write.c b/midx-write.c index b3a5f6c516..c57726ef94 100644 --- a/midx-write.c +++ b/midx-write.c @@ -154,7 +154,7 @@ static void add_pack_to_midx(const char *full_path, size_t full_path_len, return; ALLOC_GROW(ctx->info, ctx->nr + 1, ctx->alloc); - p = add_packed_git(full_path, full_path_len, 0); + p = add_packed_git(the_repository, full_path, full_path_len, 0); if (!p) { warning(_("failed to add packfile '%s'"), full_path); diff --git a/midx.c b/midx.c index 4a05f74606..94609456a2 100644 --- a/midx.c +++ b/midx.c @@ -455,7 +455,7 @@ int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, strbuf_addf(&pack_name, "%s/pack/%s", m->object_dir, m->pack_names[pack_int_id]); - p = add_packed_git(pack_name.buf, pack_name.len, m->local); + p = add_packed_git(r, pack_name.buf, pack_name.len, m->local); strbuf_release(&pack_name); if (!p) diff --git a/packfile.c b/packfile.c index 4588004223..f300119bb1 100644 --- a/packfile.c +++ b/packfile.c @@ -706,7 +706,8 @@ void unuse_pack(struct pack_window **w_cursor) } } -struct packed_git *add_packed_git(const char *path, size_t path_len, int local) +struct packed_git *add_packed_git(struct repository *repo, const char *path, + size_t path_len, int local) { struct stat st; size_t alloc; @@ -751,9 +752,9 @@ struct packed_git *add_packed_git(const char *path, size_t path_len, int local) p->pack_size = st.st_size; p->pack_local = local; p->mtime = st.st_mtime; - if (path_len < the_hash_algo->hexsz || - get_hash_hex(path + path_len - the_hash_algo->hexsz, p->hash)) - hashclr(p->hash, the_repository->hash_algo); + if (path_len < repo->hash_algo->hexsz || + get_hash_hex(path + path_len - repo->hash_algo->hexsz, p->hash)) + hashclr(p->hash, repo->hash_algo); return p; } @@ -880,7 +881,8 @@ static void prepare_pack(const char *full_name, size_t full_name_len, /* Don't reopen a pack we already have. */ if (!hashmap_get(&data->r->objects->pack_map, &hent, pack_name)) { - p = add_packed_git(full_name, full_name_len, data->local); + p = add_packed_git(data->r, full_name, full_name_len, + data->local); if (p) install_packed_git(data->r, p); } @@ -1113,9 +1115,8 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf, return used; } -unsigned long get_size_from_delta(struct packed_git *p, - struct pack_window **w_curs, - off_t curpos) +unsigned long get_size_from_delta(struct repository *repo, struct packed_git *p, + struct pack_window **w_curs, off_t curpos) { const unsigned char *data; unsigned char delta_head[20], *in; @@ -1128,7 +1129,7 @@ unsigned long get_size_from_delta(struct packed_git *p, git_inflate_init(&stream); do { - in = use_pack(the_repository, p, w_curs, curpos, &stream.avail_in); + in = use_pack(repo, p, w_curs, curpos, &stream.avail_in); stream.next_in = in; /* * Note: the window section returned by use_pack() must be @@ -1559,7 +1560,7 @@ int packed_object_info(struct repository *r, struct packed_git *p, type = OBJ_BAD; goto out; } - *oi->sizep = get_size_from_delta(p, &w_curs, tmp_pos); + *oi->sizep = get_size_from_delta(r, p, &w_curs, tmp_pos); if (*oi->sizep == 0) { type = OBJ_BAD; goto out; diff --git a/packfile.h b/packfile.h index b74d649c23..22d053a3af 100644 --- a/packfile.h +++ b/packfile.h @@ -117,7 +117,8 @@ void close_pack(struct packed_git *); void close_object_store(struct raw_object_store *o); void unuse_pack(struct pack_window **); void clear_delta_base_cache(void); -struct packed_git *add_packed_git(const char *path, size_t path_len, int local); +struct packed_git *add_packed_git(struct repository *repo, const char *path, + size_t path_len, int local); /* * Unlink the .pack and associated extension files. @@ -166,7 +167,8 @@ off_t find_pack_entry_one(const unsigned char *sha1, struct packed_git *); int is_pack_valid(struct repository *repo, struct packed_git *); void *unpack_entry(struct repository *r, struct packed_git *, off_t, enum object_type *, unsigned long *); unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep); -unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t); +unsigned long get_size_from_delta(struct repository *repo, struct packed_git *, + struct pack_window **, off_t); int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *); off_t get_delta_base(struct packed_git *p, struct pack_window **w_curs, off_t *curpos, enum object_type type,
-- 2.47.0