repack: add --keep-pack option
We allow to keep existing packs by having companion .keep files. This is helpful when a pack is permanently kept. In the next patch, git-gc just wants to keep a pack temporarily, for one pack-objects run. git-gc can use --keep-pack for this use case. A note about why the pack_keep field cannot be reused and pack_keep_in_core has to be added. This is about the case when --keep-pack is specified together with either --keep-unreachable or --unpack-unreachable, but --honor-pack-keep is NOT specified. In this case, we want to exclude objects from the packs specified on command line, not from ones with .keep files. If only one bit flag is used, we have to clear pack_keep on pack files with the .keep file. But we can't make any assumption about unreachable objects in .keep packs. If "pack_keep" field is false for .keep packs, we could potentially pull lots of unreachable objects into the new pack, or unpack them loose. The safer approach is ignore all packs with either .keep file or --keep-pack. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
committed by
Junio C Hamano
Junio C Hamano
parent
e9e33ab0fb
commit
ed7e5fc3a2
@ -30,6 +30,7 @@
|
||||
#include "list.h"
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
#include "dir.h"
|
||||
|
||||
static const char *pack_usage[] = {
|
||||
N_("git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"),
|
||||
@ -55,7 +56,8 @@ static int pack_loose_unreachable;
|
||||
static int local;
|
||||
static int have_non_local_packs;
|
||||
static int incremental;
|
||||
static int ignore_packed_keep;
|
||||
static int ignore_packed_keep_on_disk;
|
||||
static int ignore_packed_keep_in_core;
|
||||
static int allow_ofs_delta;
|
||||
static struct pack_idx_option pack_idx_opts;
|
||||
static const char *base_name;
|
||||
@ -982,13 +984,16 @@ static int want_found_object(int exclude, struct packed_git *p)
|
||||
* Otherwise, we signal "-1" at the end to tell the caller that we do
|
||||
* not know either way, and it needs to check more packs.
|
||||
*/
|
||||
if (!ignore_packed_keep &&
|
||||
if (!ignore_packed_keep_on_disk &&
|
||||
!ignore_packed_keep_in_core &&
|
||||
(!local || !have_non_local_packs))
|
||||
return 1;
|
||||
|
||||
if (local && !p->pack_local)
|
||||
return 0;
|
||||
if (ignore_packed_keep && p->pack_local && p->pack_keep)
|
||||
if (p->pack_local &&
|
||||
((ignore_packed_keep_on_disk && p->pack_keep) ||
|
||||
(ignore_packed_keep_in_core && p->pack_keep_in_core)))
|
||||
return 0;
|
||||
|
||||
/* we don't know yet; keep looking for more packs */
|
||||
@ -2675,7 +2680,7 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs)
|
||||
struct object_id oid;
|
||||
struct object *o;
|
||||
|
||||
if (!p->pack_local || p->pack_keep)
|
||||
if (!p->pack_local || p->pack_keep || p->pack_keep_in_core)
|
||||
continue;
|
||||
if (open_pack_index(p))
|
||||
die("cannot open pack index");
|
||||
@ -2738,7 +2743,8 @@ static int has_sha1_pack_kept_or_nonlocal(const struct object_id *oid)
|
||||
get_packed_git(the_repository);
|
||||
|
||||
while (p) {
|
||||
if ((!p->pack_local || p->pack_keep) &&
|
||||
if ((!p->pack_local || p->pack_keep ||
|
||||
p->pack_keep_in_core) &&
|
||||
find_pack_entry_one(oid->hash, p)) {
|
||||
last_found = p;
|
||||
return 1;
|
||||
@ -2781,7 +2787,7 @@ static void loosen_unused_packed_objects(struct rev_info *revs)
|
||||
struct object_id oid;
|
||||
|
||||
for (p = get_packed_git(the_repository); p; p = p->next) {
|
||||
if (!p->pack_local || p->pack_keep)
|
||||
if (!p->pack_local || p->pack_keep || p->pack_keep_in_core)
|
||||
continue;
|
||||
|
||||
if (open_pack_index(p))
|
||||
@ -2807,7 +2813,8 @@ static int pack_options_allow_reuse(void)
|
||||
{
|
||||
return pack_to_stdout &&
|
||||
allow_ofs_delta &&
|
||||
!ignore_packed_keep &&
|
||||
!ignore_packed_keep_on_disk &&
|
||||
!ignore_packed_keep_in_core &&
|
||||
(!local || !have_non_local_packs) &&
|
||||
!incremental;
|
||||
}
|
||||
@ -2916,6 +2923,32 @@ static void get_object_list(int ac, const char **av)
|
||||
oid_array_clear(&recent_objects);
|
||||
}
|
||||
|
||||
static void add_extra_kept_packs(const struct string_list *names)
|
||||
{
|
||||
struct packed_git *p;
|
||||
|
||||
if (!names->nr)
|
||||
return;
|
||||
|
||||
for (p = get_packed_git(the_repository); p; p = p->next) {
|
||||
const char *name = basename(p->pack_name);
|
||||
int i;
|
||||
|
||||
if (!p->pack_local)
|
||||
continue;
|
||||
|
||||
for (i = 0; i < names->nr; i++)
|
||||
if (!fspathcmp(name, names->items[i].string))
|
||||
break;
|
||||
|
||||
if (i < names->nr) {
|
||||
p->pack_keep_in_core = 1;
|
||||
ignore_packed_keep_in_core = 1;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int option_parse_index_version(const struct option *opt,
|
||||
const char *arg, int unset)
|
||||
{
|
||||
@ -2955,6 +2988,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
|
||||
struct argv_array rp = ARGV_ARRAY_INIT;
|
||||
int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0;
|
||||
int rev_list_index = 0;
|
||||
struct string_list keep_pack_list = STRING_LIST_INIT_NODUP;
|
||||
struct option pack_objects_options[] = {
|
||||
OPT_SET_INT('q', "quiet", &progress,
|
||||
N_("do not show progress meter"), 0),
|
||||
@ -3019,8 +3053,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
|
||||
N_("create thin packs")),
|
||||
OPT_BOOL(0, "shallow", &shallow,
|
||||
N_("create packs suitable for shallow fetches")),
|
||||
OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep,
|
||||
OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep_on_disk,
|
||||
N_("ignore packs that have companion .keep file")),
|
||||
OPT_STRING_LIST(0, "keep-pack", &keep_pack_list, N_("name"),
|
||||
N_("ignore this pack")),
|
||||
OPT_INTEGER(0, "compression", &pack_compression_level,
|
||||
N_("pack compression level")),
|
||||
OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents,
|
||||
@ -3148,19 +3184,20 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
|
||||
if (progress && all_progress_implied)
|
||||
progress = 2;
|
||||
|
||||
if (ignore_packed_keep) {
|
||||
add_extra_kept_packs(&keep_pack_list);
|
||||
if (ignore_packed_keep_on_disk) {
|
||||
struct packed_git *p;
|
||||
for (p = get_packed_git(the_repository); p; p = p->next)
|
||||
if (p->pack_local && p->pack_keep)
|
||||
break;
|
||||
if (!p) /* no keep-able packs found */
|
||||
ignore_packed_keep = 0;
|
||||
ignore_packed_keep_on_disk = 0;
|
||||
}
|
||||
if (local) {
|
||||
/*
|
||||
* unlike ignore_packed_keep above, we do not want to
|
||||
* unset "local" based on looking at packs, as it
|
||||
* also covers non-local objects
|
||||
* unlike ignore_packed_keep_on_disk above, we do not
|
||||
* want to unset "local" based on looking at packs, as
|
||||
* it also covers non-local objects
|
||||
*/
|
||||
struct packed_git *p;
|
||||
for (p = get_packed_git(the_repository); p; p = p->next) {
|
||||
|
||||
Reference in New Issue
Block a user