about summary refs log tree commit
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-11 13:09:55 +0900
committerJunio C Hamano <gitster@pobox.com>2018-04-11 13:09:55 +0900
commit3a1ec60c43b1cad73fed8040aed7117900e9fd9d (patch)
tree596ad53743761ff1ea09a80cf3f154aafa615f08
parentcf0b1793ead9428d88e6592e624c7cb222913c58 (diff)
parent464416a2eaadf84d2bfdf795007863d03b222b7c (diff)
downloadgit-3a1ec60c43b1cad73fed8040aed7117900e9fd9d.tar.gz
Refactoring of the internal global data structure continues.

* sb/packfiles-in-repository:
  packfile: keep prepare_packed_git() private
  packfile: allow find_pack_entry to handle arbitrary repositories
  packfile: add repository argument to find_pack_entry
  packfile: allow reprepare_packed_git to handle arbitrary repositories
  packfile: allow prepare_packed_git to handle arbitrary repositories
  packfile: allow prepare_packed_git_one to handle arbitrary repositories
  packfile: add repository argument to reprepare_packed_git
  packfile: add repository argument to prepare_packed_git
  packfile: add repository argument to prepare_packed_git_one
  packfile: allow install_packed_git to handle arbitrary repositories
  packfile: allow rearrange_packed_git to handle arbitrary repositories
  packfile: allow prepare_packed_git_mru to handle arbitrary repositories
-rw-r--r--builtin/count-objects.c3
-rw-r--r--builtin/fsck.c2
-rw-r--r--builtin/gc.c3
-rw-r--r--builtin/pack-objects.c1
-rw-r--r--builtin/pack-redundant.c2
-rw-r--r--builtin/receive-pack.c3
-rw-r--r--bulk-checkin.c3
-rw-r--r--fast-import.c3
-rw-r--r--fetch-pack.c3
-rw-r--r--http-backend.c1
-rw-r--r--http.c2
-rw-r--r--pack-bitmap.c1
-rw-r--r--packfile.c76
-rw-r--r--packfile.h11
-rw-r--r--server-info.c1
-rw-r--r--sha1_file.c8
-rw-r--r--sha1_name.c2
17 files changed, 58 insertions, 67 deletions
diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index b28ff00be2..b054713e1a 100644
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -122,8 +122,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
                 struct strbuf loose_buf = STRBUF_INIT;
                 struct strbuf pack_buf = STRBUF_INIT;
                 struct strbuf garbage_buf = STRBUF_INIT;
-                if (!get_packed_git(the_repository))
-                        prepare_packed_git();
+
                 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 13c0a8048e..087360a675 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -735,8 +735,6 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                         uint32_t total = 0, count = 0;
                         struct progress *progress = NULL;
 
-                        prepare_packed_git();
-
                         if (show_progress) {
                                 for (p = get_packed_git(the_repository); p;
                                      p = p->next) {
diff --git a/builtin/gc.c b/builtin/gc.c
index cef38e5427..3e67124eaa 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -174,7 +174,6 @@ static int too_many_packs(void)
         if (gc_auto_pack_limit <= 0)
                 return 0;
 
-        prepare_packed_git();
         for (cnt = 0, p = get_packed_git(the_repository); p; p = p->next) {
                 if (!p->pack_local)
                         continue;
@@ -481,7 +480,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
                 return error(FAILED_RUN, rerere.argv[0]);
 
         report_garbage = report_pack_garbage;
-        reprepare_packed_git();
+        reprepare_packed_git(the_repository);
         if (pack_garbage.nr > 0)
                 clean_pack_garbage();
 
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 89f49bb5f6..4bdae5a1d8 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3148,7 +3148,6 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
         if (progress && all_progress_implied)
                 progress = 2;
 
-        prepare_packed_git();
         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 f060b941b5..354478a127 100644
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -631,8 +631,6 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
                         break;
         }
 
-        prepare_packed_git();
-
         if (load_all_packs)
                 load_all();
         else
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 19428ef97d..c4272fbc96 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "repository.h"
 #include "config.h"
 #include "lockfile.h"
 #include "pack.h"
@@ -1778,7 +1779,7 @@ static const char *unpack(int err_fd, struct shallow_info *si)
                 status = finish_command(&child);
                 if (status)
                         return "index-pack abnormal exit";
-                reprepare_packed_git();
+                reprepare_packed_git(the_repository);
         }
         return NULL;
 }
