undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packfile: add repository argument to prepare_packed_git

Browse Source 
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>
This commit is contained in:
Stefan Beller 2018-03-23 18:45:20 +01:00 committed by Junio C Hamano
parent 072a109356
commit 6fdb4e9f5a
12 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/count-objects.c
View File

@ -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))
prepare_packed_git();
prepare_packed_git(the_repository);
for (p = get_packed_git(the_repository); p; p = p->next) {
if (!p->pack_local)
continue;

2
builtin/fsck.c
View File

@ -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;
prepare_packed_git();
prepare_packed_git(the_repository);
if (show_progress) {
for (p = get_packed_git(the_repository); p;

2
builtin/gc.c
View File

@ -174,7 +174,7 @@ static int too_many_packs(void)
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;

2
builtin/pack-objects.c
View File

@ -3152,7 +3152,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
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)

2
builtin/pack-redundant.c
View File

@ -631,7 +631,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
break;
}
prepare_packed_git();
prepare_packed_git(the_repository);
if (load_all_packs)
load_all();

2
fast-import.c
View File

@ -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;
prepare_packed_git();
prepare_packed_git(the_repository);
start_packfile();
set_die_routine(die_nicely);
set_checkpoint_signal();

2
http-backend.c
View File

@ -519,7 +519,7 @@ static void get_info_packs(struct strbuf *hdr, char *arg)
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++;

2
pack-bitmap.c
View File

@ -336,7 +336,7 @@ static int open_pack_bitmap(void)
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;

10
packfile.c
View File

@ -817,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))
@ -884,7 +884,7 @@ static void prepare_packed_git_mru(struct repository *r)
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;
@ -903,7 +903,7 @@ void reprepare_packed_git(void)
{
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)
@ -1854,7 +1854,7 @@ int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
{
struct list_head *pos;
prepare_packed_git();
prepare_packed_git(the_repository);
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;
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;

3
packfile.h
View File

@ -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);
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);

2
server-info.c
View File

@ -201,7 +201,7 @@ static void init_pack_info(const char *infofile, int force)
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.

4
sha1_name.c
View File

@ -196,7 +196,7 @@ static void find_short_packed_object(struct disambiguate_state *ds)
{
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);
@ -567,7 +567,7 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
{
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);
}