packfile: add repository argument to prepare_packed_git

Add a repository argument to allow prepare_packed_git callers to be
more specific about which repository to handle. See commit "sha1_file:
add repository argument to link_alt_odb_entry" for an explanation of
the #define trick.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index b28ff00be23531314722925533d09b84941fba6f..ea8bd9e2e27166aff8c408440ed9293fd3da9e4f 100644 (file)
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -123,7 +123,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
                struct strbuf pack_buf = STRBUF_INIT;
                struct strbuf garbage_buf = STRBUF_INIT;
                if (!get_packed_git(the_repository))
                struct strbuf pack_buf = STRBUF_INIT;
                struct strbuf garbage_buf = STRBUF_INIT;
                if (!get_packed_git(the_repository))

-                       prepare_packed_git();
+                       prepare_packed_git(the_repository);

                for (p = get_packed_git(the_repository); p; p = p->next) {
                        if (!p->pack_local)
                                continue;
                for (p = get_packed_git(the_repository); p; p = p->next) {
                        if (!p->pack_local)
                                continue;

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 3ef25fab9712a12edd70700b941dd62203de9d4a..d40a82b7024e1bb4eac218aae81afee137b1dfa3 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -729,7 +729,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                        uint32_t total = 0, count = 0;
                        struct progress *progress = NULL;
 
                        uint32_t total = 0, count = 0;
                        struct progress *progress = NULL;
 

-                       prepare_packed_git();
+                       prepare_packed_git(the_repository);

 
                        if (show_progress) {
                                for (p = get_packed_git(the_repository); p;
 
                        if (show_progress) {
                                for (p = get_packed_git(the_repository); p;

diff --git a/builtin/gc.c b/builtin/gc.c
index b00238cd5d3f1aeea5b927f6a576142cae85aefa..4c7409946edc47a5bb1a2165a104250aea6f137d 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -174,7 +174,7 @@ static int too_many_packs(void)
        if (gc_auto_pack_limit <= 0)
                return 0;
 
        if (gc_auto_pack_limit <= 0)
                return 0;
 

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

        for (cnt = 0, p = get_packed_git(the_repository); p; p = p->next) {
                if (!p->pack_local)
                        continue;
        for (cnt = 0, p = get_packed_git(the_repository); p; p = p->next) {
                if (!p->pack_local)
                        continue;

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 223f2d9fc0c0a33174ab899e1e0bd90da3dd9bb4..491ce433daafad00891b64fa40994b036ee35c3b 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3152,7 +3152,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
        if (progress && all_progress_implied)
                progress = 2;
 
        if (progress && all_progress_implied)
                progress = 2;
 

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

        if (ignore_packed_keep) {
                struct packed_git *p;
                for (p = get_packed_git(the_repository); p; p = p->next)
        if (ignore_packed_keep) {
                struct packed_git *p;
                for (p = get_packed_git(the_repository); p; p = p->next)

diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index b5b007e706ad4ac2b84d13c1c76222a04c1e65e5..da6637f7fc701bd5af4757d014760c60fc301e4f 100644 (file)
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -631,7 +631,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
                        break;
        }
 
                        break;
        }
 

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

 
        if (load_all_packs)
                load_all();
 
        if (load_all_packs)
                load_all();

diff --git a/fast-import.c b/fast-import.c
index ae4ced3ae186a7c6d323e580fe5fa1873fb67b3b..47981e6db7f7349ea3cfed5620a2d48750ba86cf 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -3473,7 +3473,7 @@ int cmd_main(int argc, const char **argv)
                rc_free[i].next = &rc_free[i + 1];
        rc_free[cmd_save - 1].next = NULL;
 
                rc_free[i].next = &rc_free[i + 1];
        rc_free[cmd_save - 1].next = NULL;
 

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

        start_packfile();
        set_die_routine(die_nicely);
        set_checkpoint_signal();
        start_packfile();
        set_die_routine(die_nicely);
        set_checkpoint_signal();

diff --git a/http-backend.c b/http-backend.c
index 64dde78c1b4e9f96bedc2833b1c4e5b8407c6d73..c1b1c2d5572c900eabb8234163ba4ee264a2e2e2 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -519,7 +519,7 @@ static void get_info_packs(struct strbuf *hdr, char *arg)
        size_t cnt = 0;
 
        select_getanyfile(hdr);
        size_t cnt = 0;
 
        select_getanyfile(hdr);

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

        for (p = get_packed_git(the_repository); p; p = p->next) {
                if (p->pack_local)
                        cnt++;
        for (p = get_packed_git(the_repository); p; p = p->next) {
                if (p->pack_local)
                        cnt++;

diff --git a/pack-bitmap.c b/pack-bitmap.c
index 22cd425788c2a716bf8d8d148c2b0709cae34646..57fec38f3f328ac4462cf188519828fc6626787d 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -336,7 +336,7 @@ static int open_pack_bitmap(void)
 
        assert(!bitmap_git.map && !bitmap_git.loaded);
 
 
        assert(!bitmap_git.map && !bitmap_git.loaded);
 

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

        for (p = get_packed_git(the_repository); p; p = p->next) {
                if (open_pack_bitmap_1(p) == 0)
                        ret = 0;
        for (p = get_packed_git(the_repository); p; p = p->next) {
                if (open_pack_bitmap_1(p) == 0)
                        ret = 0;

diff --git a/packfile.c b/packfile.c
index b789d0f0a367d1cc6cdaab18dc34026a5f615654..6b2c86c5e0d1ab158a2f1e4f6fb90e7765d87edf 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -817,7 +817,7 @@ unsigned long approximate_object_count(void)
                unsigned long count;
                struct packed_git *p;
 
                unsigned long count;
                struct packed_git *p;
 

-               prepare_packed_git();
+               prepare_packed_git(the_repository);

                count = 0;
                for (p = the_repository->objects->packed_git; p; p = p->next) {
                        if (open_pack_index(p))
                count = 0;
                for (p = the_repository->objects->packed_git; p; p = p->next) {
                        if (open_pack_index(p))


@@ -884,7 +884,7 @@ static void prepare_packed_git_mru(struct repository *r)
                list_add_tail(&p->mru, &r->objects->packed_git_mru);
 }
 
                list_add_tail(&p->mru, &r->objects->packed_git_mru);
 }
 

-void prepare_packed_git(void)
+void prepare_packed_git_the_repository(void)

 {
        struct alternate_object_database *alt;
 
 {
        struct alternate_object_database *alt;
 


@@ -903,7 +903,7 @@ void reprepare_packed_git(void)
 {
        the_repository->objects->approximate_object_count_valid = 0;
        the_repository->objects->packed_git_initialized = 0;
 {
        the_repository->objects->approximate_object_count_valid = 0;
        the_repository->objects->packed_git_initialized = 0;

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

 }
 
 struct packed_git *get_packed_git(struct repository *r)
 }
 
 struct packed_git *get_packed_git(struct repository *r)


@@ -1854,7 +1854,7 @@ int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
 {
        struct list_head *pos;
 
 {
        struct list_head *pos;
 

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

        if (!the_repository->objects->packed_git)
                return 0;
 
        if (!the_repository->objects->packed_git)
                return 0;
 


@@ -1908,7 +1908,7 @@ int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags)
        int r = 0;
        int pack_errors = 0;
 
        int r = 0;
        int pack_errors = 0;
 

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

        for (p = the_repository->objects->packed_git; p; p = p->next) {
                if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
                        continue;
        for (p = the_repository->objects->packed_git; p; p = p->next) {
                if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
                        continue;

diff --git a/packfile.h b/packfile.h
index 77442172f03fc4911bd570a2537d1141bee8eb2b..3f59456e7e6bc34c66bb83c1fd2859e297b8ae8a 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -34,7 +34,8 @@ extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_
 #define PACKDIR_FILE_GARBAGE 4
 extern void (*report_garbage)(unsigned seen_bits, const char *path);
 
 #define PACKDIR_FILE_GARBAGE 4
 extern void (*report_garbage)(unsigned seen_bits, const char *path);
 

-extern void prepare_packed_git(void);
+#define prepare_packed_git(r) prepare_packed_git_##r()
+extern void prepare_packed_git_the_repository(void);

 extern void reprepare_packed_git(void);
 extern void install_packed_git(struct repository *r, struct packed_git *pack);
 
 extern void reprepare_packed_git(void);
 extern void install_packed_git(struct repository *r, struct packed_git *pack);
 

diff --git a/server-info.c b/server-info.c
index 75a8b65e4746e9efaae2fd4e569e2558468ef9a6..bf5c325867eaff44a983ca48e4c57e331ba29e8f 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -201,7 +201,7 @@ static void init_pack_info(const char *infofile, int force)
        objdir = get_object_directory();
        objdirlen = strlen(objdir);
 
        objdir = get_object_directory();
        objdirlen = strlen(objdir);
 

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

        for (p = get_packed_git(the_repository); p; p = p->next) {
                /* we ignore things on alternate path since they are
                 * not available to the pullers in general.
        for (p = get_packed_git(the_repository); p; p = p->next) {
                /* we ignore things on alternate path since they are
                 * not available to the pullers in general.

diff --git a/sha1_name.c b/sha1_name.c
index 4325f74e0cbdb2502887b1c80ad18b88c23bba5d..e0b62f3c5633b18a2406926e685faae53a444e82 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -196,7 +196,7 @@ static void find_short_packed_object(struct disambiguate_state *ds)
 {
        struct packed_git *p;
 
 {
        struct packed_git *p;
 

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

        for (p = get_packed_git(the_repository); p && !ds->ambiguous;
             p = p->next)
                unique_in_pack(p, ds);
        for (p = get_packed_git(the_repository); p && !ds->ambiguous;
             p = p->next)
                unique_in_pack(p, ds);


@@ -567,7 +567,7 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
 {
        struct packed_git *p;
 
 {
        struct packed_git *p;
 

-       prepare_packed_git();
+       prepare_packed_git(the_repository);

        for (p = get_packed_git(the_repository); p; p = p->next)
                find_abbrev_len_for_pack(p, mad);
 }
        for (p = get_packed_git(the_repository); p; p = p->next)
                find_abbrev_len_for_pack(p, mad);
 }