Skip to content

Commit b271a30

Browse files
gitstergitster
committed
Merge branch 'ds/status-with-sparse-index'
"git status" codepath learned to work with sparsely populated index without hydrating it fully. * ds/status-with-sparse-index: t1092: document bad sparse-checkout behavior fsmonitor: integrate with sparse index wt-status: expand added sparse directory entries status: use sparse-index throughout status: skip sparse-checkout percentage with sparse-index diff-lib: handle index diffs with sparse dirs dir.c: accept a directory as part of cone-mode patterns unpack-trees: unpack sparse directory entries unpack-trees: rename unpack_nondirectories() unpack-trees: compare sparse directories correctly unpack-trees: preserve cache_bottom t1092: add tests for status/add and sparse files t1092: expand repository data shape t1092: replace incorrect 'echo' with 'cat' sparse-index: include EXTENDED flag when expanding sparse-index: skip indexes with unmerged entries
2 parents 6d56fb2 + e5ca291 commit b271a30

File tree

10 files changed

+470
-38
lines changed

10 files changed

+470
-38
lines changed

‎builtin/commit.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,6 +1517,9 @@ int cmd_status(int argc, const char **argv, const char *prefix)
15171517
if (argc == 2 && !strcmp(argv[1], "-h"))
15181518
usage_with_options(builtin_status_usage, builtin_status_options);
15191519