diff --git a/bulk-checkin.c b/bulk-checkin.c
index e5ce2a7954..de1f4040c7 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -3,6 +3,7 @@
  */
 #include "cache.h"
 #include "bulk-checkin.h"
+#include "repository.h"
 #include "csum-file.h"
 #include "pack.h"
 #include "strbuf.h"
@@ -57,7 +58,7 @@ clear_exit:
 
         strbuf_release(&packname);
         /* Make objects we just wrote available to ourselves */
-        reprepare_packed_git();
+        reprepare_packed_git(the_repository);
 }
 
 static int already_written(struct bulk_checkin_state *state, struct object_id *oid)
diff --git a/fast-import.c b/fast-import.c
index b2f6d6d583..99f8f56e8c 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1038,7 +1038,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(new_p);
+                install_packed_git(the_repository, new_p);
                 free(idx_name);
 
                 /* Print the boundary */
@@ -3476,7 +3476,6 @@ int cmd_main(int argc, const char **argv)
                 rc_free[i].next = &rc_free[i + 1];
         rc_free[cmd_save - 1].next = NULL;
 
-        prepare_packed_git();
         start_packfile();
         set_die_routine(die_nicely);
         set_checkpoint_signal();
diff --git a/fetch-pack.c b/fetch-pack.c
index 52932b37f8..adc1b68dd3 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "repository.h"
 #include "config.h"
 #include "lockfile.h"
 #include "refs.h"
@@ -1240,7 +1241,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
         prepare_shallow_info(&si, shallow);
         ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought,
                                 &si, pack_lockfile);
-        reprepare_packed_git();
+        reprepare_packed_git(the_repository);
         update_shallow(args, sought, nr_sought, &si);
         clear_shallow_info(&si);
         return ref_cpy;
diff --git a/http-backend.c b/http-backend.c
index 64dde78c1b..88d2a9bc40 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -519,7 +519,6 @@ static void get_info_packs(struct strbuf *hdr, char *arg)
         size_t cnt = 0;
 
         select_getanyfile(hdr);
-        prepare_packed_git();
         for (p = get_packed_git(the_repository); p; p = p->next) {
                 if (p->pack_local)
                         cnt++;
diff --git a/http.c b/http.c
index 9304045b6c..833321a340 100644
--- a/http.c
+++ b/http.c
@@ -2136,7 +2136,7 @@ int finish_http_pack_request(struct http_pack_request *preq)
                 return -1;
         }
 
-        install_packed_git(p);
+        install_packed_git(the_repository, p);
         free(tmp_idx);
         return 0;
 }
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 22cd425788..3f2dab340f 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -336,7 +336,6 @@ static int open_pack_bitmap(void)
 
         assert(!bitmap_git.map && !bitmap_git.loaded);
 
-        prepare_packed_git();
         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 8e8b743910..0bc67d0e00 100644
--- a/packfile.c
+++ b/packfile.c
@@ -680,13 +680,13 @@ struct packed_git *add_packed_git(const char *path, size_t path_len, int local)
         return p;
 }
 
-void install_packed_git(struct packed_git *pack)
+void install_packed_git(struct repository *r, struct packed_git *pack)
 {
         if (pack->pack_fd != -1)
                 pack_open_fds++;
 
-        pack->next = the_repository->objects->packed_git;
-        the_repository->objects->packed_git = pack;
+        pack->next = r->objects->packed_git;
+        r->objects->packed_git = pack;
 }
 
 void (*report_garbage)(unsigned seen_bits, const char *path);
@@ -735,7 +735,7 @@ static void report_pack_garbage(struct string_list *list)
         report_helper(list, seen_bits, first, list->nr);
 }
 
