mirror of
https://github.com/git/git.git
synced 2026-08-08 17:11:48 +00:00
a53c3b6193
Teach 'git repack' to accept '--geometric' and '--cruft' together. When both are given, the geometric repack rolls up non-cruft packs as usual, and a separate cruft pack is written to collect unreachable objects. Previously, '--cruft' implied `ALL_INTO_ONE`, which is fundamentally incompatible with geometric repacking. Relax this so that '--cruft' only implies `ALL_INTO_ONE` when '--geometric' is not also given. When combining the two modes: - Use the new '--stdin-packs=follow-reachable' mode so that only reachable objects from the rolled-up packs (and any reachable loose objects) appear in the geometric pack. Unreachable objects are left for the cruft writer to collect. - Plumb our `pack_geometry` into `write_cruft_pack()`, so that the latter can tell 'pack-objects' which non-kept packs are below the split (excluded, so their unreachable objects are candidates for the cruft pack) versus above the split (included, so they are treated as reachable). - Handle promisor packs in the cruft writer's geometry path, since promisor packs have their own split point. - Use the refs snapshot (when available) so that pack-objects and the MIDX bitmap writer see the same set of reference tips. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
110 lines
3.1 KiB
C
110 lines
3.1 KiB
C
#include "git-compat-util.h"
|
|
#include "repack.h"
|
|
#include "packfile.h"
|
|
#include "repository.h"
|
|
#include "run-command.h"
|
|
|
|
static void combine_small_cruft_packs(FILE *in, off_t combine_cruft_below_size,
|
|
struct existing_packs *existing)
|
|
{
|
|
struct packed_git *p;
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
repo_for_each_pack(existing->repo, p) {
|
|
if (!(p->is_cruft && p->pack_local))
|
|
continue;
|
|
|
|
strbuf_reset(&buf);
|
|
strbuf_addstr(&buf, pack_basename(p));
|
|
strbuf_strip_suffix(&buf, ".pack");
|
|
|
|
if (!string_list_has_string(&existing->cruft_packs, buf.buf))
|
|
continue;
|
|
|
|
if (p->pack_size < combine_cruft_below_size) {
|
|
fprintf(in, "-%s\n", pack_basename(p));
|
|
} else {
|
|
existing_packs_retain_cruft(existing, p);
|
|
fprintf(in, "%s\n", pack_basename(p));
|
|
}
|
|
}
|
|
|
|
strbuf_release(&buf);
|
|
}
|
|
|
|
int write_cruft_pack(const struct write_pack_opts *opts,
|
|
const char *cruft_expiration,
|
|
unsigned long combine_cruft_below_size,
|
|
struct string_list *names,
|
|
struct existing_packs *existing,
|
|
struct pack_geometry *geometry)
|
|
{
|
|
struct child_process cmd = CHILD_PROCESS_INIT;
|
|
struct string_list_item *item;
|
|
FILE *in;
|
|
int ret;
|
|
const char *pack_prefix = write_pack_opts_pack_prefix(opts);
|
|
|
|
prepare_pack_objects(&cmd, opts->po_args, opts->destination);
|
|
|
|
strvec_push(&cmd.args, "--cruft");
|
|
if (cruft_expiration)
|
|
strvec_pushf(&cmd.args, "--cruft-expiration=%s",
|
|
cruft_expiration);
|
|
|
|
strvec_push(&cmd.args, "--non-empty");
|
|
|
|
cmd.in = -1;
|
|
|
|
ret = start_command(&cmd);
|
|
if (ret)
|
|
return ret;
|
|
|
|
/*
|
|
* names has a confusing double use: it both provides the list
|
|
* of just-written new packs, and accepts the name of the cruft
|
|
* pack we are writing.
|
|
*
|
|
* By the time it is read here, it contains only the pack(s)
|
|
* that were just written, which is exactly the set of packs we
|
|
* want to consider kept.
|
|
*
|
|
* If `--expire-to` is given, the double-use served by `names`
|
|
* ensures that the pack written to `--expire-to` excludes any
|
|
* objects contained in the cruft pack.
|
|
*/
|
|
in = xfdopen(cmd.in, "w");
|
|
for_each_string_list_item(item, names)
|
|
fprintf(in, "%s-%s.pack\n", pack_prefix, item->string);
|
|
if (combine_cruft_below_size && !cruft_expiration)
|
|
combine_small_cruft_packs(in, combine_cruft_below_size,
|
|
existing);
|
|
else
|
|
for_each_string_list_item(item, &existing->cruft_packs)
|
|
fprintf(in, "-%s.pack\n", item->string);
|
|
if (geometry) {
|
|
uint32_t j;
|
|
for (j = 0; j < geometry->split; j++)
|
|
fprintf(in, "-%s\n",
|
|
pack_basename(geometry->pack[j]));
|
|
for (; j < geometry->pack_nr; j++)
|
|
fprintf(in, "%s\n",
|
|
pack_basename(geometry->pack[j]));
|
|
for (j = 0; j < geometry->promisor_split; j++)
|
|
fprintf(in, "-%s\n",
|
|
pack_basename(geometry->promisor_pack[j]));
|
|
for (; j < geometry->promisor_pack_nr; j++)
|
|
fprintf(in, "%s\n",
|
|
pack_basename(geometry->promisor_pack[j]));
|
|
} else {
|
|
for_each_string_list_item(item, &existing->non_kept_packs)
|
|
fprintf(in, "-%s.pack\n", item->string);
|
|
}
|
|
for_each_string_list_item(item, &existing->kept_packs)
|
|
fprintf(in, "%s.pack\n", item->string);
|
|
fclose(in);
|
|
|
|
return finish_pack_objects_cmd(existing->repo->hash_algo, opts, &cmd,
|
|
names);
|
|
}
|