pack-bitmap: initialize `bitmap_writer_init()` with packing_data

In order to determine its object order, the pack-bitmap machinery keeps a 'struct packing_data' corresponding to the pack or pseudo-pack (when writing a MIDX bitmap) being written. The to_pack field is provided to the bitmap machinery by callers of bitmap_writer_build() and assigned to the bitmap_writer struct at that point. But a subsequent commit will want to have access to that data earlier on during commit selection. Prepare for that by adding a 'to_pack' argument to 'bitmap_writer_init()', and initializing the field during that function. Subsequent commits will clean up other functions which take now-redundant arguments (like nr_objects, which is equivalent to pdata->objects_nr, or pdata itself). Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed Aug 15, 2024 at 13:31 UTC 01e9d129396e98b611bff2ae82bb3d610b28c588
4 files changed +7 -4
builtin/pack-objects.c
+1 -1
@@ -1342,7 +1342,7 @@ static void write_pack_file(void)
1342
1343 if (write_bitmap_index) {
1344 bitmap_writer_init(&bitmap_writer,
1345 - the_repository);
1345 + the_repository, &to_pack);
1346 bitmap_writer_set_checksum(&bitmap_writer, hash);
1347 bitmap_writer_build_type_index(&bitmap_writer,
1348 &to_pack, written_list, nr_written);
midx-write.c
+1 -1
@@ -825,7 +825,7 @@ static int write_midx_bitmap(const char *midx_name,
825 for (i = 0; i < pdata->nr_objects; i++)
826 index[i] = &pdata->objects[i].idx;
827
828 - bitmap_writer_init(&writer, the_repository);
828 + bitmap_writer_init(&writer, the_repository, pdata);
829 bitmap_writer_show_progress(&writer, flags & MIDX_PROGRESS);
830 bitmap_writer_build_type_index(&writer, pdata, index,
831 pdata->nr_objects);
pack-bitmap-write.c
+3 -1
@@ -41,13 +41,15 @@ static inline int bitmap_writer_nr_selected_commits(struct bitmap_writer *writer
41 return writer->selected_nr - writer->pseudo_merges_nr;
42 }
43
44 -void bitmap_writer_init(struct bitmap_writer *writer, struct repository *r)
44 +void bitmap_writer_init(struct bitmap_writer *writer, struct repository *r,
45 + struct packing_data *pdata)
46 {
47 memset(writer, 0, sizeof(struct bitmap_writer));
48 if (writer->bitmaps)
49 BUG("bitmap writer already initialized");
50 writer->bitmaps = kh_init_oid_map();
51 writer->pseudo_merge_commits = kh_init_oid_map();
52 + writer->to_pack = pdata;
53
54 string_list_init_dup(&writer->pseudo_merge_groups);
55
pack-bitmap.h
+2 -1
@@ -123,7 +123,8 @@ struct bitmap_writer {
123 unsigned char pack_checksum[GIT_MAX_RAWSZ];
124 };
125
126 -void bitmap_writer_init(struct bitmap_writer *writer, struct repository *r);
126 +void bitmap_writer_init(struct bitmap_writer *writer, struct repository *r,
127 + struct packing_data *pdata);
128 void bitmap_writer_show_progress(struct bitmap_writer *writer, int show);
129 void bitmap_writer_set_checksum(struct bitmap_writer *writer,
130 const unsigned char *sha1);