mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-bitmap: convert traverse_bitmap_commit_list to object_id

Browse Source 
Convert traverse_bitmap_commit_list and the callbacks it takes to use a
pointer to struct object_id.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2017-10-15 22:07:00 +00:00 committed by Junio C Hamano
parent 334dc52f49
commit 206649672e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/pack-objects.c
View File

@ -1097,20 +1097,20 @@ static int add_object_entry(const unsigned char *sha1, enum object_type type,
return 1; return 1;
} }
static int add_object_entry_from_bitmap(const unsigned char *sha1, static int add_object_entry_from_bitmap(const struct object_id *oid,
enum object_type type, enum object_type type,
int flags, uint32_t name_hash, int flags, uint32_t name_hash,
struct packed_git *pack, off_t offset) struct packed_git *pack, off_t offset)
{ {
uint32_t index_pos; uint32_t index_pos;
if (have_duplicate_entry(sha1, 0, &index_pos)) if (have_duplicate_entry(oid->hash, 0, &index_pos))
return 0; return 0;
if (!want_object_in_pack(sha1, 0, &pack, &offset)) if (!want_object_in_pack(oid->hash, 0, &pack, &offset))
return 0; return 0;
create_object_entry(sha1, type, name_hash, 0, 0, index_pos, pack, offset); create_object_entry(oid->hash, type, name_hash, 0, 0, index_pos, pack, offset);
display_progress(progress_state, nr_result); display_progress(progress_state, nr_result);
return 1; return 1;

4
builtin/rev-list.c
View File

@ -258,14 +258,14 @@ static int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
} }
static int show_object_fast( static int show_object_fast(
const unsigned char *sha1, const struct object_id *oid,
enum object_type type, enum object_type type,
int exclude, int exclude,
uint32_t name_hash, uint32_t name_hash,
struct packed_git *found_pack, struct packed_git *found_pack,
off_t found_offset) off_t found_offset)
{ {
fprintf(stdout, "%s\n", sha1_to_hex(sha1)); fprintf(stdout, "%s\n", oid_to_hex(oid));
return 1; return 1;
} }

8
pack-bitmap.c
View File

@ -587,7 +587,7 @@ static void show_extended_objects(struct bitmap *objects,
continue; continue;
obj = eindex->objects[i]; obj = eindex->objects[i];
show_reach(obj->oid.hash, obj->type, 0, eindex->hashes[i], NULL, 0); show_reach(&obj->oid, obj->type, 0, eindex->hashes[i], NULL, 0);
} }
} }
@ -612,7 +612,7 @@ static void show_objects_for_type(
eword_t word = objects->words[i] & filter; eword_t word = objects->words[i] & filter;
for (offset = 0; offset < BITS_IN_EWORD; ++offset) { for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
const unsigned char *sha1; struct object_id oid;
struct revindex_entry *entry; struct revindex_entry *entry;
uint32_t hash = 0; uint32_t hash = 0;
@ -625,12 +625,12 @@ static void show_objects_for_type(
continue; continue;
entry = &bitmap_git.pack->revindex[pos + offset]; entry = &bitmap_git.pack->revindex[pos + offset];
sha1 = nth_packed_object_sha1(bitmap_git.pack, entry->nr); nth_packed_object_oid(&oid, bitmap_git.pack, entry->nr);
if (bitmap_git.hashes) if (bitmap_git.hashes)
hash = get_be32(bitmap_git.hashes + entry->nr); hash = get_be32(bitmap_git.hashes + entry->nr);
show_reach(sha1, object_type, 0, hash, bitmap_git.pack, entry->offset); show_reach(&oid, object_type, 0, hash, bitmap_git.pack, entry->offset);
} }
pos += BITS_IN_EWORD; pos += BITS_IN_EWORD;

2
pack-bitmap.h
View File

@ -27,7 +27,7 @@ enum pack_bitmap_flags {
}; };
typedef int (*show_reachable_fn)( typedef int (*show_reachable_fn)(
const unsigned char *sha1, const struct object_id *oid,
enum object_type type, enum object_type type,
int flags, int flags,
uint32_t hash, uint32_t hash,