averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

packfile: refactor install_packed_git() to work on packfile store

Browse Source 
The `install_packed_git()` functions adds a packfile to a specific
object store. Refactor it to accept a packfile store instead of a
repository to clarify its scope.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-09-23 12:17:09 +02:00
committed by Junio C Hamano
parent 78237ea53d
commit f6f236d926
7 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/fast-import.c
View File

@@ -901,7 +901,7 @@ static void end_packfile(void)
if (!new_p) if (!new_p)
die("core git rejected index %s", idx_name); die("core git rejected index %s", idx_name);
all_packs[pack_id] = new_p; all_packs[pack_id] = new_p;
install_packed_git(the_repository, new_p); packfile_store_add_pack(the_repository->objects->packfiles, new_p);
free(idx_name); free(idx_name);
/* Print the boundary */ /* Print the boundary */

2
builtin/index-pack.c
View File

@@ -1645,7 +1645,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
p = add_packed_git(the_repository, final_index_name, p = add_packed_git(the_repository, final_index_name,
strlen(final_index_name), 0); strlen(final_index_name), 0);
if (p) if (p)
install_packed_git(the_repository, p); packfile_store_add_pack(the_repository->objects->packfiles, p);
} }
if (!from_stdin) { if (!from_stdin) {

2
http.c
View File

@@ -2541,7 +2541,7 @@ void http_install_packfile(struct packed_git *p,
lst = &((*lst)->next); lst = &((*lst)->next);
*lst = (*lst)->next; *lst = (*lst)->next;
install_packed_git(the_repository, p); packfile_store_add_pack(the_repository->objects->packfiles, p);
} }
struct http_pack_request *new_http_pack_request( struct http_pack_request *new_http_pack_request(

2
http.h
View File

@@ -210,7 +210,7 @@ int finish_http_pack_request(struct http_pack_request *preq);
void release_http_pack_request(struct http_pack_request *preq); void release_http_pack_request(struct http_pack_request *preq);
/* /*
* Remove p from the given list, and invoke install_packed_git() on it. * Remove p from the given list, and invoke packfile_store_add_pack() on it.
* *
* This is a convenience function for users that have obtained a list of packs * This is a convenience function for users that have obtained a list of packs
* from http_get_info_packs() and have chosen a specific pack to fetch. * from http_get_info_packs() and have chosen a specific pack to fetch.

2
midx.c
View File

@@ -467,7 +467,7 @@ int prepare_midx_pack(struct multi_pack_index *m,
p = add_packed_git(r, pack_name.buf, pack_name.len, p = add_packed_git(r, pack_name.buf, pack_name.len,
m->source->local); m->source->local);
if (p) { if (p) {
install_packed_git(r, p); packfile_store_add_pack(r->objects->packfiles, p);
list_add_tail(&p->mru, &r->objects->packfiles->mru); list_add_tail(&p->mru, &r->objects->packfiles->mru);
} }
} }

11
packfile.c
View File

@@ -779,16 +779,17 @@ struct packed_git *add_packed_git(struct repository *r, const char *path,
return p; return p;
} }
void install_packed_git(struct repository *r, struct packed_git *pack) void packfile_store_add_pack(struct packfile_store *store,
struct packed_git *pack)
{ {
if (pack->pack_fd != -1) if (pack->pack_fd != -1)
pack_open_fds++; pack_open_fds++;
pack->next = r->objects->packfiles->packs; pack->next = store->packs;
r->objects->packfiles->packs = pack; store->packs = pack;
hashmap_entry_init(&pack->packmap_ent, strhash(pack->pack_name)); hashmap_entry_init(&pack->packmap_ent, strhash(pack->pack_name));
hashmap_add(&r->objects->packfiles->map, &pack->packmap_ent); hashmap_add(&store->map, &pack->packmap_ent);
} }
void (*report_garbage)(unsigned seen_bits, const char *path); void (*report_garbage)(unsigned seen_bits, const char *path);
@@ -904,7 +905,7 @@ static void prepare_pack(const char *full_name, size_t full_name_len,
if (!hashmap_get(&data->r->objects->packfiles->map, &hent, pack_name)) { if (!hashmap_get(&data->r->objects->packfiles->map, &hent, pack_name)) {
p = add_packed_git(data->r, full_name, full_name_len, data->local); p = add_packed_git(data->r, full_name, full_name_len, data->local);
if (p) if (p)
install_packed_git(data->r, p); packfile_store_add_pack(data->r->objects->packfiles, p);
} }
free(pack_name); free(pack_name);
} }

9
packfile.h
View File

@@ -120,6 +120,13 @@ void packfile_store_close(struct packfile_store *store);
*/ */
void packfile_store_reprepare(struct packfile_store *store); void packfile_store_reprepare(struct packfile_store *store);
/*
* Add the pack to the store so that contained objects become accessible via
* the store. This moves ownership into the store.
*/
void packfile_store_add_pack(struct packfile_store *store,
struct packed_git *pack);
struct pack_window { struct pack_window {
struct pack_window *next; struct pack_window *next;
unsigned char *base; unsigned char *base;
@@ -196,8 +203,6 @@ int for_each_packed_object(struct repository *repo, each_packed_object_fn cb,
#define PACKDIR_FILE_GARBAGE 4 #define PACKDIR_FILE_GARBAGE 4
extern void (*report_garbage)(unsigned seen_bits, const char *path); extern void (*report_garbage)(unsigned seen_bits, const char *path);
void install_packed_git(struct repository *r, struct packed_git *pack);
struct packed_git *get_packed_git(struct repository *r); struct packed_git *get_packed_git(struct repository *r);
struct list_head *get_packed_git_mru(struct repository *r); struct list_head *get_packed_git_mru(struct repository *r);
struct multi_pack_index *get_multi_pack_index(struct odb_source *source); struct multi_pack_index *get_multi_pack_index(struct odb_source *source);