mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-12 11:46:07 +02:00
Code

pack-*.c: remove the_repository references 

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:
Nguyễn Thái Ngọc Duy 2018-11-10 06:49:08 +01:00 committed by Junio C Hamano
parent 94e10825bd
commit 7c14112741
6 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pack-objects.c
View File

@ -3481,7 +3481,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
} }
} }
prepare_packing_data(&to_pack); prepare_packing_data(the_repository, &to_pack);
if (progress) if (progress)
progress_state = start_progress(_("Enumerating objects"), 0); progress_state = start_progress(_("Enumerating objects"), 0);

6
pack-bitmap-write.c
View File

@ -77,7 +77,7 @@ void bitmap_writer_build_type_index(struct packing_data *to_pack,
break; break;
default: default:
real_type = oid_object_info(the_repository, real_type = oid_object_info(to_pack->repo,
&entry->idx.oid, NULL); &entry->idx.oid, NULL);
break; break;
} }
@ -262,7 +262,7 @@ void bitmap_writer_build(struct packing_data *to_pack)
if (writer.show_progress) if (writer.show_progress)
writer.progress = start_progress("Building bitmaps", writer.selected_nr); writer.progress = start_progress("Building bitmaps", writer.selected_nr);
repo_init_revisions(the_repository, &revs, NULL); repo_init_revisions(to_pack->repo, &revs, NULL);
revs.tag_objects = 1; revs.tag_objects = 1;
revs.tree_objects = 1; revs.tree_objects = 1;
revs.blob_objects = 1; revs.blob_objects = 1;
@ -363,7 +363,7 @@ static int date_compare(const void *_a, const void *_b)
void bitmap_writer_reuse_bitmaps(struct packing_data *to_pack) void bitmap_writer_reuse_bitmaps(struct packing_data *to_pack)
{ {
struct bitmap_index *bitmap_git; struct bitmap_index *bitmap_git;
if (!(bitmap_git = prepare_bitmap_git())) if (!(bitmap_git = prepare_bitmap_git(to_pack->repo)))
return; return;
writer.reused = kh_init_sha1(); writer.reused = kh_init_sha1();

13
pack-bitmap.c
View File

@ -328,14 +328,15 @@ static int load_pack_bitmap(struct bitmap_index *bitmap_git)
return -1; return -1;
} }
static int open_pack_bitmap(struct bitmap_index *bitmap_git) static int open_pack_bitmap(struct repository *r,
struct bitmap_index *bitmap_git)
{ {
struct packed_git *p; struct packed_git *p;
int ret = -1; int ret = -1;
assert(!bitmap_git->map); assert(!bitmap_git->map);
for (p = get_all_packs(the_repository); p; p = p->next) { for (p = get_all_packs(r); p; p = p->next) {
if (open_pack_bitmap_1(bitmap_git, p) == 0) if (open_pack_bitmap_1(bitmap_git, p) == 0)
ret = 0; ret = 0;
} }
@ -343,11 +344,11 @@ static int open_pack_bitmap(struct bitmap_index *bitmap_git)
return ret; return ret;
} }
struct bitmap_index *prepare_bitmap_git(void) struct bitmap_index *prepare_bitmap_git(struct repository *r)
{ {
struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git)); struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git));
if (!open_pack_bitmap(bitmap_git) && !load_pack_bitmap(bitmap_git)) if (!open_pack_bitmap(r, bitmap_git) && !load_pack_bitmap(bitmap_git))
return bitmap_git; return bitmap_git;
free_bitmap_index(bitmap_git); free_bitmap_index(bitmap_git);
@ -690,7 +691,7 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git)); struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git));
/* try to open a bitmapped pack, but don't parse it yet /* try to open a bitmapped pack, but don't parse it yet
* because we may not need to use it */ * because we may not need to use it */
if (open_pack_bitmap(bitmap_git) < 0) if (open_pack_bitmap(revs->repo, bitmap_git) < 0)
goto cleanup; goto cleanup;
for (i = 0; i < revs->pending.nr; ++i) { for (i = 0; i < revs->pending.nr; ++i) {
@ -955,7 +956,7 @@ void test_bitmap_walk(struct rev_info *revs)
struct bitmap_test_data tdata; struct bitmap_test_data tdata;
struct bitmap_index *bitmap_git; struct bitmap_index *bitmap_git;
if (!(bitmap_git = prepare_bitmap_git())) if (!(bitmap_git = prepare_bitmap_git(revs->repo)))
die("failed to load bitmap indexes"); die("failed to load bitmap indexes");
if (revs->pending.nr != 1) if (revs->pending.nr != 1)

3
pack-bitmap.h
View File

@ -6,6 +6,7 @@
#include "pack-objects.h" #include "pack-objects.h"
struct commit; struct commit;
struct repository;
struct rev_info; struct rev_info;
struct bitmap_disk_header { struct bitmap_disk_header {
@ -39,7 +40,7 @@ typedef int (*show_reachable_fn)(
struct bitmap_index; struct bitmap_index;
struct bitmap_index *prepare_bitmap_git(void); struct bitmap_index *prepare_bitmap_git(struct repository *r);
void count_bitmap_commit_list(struct bitmap_index *, uint32_t *commits, void count_bitmap_commit_list(struct bitmap_index *, uint32_t *commits,
uint32_t *trees, uint32_t *blobs, uint32_t *tags); uint32_t *trees, uint32_t *blobs, uint32_t *tags);
void traverse_bitmap_commit_list(struct bitmap_index *, void traverse_bitmap_commit_list(struct bitmap_index *,

6
pack-objects.c
View File

@ -99,7 +99,7 @@ static void prepare_in_pack_by_idx(struct packing_data *pdata)
* (i.e. in_pack_idx also zero) should return NULL. * (i.e. in_pack_idx also zero) should return NULL.
*/ */
mapping[cnt++] = NULL; mapping[cnt++] = NULL;
for (p = get_all_packs(the_repository); p; p = p->next, cnt++) { for (p = get_all_packs(pdata->repo); p; p = p->next, cnt++) {
if (cnt == nr) { if (cnt == nr) {
free(mapping); free(mapping);
return; return;
@ -133,8 +133,10 @@ void oe_map_new_pack(struct packing_data *pack,
} }
/* assume pdata is already zero'd by caller */ /* assume pdata is already zero'd by caller */
void prepare_packing_data(struct packing_data *pdata) void prepare_packing_data(struct repository *r, struct packing_data *pdata)
{ {
pdata->repo = r;
if (git_env_bool("GIT_TEST_FULL_IN_PACK_ARRAY", 0)) { if (git_env_bool("GIT_TEST_FULL_IN_PACK_ARRAY", 0)) {
/* /*
* do not initialize in_pack_by_idx[] to force the * do not initialize in_pack_by_idx[] to force the

5
pack-objects.h
View File

@ -5,6 +5,8 @@
#include "thread-utils.h" #include "thread-utils.h"
#include "pack.h" #include "pack.h"
struct repository;
#define DEFAULT_DELTA_CACHE_SIZE (256 * 1024 * 1024) #define DEFAULT_DELTA_CACHE_SIZE (256 * 1024 * 1024)
#define OE_DFS_STATE_BITS 2 #define OE_DFS_STATE_BITS 2
@ -127,6 +129,7 @@ struct object_entry {
}; };
struct packing_data { struct packing_data {
struct repository *repo;
struct object_entry *objects; struct object_entry *objects;
uint32_t nr_objects, nr_alloc; uint32_t nr_objects, nr_alloc;
@ -165,7 +168,7 @@ struct packing_data {
unsigned char *layer; unsigned char *layer;
}; };
void prepare_packing_data(struct packing_data *pdata); void prepare_packing_data(struct repository *r, struct packing_data *pdata);
static inline void packing_data_lock(struct packing_data *pdata) static inline void packing_data_lock(struct packing_data *pdata)
{ {