midx: add MIDX_PROGRESS flag
Add the MIDX_PROGRESS flag and update the write|verify|expire|repack functions in midx.h to accept a flags parameter. The MIDX_PROGRESS flag indicates whether the caller of the function would like progress information to be displayed. This patch only changes the method prototypes and does not change the functionality. The functionality change will be handled by a later patch. Signed-off-by: William Baker <William.Baker@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
William Baker committed
Oct 21, 2019 at 18:39 UTC
efbc3aee08dfac70d426cca93cc5cfc0f14f8ee7
4 files changed
+15
-13
builtin/multi-pack-index.c
+4
-4
@@ -47,16 +47,16 @@ int cmd_multi_pack_index(int argc, const char **argv,
47
trace2_cmd_mode(argv[0]);
48
49
if (!strcmp(argv[0], "repack"))
50
- return midx_repack(the_repository, opts.object_dir, (size_t)opts.batch_size);
50
+ return midx_repack(the_repository, opts.object_dir, (size_t)opts.batch_size, 0);
51
if (opts.batch_size)
52
die(_("--batch-size option is only for 'repack' subcommand"));
53
54
if (!strcmp(argv[0], "write"))
55
- return write_midx_file(opts.object_dir);
55
+ return write_midx_file(opts.object_dir, 0);
56
if (!strcmp(argv[0], "verify"))
57
- return verify_midx_file(the_repository, opts.object_dir);
57
+ return verify_midx_file(the_repository, opts.object_dir, 0);
58
if (!strcmp(argv[0], "expire"))
59
- return expire_midx_packs(the_repository, opts.object_dir);
59
+ return expire_midx_packs(the_repository, opts.object_dir, 0);
60
61
die(_("unrecognized subcommand: %s"), argv[0]);
62
}
builtin/repack.c
+1
-1
@@ -562,7 +562,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
562
remove_temporary_files();
563
564
if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0))
565
- write_midx_file(get_object_directory());
565
+ write_midx_file(get_object_directory(), 0);
566
567
string_list_clear(&names, 0);
568
string_list_clear(&rollback, 0);
midx.c
+4
-4
@@ -1016,7 +1016,7 @@ cleanup:
1016
return result;
1017
}
1018
1019
-int write_midx_file(const char *object_dir)
1019
+int write_midx_file(const char *object_dir, unsigned flags)
1020
{
1021
return write_midx_internal(object_dir, NULL, NULL);
1022
}
@@ -1076,7 +1076,7 @@ static int compare_pair_pos_vs_id(const void *_a, const void *_b)
1076
display_progress(progress, _n); \
1077
} while (0)
1078
1079
-int verify_midx_file(struct repository *r, const char *object_dir)
1079
+int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags)
1080
{
1081
struct pair_pos_vs_id *pairs = NULL;
1082
uint32_t i;
@@ -1183,7 +1183,7 @@ int verify_midx_file(struct repository *r, const char *object_dir)
1183
return verify_midx_error;
1184
}
1185
1186
-int expire_midx_packs(struct repository *r, const char *object_dir)
1186
+int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags)
1187
{
1188
uint32_t i, *count, result = 0;
1189
struct string_list packs_to_drop = STRING_LIST_INIT_DUP;
@@ -1315,7 +1315,7 @@ static int fill_included_packs_batch(struct repository *r,
1315
return 0;
1316
}
1317
1318
-int midx_repack(struct repository *r, const char *object_dir, size_t batch_size)
1318
+int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, unsigned flags)
1319
{
1320
int result = 0;
1321
uint32_t i;
midx.h
+6
-4
@@ -37,6 +37,8 @@ struct multi_pack_index {
37
char object_dir[FLEX_ARRAY];
38
};
39
40
+#define MIDX_PROGRESS (1 << 0)
41
+
42
struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local);
43
int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id);
44
int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result);
@@ -47,11 +49,11 @@ int fill_midx_entry(struct repository *r, const struct object_id *oid, struct pa
49
int midx_contains_pack(struct multi_pack_index *m, const char *idx_or_pack_name);
50
int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, int local);
51
50
-int write_midx_file(const char *object_dir);
52
+int write_midx_file(const char *object_dir, unsigned flags);
53
void clear_midx_file(struct repository *r);
52
-int verify_midx_file(struct repository *r, const char *object_dir);
53
-int expire_midx_packs(struct repository *r, const char *object_dir);
54
-int midx_repack(struct repository *r, const char *object_dir, size_t batch_size);
54
+int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags);
55
+int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags);
56
+int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, unsigned flags);
57
58
void close_midx(struct multi_pack_index *m);
59