sparse-checkout: hold pattern list in index
As we modify the sparse-checkout definition, we perform index operations on a pattern_list that only exists in-memory. This allows easy backing out in case the index update fails. However, if the index write itself cares about the sparse-checkout pattern set, we need access to that in-memory copy. Place a pointer to a 'struct pattern_list' in the index so we can access this on-demand. This will be used in the next change which uses the sparse-checkout definition to filter out directories that are outside the sparse cone. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
6863df3550
commit
836e25c51b
|
@ -110,6 +110,8 @@ static int update_working_directory(struct pattern_list *pl)
|
||||||
if (is_index_unborn(r->index))
|
if (is_index_unborn(r->index))
|
||||||
return UPDATE_SPARSITY_SUCCESS;
|
return UPDATE_SPARSITY_SUCCESS;
|
||||||
|
|
||||||
|
r->index->sparse_checkout_patterns = pl;
|
||||||
|
|
||||||
memset(&o, 0, sizeof(o));
|
memset(&o, 0, sizeof(o));
|
||||||
o.verbose_update = isatty(2);
|
o.verbose_update = isatty(2);
|
||||||
o.update = 1;
|
o.update = 1;
|
||||||
|
@ -138,6 +140,7 @@ static int update_working_directory(struct pattern_list *pl)
|
||||||
else
|
else
|
||||||
rollback_lock_file(&lock_file);
|
rollback_lock_file(&lock_file);
|
||||||
|
|
||||||
|
r->index->sparse_checkout_patterns = NULL;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -517,19 +520,18 @@ static int modify_pattern_list(int argc, const char **argv, enum modify_type m)
|
||||||
{
|
{
|
||||||
int result;
|
int result;
|
||||||
int changed_config = 0;
|
int changed_config = 0;
|
||||||
struct pattern_list pl;
|
struct pattern_list *pl = xcalloc(1, sizeof(*pl));
|
||||||
memset(&pl, 0, sizeof(pl));
|
|
||||||
|
|
||||||
switch (m) {
|
switch (m) {
|
||||||
case ADD:
|
case ADD:
|
||||||
if (core_sparse_checkout_cone)
|
if (core_sparse_checkout_cone)
|
||||||
add_patterns_cone_mode(argc, argv, &pl);
|
add_patterns_cone_mode(argc, argv, pl);
|
||||||
else
|
else
|
||||||
add_patterns_literal(argc, argv, &pl);
|
add_patterns_literal(argc, argv, pl);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case REPLACE:
|
case REPLACE:
|
||||||
add_patterns_from_input(&pl, argc, argv);
|
add_patterns_from_input(pl, argc, argv);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -539,12 +541,13 @@ static int modify_pattern_list(int argc, const char **argv, enum modify_type m)
|
||||||
changed_config = 1;
|
changed_config = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
result = write_patterns_and_update(&pl);
|
result = write_patterns_and_update(pl);
|
||||||
|
|
||||||
if (result && changed_config)
|
if (result && changed_config)
|
||||||
set_config(MODE_NO_PATTERNS);
|
set_config(MODE_NO_PATTERNS);
|
||||||
|
|
||||||
clear_pattern_list(&pl);
|
clear_pattern_list(pl);
|
||||||
|
free(pl);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
2
cache.h
2
cache.h
|
@ -307,6 +307,7 @@ static inline unsigned int canon_mode(unsigned int mode)
|
||||||
struct split_index;
|
struct split_index;
|
||||||
struct untracked_cache;
|
struct untracked_cache;
|
||||||
struct progress;
|
struct progress;
|
||||||
|
struct pattern_list;
|
||||||
|
|
||||||
struct index_state {
|
struct index_state {
|
||||||
struct cache_entry **cache;
|
struct cache_entry **cache;
|
||||||
|
@ -338,6 +339,7 @@ struct index_state {
|
||||||
struct mem_pool *ce_mem_pool;
|
struct mem_pool *ce_mem_pool;
|
||||||
struct progress *progress;
|
struct progress *progress;
|
||||||
struct repository *repo;
|
struct repository *repo;
|
||||||
|
struct pattern_list *sparse_checkout_patterns;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Name hashing */
|
/* Name hashing */
|
||||||
|
|
Loading…
Reference in New Issue