зеркало из https://github.com/microsoft/git.git
object-store: move packed_git and packed_git_mru to object store
In a process with multiple repositories open, packfile accessors should be associated to a single repository and not shared globally. Move packed_git and packed_git_mru into the_repository and adjust callers to reflect this. [nd: while at there, wrap access to these two fields in get_packed_git() and get_packed_git_mru(). This allows us to lazily initialize these fields without caller doing that explicitly] Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
Junio C Hamano
Родитель
97501e933a
Коммит
a80d72db2a
|
|
@ -7,6 +7,7 @@
|
|||
#include "cache.h"
|
||||
#include "config.h"
|
||||
#include "dir.h"
|
||||
#include "repository.h"
|
||||
#include "builtin.h"
|
||||
#include "parse-options.h"
|
||||
#include "quote.h"
|
||||
|
|
@ -121,9 +122,9 @@ 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 (!packed_git)
|
||||
if (!get_packed_git(the_repository))
|
||||
prepare_packed_git();
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = get_packed_git(the_repository); p; p = p->next) {
|
||||
if (!p->pack_local)
|
||||
continue;
|
||||
if (open_pack_index(p))
|
||||
|
|
|
|||
|
|
@ -732,7 +732,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
|||
prepare_packed_git();
|
||||
|
||||
if (show_progress) {
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = get_packed_git(the_repository); p;
|
||||
p = p->next) {
|
||||
if (open_pack_index(p))
|
||||
continue;
|
||||
total += p->num_objects;
|
||||
|
|
@ -740,7 +741,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
|||
|
||||
progress = start_progress(_("Checking objects"), total);
|
||||
}
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = get_packed_git(the_repository); p;
|
||||
p = p->next) {
|
||||
/* verify gives error messages itself */
|
||||
if (verify_pack(p, fsck_obj_buffer,
|
||||
progress, count))
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
*/
|
||||
|
||||
#include "builtin.h"
|
||||
#include "repository.h"
|
||||
#include "config.h"
|
||||
#include "tempfile.h"
|
||||
#include "lockfile.h"
|
||||
|
|
@ -20,6 +21,7 @@
|
|||
#include "argv-array.h"
|
||||
#include "commit.h"
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
#define FAILED_RUN "failed to run %s"
|
||||
|
||||
|
|
@ -173,7 +175,7 @@ static int too_many_packs(void)
|
|||
return 0;
|
||||
|
||||
prepare_packed_git();
|
||||
for (cnt = 0, p = packed_git; p; p = p->next) {
|
||||
for (cnt = 0, p = get_packed_git(the_repository); p; p = p->next) {
|
||||
if (!p->pack_local)
|
||||
continue;
|
||||
if (p->pack_keep)
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#include "streaming.h"
|
||||
#include "thread-utils.h"
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
static const char index_pack_usage[] =
|
||||
"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include "builtin.h"
|
||||
#include "cache.h"
|
||||
#include "repository.h"
|
||||
#include "config.h"
|
||||
#include "attr.h"
|
||||
#include "object.h"
|
||||
|
|
@ -28,6 +29,7 @@
|
|||
#include "argv-array.h"
|
||||
#include "list.h"
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
static const char *pack_usage[] = {
|
||||
N_("git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"),
|
||||
|
|
@ -1025,8 +1027,7 @@ static int want_object_in_pack(const struct object_id *oid,
|
|||
if (want != -1)
|
||||
return want;
|
||||
}
|
||||
|
||||
list_for_each(pos, &packed_git_mru) {
|
||||
list_for_each(pos, get_packed_git_mru(the_repository)) {
|
||||
struct packed_git *p = list_entry(pos, struct packed_git, mru);
|
||||
off_t offset;
|
||||
|
||||
|
|
@ -1044,7 +1045,8 @@ static int want_object_in_pack(const struct object_id *oid,
|
|||
}
|
||||
want = want_found_object(exclude, p);
|
||||
if (!exclude && want > 0)
|
||||
list_move(&p->mru, &packed_git_mru);
|
||||
list_move(&p->mru,
|
||||
get_packed_git_mru(the_repository));
|
||||
if (want != -1)
|
||||
return want;
|
||||
}
|
||||
|
|
@ -2673,7 +2675,7 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs)
|
|||
|
||||
memset(&in_pack, 0, sizeof(in_pack));
|
||||
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = get_packed_git(the_repository); p; p = p->next) {
|
||||
struct object_id oid;
|
||||
struct object *o;
|
||||
|
||||
|
|
@ -2736,7 +2738,8 @@ static int has_sha1_pack_kept_or_nonlocal(const struct object_id *oid)
|
|||
static struct packed_git *last_found = (void *)1;
|
||||
struct packed_git *p;
|
||||
|
||||
p = (last_found != (void *)1) ? last_found : packed_git;
|
||||
p = (last_found != (void *)1) ? last_found :
|
||||
get_packed_git(the_repository);
|
||||
|
||||
while (p) {
|
||||
if ((!p->pack_local || p->pack_keep) &&
|
||||
|
|
@ -2745,7 +2748,7 @@ static int has_sha1_pack_kept_or_nonlocal(const struct object_id *oid)
|
|||
return 1;
|
||||
}
|
||||
if (p == last_found)
|
||||
p = packed_git;
|
||||
p = get_packed_git(the_repository);
|
||||
else
|
||||
p = p->next;
|
||||
if (p == last_found)
|
||||
|
|
@ -2781,7 +2784,7 @@ static void loosen_unused_packed_objects(struct rev_info *revs)
|
|||
uint32_t i;
|
||||
struct object_id oid;
|
||||
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = get_packed_git(the_repository); p; p = p->next) {
|
||||
if (!p->pack_local || p->pack_keep)
|
||||
continue;
|
||||
|
||||
|
|
@ -3152,7 +3155,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
|
|||
prepare_packed_git();
|
||||
if (ignore_packed_keep) {
|
||||
struct packed_git *p;
|
||||
for (p = packed_git; p; p = p->next)
|
||||
for (p = get_packed_git(the_repository); p; p = p->next)
|
||||
if (p->pack_local && p->pack_keep)
|
||||
break;
|
||||
if (!p) /* no keep-able packs found */
|
||||
|
|
@ -3165,7 +3168,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
|
|||
* also covers non-local objects
|
||||
*/
|
||||
struct packed_git *p;
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = get_packed_git(the_repository); p; p = p->next) {
|
||||
if (!p->pack_local) {
|
||||
have_non_local_packs = 1;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@
|
|||
*/
|
||||
|
||||
#include "builtin.h"
|
||||
#include "repository.h"
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
#define BLKSIZE 512
|
||||
|
||||
|
|
@ -571,7 +573,7 @@ static struct pack_list * add_pack(struct packed_git *p)
|
|||
|
||||
static struct pack_list * add_pack_file(const char *filename)
|
||||
{
|
||||
struct packed_git *p = packed_git;
|
||||
struct packed_git *p = get_packed_git(the_repository);
|
||||
|
||||
if (strlen(filename) < 40)
|
||||
die("Bad pack filename: %s", filename);
|
||||
|
|
@ -586,7 +588,7 @@ static struct pack_list * add_pack_file(const char *filename)
|
|||
|
||||
static void load_all(void)
|
||||
{
|
||||
struct packed_git *p = packed_git;
|
||||
struct packed_git *p = get_packed_git(the_repository);
|
||||
|
||||
while (p) {
|
||||
add_pack(p);
|
||||
|
|
|
|||
29
cache.h
29
cache.h
|
|
@ -1585,35 +1585,6 @@ struct pack_window {
|
|||
unsigned int inuse_cnt;
|
||||
};
|
||||
|
||||
extern struct packed_git {
|
||||
struct packed_git *next;
|
||||
struct list_head mru;
|
||||
struct pack_window *windows;
|
||||
off_t pack_size;
|
||||
const void *index_data;
|
||||
size_t index_size;
|
||||
uint32_t num_objects;
|
||||
uint32_t num_bad_objects;
|
||||
unsigned char *bad_object_sha1;
|
||||
int index_version;
|
||||
time_t mtime;
|
||||
int pack_fd;
|
||||
unsigned pack_local:1,
|
||||
pack_keep:1,
|
||||
freshened:1,
|
||||
do_not_close:1,
|
||||
pack_promisor:1;
|
||||
unsigned char sha1[20];
|
||||
struct revindex_entry *revindex;
|
||||
/* something like ".git/objects/pack/xxxxx.pack" */
|
||||
char pack_name[FLEX_ARRAY]; /* more */
|
||||
} *packed_git;
|
||||
|
||||
/*
|
||||
* A most-recently-used ordered version of the packed_git list.
|
||||
*/
|
||||
extern struct list_head packed_git_mru;
|
||||
|
||||
struct pack_entry {
|
||||
off_t offset;
|
||||
unsigned char sha1[20];
|
||||
|
|
|
|||
|
|
@ -154,6 +154,7 @@ Format of STDIN stream:
|
|||
|
||||
#include "builtin.h"
|
||||
#include "cache.h"
|
||||
#include "repository.h"
|
||||
#include "config.h"
|
||||
#include "lockfile.h"
|
||||
#include "object.h"
|
||||
|
|
@ -168,6 +169,7 @@ Format of STDIN stream:
|
|||
#include "dir.h"
|
||||
#include "run-command.h"
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
#define PACK_ID_BITS 16
|
||||
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
|
||||
|
|
@ -1110,7 +1112,8 @@ static int store_object(
|
|||
if (e->idx.offset) {
|
||||
duplicate_count_by_type[type]++;
|
||||
return 1;
|
||||
} else if (find_sha1_pack(oid.hash, packed_git)) {
|
||||
} else if (find_sha1_pack(oid.hash,
|
||||
get_packed_git(the_repository))) {
|
||||
e->type = type;
|
||||
e->pack_id = MAX_PACK_ID;
|
||||
e->idx.offset = 1; /* just not zero! */
|
||||
|
|
@ -1305,7 +1308,8 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
|
|||
duplicate_count_by_type[OBJ_BLOB]++;
|
||||
truncate_pack(&checkpoint);
|
||||
|
||||
} else if (find_sha1_pack(oid.hash, packed_git)) {
|
||||
} else if (find_sha1_pack(oid.hash,
|
||||
get_packed_git(the_repository))) {
|
||||
e->type = OBJ_BLOB;
|
||||
e->pack_id = MAX_PACK_ID;
|
||||
e->idx.offset = 1; /* just not zero! */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include "cache.h"
|
||||
#include "config.h"
|
||||
#include "repository.h"
|
||||
#include "refs.h"
|
||||
#include "pkt-line.h"
|
||||
#include "object.h"
|
||||
|
|
@ -10,6 +11,7 @@
|
|||
#include "url.h"
|
||||
#include "argv-array.h"
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
static const char content_type[] = "Content-Type";
|
||||
static const char content_length[] = "Content-Length";
|
||||
|
|
@ -518,13 +520,13 @@ static void get_info_packs(struct strbuf *hdr, char *arg)
|
|||
|
||||
select_getanyfile(hdr);
|
||||
prepare_packed_git();
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = get_packed_git(the_repository); p; p = p->next) {
|
||||
if (p->pack_local)
|
||||
cnt++;
|
||||
}
|
||||
|
||||
strbuf_grow(&buf, cnt * 53 + 2);
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = get_packed_git(the_repository); p; p = p->next) {
|
||||
if (p->pack_local)
|
||||
strbuf_addf(&buf, "P %s\n", p->pack_name + objdirlen + 6);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
#include "sigchain.h"
|
||||
#include "argv-array.h"
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
#ifdef EXPAT_NEEDS_XMLPARSE_H
|
||||
#include <xmlparse.h>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
#include "list.h"
|
||||
#include "transport.h"
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
struct alt_base {
|
||||
char *base;
|
||||
|
|
|
|||
1
http.c
1
http.c
|
|
@ -14,6 +14,7 @@
|
|||
#include "packfile.h"
|
||||
#include "protocol.h"
|
||||
#include "string-list.h"
|
||||
#include "object-store.h"
|
||||
|
||||
static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);
|
||||
static int trace_curl_data = 1;
|
||||
|
|
|
|||
|
|
@ -52,6 +52,30 @@ void add_to_alternates_memory(const char *dir);
|
|||
*/
|
||||
struct strbuf *alt_scratch_buf(struct alternate_object_database *alt);
|
||||
|
||||
struct packed_git {
|
||||
struct packed_git *next;
|
||||
struct list_head mru;
|
||||
struct pack_window *windows;
|
||||
off_t pack_size;
|
||||
const void *index_data;
|
||||
size_t index_size;
|
||||
uint32_t num_objects;
|
||||
uint32_t num_bad_objects;
|
||||
unsigned char *bad_object_sha1;
|
||||
int index_version;
|
||||
time_t mtime;
|
||||
int pack_fd;
|
||||
unsigned pack_local:1,
|
||||
pack_keep:1,
|
||||
freshened:1,
|
||||
do_not_close:1,
|
||||
pack_promisor:1;
|
||||
unsigned char sha1[20];
|
||||
struct revindex_entry *revindex;
|
||||
/* something like ".git/objects/pack/xxxxx.pack" */
|
||||
char pack_name[FLEX_ARRAY]; /* more */
|
||||
};
|
||||
|
||||
struct raw_object_store {
|
||||
/*
|
||||
* Path to the repository's object store.
|
||||
|
|
@ -64,6 +88,16 @@ struct raw_object_store {
|
|||
|
||||
struct alternate_object_database *alt_odb_list;
|
||||
struct alternate_object_database **alt_odb_tail;
|
||||
|
||||
/*
|
||||
* private data
|
||||
*
|
||||
* should only be accessed directly by packfile.c
|
||||
*/
|
||||
|
||||
struct packed_git *packed_git;
|
||||
/* A most-recently-used ordered version of the packed_git list. */
|
||||
struct list_head packed_git_mru;
|
||||
};
|
||||
|
||||
struct raw_object_store *raw_object_store_new(void);
|
||||
|
|
|
|||
7
object.c
7
object.c
|
|
@ -452,6 +452,7 @@ struct raw_object_store *raw_object_store_new(void)
|
|||
struct raw_object_store *o = xmalloc(sizeof(*o));
|
||||
|
||||
memset(o, 0, sizeof(*o));
|
||||
INIT_LIST_HEAD(&o->packed_git_mru);
|
||||
return o;
|
||||
}
|
||||
|
||||
|
|
@ -480,4 +481,10 @@ void raw_object_store_clear(struct raw_object_store *o)
|
|||
|
||||
free_alt_odbs(o);
|
||||
o->alt_odb_tail = NULL;
|
||||
|
||||
INIT_LIST_HEAD(&o->packed_git_mru);
|
||||
/*
|
||||
* TODO: call close_all_packs once migrated to
|
||||
* take an object store argument
|
||||
*/
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@
|
|||
#include "pack-revindex.h"
|
||||
#include "pack-objects.h"
|
||||
#include "packfile.h"
|
||||
#include "repository.h"
|
||||
#include "object-store.h"
|
||||
|
||||
/*
|
||||
* An entry on the bitmap index, representing the bitmap for a given
|
||||
|
|
@ -335,7 +337,7 @@ static int open_pack_bitmap(void)
|
|||
assert(!bitmap_git.map && !bitmap_git.loaded);
|
||||
|
||||
prepare_packed_git();
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = get_packed_git(the_repository); p; p = p->next) {
|
||||
if (open_pack_bitmap_1(p) == 0)
|
||||
ret = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
#include "pack-revindex.h"
|
||||
#include "progress.h"
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
struct idx_entry {
|
||||
off_t offset;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include "cache.h"
|
||||
#include "pack-revindex.h"
|
||||
#include "object-store.h"
|
||||
|
||||
/*
|
||||
* Pack index for existing packs give us easy access to the offsets into
|
||||
|
|
|
|||
51
packfile.c
51
packfile.c
|
|
@ -46,8 +46,6 @@ static unsigned int pack_open_fds;
|
|||
static unsigned int pack_max_fds;
|
||||
static size_t peak_pack_mapped;
|
||||
static size_t pack_mapped;
|
||||
struct packed_git *packed_git;
|
||||
LIST_HEAD(packed_git_mru);
|
||||
|
||||
#define SZ_FMT PRIuMAX
|
||||
static inline uintmax_t sz_fmt(size_t s) { return s; }
|
||||
|
|
@ -247,7 +245,7 @@ static int unuse_one_window(struct packed_git *current)
|
|||
|
||||
if (current)
|
||||
scan_windows(current, &lru_p, &lru_w, &lru_l);
|
||||
for (p = packed_git; p; p = p->next)
|
||||
for (p = the_repository->objects->packed_git; p; p = p->next)
|
||||
scan_windows(p, &lru_p, &lru_w, &lru_l);
|
||||
if (lru_p) {
|
||||
munmap(lru_w->base, lru_w->len);
|
||||
|
|
@ -317,7 +315,7 @@ void close_all_packs(void)
|
|||
{
|
||||
struct packed_git *p;
|
||||
|
||||
for (p = packed_git; p; p = p->next)
|
||||
for (p = the_repository->objects->packed_git; p; p = p->next)
|
||||
if (p->do_not_close)
|
||||
die("BUG: want to close pack marked 'do-not-close'");
|
||||
else
|
||||
|
|
@ -385,7 +383,7 @@ static int close_one_pack(void)
|
|||
struct pack_window *mru_w = NULL;
|
||||
int accept_windows_inuse = 1;
|
||||
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = the_repository->objects->packed_git; p; p = p->next) {
|
||||
if (p->pack_fd == -1)
|
||||
continue;
|
||||
find_lru_pack(p, &lru_p, &mru_w, &accept_windows_inuse);
|
||||
|
|
@ -687,8 +685,8 @@ void install_packed_git(struct packed_git *pack)
|
|||
if (pack->pack_fd != -1)
|
||||
pack_open_fds++;
|
||||
|
||||
pack->next = packed_git;
|
||||
packed_git = pack;
|
||||
pack->next = the_repository->objects->packed_git;
|
||||
the_repository->objects->packed_git = pack;
|
||||
}
|
||||
|
||||
void (*report_garbage)(unsigned seen_bits, const char *path);
|
||||
|
|
@ -770,7 +768,8 @@ 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 = packed_git; p; p = p->next) {
|
||||
for (p = the_repository->objects->packed_git; p;
|
||||
p = p->next) {
|
||||
size_t len;
|
||||
if (strip_suffix(p->pack_name, ".pack", &len) &&
|
||||
len == base_len &&
|
||||
|
|
@ -821,7 +820,7 @@ unsigned long approximate_object_count(void)
|
|||
|
||||
prepare_packed_git();
|
||||
count = 0;
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = the_repository->objects->packed_git; p; p = p->next) {
|
||||
if (open_pack_index(p))
|
||||
continue;
|
||||
count += p->num_objects;
|
||||
|
|
@ -870,18 +869,19 @@ static int sort_pack(const void *a_, const void *b_)
|
|||
|
||||
static void rearrange_packed_git(void)
|
||||
{
|
||||
packed_git = llist_mergesort(packed_git, get_next_packed_git,
|
||||
set_next_packed_git, sort_pack);
|
||||
the_repository->objects->packed_git = llist_mergesort(
|
||||
the_repository->objects->packed_git, get_next_packed_git,
|
||||
set_next_packed_git, sort_pack);
|
||||
}
|
||||
|
||||
static void prepare_packed_git_mru(void)
|
||||
{
|
||||
struct packed_git *p;
|
||||
|
||||
INIT_LIST_HEAD(&packed_git_mru);
|
||||
INIT_LIST_HEAD(&the_repository->objects->packed_git_mru);
|
||||
|
||||
for (p = packed_git; p; p = p->next)
|
||||
list_add_tail(&p->mru, &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);
|
||||
}
|
||||
|
||||
static int prepare_packed_git_run_once = 0;
|
||||
|
|
@ -907,6 +907,16 @@ void reprepare_packed_git(void)
|
|||
prepare_packed_git();
|
||||
}
|
||||
|
||||
struct packed_git *get_packed_git(struct repository *r)
|
||||
{
|
||||
return r->objects->packed_git;
|
||||
}
|
||||
|
||||
struct list_head *get_packed_git_mru(struct repository *r)
|
||||
{
|
||||
return &r->objects->packed_git_mru;
|
||||
}
|
||||
|
||||
unsigned long unpack_object_header_buffer(const unsigned char *buf,
|
||||
unsigned long len, enum object_type *type, unsigned long *sizep)
|
||||
{
|
||||
|
|
@ -1015,7 +1025,7 @@ const struct packed_git *has_packed_and_bad(const unsigned char *sha1)
|
|||
struct packed_git *p;
|
||||
unsigned i;
|
||||
|
||||
for (p = packed_git; p; p = p->next)
|
||||
for (p = the_repository->objects->packed_git; p; p = p->next)
|
||||
for (i = 0; i < p->num_bad_objects; i++)
|
||||
if (!hashcmp(sha1, p->bad_object_sha1 + 20 * i))
|
||||
return p;
|
||||
|
|
@ -1846,13 +1856,14 @@ int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
|
|||
struct list_head *pos;
|
||||
|
||||
prepare_packed_git();
|
||||
if (!packed_git)
|
||||
if (!the_repository->objects->packed_git)
|
||||
return 0;
|
||||
|
||||
list_for_each(pos, &packed_git_mru) {
|
||||
list_for_each(pos, &the_repository->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, &packed_git_mru);
|
||||
list_move(&p->mru,
|
||||
&the_repository->objects->packed_git_mru);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -1899,7 +1910,7 @@ int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags)
|
|||
int pack_errors = 0;
|
||||
|
||||
prepare_packed_git();
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
for (p = the_repository->objects->packed_git; p; p = p->next) {
|
||||
if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
|
||||
continue;
|
||||
if ((flags & FOR_EACH_OBJECT_PROMISOR_ONLY) &&
|
||||
|
|
@ -1930,7 +1941,7 @@ static int add_promisor_object(const struct object_id *oid,
|
|||
|
||||
/*
|
||||
* If this is a tree, commit, or tag, the objects it refers
|
||||
* to are also promisor objects. (Blobs refer to no objects.)
|
||||
* to are also promisor objects. (Blobs refer to no objects->)
|
||||
*/
|
||||
if (obj->type == OBJ_TREE) {
|
||||
struct tree *tree = (struct tree *)obj;
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@ extern void prepare_packed_git(void);
|
|||
extern void reprepare_packed_git(void);
|
||||
extern void install_packed_git(struct packed_git *pack);
|
||||
|
||||
struct packed_git *get_packed_git(struct repository *r);
|
||||
struct list_head *get_packed_git_mru(struct repository *r);
|
||||
|
||||
/*
|
||||
* Give a rough count of objects in the repository. This sacrifices accuracy
|
||||
* for speed.
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
#include "list-objects.h"
|
||||
#include "packfile.h"
|
||||
#include "worktree.h"
|
||||
#include "object-store.h"
|
||||
|
||||
struct connectivity_progress {
|
||||
struct progress *progress;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
#include "cache.h"
|
||||
#include "repository.h"
|
||||
#include "refs.h"
|
||||
#include "object.h"
|
||||
#include "commit.h"
|
||||
#include "tag.h"
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
/*
|
||||
* Create the file "path" by writing to a temporary file and renaming
|
||||
|
|
@ -200,7 +202,7 @@ static void init_pack_info(const char *infofile, int force)
|
|||
objdirlen = strlen(objdir);
|
||||
|
||||
prepare_packed_git();
|
||||
for (p = packed_git; p; p = p->next) {
|
||||
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.
|
||||
*/
|
||||
|
|
@ -210,7 +212,7 @@ static void init_pack_info(const char *infofile, int force)
|
|||
}
|
||||
num_pack = i;
|
||||
info = xcalloc(num_pack, sizeof(struct pack_info *));
|
||||
for (i = 0, p = packed_git; p; p = p->next) {
|
||||
for (i = 0, p = get_packed_git(the_repository); p; p = p->next) {
|
||||
if (!p->pack_local)
|
||||
continue;
|
||||
info[i] = xcalloc(1, sizeof(struct pack_info));
|
||||
|
|
|
|||
|
|
@ -197,7 +197,8 @@ static void find_short_packed_object(struct disambiguate_state *ds)
|
|||
struct packed_git *p;
|
||||
|
||||
prepare_packed_git();
|
||||
for (p = packed_git; p && !ds->ambiguous; p = p->next)
|
||||
for (p = get_packed_git(the_repository); p && !ds->ambiguous;
|
||||
p = p->next)
|
||||
unique_in_pack(p, ds);
|
||||
}
|
||||
|
||||
|
|
@ -567,7 +568,7 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
|
|||
struct packed_git *p;
|
||||
|
||||
prepare_packed_git();
|
||||
for (p = packed_git; p; p = p->next)
|
||||
for (p = get_packed_git(the_repository); p; p = p->next)
|
||||
find_abbrev_len_for_pack(p, mad);
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче