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

dir: include DIR_KEEP_UNTRACKED_CONTENTS handling in treat_directory()

Browse Source 
Handling DIR_KEEP_UNTRACKED_CONTENTS within treat_directory() instead of
as a post-processing step in read_directory():
  * allows us to directly access and remove the relevant entries instead
    of needing to calculate which ones need to be removed
  * keeps the logic for directory handling in one location (and puts it
    closer the the logic for stripping out extra ignored entries, which
    seems logical).

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2020-04-01 04:17:43 +00:00 committed by Junio C Hamano
parent 8d92fb2927
commit 1684644489
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dir.c
View File

@ -1665,7 +1665,8 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
* you CAN'T DO BOTH. * you CAN'T DO BOTH.
*/ */
enum path_treatment state; enum path_treatment state;
int nested_repo = 0, old_ignored_nr, check_only, stop_early; int nested_repo = 0, check_only, stop_early;
int old_ignored_nr, old_untracked_nr;
/* The "len-1" is to strip the final '/' */ /* The "len-1" is to strip the final '/' */
enum exist_status status = directory_exists_in_index(istate, dirname, len-1); enum exist_status status = directory_exists_in_index(istate, dirname, len-1);
@ -1785,9 +1786,13 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
* --porcelain), without listing the individual ignored files * --porcelain), without listing the individual ignored files
* underneath. To do so, we'll save the current ignored_nr, and * underneath. To do so, we'll save the current ignored_nr, and
* pop all the ones added after it if it turns out the entire * pop all the ones added after it if it turns out the entire
* directory is ignored. * directory is ignored. Also, when DIR_SHOW_IGNORED_TOO and
* !DIR_KEEP_UNTRACKED_CONTENTS then we don't want to show
* untracked paths so will need to pop all those off the last
* after we traverse.
*/ */
old_ignored_nr = dir->ignored_nr; old_ignored_nr = dir->ignored_nr;
old_untracked_nr = dir->nr;
/* Actually recurse into dirname now, we'll fixup the state later. */ /* Actually recurse into dirname now, we'll fixup the state later. */
untracked = lookup_untracked(dir->untracked, untracked, untracked = lookup_untracked(dir->untracked, untracked,
@ -1825,6 +1830,18 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
} }
} }
/*
* We may need to ignore some of the untracked paths we found while
* traversing subdirectories.
*/
if ((dir->flags & DIR_SHOW_IGNORED_TOO) &&
!(dir->flags & DIR_KEEP_UNTRACKED_CONTENTS)) {
int i;
for (i = old_untracked_nr + 1; i<dir->nr; ++i)
FREE_AND_NULL(dir->entries[i]);
dir->nr = old_untracked_nr;
}
/* /*
* If there is nothing under the current directory and we are not * If there is nothing under the current directory and we are not
* hiding empty directories, then we need to report on the * hiding empty directories, then we need to report on the
@ -2653,28 +2670,6 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,
QSORT(dir->entries, dir->nr, cmp_dir_entry); QSORT(dir->entries, dir->nr, cmp_dir_entry);
QSORT(dir->ignored, dir->ignored_nr, cmp_dir_entry); QSORT(dir->ignored, dir->ignored_nr, cmp_dir_entry);
/*
* If DIR_SHOW_IGNORED_TOO is set, read_directory_recursive() will
* also pick up untracked contents of untracked dirs; by default
* we discard these, but given DIR_KEEP_UNTRACKED_CONTENTS we do not.
*/
if ((dir->flags & DIR_SHOW_IGNORED_TOO) &&
!(dir->flags & DIR_KEEP_UNTRACKED_CONTENTS)) {
int i, j;
/* remove from dir->entries untracked contents of untracked dirs */
for (i = j = 0; j < dir->nr; j++) {
if (i &&
check_dir_entry_contains(dir->entries[i - 1], dir->entries[j])) {
FREE_AND_NULL(dir->entries[j]);
} else {
dir->entries[i++] = dir->entries[j];
}
}
dir->nr = i;
}
trace_performance_leave("read directory %.*s", len, path); trace_performance_leave("read directory %.*s", len, path);
if (dir->untracked) { if (dir->untracked) {
static int force_untracked_cache = -1; static int force_untracked_cache = -1;