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

pack-bitmap: allow passing payloads to show_reachable_fn()

Browse Source 
The `show_reachable_fn` callback is used by a couple of functions to
present reachable objects to the caller. The function does not provide a
way for the caller to pass a payload though, which is functionality that
we'll require in a subsequent commit.

Change the callback type to accept a payload and adapt all callsites
accordingly.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-04-02 13:13:42 +02:00
committed by Junio C Hamano
parent 8fa9fe171a
commit 3d45483846
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pack-bitmap.c
View File

@@ -1625,7 +1625,7 @@ static void show_extended_objects(struct bitmap_index *bitmap_git,
(obj->type == OBJ_TAG && !revs->tag_objects))
continue;
show_reach(&obj->oid, obj->type, 0, eindex->hashes[i], NULL, 0);
show_reach(&obj->oid, obj->type, 0, eindex->hashes[i], NULL, 0, NULL);
}
}
@@ -1663,7 +1663,8 @@ static void init_type_iterator(struct ewah_or_iterator *it,
static void show_objects_for_type(
struct bitmap_index *bitmap_git,
enum object_type object_type,
show_reachable_fn show_reach)
show_reachable_fn show_reach,
void *payload)
{
size_t i = 0;
uint32_t offset;
@@ -1715,7 +1716,7 @@ static void show_objects_for_type(
if (bitmap_git->hashes)
hash = get_be32(bitmap_git->hashes + index_pos);
show_reach(&oid, object_type, 0, hash, pack, ofs);
show_reach(&oid, object_type, 0, hash, pack, ofs, payload);
}
}
@@ -2518,13 +2519,13 @@ void traverse_bitmap_commit_list(struct bitmap_index *bitmap_git,
{
assert(bitmap_git->result);
show_objects_for_type(bitmap_git, OBJ_COMMIT, show_reachable);
show_objects_for_type(bitmap_git, OBJ_COMMIT, show_reachable, NULL);
if (revs->tree_objects)
show_objects_for_type(bitmap_git, OBJ_TREE, show_reachable);
show_objects_for_type(bitmap_git, OBJ_TREE, show_reachable, NULL);
if (revs->blob_objects)
show_objects_for_type(bitmap_git, OBJ_BLOB, show_reachable);
show_objects_for_type(bitmap_git, OBJ_BLOB, show_reachable, NULL);
if (revs->tag_objects)
show_objects_for_type(bitmap_git, OBJ_TAG, show_reachable);
show_objects_for_type(bitmap_git, OBJ_TAG, show_reachable, NULL);
show_extended_objects(bitmap_git, revs, show_reachable);
}