undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/repack.c: keep track of existing packs unconditionally

Browse Source 
In order to be able to write a multi-pack index during repacking, `git
repack` must keep track of which packs it wants to write into the MIDX.
This set is the union of existing packs which will not be deleted,
new pack(s) generated as a result of the repack, and .keep packs.

Prior to this patch, `git repack` populated the list of existing packs
only when repacking all-into-one (i.e., with `-A` or `-a`), but we will
soon need to know this list when repacking when writing a MIDX without
a-i-o.

Populate the list of existing packs unconditionally, and guard removing
packs from that list only when repacking a-i-o.

Additionally, keep track of filenames of kept packs separately, since
this, too, will be used in an upcoming patch.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau 2021-09-28 21:55:10 -04:00 committed by Junio C Hamano
parent 08944d1c22
commit 90f838bc36
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
builtin/repack.c
View File

@ -94,12 +94,14 @@ static void remove_pack_on_signal(int signo)
} }
/* /*
* Adds all packs hex strings to the fname list, which do not * Adds all packs hex strings to either fname_list or fname_kept_list
* have a corresponding .keep file. These packs are not to * based on whether each pack has a corresponding .keep file or not.
* be kept if we are going to pack everything into one file. * Packs without a .keep file are not to be kept if we are going to
* pack everything into one file.
*/ */
static void get_non_kept_pack_filenames(struct string_list *fname_list, static void collect_pack_filenames(struct string_list *fname_list,
const struct string_list *extra_keep) struct string_list *fname_kept_list,
const struct string_list *extra_keep)
{ {
DIR *dir; DIR *dir;
struct dirent *e; struct dirent *e;
@ -112,21 +114,20 @@ static void get_non_kept_pack_filenames(struct string_list *fname_list,
size_t len; size_t len;
int i; int i;
for (i = 0; i < extra_keep->nr; i++)
if (!fspathcmp(e->d_name, extra_keep->items[i].string))
break;
if (extra_keep->nr > 0 && i < extra_keep->nr)
continue;
if (!strip_suffix(e->d_name, ".pack", &len)) if (!strip_suffix(e->d_name, ".pack", &len))
continue; continue;
for (i = 0; i < extra_keep->nr; i++)
if (!fspathcmp(e->d_name, extra_keep->items[i].string))
break;
fname = xmemdupz(e->d_name, len); fname = xmemdupz(e->d_name, len);
if (!file_exists(mkpath("%s/%s.keep", packdir, fname))) if ((extra_keep->nr > 0 && i < extra_keep->nr) ||
string_list_append_nodup(fname_list, fname); (file_exists(mkpath("%s/%s.keep", packdir, fname))))
string_list_append_nodup(fname_kept_list, fname);
else else
free(fname); string_list_append_nodup(fname_list, fname);
} }
closedir(dir); closedir(dir);
} }
@ -440,6 +441,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
struct string_list names = STRING_LIST_INIT_DUP; struct string_list names = STRING_LIST_INIT_DUP;
struct string_list rollback = STRING_LIST_INIT_NODUP; struct string_list rollback = STRING_LIST_INIT_NODUP;
struct string_list existing_packs = STRING_LIST_INIT_DUP; struct string_list existing_packs = STRING_LIST_INIT_DUP;
struct string_list existing_kept_packs = STRING_LIST_INIT_DUP;
struct pack_geometry *geometry = NULL; struct pack_geometry *geometry = NULL;
struct strbuf line = STRBUF_INIT; struct strbuf line = STRBUF_INIT;
int i, ext, ret; int i, ext, ret;
@ -572,9 +574,10 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
if (use_delta_islands) if (use_delta_islands)
strvec_push(&cmd.args, "--delta-islands"); strvec_push(&cmd.args, "--delta-islands");
if (pack_everything & ALL_INTO_ONE) { collect_pack_filenames(&existing_packs, &existing_kept_packs,
get_non_kept_pack_filenames(&existing_packs, &keep_pack_list); &keep_pack_list);
if (pack_everything & ALL_INTO_ONE) {
repack_promisor_objects(&po_args, &names); repack_promisor_objects(&po_args, &names);
if (existing_packs.nr && delete_redundant) { if (existing_packs.nr && delete_redundant) {
@ -683,17 +686,19 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
reprepare_packed_git(the_repository); reprepare_packed_git(the_repository);
if (delete_redundant) { if (delete_redundant) {
const int hexsz = the_hash_algo->hexsz;
int opts = 0; int opts = 0;
string_list_sort(&names); if (pack_everything & ALL_INTO_ONE) {
for_each_string_list_item(item, &existing_packs) { const int hexsz = the_hash_algo->hexsz;
char *sha1; string_list_sort(&names);
size_t len = strlen(item->string); for_each_string_list_item(item, &existing_packs) {
if (len < hexsz) char *sha1;
continue; size_t len = strlen(item->string);
sha1 = item->string + len - hexsz; if (len < hexsz)
if (!string_list_has_string(&names, sha1)) continue;
remove_redundant_pack(packdir, item->string); sha1 = item->string + len - hexsz;
if (!string_list_has_string(&names, sha1))
remove_redundant_pack(packdir, item->string);
}
} }
if (geometry) { if (geometry) {
@ -739,6 +744,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
string_list_clear(&names, 0); string_list_clear(&names, 0);
string_list_clear(&rollback, 0); string_list_clear(&rollback, 0);
string_list_clear(&existing_packs, 0); string_list_clear(&existing_packs, 0);
string_list_clear(&existing_kept_packs, 0);
clear_pack_geometry(geometry); clear_pack_geometry(geometry);
strbuf_release(&line); strbuf_release(&line);