-static void prepare_packed_git_one(char *objdir, int local)
+static void prepare_packed_git_one(struct repository *r, char *objdir, int local)
 {
         struct strbuf path = STRBUF_INIT;
         size_t dirnamelen;
@@ -768,7 +768,7 @@ static void prepare_packed_git_one(char *objdir, int local)
                 base_len = path.len;
                 if (strip_suffix_mem(path.buf, &base_len, ".idx")) {
                         /* Don't reopen a pack we already have. */
-                        for (p = the_repository->objects->packed_git; p;
+                        for (p = r->objects->packed_git; p;
                              p = p->next) {
                                 size_t len;
                                 if (strip_suffix(p->pack_name, ".pack", &len) &&
@@ -782,7 +782,7 @@ static void prepare_packed_git_one(char *objdir, int local)
                              * corresponding .pack file that we can map.
                              */
                             (p = add_packed_git(path.buf, path.len, local)) != NULL)
-                                install_packed_git(p);
+                                install_packed_git(r, p);
                 }
 
                 if (!report_garbage)
@@ -803,6 +803,7 @@ static void prepare_packed_git_one(char *objdir, int local)
         strbuf_release(&path);
 }
 
+static void prepare_packed_git(struct repository *r);
 /*
  * Give a fast, rough count of the number of objects in the repository. This
  * ignores loose objects completely. If you have a lot of them, then either
@@ -816,7 +817,7 @@ unsigned long approximate_object_count(void)
                 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))
@@ -866,52 +867,54 @@ static int sort_pack(const void *a_, const void *b_)
         return -1;
 }
 
-static void rearrange_packed_git(void)
+static void rearrange_packed_git(struct repository *r)
 {
-        the_repository->objects->packed_git = llist_mergesort(
-                the_repository->objects->packed_git, get_next_packed_git,
+        r->objects->packed_git = llist_mergesort(
+                r->objects->packed_git, get_next_packed_git,
                 set_next_packed_git, sort_pack);
 }
 
-static void prepare_packed_git_mru(void)
+static void prepare_packed_git_mru(struct repository *r)
 {
         struct packed_git *p;
 
-        INIT_LIST_HEAD(&the_repository->objects->packed_git_mru);
+        INIT_LIST_HEAD(&r->objects->packed_git_mru);
 
-        for (p = the_repository->objects->packed_git; p; p = p->next)
-                list_add_tail(&p->mru, &the_repository->objects->packed_git_mru);
+        for (p = r->objects->packed_git; p; p = p->next)
+                list_add_tail(&p->mru, &r->objects->packed_git_mru);
 }
 
-void prepare_packed_git(void)
+static void prepare_packed_git(struct repository *r)
 {
         struct alternate_object_database *alt;
 
-        if (the_repository->objects->packed_git_initialized)
+        if (r->objects->packed_git_initialized)
                 return;
-        prepare_packed_git_one(get_object_directory(), 1);
-        prepare_alt_odb(the_repository);
-        for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next)
-                prepare_packed_git_one(alt->path, 0);
-        rearrange_packed_git();
-        prepare_packed_git_mru();
-        the_repository->objects->packed_git_initialized = 1;
+        prepare_packed_git_one(r, r->objects->objectdir, 1);
+        prepare_alt_odb(r);
+        for (alt = r->objects->alt_odb_list; alt; alt = alt->next)
+                prepare_packed_git_one(r, alt->path, 0);
+        rearrange_packed_git(r);
+        prepare_packed_git_mru(r);
+        r->objects->packed_git_initialized = 1;
 }
 
-void reprepare_packed_git(void)
+void reprepare_packed_git(struct repository *r)
 {
-        the_repository->objects->approximate_object_count_valid = 0;
-        the_repository->objects->packed_git_initialized = 0;
-        prepare_packed_git();
+        r->objects->approximate_object_count_valid = 0;
+        r->objects->packed_git_initialized = 0;
+        prepare_packed_git(r);
 }
 
 struct packed_git *get_packed_git(struct repository *r)
 {
+        prepare_packed_git(r);
         return r->objects->packed_git;
 }
 
 struct list_head *get_packed_git_mru(struct repository *r)
 {
+        prepare_packed_git(r);
         return &r->objects->packed_git_mru;
 }
 
@@ -1834,23 +1837,18 @@ static int fill_pack_entry(const unsigned char *sha1,
         return 1;
 }
 
-/*
- * Iff a pack file contains the object named by sha1, return true and
- * store its location to e.
- */
-int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
+int find_pack_entry(struct repository *r, const unsigned char *sha1, struct pack_entry *e)
 {
         struct list_head *pos;
 
-        prepare_packed_git();
-        if (!the_repository->objects->packed_git)
+        prepare_packed_git(r);
+        if (!r->objects->packed_git)
                 return 0;
 
-        list_for_each(pos, &the_repository->objects->packed_git_mru) {
+        list_for_each(pos, &r->objects->packed_git_mru) {
                 struct packed_git *p = list_entry(pos, struct packed_git, mru);
                 if (fill_pack_entry(sha1, e, p)) {
-                        list_move(&p->mru,
-                                  &the_repository->objects->packed_git_mru);
+                        list_move(&p->mru, &r->objects->packed_git_mru);
                         return 1;
                 }
         }
@@ -1860,7 +1858,7 @@ int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
 int has_sha1_pack(const unsigned char *sha1)
 {
         struct pack_entry e;
-        return find_pack_entry(sha1, &e);
+        return find_pack_entry(the_repository, sha1, &e);
 }
 
 int has_pack_index(const unsigned char *sha1)
@@ -1896,7 +1894,7 @@ int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags)
         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;
diff --git a/packfile.h b/packfile.h
index a7abd602da..a92c0b241c 100644
--- a/packfile.h
+++ b/packfile.h
@@ -34,9 +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);
 
-extern void prepare_packed_git(void);
-extern void reprepare_packed_git(void);
-extern void install_packed_git(struct packed_git *pack);
+extern void reprepare_packed_git(struct repository *r);
+extern 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);
@@ -131,7 +130,11 @@ extern int packed_object_info(struct packed_git *pack, off_t offset, struct obje
 extern void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
 extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1);
 
-extern int find_pack_entry(const unsigned char *sha1, struct pack_entry *e);
+/*
+ * Iff a pack file in the given repository contains the object named by sha1,
+ * return true and store its location to e.
+ */
+extern int find_pack_entry(struct repository *r, const unsigned char *sha1, struct pack_entry *e);
 
 extern int has_sha1_pack(const unsigned char *sha1);
 
diff --git a/server-info.c b/server-info.c
index 75a8b65e47..83460ec0d6 100644
--- a/server-info.c
+++ b/server-info.c
@@ -201,7 +201,6 @@ static void init_pack_info(const char *infofile, int force)
         objdir = get_object_directory();
         objdirlen = strlen(objdir);
 
-        prepare_packed_git();
         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_file.c b/sha1_file.c
index aab3b58e03..77ccaab928 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1268,7 +1268,7 @@ int oid_object_info_extended(const struct object_id *oid, struct object_info *oi
         }
 
         while (1) {
-                if (find_pack_entry(real->hash, &e))
+                if (find_pack_entry(the_repository, real->hash, &e))
                         break;
 
                 if (flags & OBJECT_INFO_IGNORE_LOOSE)
@@ -1280,8 +1280,8 @@ int oid_object_info_extended(const struct object_id *oid, struct object_info *oi
 
                 /* Not a loose object; someone else may have just packed it. */
                 if (!(flags & OBJECT_INFO_QUICK)) {
-                        reprepare_packed_git();
-                        if (find_pack_entry(real->hash, &e))
+                        reprepare_packed_git(the_repository);
+                        if (find_pack_entry(the_repository, real->hash, &e))
                                 break;
                 }
 
@@ -1669,7 +1669,7 @@ static int freshen_loose_object(const unsigned char *sha1)
 static int freshen_packed_object(const unsigned char *sha1)
 {
         struct pack_entry e;
-        if (!find_pack_entry(sha1, &e))
+        if (!find_pack_entry(the_repository, sha1, &e))
                 return 0;
         if (e.p->freshened)
                 return 1;
diff --git a/sha1_name.c b/sha1_name.c
index 509a95f0cf..5b93bf8da3 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -179,7 +179,6 @@ static void find_short_packed_object(struct disambiguate_state *ds)
 {
         struct packed_git *p;
 
-        prepare_packed_git();
         for (p = get_packed_git(the_repository); p && !ds->ambiguous;
              p = p->next)
                 unique_in_pack(p, ds);
@@ -534,7 +533,6 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
 {
         struct packed_git *p;
 
-        prepare_packed_git();
         for (p = get_packed_git(the_repository); p; p = p->next)
                 find_abbrev_len_for_pack(p, mad);
 }