1520+
prepare_repo_settings(the_repository);
1521+
the_repository->settings.command_requires_full_index = 0;
1522+
15201523
status_init_config(&s, git_status_config);
15211524
argc = parse_options(argc, argv, prefix,
15221525
builtin_status_options,

‎diff-lib.c‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,11 @@ static void show_new_file(struct rev_info *revs,
325325
unsigned dirty_submodule = 0;
326326
struct index_state *istate = revs->diffopt.repo->index;
327327

328+
if (new_file && S_ISSPARSEDIR(new_file->ce_mode)) {
329+
diff_tree_oid(NULL, &new_file->oid, new_file->name, &revs->diffopt);
330+
return;
331+
}
332+
328333
/*
329334
* New file in the index: it might actually be different in
330335
* the working tree.
@@ -347,6 +352,20 @@ static int show_modified(struct rev_info *revs,
347352
unsigned dirty_submodule = 0;
348353
struct index_state *istate = revs->diffopt.repo->index;
349354

355+
assert(S_ISSPARSEDIR(old_entry->ce_mode) ==
356+
S_ISSPARSEDIR(new_entry->ce_mode));
357+
358+
/*
359+
* If both are sparse directory entries, then expand the
360+
* modifications to the file level. If only one was a sparse
361+
* directory, then they appear as an add and delete instead of
362+
* a modification.
363+
*/
364+
if (S_ISSPARSEDIR(new_entry->ce_mode)) {
365+
diff_tree_oid(&old_entry->oid, &new_entry->oid, new_entry->name, &revs->diffopt);
366+
return 0;
367+
}
368+
350369
if (get_stat_data(istate, new_entry, &oid, &mode, cached, match_missing,
351370
&dirty_submodule, &revs->diffopt) < 0) {
352371
if (report_missing)

‎dir.c‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,7 @@ enum pattern_match_result path_matches_pattern_list(
13801380
struct path_pattern *pattern;
13811381
struct strbuf parent_pathname = STRBUF_INIT;
13821382
int result = NOT_MATCHED;
1383-
const char *slash_pos;
1383+
size_t slash_pos;
13841384

13851385
if (!pl->use_cone_patterns) {
13861386
pattern = last_matching_pattern_from_list(pathname, pathlen, basename,
@@ -1401,21 +1401,35 @@ enum pattern_match_result path_matches_pattern_list(
14011401
strbuf_addch(&parent_pathname, '/');
14021402
strbuf_add(&parent_pathname, pathname, pathlen);
14031403

1404+
/*
1405+
* Directory entries are matched if and only if a file
1406+
* contained immediately within them is matched. For the
1407+
* case of a directory entry, modify the path to create
1408+
* a fake filename within this directory, allowing us to
1409+
* use the file-base matching logic in an equivalent way.
1410+
*/
1411+
if (parent_pathname.len > 0 &&
1412+
parent_pathname.buf[parent_pathname.len - 1] == '/') {
1413+
slash_pos = parent_pathname.len - 1;
1414+
strbuf_add(&parent_pathname, "-", 1);
1415+
} else {
1416+
const char *slash_ptr = strrchr(parent_pathname.buf, '/');
1417+
slash_pos = slash_ptr ? slash_ptr - parent_pathname.buf : 0;
1418+
}
1419+
14041420
if (hashmap_contains_path(&pl->recursive_hashmap,
14051421
&parent_pathname)) {
14061422
result = MATCHED_RECURSIVE;
14071423
goto done;
14081424
}
14091425

1410-
slash_pos = strrchr(parent_pathname.buf, '/');
1411-
1412-
if (slash_pos == parent_pathname.buf) {
1426+
if (!slash_pos) {
14131427
/* include every file in root */
14141428
result = MATCHED;
14151429
goto done;
14161430
}
14171431

1418-
strbuf_setlen(&parent_pathname, slash_pos - parent_pathname.buf);
1432+
strbuf_setlen(&parent_pathname, slash_pos);
14191433

14201434
if (hashmap_contains_path(&pl->parent_hashmap, &parent_pathname)) {
14211435
result = MATCHED;

‎read-cache.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,8 +1585,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
15851585
*/
15861586
preload_index(istate, pathspec, 0);
15871587
trace2_region_enter("index", "refresh", NULL);
1588-
/* TODO: audit for interaction with sparse-index. */
1589-
ensure_full_index(istate);
1588+
15901589
for (i = 0; i < istate->cache_nr; i++) {
15911590
struct cache_entry *ce, *new_entry;
15921591
int cache_errno = 0;
@@ -1601,6 +1600,13 @@ int refresh_index(struct index_state *istate, unsigned int flags,
16011600
if (ignore_skip_worktree && ce_skip_worktree(ce))
16021601
continue;
16031602

1603+
/*
1604+
* If this entry is a sparse directory, then there isn't
1605+
* any stat() information to update. Ignore the entry.
1606+
*/
1607+
if (S_ISSPARSEDIR(ce->ce_mode))
1608+
continue;
1609+
16041610
if (pathspec && !ce_path_match(istate, ce, pathspec, seen))
16051611
filtered = 1;
16061612

‎sparse-index.c‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,17 @@ int set_sparse_index_config(struct repository *repo, int enable)
116116
return res;
117117
}
118118

119+
static int index_has_unmerged_entries(struct index_state *istate)
120+
{
121+
int i;
122+
for (i = 0; i < istate->cache_nr; i++) {
123+
if (ce_stage(istate->cache[i]))
124+
return 1;
125+
}
126+
127+
return 0;
128+
}
129+
119130
int convert_to_sparse(struct index_state *istate)
120131
{
121132
int test_env;
@@ -152,6 +163,13 @@ int convert_to_sparse(struct index_state *istate)
152163
return -1;
153164
}
154165

166+
/*
167+
* NEEDSWORK: If we have unmerged entries, then stay full.
168+
* Unmerged entries prevent the cache-tree extension from working.
169+
*/
170+
if (index_has_unmerged_entries(istate))
171+
return 0;
172+
155173
if (cache_tree_update(istate, 0)) {
156174
warning(_("unable to update cache-tree, staying full"));
157175
return -1;
@@ -168,6 +186,10 @@ int convert_to_sparse(struct index_state *istate)
168186
cache_tree_free(&istate->cache_tree);
169187
cache_tree_update(istate, 0);
170188

189+
istate->fsmonitor_has_run_once = 0;
190+
FREE_AND_NULL(istate->fsmonitor_dirty);
191+
FREE_AND_NULL(istate->fsmonitor_last_update);
192+
171193
istate->sparse_index = 1;
172194
trace2_region_leave("index", "convert_to_sparse", istate->repo);
173195
return 0;
@@ -195,7 +217,7 @@ static int add_path_to_index(const struct object_id *oid,
195217
strbuf_addstr(base, path);
196218

197219
ce = make_cache_entry(istate, mode, oid, base->buf, 0, 0);
198-
ce->ce_flags |= CE_SKIP_WORKTREE;
220+
ce->ce_flags |= CE_SKIP_WORKTREE | CE_EXTENDED;
199221
set_index_entry(istate, istate->cache_nr++, ce);
200222

201223
strbuf_setlen(base, len);
@@ -264,6 +286,9 @@ void ensure_full_index(struct index_state *istate)
264286
istate->cache = full->cache;
265287
istate->cache_nr = full->cache_nr;
266288
istate->cache_alloc = full->cache_alloc;
289+
istate->fsmonitor_has_run_once = 0;
290+
FREE_AND_NULL(istate->fsmonitor_dirty);
291+
FREE_AND_NULL(istate->fsmonitor_last_update);
267292

268293
strbuf_release(&base);
269294
free(full);

0 commit comments

Comments
 (0)