packfile: refactor `install_packed_git()` to work on packfile store

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>

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 2c35f9345d02d7c711ee522de5973b205c85ef51..e9d82b31c390bf05e5229d9d9af037ae4e056ce6 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -901,7 +901,7 @@ static void end_packfile(void)
                if (!new_p)
                        die("core git rejected index %s", idx_name);
                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);
 
                /* Print the boundary */

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index f91c301bba9fbd9171aba65d708d27f9e58c8012..ed490dfad47859a8eafa5e57e6cd6317fb3e06dc 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -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,
                                   strlen(final_index_name), 0);
                if (p)
-                       install_packed_git(the_repository, p);
+                       packfile_store_add_pack(the_repository->objects->packfiles, p);
        }
 
        if (!from_stdin) {

diff --git a/http.c b/http.c
index 98853d64834f99f881635944443cc368dc415eb0..af2120b64c711c1d59518a30bae7b96777ac181a 100644 (file)
--- a/http.c
+++ b/http.c
@@ -2541,7 +2541,7 @@ void http_install_packfile(struct packed_git *p,
                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(

diff --git a/http.h b/http.h
index 36202139f451ffa1e5b2cbaeae49d0875a4f76a7..e5a5380c6c384e56966d12d0c4d5a9d2e12654c0 100644 (file)
--- a/http.h
+++ b/http.h
@@ -210,7 +210,7 @@ int finish_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
  * from http_get_info_packs() and have chosen a specific pack to fetch.

diff --git a/midx.c b/midx.c
index 91c7b3917d6b80e46013e2dea75bec499ff06fbf..69c44be71c5dc7e59e165260a6eb98fc50bbcb93 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -467,7 +467,7 @@ int prepare_midx_pack(struct multi_pack_index *m,
                p = add_packed_git(r, pack_name.buf, pack_name.len,
                                   m->source->local);
                if (p) {
-                       install_packed_git(r, p);
+                       packfile_store_add_pack(r->objects->packfiles, p);
                        list_add_tail(&p->mru, &r->objects->packfiles->mru);
                }
        }

diff --git a/packfile.c b/packfile.c
index 950b98aac51c3fbe7980ac61dd5fb92b1f424453..af806aba093518b9e4c74e57f77ede7546bdad75 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -779,16 +779,17 @@ struct packed_git *add_packed_git(struct repository *r, const char *path,
        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)
                pack_open_fds++;
 
-       pack->next = r->objects->packfiles->packs;
-       r->objects->packfiles->packs = pack;
+       pack->next = store->packs;
+       store->packs = pack;
 
        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);
@@ -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)) {
                        p = add_packed_git(data->r, full_name, full_name_len, data->local);
                        if (p)
-                               install_packed_git(data->r, p);
+                               packfile_store_add_pack(data->r->objects->packfiles, p);
                }
                free(pack_name);
        }

diff --git a/packfile.h b/packfile.h
index a85ff607febe54816253a30b9ab356638663aabb..ba4b0cef9cb0e7b51e4a36dd226f8c4cb796df86 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -120,6 +120,13 @@ void packfile_store_close(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 *next;
        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
 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 list_head *get_packed_git_mru(struct repository *r);
 struct multi_pack_index *get_multi_pack_index(struct odb_source *source);