]>
Commit | Line | Data |
---|---|---|
453ec4bd LT |
1 | /* |
2 | * This handles recursive filename detection with exclude | |
3 | * files, index knowledge etc.. | |
4 | * | |
5 | * Copyright (C) Linus Torvalds, 2005-2006 | |
6 | * Junio Hamano, 2005-2006 | |
7 | */ | |
36bf1958 | 8 | #include "git-compat-util.h" |
0b027f6c | 9 | #include "abspath.h" |
b2141fc1 | 10 | #include "config.h" |
73359a9b | 11 | #include "convert.h" |
453ec4bd | 12 | #include "dir.h" |
32a8f510 | 13 | #include "environment.h" |
f394e093 | 14 | #include "gettext.h" |
f5653856 | 15 | #include "name-hash.h" |
87bed179 | 16 | #include "object-file.h" |
a034e910 | 17 | #include "object-store-ll.h" |
c339932b | 18 | #include "path.h" |
b0db7046 | 19 | #include "attr.h" |
09595258 | 20 | #include "refs.h" |
237ec6e4 | 21 | #include "wildmatch.h" |
64acde94 | 22 | #include "pathspec.h" |
dde843e7 | 23 | #include "utf8.h" |
83c094ad NTND |
24 | #include "varint.h" |
25 | #include "ewah/ewok.h" | |
68d68646 EN |
26 | #include "fsmonitor-ll.h" |
27 | #include "read-cache-ll.h" | |
e38da487 | 28 | #include "setup.h" |
baf889c2 | 29 | #include "sparse-index.h" |
da62f786 | 30 | #include "submodule-config.h" |
cb2a5135 | 31 | #include "symlinks.h" |
74ea5c95 | 32 | #include "trace2.h" |
d4a4f929 | 33 | #include "tree.h" |
453ec4bd | 34 | |
defd7c7b KB |
35 | /* |
36 | * Tells read_directory_recursive how a file or directory should be treated. | |
37 | * Values are ordered by significance, e.g. if a directory contains both | |
38 | * excluded and untracked files, it is listed as untracked because | |
39 | * path_untracked > path_excluded. | |
40 | */ | |
41 | enum path_treatment { | |
42 | path_none = 0, | |
43 | path_recurse, | |
44 | path_excluded, | |
45 | path_untracked | |
46 | }; | |
47 | ||
cf7c6148 NTND |
48 | /* |
49 | * Support data structure for our opendir/readdir/closedir wrappers | |
50 | */ | |
51 | struct cached_dir { | |
52 | DIR *fdir; | |
53 | struct untracked_cache_dir *untracked; | |
91a2288b NTND |
54 | int nr_files; |
55 | int nr_dirs; | |
56 | ||
ad6f2157 JK |
57 | const char *d_name; |
58 | int d_type; | |
91a2288b NTND |
59 | const char *file; |
60 | struct untracked_cache_dir *ucd; | |
cf7c6148 NTND |
61 | }; |
62 | ||
defd7c7b | 63 | static enum path_treatment read_directory_recursive(struct dir_struct *dir, |
0ef8e169 BW |
64 | struct index_state *istate, const char *path, int len, |
65 | struct untracked_cache_dir *untracked, | |
5aaa7fd3 | 66 | int check_only, int stop_at_first_file, const struct pathspec *pathspec); |
ad6f2157 JK |
67 | static int resolve_dtype(int dtype, struct index_state *istate, |
68 | const char *path, int len); | |
906fc557 | 69 | struct dirent *readdir_skip_dot_and_dotdot(DIR *dirp) |
b548f0f1 EN |
70 | { |
71 | struct dirent *e; | |
72 | ||
73 | while ((e = readdir(dirp)) != NULL) { | |
74 | if (!is_dot_or_dotdot(e->d_name)) | |
75 | break; | |
76 | } | |
77 | return e; | |
78 | } | |
79 | ||
e0556a92 PC |
80 | int count_slashes(const char *s) |
81 | { | |
82 | int cnt = 0; | |
83 | while (*s) | |
84 | if (*s++ == '/') | |
85 | cnt++; | |
86 | return cnt; | |
87 | } | |
88 | ||
ba0897e6 | 89 | int fspathcmp(const char *a, const char *b) |
8cf2a84e JJ |
90 | { |
91 | return ignore_case ? strcasecmp(a, b) : strcmp(a, b); | |
92 | } | |
93 | ||
cf2dc1c2 EW |
94 | int fspatheq(const char *a, const char *b) |
95 | { | |
96 | return !fspathcmp(a, b); | |
97 | } | |
98 | ||
ba0897e6 | 99 | int fspathncmp(const char *a, const char *b, size_t count) |
8cf2a84e JJ |
100 | { |
101 | return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count); | |
102 | } | |
103 | ||
cf2dc1c2 EW |
104 | unsigned int fspathhash(const char *str) |
105 | { | |
106 | return ignore_case ? strihash(str) : strhash(str); | |
107 | } | |
108 | ||
1f26ce61 CB |
109 | int git_fnmatch(const struct pathspec_item *item, |
110 | const char *pattern, const char *string, | |
111 | int prefix) | |
5d74762d | 112 | { |
5d74762d | 113 | if (prefix > 0) { |
93d93537 | 114 | if (ps_strncmp(item, pattern, string, prefix)) |
eb07894f | 115 | return WM_NOMATCH; |
5d74762d NTND |
116 | pattern += prefix; |
117 | string += prefix; | |
118 | } | |
bd30c2e4 | 119 | if (item->flags & PATHSPEC_ONESTAR) { |
8c6abbcd NTND |
120 | int pattern_len = strlen(++pattern); |
121 | int string_len = strlen(string); | |
122 | return string_len < pattern_len || | |
93d93537 NTND |
123 | ps_strcmp(item, pattern, |
124 | string + string_len - pattern_len); | |
8c6abbcd | 125 | } |
bd30c2e4 | 126 | if (item->magic & PATHSPEC_GLOB) |
93d93537 NTND |
127 | return wildmatch(pattern, string, |
128 | WM_PATHNAME | | |
55d34269 | 129 | (item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0)); |
bd30c2e4 NTND |
130 | else |
131 | /* wildmatch has not learned no FNM_PATHNAME mode yet */ | |
eb07894f | 132 | return wildmatch(pattern, string, |
55d34269 | 133 | item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0); |
5d74762d NTND |
134 | } |
135 | ||
0b6e56df JH |
136 | static int fnmatch_icase_mem(const char *pattern, int patternlen, |
137 | const char *string, int stringlen, | |
138 | int flags) | |
139 | { | |
140 | int match_status; | |
141 | struct strbuf pat_buf = STRBUF_INIT; | |
142 | struct strbuf str_buf = STRBUF_INIT; | |
143 | const char *use_pat = pattern; | |
144 | const char *use_str = string; | |
145 | ||
146 | if (pattern[patternlen]) { | |
147 | strbuf_add(&pat_buf, pattern, patternlen); | |
148 | use_pat = pat_buf.buf; | |
149 | } | |
150 | if (string[stringlen]) { | |
151 | strbuf_add(&str_buf, string, stringlen); | |
152 | use_str = str_buf.buf; | |
153 | } | |
154 | ||
f30366b2 JH |
155 | if (ignore_case) |
156 | flags |= WM_CASEFOLD; | |
55d34269 | 157 | match_status = wildmatch(use_pat, use_str, flags); |
0b6e56df JH |
158 | |
159 | strbuf_release(&pat_buf); | |
160 | strbuf_release(&str_buf); | |
161 | ||
162 | return match_status; | |
163 | } | |
164 | ||
827f4d6c | 165 | static size_t common_prefix_len(const struct pathspec *pathspec) |
3c6a370b | 166 | { |
827f4d6c | 167 | int n; |
4a085b16 | 168 | size_t max = 0; |
3c6a370b | 169 | |
93d93537 NTND |
170 | /* |
171 | * ":(icase)path" is treated as a pathspec full of | |
172 | * wildcard. In other words, only prefix is considered common | |
173 | * prefix. If the pathspec is abc/foo abc/bar, running in | |
bbbb6b0b | 174 | * subdir xyz, the common prefix is still xyz, not xyz/abc as |
93d93537 NTND |
175 | * in non-:(icase). |
176 | */ | |
5c6933d2 NTND |
177 | GUARD_PATHSPEC(pathspec, |
178 | PATHSPEC_FROMTOP | | |
179 | PATHSPEC_MAXDEPTH | | |
bd30c2e4 | 180 | PATHSPEC_LITERAL | |
93d93537 | 181 | PATHSPEC_GLOB | |
ef79b1f8 | 182 | PATHSPEC_ICASE | |
b0db7046 BW |
183 | PATHSPEC_EXCLUDE | |
184 | PATHSPEC_ATTR); | |
4a085b16 | 185 | |
827f4d6c | 186 | for (n = 0; n < pathspec->nr; n++) { |
93d93537 | 187 | size_t i = 0, len = 0, item_len; |
ef79b1f8 NTND |
188 | if (pathspec->items[n].magic & PATHSPEC_EXCLUDE) |
189 | continue; | |
93d93537 NTND |
190 | if (pathspec->items[n].magic & PATHSPEC_ICASE) |
191 | item_len = pathspec->items[n].prefix; | |
192 | else | |
193 | item_len = pathspec->items[n].nowildcard_len; | |
194 | while (i < item_len && (n == 0 || i < max)) { | |
827f4d6c NTND |
195 | char c = pathspec->items[n].match[i]; |
196 | if (c != pathspec->items[0].match[i]) | |
4a085b16 JH |
197 | break; |
198 | if (c == '/') | |
199 | len = i + 1; | |
827f4d6c | 200 | i++; |
4a085b16 | 201 | } |
827f4d6c | 202 | if (n == 0 || len < max) { |
4a085b16 JH |
203 | max = len; |
204 | if (!max) | |
205 | break; | |
206 | } | |
3c6a370b | 207 | } |
4a085b16 | 208 | return max; |
3c6a370b LT |
209 | } |
210 | ||
f950eb95 CB |
211 | /* |
212 | * Returns a copy of the longest leading path common among all | |
213 | * pathspecs. | |
214 | */ | |
827f4d6c | 215 | char *common_prefix(const struct pathspec *pathspec) |
f950eb95 CB |
216 | { |
217 | unsigned long len = common_prefix_len(pathspec); | |
218 | ||
827f4d6c | 219 | return len ? xmemdupz(pathspec->items[0].match, len) : NULL; |
f950eb95 CB |
220 | } |
221 | ||
0d32c183 BW |
222 | int fill_directory(struct dir_struct *dir, |
223 | struct index_state *istate, | |
224 | const struct pathspec *pathspec) | |
1d8842d9 | 225 | { |
bec5ab89 | 226 | const char *prefix; |
966de302 | 227 | size_t prefix_len; |
1d8842d9 | 228 | |
351ea1c3 EN |
229 | unsigned exclusive_flags = DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO; |
230 | if ((dir->flags & exclusive_flags) == exclusive_flags) | |
231 | BUG("DIR_SHOW_IGNORED and DIR_SHOW_IGNORED_TOO are exclusive"); | |
232 | ||
1d8842d9 LT |
233 | /* |
234 | * Calculate common prefix for the pathspec, and | |
235 | * use that to optimize the directory walk | |
236 | */ | |
bec5ab89 RS |
237 | prefix_len = common_prefix_len(pathspec); |
238 | prefix = prefix_len ? pathspec->items[0].match : ""; | |
1d8842d9 LT |
239 | |
240 | /* Read the directory and prune it */ | |
0d32c183 | 241 | read_directory(dir, istate, prefix, prefix_len, pathspec); |
966de302 | 242 | |
966de302 | 243 | return prefix_len; |
1d8842d9 LT |
244 | } |
245 | ||
bc96cc87 NTND |
246 | int within_depth(const char *name, int namelen, |
247 | int depth, int max_depth) | |
248 | { | |
249 | const char *cp = name, *cpe = name + namelen; | |
250 | ||
251 | while (cp < cpe) { | |
252 | if (*cp++ != '/') | |
253 | continue; | |
254 | depth++; | |
255 | if (depth > max_depth) | |
256 | return 0; | |
257 | } | |
258 | return 1; | |
259 | } | |
260 | ||
578d81d0 JH |
261 | /* |
262 | * Read the contents of the blob with the given OID into a buffer. | |
263 | * Append a trailing LF to the end if the last line doesn't have one. | |
264 | * | |
265 | * Returns: | |
266 | * -1 when the OID is invalid or unknown or does not refer to a blob. | |
267 | * 0 when the blob is empty. | |
268 | * 1 along with { data, size } of the (possibly augmented) buffer | |
269 | * when successful. | |
270 | * | |
4b33e602 | 271 | * Optionally updates the given oid_stat with the given OID (when valid). |
578d81d0 | 272 | */ |
4b33e602 PO |
273 | static int do_read_blob(const struct object_id *oid, struct oid_stat *oid_stat, |
274 | size_t *size_out, char **data_out) | |
578d81d0 JH |
275 | { |
276 | enum object_type type; | |
277 | unsigned long sz; | |
278 | char *data; | |
279 | ||
280 | *size_out = 0; | |
281 | *data_out = NULL; | |
282 | ||
bc726bd0 | 283 | data = repo_read_object_file(the_repository, oid, &type, &sz); |
578d81d0 JH |
284 | if (!data || type != OBJ_BLOB) { |
285 | free(data); | |
286 | return -1; | |
287 | } | |
288 | ||
4b33e602 PO |
289 | if (oid_stat) { |
290 | memset(&oid_stat->stat, 0, sizeof(oid_stat->stat)); | |
291 | oidcpy(&oid_stat->oid, oid); | |
578d81d0 JH |
292 | } |
293 | ||
294 | if (sz == 0) { | |
295 | free(data); | |
296 | return 0; | |
297 | } | |
298 | ||
299 | if (data[sz - 1] != '\n') { | |
300 | data = xrealloc(data, st_add(sz, 1)); | |
301 | data[sz++] = '\n'; | |
302 | } | |
303 | ||
304 | *size_out = xsize_t(sz); | |
305 | *data_out = data; | |
306 | ||
307 | return 1; | |
308 | } | |
309 | ||
75a6315f BW |
310 | #define DO_MATCH_EXCLUDE (1<<0) |
311 | #define DO_MATCH_DIRECTORY (1<<1) | |
a3d89d8f | 312 | #define DO_MATCH_LEADING_PATHSPEC (1<<2) |
42b0874a | 313 | |
61cf2820 | 314 | /* |
29b577b9 | 315 | * Does the given pathspec match the given name? A match is found if |
61cf2820 | 316 | * |
29b577b9 EN |
317 | * (1) the pathspec string is leading directory of 'name' ("RECURSIVELY"), or |
318 | * (2) the pathspec string has a leading part matching 'name' ("LEADING"), or | |
319 | * (3) the pathspec string is a wildcard and matches 'name' ("WILDCARD"), or | |
320 | * (4) the pathspec string is exactly the same as 'name' ("EXACT"). | |
61cf2820 | 321 | * |
29b577b9 | 322 | * Return value tells which case it was (1-4), or 0 when there is no match. |
61cf2820 | 323 | * |
29b577b9 EN |
324 | * It may be instructive to look at a small table of concrete examples |
325 | * to understand the differences between 1, 2, and 4: | |
326 | * | |
327 | * Pathspecs | |
328 | * | a/b | a/b/ | a/b/c | |
329 | * ------+-----------+-----------+------------ | |
330 | * a/b | EXACT | EXACT[1] | LEADING[2] | |
331 | * Names a/b/ | RECURSIVE | EXACT | LEADING[2] | |
332 | * a/b/c | RECURSIVE | RECURSIVE | EXACT | |
333 | * | |
334 | * [1] Only if DO_MATCH_DIRECTORY is passed; otherwise, this is NOT a match. | |
335 | * [2] Only if DO_MATCH_LEADING_PATHSPEC is passed; otherwise, not a match. | |
61cf2820 | 336 | */ |
847a9e5d | 337 | static int match_pathspec_item(struct index_state *istate, |
6d2df284 | 338 | const struct pathspec_item *item, int prefix, |
42b0874a | 339 | const char *name, int namelen, unsigned flags) |
61cf2820 NTND |
340 | { |
341 | /* name/namelen has prefix cut off by caller */ | |
342 | const char *match = item->match + prefix; | |
343 | int matchlen = item->len - prefix; | |
344 | ||
93d93537 NTND |
345 | /* |
346 | * The normal call pattern is: | |
347 | * 1. prefix = common_prefix_len(ps); | |
348 | * 2. prune something, or fill_directory | |
854b0959 | 349 | * 3. match_pathspec() |
93d93537 NTND |
350 | * |
351 | * 'prefix' at #1 may be shorter than the command's prefix and | |
352 | * it's ok for #2 to match extra files. Those extras will be | |
353 | * trimmed at #3. | |
354 | * | |
355 | * Suppose the pathspec is 'foo' and '../bar' running from | |
356 | * subdir 'xyz'. The common prefix at #1 will be empty, thanks | |
357 | * to "../". We may have xyz/foo _and_ XYZ/foo after #2. The | |
358 | * user does not want XYZ/foo, only the "foo" part should be | |
359 | * case-insensitive. We need to filter out XYZ/foo here. In | |
360 | * other words, we do not trust the caller on comparing the | |
361 | * prefix part when :(icase) is involved. We do exact | |
362 | * comparison ourselves. | |
363 | * | |
364 | * Normally the caller (common_prefix_len() in fact) does | |
365 | * _exact_ matching on name[-prefix+1..-1] and we do not need | |
366 | * to check that part. Be defensive and check it anyway, in | |
367 | * case common_prefix_len is changed, or a new caller is | |
368 | * introduced that does not use common_prefix_len. | |
369 | * | |
370 | * If the penalty turns out too high when prefix is really | |
371 | * long, maybe change it to | |
372 | * strncmp(match, name, item->prefix - prefix) | |
373 | */ | |
374 | if (item->prefix && (item->magic & PATHSPEC_ICASE) && | |
375 | strncmp(item->match, name - prefix, item->prefix)) | |
376 | return 0; | |
377 | ||
22af33be | 378 | if (item->attr_match_nr && |
f4a8fde0 | 379 | !match_pathspec_attrs(istate, name - prefix, namelen + prefix, item)) |
b0db7046 BW |
380 | return 0; |
381 | ||
61cf2820 NTND |
382 | /* If the match was just the prefix, we matched */ |
383 | if (!*match) | |
384 | return MATCHED_RECURSIVELY; | |
385 | ||
93d93537 | 386 | if (matchlen <= namelen && !ps_strncmp(item, match, name, matchlen)) { |
61cf2820 NTND |
387 | if (matchlen == namelen) |
388 | return MATCHED_EXACTLY; | |
389 | ||
390 | if (match[matchlen-1] == '/' || name[matchlen] == '/') | |
391 | return MATCHED_RECURSIVELY; | |
68690fdd NTND |
392 | } else if ((flags & DO_MATCH_DIRECTORY) && |
393 | match[matchlen - 1] == '/' && | |
394 | namelen == matchlen - 1 && | |
395 | !ps_strncmp(item, match, name, namelen)) | |
396 | return MATCHED_EXACTLY; | |
61cf2820 | 397 | |
5d74762d | 398 | if (item->nowildcard_len < item->len && |
bd30c2e4 | 399 | !git_fnmatch(item, match, name, |
8c6abbcd | 400 | item->nowildcard_len - prefix)) |
61cf2820 NTND |
401 | return MATCHED_FNMATCH; |
402 | ||
29b577b9 | 403 | /* Perform checks to see if "name" is a leading string of the pathspec */ |
f1f061e1 EN |
404 | if ( (flags & DO_MATCH_LEADING_PATHSPEC) && |
405 | !(flags & DO_MATCH_EXCLUDE)) { | |
75a6315f | 406 | /* name is a literal prefix of the pathspec */ |
a5e916c7 | 407 | int offset = name[namelen-1] == '/' ? 1 : 0; |
75a6315f | 408 | if ((namelen < matchlen) && |
a5e916c7 | 409 | (match[namelen-offset] == '/') && |
75a6315f | 410 | !ps_strncmp(item, match, name, namelen)) |
89a1f4aa | 411 | return MATCHED_RECURSIVELY_LEADING_PATHSPEC; |
75a6315f | 412 | |
2f5d3847 | 413 | /* name doesn't match up to the first wild character */ |
75a6315f BW |
414 | if (item->nowildcard_len < item->len && |
415 | ps_strncmp(item, match, name, | |
416 | item->nowildcard_len - prefix)) | |
417 | return 0; | |
418 | ||
072a2310 EN |
419 | /* |
420 | * name has no wildcard, and it didn't match as a leading | |
421 | * pathspec so return. | |
422 | */ | |
423 | if (item->nowildcard_len == item->len) | |
424 | return 0; | |
425 | ||
75a6315f BW |
426 | /* |
427 | * Here is where we would perform a wildmatch to check if | |
428 | * "name" can be matched as a directory (or a prefix) against | |
429 | * the pathspec. Since wildmatch doesn't have this capability | |
430 | * at the present we have to punt and say that it is a match, | |
431 | * potentially returning a false positive | |
432 | * The submodules themselves will be able to perform more | |
433 | * accurate matching to determine if the pathspec matches. | |
434 | */ | |
89a1f4aa | 435 | return MATCHED_RECURSIVELY_LEADING_PATHSPEC; |
75a6315f BW |
436 | } |
437 | ||
61cf2820 NTND |
438 | return 0; |
439 | } | |
440 | ||
441 | /* | |
f1f061e1 EN |
442 | * do_match_pathspec() is meant to ONLY be called by |
443 | * match_pathspec_with_flags(); calling it directly risks pathspecs | |
444 | * like ':!unwanted_path' being ignored. | |
445 | * | |
52ed1894 AS |
446 | * Given a name and a list of pathspecs, returns the nature of the |
447 | * closest (i.e. most specific) match of the name to any of the | |
448 | * pathspecs. | |
449 | * | |
450 | * The caller typically calls this multiple times with the same | |
451 | * pathspec and seen[] array but with different name/namelen | |
452 | * (e.g. entries from the index) and is interested in seeing if and | |
453 | * how each pathspec matches all the names it calls this function | |
454 | * with. A mark is left in the seen[] array for each pathspec element | |
455 | * indicating the closest type of match that element achieved, so if | |
456 | * seen[n] remains zero after multiple invocations, that means the nth | |
457 | * pathspec did not match any names, which could indicate that the | |
458 | * user mistyped the nth pathspec. | |
61cf2820 | 459 | */ |
847a9e5d | 460 | static int do_match_pathspec(struct index_state *istate, |
6d2df284 | 461 | const struct pathspec *ps, |
854b0959 NTND |
462 | const char *name, int namelen, |
463 | int prefix, char *seen, | |
42b0874a | 464 | unsigned flags) |
61cf2820 | 465 | { |
42b0874a | 466 | int i, retval = 0, exclude = flags & DO_MATCH_EXCLUDE; |
61cf2820 | 467 | |
5c6933d2 NTND |
468 | GUARD_PATHSPEC(ps, |
469 | PATHSPEC_FROMTOP | | |
470 | PATHSPEC_MAXDEPTH | | |
bd30c2e4 | 471 | PATHSPEC_LITERAL | |
93d93537 | 472 | PATHSPEC_GLOB | |
ef79b1f8 | 473 | PATHSPEC_ICASE | |
b0db7046 BW |
474 | PATHSPEC_EXCLUDE | |
475 | PATHSPEC_ATTR); | |
8f4f8f45 | 476 | |
61cf2820 | 477 | if (!ps->nr) { |
6330a171 NTND |
478 | if (!ps->recursive || |
479 | !(ps->magic & PATHSPEC_MAXDEPTH) || | |
480 | ps->max_depth == -1) | |
61cf2820 NTND |
481 | return MATCHED_RECURSIVELY; |
482 | ||
483 | if (within_depth(name, namelen, 0, ps->max_depth)) | |
484 | return MATCHED_EXACTLY; | |
485 | else | |
486 | return 0; | |
487 | } | |
488 | ||
489 | name += prefix; | |
490 | namelen -= prefix; | |
491 | ||
492 | for (i = ps->nr - 1; i >= 0; i--) { | |
493 | int how; | |
ef79b1f8 NTND |
494 | |
495 | if ((!exclude && ps->items[i].magic & PATHSPEC_EXCLUDE) || | |
496 | ( exclude && !(ps->items[i].magic & PATHSPEC_EXCLUDE))) | |
497 | continue; | |
498 | ||
61cf2820 NTND |
499 | if (seen && seen[i] == MATCHED_EXACTLY) |
500 | continue; | |
ef79b1f8 NTND |
501 | /* |
502 | * Make exclude patterns optional and never report | |
503 | * "pathspec ':(exclude)foo' matches no files" | |
504 | */ | |
505 | if (seen && ps->items[i].magic & PATHSPEC_EXCLUDE) | |
506 | seen[i] = MATCHED_FNMATCH; | |
6d2df284 | 507 | how = match_pathspec_item(istate, ps->items+i, prefix, name, |
42b0874a | 508 | namelen, flags); |
6330a171 NTND |
509 | if (ps->recursive && |
510 | (ps->magic & PATHSPEC_MAXDEPTH) && | |
511 | ps->max_depth != -1 && | |
61cf2820 NTND |
512 | how && how != MATCHED_FNMATCH) { |
513 | int len = ps->items[i].len; | |
514 | if (name[len] == '/') | |
515 | len++; | |
516 | if (within_depth(name+len, namelen-len, 0, ps->max_depth)) | |
517 | how = MATCHED_EXACTLY; | |
518 | else | |
519 | how = 0; | |
520 | } | |
521 | if (how) { | |
522 | if (retval < how) | |
523 | retval = how; | |
524 | if (seen && seen[i] < how) | |
525 | seen[i] = how; | |
526 | } | |
527 | } | |
528 | return retval; | |
529 | } | |
530 | ||
847a9e5d | 531 | static int match_pathspec_with_flags(struct index_state *istate, |
f1f061e1 EN |
532 | const struct pathspec *ps, |
533 | const char *name, int namelen, | |
534 | int prefix, char *seen, unsigned flags) | |
ef79b1f8 NTND |
535 | { |
536 | int positive, negative; | |
6d2df284 | 537 | positive = do_match_pathspec(istate, ps, name, namelen, |
42b0874a | 538 | prefix, seen, flags); |
ef79b1f8 NTND |
539 | if (!(ps->magic & PATHSPEC_EXCLUDE) || !positive) |
540 | return positive; | |
6d2df284 | 541 | negative = do_match_pathspec(istate, ps, name, namelen, |
42b0874a NTND |
542 | prefix, seen, |
543 | flags | DO_MATCH_EXCLUDE); | |
ef79b1f8 NTND |
544 | return negative ? 0 : positive; |
545 | } | |
546 | ||
847a9e5d | 547 | int match_pathspec(struct index_state *istate, |
f1f061e1 EN |
548 | const struct pathspec *ps, |
549 | const char *name, int namelen, | |
550 | int prefix, char *seen, int is_dir) | |
551 | { | |
552 | unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0; | |
553 | return match_pathspec_with_flags(istate, ps, name, namelen, | |
554 | prefix, seen, flags); | |
555 | } | |
556 | ||
75a6315f BW |
557 | /** |
558 | * Check if a submodule is a superset of the pathspec | |
559 | */ | |
847a9e5d | 560 | int submodule_path_match(struct index_state *istate, |
6d2df284 | 561 | const struct pathspec *ps, |
75a6315f BW |
562 | const char *submodule_name, |
563 | char *seen) | |
564 | { | |
f1f061e1 EN |
565 | int matched = match_pathspec_with_flags(istate, ps, submodule_name, |
566 | strlen(submodule_name), | |
567 | 0, seen, | |
568 | DO_MATCH_DIRECTORY | | |
569 | DO_MATCH_LEADING_PATHSPEC); | |
75a6315f BW |
570 | return matched; |
571 | } | |
572 | ||
777c55a6 | 573 | int report_path_error(const char *ps_matched, |
c5c33504 | 574 | const struct pathspec *pathspec) |
777c55a6 JH |
575 | { |
576 | /* | |
577 | * Make sure all pathspec matched; otherwise it is an error. | |
578 | */ | |
777c55a6 JH |
579 | int num, errors = 0; |
580 | for (num = 0; num < pathspec->nr; num++) { | |
581 | int other, found_dup; | |
582 | ||
583 | if (ps_matched[num]) | |
584 | continue; | |
585 | /* | |
586 | * The caller might have fed identical pathspec | |
587 | * twice. Do not barf on such a mistake. | |
588 | * FIXME: parse_pathspec should have eliminated | |
589 | * duplicate pathspec. | |
590 | */ | |
591 | for (found_dup = other = 0; | |
592 | !found_dup && other < pathspec->nr; | |
593 | other++) { | |
594 | if (other == num || !ps_matched[other]) | |
595 | continue; | |
596 | if (!strcmp(pathspec->items[other].original, | |
597 | pathspec->items[num].original)) | |
598 | /* | |
599 | * Ok, we have a match already. | |
600 | */ | |
601 | found_dup = 1; | |
602 | } | |
603 | if (found_dup) | |
604 | continue; | |
605 | ||
a80897c1 | 606 | error(_("pathspec '%s' did not match any file(s) known to git"), |
777c55a6 JH |
607 | pathspec->items[num].original); |
608 | errors++; | |
609 | } | |
777c55a6 JH |
610 | return errors; |
611 | } | |
612 | ||
fcd631ed NTND |
613 | /* |
614 | * Return the length of the "simple" part of a path match limiter. | |
615 | */ | |
87323bda | 616 | int simple_length(const char *match) |
fcd631ed NTND |
617 | { |
618 | int len = -1; | |
619 | ||
620 | for (;;) { | |
621 | unsigned char c = *match++; | |
622 | len++; | |
623 | if (c == '\0' || is_glob_special(c)) | |
624 | return len; | |
625 | } | |
626 | } | |
627 | ||
87323bda | 628 | int no_wildcard(const char *string) |
68492fc7 | 629 | { |
fcd631ed | 630 | return string[simple_length(string)] == '\0'; |
68492fc7 LK |
631 | } |
632 | ||
65edd96a | 633 | void parse_path_pattern(const char **pattern, |
82dce998 | 634 | int *patternlen, |
f8708998 | 635 | unsigned *flags, |
82dce998 | 636 | int *nowildcardlen) |
84460eec NTND |
637 | { |
638 | const char *p = *pattern; | |
639 | size_t i, len; | |
640 | ||
641 | *flags = 0; | |
642 | if (*p == '!') { | |
4ff89ee5 | 643 | *flags |= PATTERN_FLAG_NEGATIVE; |
84460eec NTND |
644 | p++; |
645 | } | |
646 | len = strlen(p); | |
647 | if (len && p[len - 1] == '/') { | |
648 | len--; | |
4ff89ee5 | 649 | *flags |= PATTERN_FLAG_MUSTBEDIR; |
84460eec NTND |
650 | } |
651 | for (i = 0; i < len; i++) { | |
652 | if (p[i] == '/') | |
653 | break; | |
654 | } | |
655 | if (i == len) | |
4ff89ee5 | 656 | *flags |= PATTERN_FLAG_NODIR; |
84460eec NTND |
657 | *nowildcardlen = simple_length(p); |
658 | /* | |
659 | * we should have excluded the trailing slash from 'p' too, | |
660 | * but that's one more allocation. Instead just make sure | |
661 | * nowildcardlen does not exceed real patternlen | |
662 | */ | |
663 | if (*nowildcardlen > len) | |
664 | *nowildcardlen = len; | |
665 | if (*p == '*' && no_wildcard(p + 1)) | |
4ff89ee5 | 666 | *flags |= PATTERN_FLAG_ENDSWITH; |
84460eec NTND |
667 | *pattern = p; |
668 | *patternlen = len; | |
669 | } | |
670 | ||
5cf88fd8 | 671 | int pl_hashmap_cmp(const void *cmp_data UNUSED, |
af09ce24 DS |
672 | const struct hashmap_entry *a, |
673 | const struct hashmap_entry *b, | |
5cf88fd8 | 674 | const void *key UNUSED) |
96cc8ab5 DS |
675 | { |
676 | const struct pattern_entry *ee1 = | |
677 | container_of(a, struct pattern_entry, ent); | |
678 | const struct pattern_entry *ee2 = | |
679 | container_of(b, struct pattern_entry, ent); | |
680 | ||
681 | size_t min_len = ee1->patternlen <= ee2->patternlen | |
682 | ? ee1->patternlen | |
683 | : ee2->patternlen; | |
684 | ||
f7669676 | 685 | return fspathncmp(ee1->pattern, ee2->pattern, min_len); |
96cc8ab5 DS |
686 | } |
687 | ||
4f52c2ce DS |
688 | static char *dup_and_filter_pattern(const char *pattern) |
689 | { | |
690 | char *set, *read; | |
691 | size_t count = 0; | |
692 | char *result = xstrdup(pattern); | |
693 | ||
694 | set = result; | |
695 | read = result; | |
696 | ||
697 | while (*read) { | |
698 | /* skip escape characters (once) */ | |
699 | if (*read == '\\') | |
700 | read++; | |
701 | ||
702 | *set = *read; | |
703 | ||
704 | set++; | |
705 | read++; | |
706 | count++; | |
707 | } | |
708 | *set = 0; | |
709 | ||
710 | if (count > 2 && | |
711 | *(set - 1) == '*' && | |
712 | *(set - 2) == '/') | |
713 | *(set - 2) = 0; | |
714 | ||
715 | return result; | |
716 | } | |
717 | ||
96cc8ab5 DS |
718 | static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern *given) |
719 | { | |
720 | struct pattern_entry *translated; | |
721 | char *truncated; | |
722 | char *data = NULL; | |
9abc60f8 | 723 | const char *prev, *cur, *next; |
96cc8ab5 DS |
724 | |
725 | if (!pl->use_cone_patterns) | |
726 | return; | |
727 | ||
728 | if (given->flags & PATTERN_FLAG_NEGATIVE && | |
729 | given->flags & PATTERN_FLAG_MUSTBEDIR && | |
730 | !strcmp(given->pattern, "/*")) { | |
731 | pl->full_cone = 0; | |
732 | return; | |
733 | } | |
734 | ||
735 | if (!given->flags && !strcmp(given->pattern, "/*")) { | |
736 | pl->full_cone = 1; | |
737 | return; | |
738 | } | |
739 | ||
6c11c6a1 | 740 | if (given->patternlen < 2 || |
a3eca584 | 741 | *given->pattern != '/' || |
9e6d3e64 | 742 | strstr(given->pattern, "**")) { |
41de0c6f DS |
743 | /* Not a cone pattern. */ |
744 | warning(_("unrecognized pattern: '%s'"), given->pattern); | |
745 | goto clear_hashmaps; | |
746 | } | |
747 | ||
5842710d WS |
748 | if (!(given->flags & PATTERN_FLAG_MUSTBEDIR) && |
749 | strcmp(given->pattern, "/*")) { | |
750 | /* Not a cone pattern. */ | |
751 | warning(_("unrecognized pattern: '%s'"), given->pattern); | |
752 | goto clear_hashmaps; | |
753 | } | |
754 | ||
9abc60f8 DS |
755 | prev = given->pattern; |
756 | cur = given->pattern + 1; | |
757 | next = given->pattern + 2; | |
758 | ||
759 | while (*cur) { | |
760 | /* Watch for glob characters '*', '\', '[', '?' */ | |
761 | if (!is_glob_special(*cur)) | |
762 | goto increment; | |
763 | ||
764 | /* But only if *prev != '\\' */ | |
765 | if (*prev == '\\') | |
766 | goto increment; | |
767 | ||
768 | /* But allow the initial '\' */ | |
769 | if (*cur == '\\' && | |
770 | is_glob_special(*next)) | |
771 | goto increment; | |
772 | ||
773 | /* But a trailing '/' then '*' is fine */ | |
774 | if (*prev == '/' && | |
775 | *cur == '*' && | |
776 | *next == 0) | |
777 | goto increment; | |
778 | ||
779 | /* Not a cone pattern. */ | |
780 | warning(_("unrecognized pattern: '%s'"), given->pattern); | |
781 | goto clear_hashmaps; | |
782 | ||
783 | increment: | |
784 | prev++; | |
785 | cur++; | |
786 | next++; | |
787 | } | |
788 | ||
96cc8ab5 DS |
789 | if (given->patternlen > 2 && |
790 | !strcmp(given->pattern + given->patternlen - 2, "/*")) { | |
791 | if (!(given->flags & PATTERN_FLAG_NEGATIVE)) { | |
792 | /* Not a cone pattern. */ | |
96cc8ab5 DS |
793 | warning(_("unrecognized pattern: '%s'"), given->pattern); |
794 | goto clear_hashmaps; | |
795 | } | |
796 | ||
4f52c2ce | 797 | truncated = dup_and_filter_pattern(given->pattern); |
96cc8ab5 DS |
798 | |
799 | translated = xmalloc(sizeof(struct pattern_entry)); | |
800 | translated->pattern = truncated; | |
801 | translated->patternlen = given->patternlen - 2; | |
802 | hashmap_entry_init(&translated->ent, | |
74318423 | 803 | fspathhash(translated->pattern)); |
96cc8ab5 DS |
804 | |
805 | if (!hashmap_get_entry(&pl->recursive_hashmap, | |
806 | translated, ent, NULL)) { | |
807 | /* We did not see the "parent" included */ | |
808 | warning(_("unrecognized negative pattern: '%s'"), | |
809 | given->pattern); | |
810 | free(truncated); | |
811 | free(translated); | |
812 | goto clear_hashmaps; | |
813 | } | |
814 | ||
815 | hashmap_add(&pl->parent_hashmap, &translated->ent); | |
816 | hashmap_remove(&pl->recursive_hashmap, &translated->ent, &data); | |
817 | free(data); | |
818 | return; | |
819 | } | |
820 | ||
821 | if (given->flags & PATTERN_FLAG_NEGATIVE) { | |
822 | warning(_("unrecognized negative pattern: '%s'"), | |
823 | given->pattern); | |
824 | goto clear_hashmaps; | |
825 | } | |
826 | ||
827 | translated = xmalloc(sizeof(struct pattern_entry)); | |
828 | ||
4f52c2ce | 829 | translated->pattern = dup_and_filter_pattern(given->pattern); |
96cc8ab5 DS |
830 | translated->patternlen = given->patternlen; |
831 | hashmap_entry_init(&translated->ent, | |
74318423 | 832 | fspathhash(translated->pattern)); |
96cc8ab5 DS |
833 | |
834 | hashmap_add(&pl->recursive_hashmap, &translated->ent); | |
835 | ||
836 | if (hashmap_get_entry(&pl->parent_hashmap, translated, ent, NULL)) { | |
837 | /* we already included this at the parent level */ | |
838 | warning(_("your sparse-checkout file may have issues: pattern '%s' is repeated"), | |
839 | given->pattern); | |
a481d437 | 840 | goto clear_hashmaps; |
96cc8ab5 DS |
841 | } |
842 | ||
843 | return; | |
844 | ||
845 | clear_hashmaps: | |
846 | warning(_("disabling cone pattern matching")); | |
6da1a258 EN |
847 | hashmap_clear_and_free(&pl->parent_hashmap, struct pattern_entry, ent); |
848 | hashmap_clear_and_free(&pl->recursive_hashmap, struct pattern_entry, ent); | |
96cc8ab5 DS |
849 | pl->use_cone_patterns = 0; |
850 | } | |
851 | ||
852 | static int hashmap_contains_path(struct hashmap *map, | |
853 | struct strbuf *pattern) | |
854 | { | |
855 | struct pattern_entry p; | |
856 | ||
857 | /* Check straight mapping */ | |
858 | p.pattern = pattern->buf; | |
859 | p.patternlen = pattern->len; | |
74318423 | 860 | hashmap_entry_init(&p.ent, fspathhash(p.pattern)); |
96cc8ab5 DS |
861 | return !!hashmap_get_entry(map, &p, ent, NULL); |
862 | } | |
863 | ||
864 | int hashmap_contains_parent(struct hashmap *map, | |
865 | const char *path, | |
866 | struct strbuf *buffer) | |
867 | { | |
868 | char *slash_pos; | |
869 | ||
870 | strbuf_setlen(buffer, 0); | |
871 | ||
872 | if (path[0] != '/') | |
873 | strbuf_addch(buffer, '/'); | |
874 | ||
875 | strbuf_addstr(buffer, path); | |
876 | ||
877 | slash_pos = strrchr(buffer->buf, '/'); | |
878 | ||
879 | while (slash_pos > buffer->buf) { | |
880 | strbuf_setlen(buffer, slash_pos - buffer->buf); | |
881 | ||
882 | if (hashmap_contains_path(map, buffer)) | |
883 | return 1; | |
884 | ||
885 | slash_pos = strrchr(buffer->buf, '/'); | |
886 | } | |
887 | ||
888 | return 0; | |
889 | } | |
890 | ||
65edd96a | 891 | void add_pattern(const char *string, const char *base, |
caa3d554 | 892 | int baselen, struct pattern_list *pl, int srcpos) |
453ec4bd | 893 | { |
ab8db613 | 894 | struct path_pattern *pattern; |
84460eec | 895 | int patternlen; |
f8708998 | 896 | unsigned flags; |
84460eec | 897 | int nowildcardlen; |
453ec4bd | 898 | |
65edd96a | 899 | parse_path_pattern(&string, &patternlen, &flags, &nowildcardlen); |
4ff89ee5 | 900 | if (flags & PATTERN_FLAG_MUSTBEDIR) { |
ab8db613 | 901 | FLEXPTR_ALLOC_MEM(pattern, pattern, string, patternlen); |
d6b8fc30 | 902 | } else { |
ab8db613 DS |
903 | pattern = xmalloc(sizeof(*pattern)); |
904 | pattern->pattern = string; | |
d6b8fc30 | 905 | } |
ab8db613 DS |
906 | pattern->patternlen = patternlen; |
907 | pattern->nowildcardlen = nowildcardlen; | |
908 | pattern->base = base; | |
909 | pattern->baselen = baselen; | |
910 | pattern->flags = flags; | |
911 | pattern->srcpos = srcpos; | |
caa3d554 DS |
912 | ALLOC_GROW(pl->patterns, pl->nr + 1, pl->alloc); |
913 | pl->patterns[pl->nr++] = pattern; | |
914 | pattern->pl = pl; | |
96cc8ab5 DS |
915 | |
916 | add_pattern_to_hashsets(pl, pattern); | |
453ec4bd LT |
917 | } |
918 | ||
847a9e5d | 919 | static int read_skip_worktree_file_from_index(struct index_state *istate, |
578d81d0 | 920 | const char *path, |
4b33e602 PO |
921 | size_t *size_out, char **data_out, |
922 | struct oid_stat *oid_stat) | |
c28b3d6e NTND |
923 | { |
924 | int pos, len; | |
c28b3d6e NTND |
925 | |
926 | len = strlen(path); | |
6f52b741 | 927 | pos = index_name_pos(istate, path, len); |
c28b3d6e | 928 | if (pos < 0) |
578d81d0 | 929 | return -1; |
6f52b741 | 930 | if (!ce_skip_worktree(istate->cache[pos])) |
578d81d0 JH |
931 | return -1; |
932 | ||
4b33e602 | 933 | return do_read_blob(&istate->cache[pos]->oid, oid_stat, size_out, data_out); |
c28b3d6e NTND |
934 | } |
935 | ||
f6198812 | 936 | /* |
caa3d554 DS |
937 | * Frees memory within pl which was allocated for exclude patterns and |
938 | * the file buffer. Does not free pl itself. | |
f6198812 | 939 | */ |
65edd96a | 940 | void clear_pattern_list(struct pattern_list *pl) |
0fd0e241 NTND |
941 | { |
942 | int i; | |
943 | ||
caa3d554 DS |
944 | for (i = 0; i < pl->nr; i++) |
945 | free(pl->patterns[i]); | |
946 | free(pl->patterns); | |
947 | free(pl->filebuf); | |
6da1a258 EN |
948 | hashmap_clear_and_free(&pl->recursive_hashmap, struct pattern_entry, ent); |
949 | hashmap_clear_and_free(&pl->parent_hashmap, struct pattern_entry, ent); | |
0fd0e241 | 950 | |
caa3d554 | 951 | memset(pl, 0, sizeof(*pl)); |
0fd0e241 NTND |
952 | } |
953 | ||
7e2e4b37 | 954 | static void trim_trailing_spaces(char *buf) |
16402b99 | 955 | { |
e61a6c1d PB |
956 | char *p, *last_space = NULL; |
957 | ||
958 | for (p = buf; *p; p++) | |
959 | switch (*p) { | |
960 | case ' ': | |
961 | if (!last_space) | |
962 | last_space = p; | |
963 | break; | |
964 | case '\\': | |
965 | p++; | |
966 | if (!*p) | |
967 | return; | |
968 | /* fallthrough */ | |
969 | default: | |
970 | last_space = NULL; | |
971 | } | |
972 | ||
973 | if (last_space) | |
974 | *last_space = '\0'; | |
16402b99 NTND |
975 | } |
976 | ||
0dcb8d7f NTND |
977 | /* |
978 | * Given a subdirectory name and "dir" of the current directory, | |
979 | * search the subdir in "dir" and return it, or create a new one if it | |
980 | * does not exist in "dir". | |
981 | * | |
982 | * If "name" has the trailing slash, it'll be excluded in the search. | |
983 | */ | |
984 | static struct untracked_cache_dir *lookup_untracked(struct untracked_cache *uc, | |
985 | struct untracked_cache_dir *dir, | |
986 | const char *name, int len) | |
987 | { | |
988 | int first, last; | |
989 | struct untracked_cache_dir *d; | |
990 | if (!dir) | |
991 | return NULL; | |
992 | if (len && name[len - 1] == '/') | |
993 | len--; | |
994 | first = 0; | |
995 | last = dir->dirs_nr; | |
996 | while (last > first) { | |
568a05c5 | 997 | int cmp, next = first + ((last - first) >> 1); |
0dcb8d7f NTND |
998 | d = dir->dirs[next]; |
999 | cmp = strncmp(name, d->name, len); | |
1000 | if (!cmp && strlen(d->name) > len) | |
1001 | cmp = -1; | |
1002 | if (!cmp) | |
1003 | return d; | |
1004 | if (cmp < 0) { | |
1005 | last = next; | |
1006 | continue; | |
1007 | } | |
1008 | first = next+1; | |
1009 | } | |
1010 | ||
1011 | uc->dir_created++; | |
96ffc06f | 1012 | FLEX_ALLOC_MEM(d, name, name, len); |
0dcb8d7f NTND |
1013 | |
1014 | ALLOC_GROW(dir->dirs, dir->dirs_nr + 1, dir->dirs_alloc); | |
f919ffeb SG |
1015 | MOVE_ARRAY(dir->dirs + first + 1, dir->dirs + first, |
1016 | dir->dirs_nr - first); | |
0dcb8d7f NTND |
1017 | dir->dirs_nr++; |
1018 | dir->dirs[first] = d; | |
1019 | return d; | |
1020 | } | |
1021 | ||
ccad261f NTND |
1022 | static void do_invalidate_gitignore(struct untracked_cache_dir *dir) |
1023 | { | |
1024 | int i; | |
1025 | dir->valid = 0; | |
1026 | dir->untracked_nr = 0; | |
1027 | for (i = 0; i < dir->dirs_nr; i++) | |
1028 | do_invalidate_gitignore(dir->dirs[i]); | |
1029 | } | |
1030 | ||
1031 | static void invalidate_gitignore(struct untracked_cache *uc, | |
1032 | struct untracked_cache_dir *dir) | |
1033 | { | |
1034 | uc->gitignore_invalidated++; | |
1035 | do_invalidate_gitignore(dir); | |
1036 | } | |
1037 | ||
91a2288b NTND |
1038 | static void invalidate_directory(struct untracked_cache *uc, |
1039 | struct untracked_cache_dir *dir) | |
1040 | { | |
26cb0182 | 1041 | int i; |
b6403131 NTND |
1042 | |
1043 | /* | |
1044 | * Invalidation increment here is just roughly correct. If | |
1045 | * untracked_nr or any of dirs[].recurse is non-zero, we | |
1046 | * should increment dir_invalidated too. But that's more | |
1047 | * expensive to do. | |
1048 | */ | |
1049 | if (dir->valid) | |
1050 | uc->dir_invalidated++; | |
1051 | ||
91a2288b NTND |
1052 | dir->valid = 0; |
1053 | dir->untracked_nr = 0; | |
26cb0182 NTND |
1054 | for (i = 0; i < dir->dirs_nr; i++) |
1055 | dir->dirs[i]->recurse = 0; | |
91a2288b NTND |
1056 | } |
1057 | ||
65edd96a | 1058 | static int add_patterns_from_buffer(char *buf, size_t size, |
578d81d0 | 1059 | const char *base, int baselen, |
caa3d554 | 1060 | struct pattern_list *pl); |
578d81d0 | 1061 | |
feb9b779 JK |
1062 | /* Flags for add_patterns() */ |
1063 | #define PATTERN_NOFOLLOW (1<<0) | |
1064 | ||
55fe6f51 NTND |
1065 | /* |
1066 | * Given a file with name "fname", read it (either from disk, or from | |
473e3930 | 1067 | * an index if 'istate' is non-null), parse it and store the |
caa3d554 | 1068 | * exclude rules in "pl". |
55fe6f51 | 1069 | * |
e5cf6d3d | 1070 | * If "oid_stat" is not NULL, compute oid of the exclude file and fill |
65edd96a | 1071 | * stat data from disk (only valid if add_patterns returns zero). If |
e5cf6d3d | 1072 | * oid_stat.valid is non-zero, "oid_stat" must contain good value as input. |
55fe6f51 | 1073 | */ |
65edd96a | 1074 | static int add_patterns(const char *fname, const char *base, int baselen, |
caa3d554 | 1075 | struct pattern_list *pl, struct index_state *istate, |
1679d60b | 1076 | unsigned flags, struct oid_stat *oid_stat) |
453ec4bd | 1077 | { |
c470701a | 1078 | struct stat st; |
578d81d0 JH |
1079 | int r; |
1080 | int fd; | |
9d14017a | 1081 | size_t size = 0; |
578d81d0 | 1082 | char *buf; |
453ec4bd | 1083 | |
feb9b779 JK |
1084 | if (flags & PATTERN_NOFOLLOW) |
1085 | fd = open_nofollow(fname, O_RDONLY); | |
1086 | else | |
1087 | fd = open(fname, O_RDONLY); | |
1088 | ||
c28b3d6e | 1089 | if (fd < 0 || fstat(fd, &st) < 0) { |
11dc1fcb NTND |
1090 | if (fd < 0) |
1091 | warn_on_fopen_errors(fname); | |
1092 | else | |
c28b3d6e | 1093 | close(fd); |
578d81d0 | 1094 | if (!istate) |
c28b3d6e | 1095 | return -1; |
578d81d0 JH |
1096 | r = read_skip_worktree_file_from_index(istate, fname, |
1097 | &size, &buf, | |
4b33e602 | 1098 | oid_stat); |
578d81d0 JH |
1099 | if (r != 1) |
1100 | return r; | |
d961baa8 | 1101 | } else { |
c28b3d6e NTND |
1102 | size = xsize_t(st.st_size); |
1103 | if (size == 0) { | |
4b33e602 PO |
1104 | if (oid_stat) { |
1105 | fill_stat_data(&oid_stat->stat, &st); | |
ba2df751 | 1106 | oidcpy(&oid_stat->oid, the_hash_algo->empty_blob); |
4b33e602 | 1107 | oid_stat->valid = 1; |
55fe6f51 | 1108 | } |
c28b3d6e NTND |
1109 | close(fd); |
1110 | return 0; | |
1111 | } | |
3733e694 | 1112 | buf = xmallocz(size); |
c28b3d6e | 1113 | if (read_in_full(fd, buf, size) != size) { |
45d76f17 | 1114 | free(buf); |
c28b3d6e NTND |
1115 | close(fd); |
1116 | return -1; | |
1117 | } | |
45d76f17 | 1118 | buf[size++] = '\n'; |
c28b3d6e | 1119 | close(fd); |
4b33e602 | 1120 | if (oid_stat) { |
55fe6f51 | 1121 | int pos; |
4b33e602 PO |
1122 | if (oid_stat->valid && |
1123 | !match_stat_data_racy(istate, &oid_stat->stat, &st)) | |
e5cf6d3d | 1124 | ; /* no content change, oid_stat->oid still good */ |
473e3930 BW |
1125 | else if (istate && |
1126 | (pos = index_name_pos(istate, fname, strlen(fname))) >= 0 && | |
1127 | !ce_stage(istate->cache[pos]) && | |
1128 | ce_uptodate(istate->cache[pos]) && | |
82b474e0 | 1129 | !would_convert_to_git(istate, fname)) |
4b33e602 PO |
1130 | oidcpy(&oid_stat->oid, |
1131 | &istate->cache[pos]->oid); | |
55fe6f51 | 1132 | else |
2dcde20e | 1133 | hash_object_file(the_hash_algo, buf, size, |
44439c1c | 1134 | OBJ_BLOB, &oid_stat->oid); |
4b33e602 PO |
1135 | fill_stat_data(&oid_stat->stat, &st); |
1136 | oid_stat->valid = 1; | |
55fe6f51 | 1137 | } |
6ba78238 | 1138 | } |
453ec4bd | 1139 | |
65edd96a | 1140 | add_patterns_from_buffer(buf, size, base, baselen, pl); |
578d81d0 JH |
1141 | return 0; |
1142 | } | |
1143 | ||
65edd96a | 1144 | static int add_patterns_from_buffer(char *buf, size_t size, |
578d81d0 | 1145 | const char *base, int baselen, |
caa3d554 | 1146 | struct pattern_list *pl) |
578d81d0 JH |
1147 | { |
1148 | int i, lineno = 1; | |
1149 | char *entry; | |
1150 | ||
96cc8ab5 DS |
1151 | hashmap_init(&pl->recursive_hashmap, pl_hashmap_cmp, NULL, 0); |
1152 | hashmap_init(&pl->parent_hashmap, pl_hashmap_cmp, NULL, 0); | |
1153 | ||
caa3d554 | 1154 | pl->filebuf = buf; |
245e1c19 | 1155 | |
dde843e7 | 1156 | if (skip_utf8_bom(&buf, size)) |
caa3d554 | 1157 | size -= buf - pl->filebuf; |
dde843e7 | 1158 | |
453ec4bd | 1159 | entry = buf; |
245e1c19 | 1160 | |
45d76f17 NTND |
1161 | for (i = 0; i < size; i++) { |
1162 | if (buf[i] == '\n') { | |
453ec4bd LT |
1163 | if (entry != buf + i && entry[0] != '#') { |
1164 | buf[i - (i && buf[i-1] == '\r')] = 0; | |
7e2e4b37 | 1165 | trim_trailing_spaces(entry); |
65edd96a | 1166 | add_pattern(entry, base, baselen, pl, lineno); |
453ec4bd | 1167 | } |
c04318e4 | 1168 | lineno++; |
453ec4bd LT |
1169 | entry = buf + i + 1; |
1170 | } | |
1171 | } | |
1172 | return 0; | |
453ec4bd LT |
1173 | } |
1174 | ||
65edd96a | 1175 | int add_patterns_from_file_to_list(const char *fname, const char *base, |
caa3d554 | 1176 | int baselen, struct pattern_list *pl, |
1679d60b JK |
1177 | struct index_state *istate, |
1178 | unsigned flags) | |
55fe6f51 | 1179 | { |
1679d60b | 1180 | return add_patterns(fname, base, baselen, pl, istate, flags, NULL); |
55fe6f51 NTND |
1181 | } |
1182 | ||
65edd96a | 1183 | int add_patterns_from_blob_to_list( |
578d81d0 JH |
1184 | struct object_id *oid, |
1185 | const char *base, int baselen, | |
caa3d554 | 1186 | struct pattern_list *pl) |
578d81d0 JH |
1187 | { |
1188 | char *buf; | |
1189 | size_t size; | |
1190 | int r; | |
1191 | ||
1192 | r = do_read_blob(oid, NULL, &size, &buf); | |
1193 | if (r != 1) | |
1194 | return r; | |
1195 | ||
65edd96a | 1196 | add_patterns_from_buffer(buf, size, base, baselen, pl); |
578d81d0 JH |
1197 | return 0; |
1198 | } | |
1199 | ||
65edd96a | 1200 | struct pattern_list *add_pattern_list(struct dir_struct *dir, |
c04318e4 | 1201 | int group_type, const char *src) |
c082df24 | 1202 | { |
caa3d554 | 1203 | struct pattern_list *pl; |
c082df24 AS |
1204 | struct exclude_list_group *group; |
1205 | ||
5fdf285e | 1206 | group = &dir->internal.exclude_list_group[group_type]; |
caa3d554 DS |
1207 | ALLOC_GROW(group->pl, group->nr + 1, group->alloc); |
1208 | pl = &group->pl[group->nr++]; | |
1209 | memset(pl, 0, sizeof(*pl)); | |
1210 | pl->src = src; | |
1211 | return pl; | |
c082df24 AS |
1212 | } |
1213 | ||
1214 | /* | |
1215 | * Used to set up core.excludesfile and .git/info/exclude lists. | |
1216 | */ | |
65edd96a | 1217 | static void add_patterns_from_file_1(struct dir_struct *dir, const char *fname, |
4b33e602 | 1218 | struct oid_stat *oid_stat) |
453ec4bd | 1219 | { |
caa3d554 | 1220 | struct pattern_list *pl; |
ccad261f NTND |
1221 | /* |
1222 | * catch setup_standard_excludes() that's called before | |
1223 | * dir->untracked is assigned. That function behaves | |
1224 | * differently when dir->untracked is non-NULL. | |
1225 | */ | |
1226 | if (!dir->untracked) | |
5fdf285e | 1227 | dir->internal.unmanaged_exclude_files++; |
65edd96a | 1228 | pl = add_pattern_list(dir, EXC_FILE, fname); |
1679d60b | 1229 | if (add_patterns(fname, "", 0, pl, NULL, 0, oid_stat) < 0) |
a80897c1 | 1230 | die(_("cannot use %s as an exclude file"), fname); |
453ec4bd LT |
1231 | } |
1232 | ||
65edd96a | 1233 | void add_patterns_from_file(struct dir_struct *dir, const char *fname) |
0dcb8d7f | 1234 | { |
5fdf285e | 1235 | dir->internal.unmanaged_exclude_files++; /* see validate_untracked_cache() */ |
65edd96a | 1236 | add_patterns_from_file_1(dir, fname, NULL); |
0dcb8d7f NTND |
1237 | } |
1238 | ||
82dce998 NTND |
1239 | int match_basename(const char *basename, int basenamelen, |
1240 | const char *pattern, int prefix, int patternlen, | |
f8708998 | 1241 | unsigned flags) |
593cb880 NTND |
1242 | { |
1243 | if (prefix == patternlen) { | |
0b6e56df | 1244 | if (patternlen == basenamelen && |
ba0897e6 | 1245 | !fspathncmp(pattern, basename, basenamelen)) |
593cb880 | 1246 | return 1; |
4ff89ee5 | 1247 | } else if (flags & PATTERN_FLAG_ENDSWITH) { |
0b6e56df | 1248 | /* "*literal" matching against "fooliteral" */ |
593cb880 | 1249 | if (patternlen - 1 <= basenamelen && |
ba0897e6 | 1250 | !fspathncmp(pattern + 1, |
0b6e56df JH |
1251 | basename + basenamelen - (patternlen - 1), |
1252 | patternlen - 1)) | |
593cb880 NTND |
1253 | return 1; |
1254 | } else { | |
0b6e56df JH |
1255 | if (fnmatch_icase_mem(pattern, patternlen, |
1256 | basename, basenamelen, | |
1257 | 0) == 0) | |
593cb880 NTND |
1258 | return 1; |
1259 | } | |
1260 | return 0; | |
1261 | } | |
1262 | ||
82dce998 NTND |
1263 | int match_pathname(const char *pathname, int pathlen, |
1264 | const char *base, int baselen, | |
77651c03 | 1265 | const char *pattern, int prefix, int patternlen) |
b5592632 NTND |
1266 | { |
1267 | const char *name; | |
1268 | int namelen; | |
1269 | ||
1270 | /* | |
1271 | * match with FNM_PATHNAME; the pattern has base implicitly | |
1272 | * in front of it. | |
1273 | */ | |
1274 | if (*pattern == '/') { | |
1275 | pattern++; | |
982ac873 | 1276 | patternlen--; |
b5592632 NTND |
1277 | prefix--; |
1278 | } | |
1279 | ||
1280 | /* | |
1281 | * baselen does not count the trailing slash. base[] may or | |
1282 | * may not end with a trailing slash though. | |
1283 | */ | |
1284 | if (pathlen < baselen + 1 || | |
1285 | (baselen && pathname[baselen] != '/') || | |
ba0897e6 | 1286 | fspathncmp(pathname, base, baselen)) |
b5592632 NTND |
1287 | return 0; |
1288 | ||
1289 | namelen = baselen ? pathlen - baselen - 1 : pathlen; | |
1290 | name = pathname + pathlen - namelen; | |
1291 | ||
1292 | if (prefix) { | |
1293 | /* | |
1294 | * if the non-wildcard part is longer than the | |
1295 | * remaining pathname, surely it cannot match. | |
1296 | */ | |
1297 | if (prefix > namelen) | |
1298 | return 0; | |
1299 | ||
ba0897e6 | 1300 | if (fspathncmp(pattern, name, prefix)) |
b5592632 NTND |
1301 | return 0; |
1302 | pattern += prefix; | |
ab3aebc1 | 1303 | patternlen -= prefix; |
b5592632 NTND |
1304 | name += prefix; |
1305 | namelen -= prefix; | |
ab3aebc1 JK |
1306 | |
1307 | /* | |
1308 | * If the whole pattern did not have a wildcard, | |
1309 | * then our prefix match is all we need; we | |
1310 | * do not need to call fnmatch at all. | |
1311 | */ | |
5ceb663e | 1312 | if (!patternlen && !namelen) |
ab3aebc1 | 1313 | return 1; |
b5592632 NTND |
1314 | } |
1315 | ||
ab3aebc1 JK |
1316 | return fnmatch_icase_mem(pattern, patternlen, |
1317 | name, namelen, | |
f30366b2 | 1318 | WM_PATHNAME) == 0; |
b5592632 NTND |
1319 | } |
1320 | ||
578cd7c3 AS |
1321 | /* |
1322 | * Scan the given exclude list in reverse to see whether pathname | |
1323 | * should be ignored. The first match (i.e. the last on the list), if | |
1324 | * any, determines the fate. Returns the exclude_list element which | |
1325 | * matched, or NULL for undecided. | |
453ec4bd | 1326 | */ |
65edd96a | 1327 | static struct path_pattern *last_matching_pattern_from_list(const char *pathname, |
578cd7c3 AS |
1328 | int pathlen, |
1329 | const char *basename, | |
1330 | int *dtype, | |
caa3d554 | 1331 | struct pattern_list *pl, |
2b70e88d | 1332 | struct index_state *istate) |
453ec4bd | 1333 | { |
ab8db613 | 1334 | struct path_pattern *res = NULL; /* undecided */ |
5cee3493 | 1335 | int i; |
453ec4bd | 1336 | |
caa3d554 | 1337 | if (!pl->nr) |
578cd7c3 | 1338 | return NULL; /* undefined */ |
d6b8fc30 | 1339 | |
caa3d554 DS |
1340 | for (i = pl->nr - 1; 0 <= i; i--) { |
1341 | struct path_pattern *pattern = pl->patterns[i]; | |
ab8db613 DS |
1342 | const char *exclude = pattern->pattern; |
1343 | int prefix = pattern->nowildcardlen; | |
35a94d44 | 1344 | |
33c5d6c8 DS |
1345 | if (pattern->flags & PATTERN_FLAG_MUSTBEDIR) { |
1346 | *dtype = resolve_dtype(*dtype, istate, pathname, pathlen); | |
1347 | if (*dtype != DT_DIR) | |
1348 | continue; | |
1349 | } | |
d6b8fc30 | 1350 | |
4ff89ee5 | 1351 | if (pattern->flags & PATTERN_FLAG_NODIR) { |
593cb880 NTND |
1352 | if (match_basename(basename, |
1353 | pathlen - (basename - pathname), | |
ab8db613 DS |
1354 | exclude, prefix, pattern->patternlen, |
1355 | pattern->flags)) { | |
1356 | res = pattern; | |
e6efecc4 NTND |
1357 | break; |
1358 | } | |
35a94d44 NTND |
1359 | continue; |
1360 | } | |
1361 | ||
ab8db613 DS |
1362 | assert(pattern->baselen == 0 || |
1363 | pattern->base[pattern->baselen - 1] == '/'); | |
b5592632 | 1364 | if (match_pathname(pathname, pathlen, |
ab8db613 DS |
1365 | pattern->base, |
1366 | pattern->baselen ? pattern->baselen - 1 : 0, | |
77651c03 | 1367 | exclude, prefix, pattern->patternlen)) { |
ab8db613 | 1368 | res = pattern; |
e6efecc4 NTND |
1369 | break; |
1370 | } | |
453ec4bd | 1371 | } |
ab8db613 | 1372 | return res; |
578cd7c3 AS |
1373 | } |
1374 | ||
1375 | /* | |
468ce99b DS |
1376 | * Scan the list of patterns to determine if the ordered list |
1377 | * of patterns matches on 'pathname'. | |
1378 | * | |
1379 | * Return 1 for a match, 0 for not matched and -1 for undecided. | |
578cd7c3 | 1380 | */ |
468ce99b DS |
1381 | enum pattern_match_result path_matches_pattern_list( |
1382 | const char *pathname, int pathlen, | |
1383 | const char *basename, int *dtype, | |
1384 | struct pattern_list *pl, | |
1385 | struct index_state *istate) | |
578cd7c3 | 1386 | { |
ab8db613 | 1387 | struct path_pattern *pattern; |
96cc8ab5 DS |
1388 | struct strbuf parent_pathname = STRBUF_INIT; |
1389 | int result = NOT_MATCHED; | |
69bdbdb0 | 1390 | size_t slash_pos; |
96cc8ab5 DS |
1391 | |
1392 | if (!pl->use_cone_patterns) { | |
1393 | pattern = last_matching_pattern_from_list(pathname, pathlen, basename, | |
1394 | dtype, pl, istate); | |
1395 | if (pattern) { | |
1396 | if (pattern->flags & PATTERN_FLAG_NEGATIVE) | |
1397 | return NOT_MATCHED; | |
1398 | else | |
1399 | return MATCHED; | |
1400 | } | |
1401 | ||
1402 | return UNDECIDED; | |
1403 | } | |
1404 | ||
1405 | if (pl->full_cone) | |
1406 | return MATCHED; | |
1407 | ||
1408 | strbuf_addch(&parent_pathname, '/'); | |
1409 | strbuf_add(&parent_pathname, pathname, pathlen); | |
1410 | ||
69bdbdb0 DS |
1411 | /* |
1412 | * Directory entries are matched if and only if a file | |
1413 | * contained immediately within them is matched. For the | |
1414 | * case of a directory entry, modify the path to create | |
1415 | * a fake filename within this directory, allowing us to | |
1416 | * use the file-base matching logic in an equivalent way. | |
1417 | */ | |
1418 | if (parent_pathname.len > 0 && | |
1419 | parent_pathname.buf[parent_pathname.len - 1] == '/') { | |
1420 | slash_pos = parent_pathname.len - 1; | |
1421 | strbuf_add(&parent_pathname, "-", 1); | |
1422 | } else { | |
1423 | const char *slash_ptr = strrchr(parent_pathname.buf, '/'); | |
1424 | slash_pos = slash_ptr ? slash_ptr - parent_pathname.buf : 0; | |
1425 | } | |
1426 | ||
96cc8ab5 DS |
1427 | if (hashmap_contains_path(&pl->recursive_hashmap, |
1428 | &parent_pathname)) { | |
eb42feca | 1429 | result = MATCHED_RECURSIVE; |
96cc8ab5 | 1430 | goto done; |
468ce99b DS |
1431 | } |
1432 | ||
69bdbdb0 | 1433 | if (!slash_pos) { |
96cc8ab5 DS |
1434 | /* include every file in root */ |
1435 | result = MATCHED; | |
1436 | goto done; | |
1437 | } | |
1438 | ||
69bdbdb0 | 1439 | strbuf_setlen(&parent_pathname, slash_pos); |
96cc8ab5 DS |
1440 | |
1441 | if (hashmap_contains_path(&pl->parent_hashmap, &parent_pathname)) { | |
1442 | result = MATCHED; | |
1443 | goto done; | |
1444 | } | |
1445 | ||
1446 | if (hashmap_contains_parent(&pl->recursive_hashmap, | |
1447 | pathname, | |
1448 | &parent_pathname)) | |
eb42feca | 1449 | result = MATCHED_RECURSIVE; |
96cc8ab5 DS |
1450 | |
1451 | done: | |
1452 | strbuf_release(&parent_pathname); | |
1453 | return result; | |
453ec4bd LT |
1454 | } |
1455 | ||
02155c8c DS |
1456 | int init_sparse_checkout_patterns(struct index_state *istate) |
1457 | { | |
1458 | if (!core_apply_sparse_checkout) | |
1459 | return 1; | |
1460 | if (istate->sparse_checkout_patterns) | |
1461 | return 0; | |
1462 | ||
1463 | CALLOC_ARRAY(istate->sparse_checkout_patterns, 1); | |
1464 | ||
1465 | if (get_sparse_checkout_patterns(istate->sparse_checkout_patterns) < 0) { | |
1466 | FREE_AND_NULL(istate->sparse_checkout_patterns); | |
1467 | return -1; | |
1468 | } | |
1469 | ||
1470 | return 0; | |
1471 | } | |
1472 | ||
1473 | static int path_in_sparse_checkout_1(const char *path, | |
1474 | struct index_state *istate, | |
1475 | int require_cone_mode) | |
1476 | { | |
02155c8c | 1477 | int dtype = DT_REG; |
20141e32 MT |
1478 | enum pattern_match_result match = UNDECIDED; |
1479 | const char *end, *slash; | |
02155c8c DS |
1480 | |
1481 | /* | |
287fd17e VD |
1482 | * We default to accepting a path if the path is empty, there are no |
1483 | * patterns, or the patterns are of the wrong type. | |
02155c8c | 1484 | */ |
287fd17e VD |
1485 | if (!*path || |
1486 | init_sparse_checkout_patterns(istate) || | |
02155c8c DS |
1487 | (require_cone_mode && |
1488 | !istate->sparse_checkout_patterns->use_cone_patterns)) | |
1489 | return 1; | |
1490 | ||
20141e32 MT |
1491 | /* |
1492 | * If UNDECIDED, use the match from the parent dir (recursively), or | |
1493 | * fall back to NOT_MATCHED at the topmost level. Note that cone mode | |
1494 | * never returns UNDECIDED, so we will execute only one iteration in | |
1495 | * this case. | |
1496 | */ | |
1497 | for (end = path + strlen(path); | |
1498 | end > path && match == UNDECIDED; | |
1499 | end = slash) { | |
1500 | ||
1501 | for (slash = end - 1; slash > path && *slash != '/'; slash--) | |
1502 | ; /* do nothing */ | |
1503 | ||
1504 | match = path_matches_pattern_list(path, end - path, | |
1505 | slash > path ? slash + 1 : path, &dtype, | |
1506 | istate->sparse_checkout_patterns, istate); | |
1507 | ||
1508 | /* We are going to match the parent dir now */ | |
1509 | dtype = DT_DIR; | |
1510 | } | |
1511 | return match > 0; | |
02155c8c DS |
1512 | } |
1513 | ||
1514 | int path_in_sparse_checkout(const char *path, | |
1515 | struct index_state *istate) | |
1516 | { | |
1517 | return path_in_sparse_checkout_1(path, istate, 0); | |
1518 | } | |
1519 | ||
1520 | int path_in_cone_mode_sparse_checkout(const char *path, | |
1521 | struct index_state *istate) | |
1522 | { | |
1523 | return path_in_sparse_checkout_1(path, istate, 1); | |
1524 | } | |
1525 | ||
65edd96a | 1526 | static struct path_pattern *last_matching_pattern_from_lists( |
ab8db613 DS |
1527 | struct dir_struct *dir, struct index_state *istate, |
1528 | const char *pathname, int pathlen, | |
1529 | const char *basename, int *dtype_p) | |
46aa2f95 KB |
1530 | { |
1531 | int i, j; | |
1532 | struct exclude_list_group *group; | |
ab8db613 | 1533 | struct path_pattern *pattern; |
46aa2f95 | 1534 | for (i = EXC_CMDL; i <= EXC_FILE; i++) { |
5fdf285e | 1535 | group = &dir->internal.exclude_list_group[i]; |
46aa2f95 | 1536 | for (j = group->nr - 1; j >= 0; j--) { |
65edd96a | 1537 | pattern = last_matching_pattern_from_list( |
46aa2f95 | 1538 | pathname, pathlen, basename, dtype_p, |
caa3d554 | 1539 | &group->pl[j], istate); |
ab8db613 DS |
1540 | if (pattern) |
1541 | return pattern; | |
46aa2f95 KB |
1542 | } |
1543 | } | |
1544 | return NULL; | |
1545 | } | |
1546 | ||
6cd5c582 KB |
1547 | /* |
1548 | * Loads the per-directory exclude list for the substring of base | |
1549 | * which has a char length of baselen. | |
1550 | */ | |
e799ed40 BW |
1551 | static void prep_exclude(struct dir_struct *dir, |
1552 | struct index_state *istate, | |
1553 | const char *base, int baselen) | |
6cd5c582 KB |
1554 | { |
1555 | struct exclude_list_group *group; | |
caa3d554 | 1556 | struct pattern_list *pl; |
6cd5c582 | 1557 | struct exclude_stack *stk = NULL; |
0dcb8d7f | 1558 | struct untracked_cache_dir *untracked; |
6cd5c582 KB |
1559 | int current; |
1560 | ||
5fdf285e | 1561 | group = &dir->internal.exclude_list_group[EXC_DIRS]; |
6cd5c582 | 1562 | |
d961baa8 NTND |
1563 | /* |
1564 | * Pop the exclude lists from the EXCL_DIRS exclude_list_group | |
6cd5c582 | 1565 | * which originate from directories not in the prefix of the |
d961baa8 NTND |
1566 | * path being checked. |
1567 | */ | |
5fdf285e | 1568 | while ((stk = dir->internal.exclude_stack) != NULL) { |
6cd5c582 | 1569 | if (stk->baselen <= baselen && |
5fdf285e | 1570 | !strncmp(dir->internal.basebuf.buf, base, stk->baselen)) |
6cd5c582 | 1571 | break; |
5fdf285e EN |
1572 | pl = &group->pl[dir->internal.exclude_stack->exclude_ix]; |
1573 | dir->internal.exclude_stack = stk->prev; | |
1574 | dir->internal.pattern = NULL; | |
caa3d554 | 1575 | free((char *)pl->src); /* see strbuf_detach() below */ |
65edd96a | 1576 | clear_pattern_list(pl); |
6cd5c582 KB |
1577 | free(stk); |
1578 | group->nr--; | |
1579 | } | |
1580 | ||
95c6f271 | 1581 | /* Skip traversing into sub directories if the parent is excluded */ |
5fdf285e | 1582 | if (dir->internal.pattern) |
95c6f271 KB |
1583 | return; |
1584 | ||
aceb9429 NTND |
1585 | /* |
1586 | * Lazy initialization. All call sites currently just | |
1587 | * memset(dir, 0, sizeof(*dir)) before use. Changing all of | |
1588 | * them seems lots of work for little benefit. | |
1589 | */ | |
5fdf285e EN |
1590 | if (!dir->internal.basebuf.buf) |
1591 | strbuf_init(&dir->internal.basebuf, PATH_MAX); | |
aceb9429 | 1592 | |
6cd5c582 KB |
1593 | /* Read from the parent directories and push them down. */ |
1594 | current = stk ? stk->baselen : -1; | |
5fdf285e | 1595 | strbuf_setlen(&dir->internal.basebuf, current < 0 ? 0 : current); |
0dcb8d7f NTND |
1596 | if (dir->untracked) |
1597 | untracked = stk ? stk->ucd : dir->untracked->root; | |
1598 | else | |
1599 | untracked = NULL; | |
1600 | ||
6cd5c582 | 1601 | while (current < baselen) { |
6cd5c582 | 1602 | const char *cp; |
4b33e602 | 1603 | struct oid_stat oid_stat; |
6cd5c582 | 1604 | |
ca56dadb | 1605 | CALLOC_ARRAY(stk, 1); |
6cd5c582 KB |
1606 | if (current < 0) { |
1607 | cp = base; | |
1608 | current = 0; | |
d961baa8 | 1609 | } else { |
6cd5c582 KB |
1610 | cp = strchr(base + current + 1, '/'); |
1611 | if (!cp) | |
1612 | die("oops in prep_exclude"); | |
1613 | cp++; | |
0dcb8d7f | 1614 | untracked = |
5fdf285e EN |
1615 | lookup_untracked(dir->untracked, |
1616 | untracked, | |
0dcb8d7f NTND |
1617 | base + current, |
1618 | cp - base - current); | |
6cd5c582 | 1619 | } |
5fdf285e | 1620 | stk->prev = dir->internal.exclude_stack; |
6cd5c582 | 1621 | stk->baselen = cp - base; |
95c6f271 | 1622 | stk->exclude_ix = group->nr; |
0dcb8d7f | 1623 | stk->ucd = untracked; |
65edd96a | 1624 | pl = add_pattern_list(dir, EXC_DIRS, NULL); |
5fdf285e EN |
1625 | strbuf_add(&dir->internal.basebuf, base + current, stk->baselen - current); |
1626 | assert(stk->baselen == dir->internal.basebuf.len); | |
95c6f271 KB |
1627 | |
1628 | /* Abort if the directory is excluded */ | |
1629 | if (stk->baselen) { | |
1630 | int dt = DT_DIR; | |
5fdf285e EN |
1631 | dir->internal.basebuf.buf[stk->baselen - 1] = 0; |
1632 | dir->internal.pattern = last_matching_pattern_from_lists(dir, | |
e799ed40 | 1633 | istate, |
5fdf285e EN |
1634 | dir->internal.basebuf.buf, stk->baselen - 1, |
1635 | dir->internal.basebuf.buf + current, &dt); | |
1636 | dir->internal.basebuf.buf[stk->baselen - 1] = '/'; | |
1637 | if (dir->internal.pattern && | |
1638 | dir->internal.pattern->flags & PATTERN_FLAG_NEGATIVE) | |
1639 | dir->internal.pattern = NULL; | |
1640 | if (dir->internal.pattern) { | |
1641 | dir->internal.exclude_stack = stk; | |
95c6f271 KB |
1642 | return; |
1643 | } | |
1644 | } | |
1645 | ||
aceb9429 | 1646 | /* Try to read per-directory file */ |
4b33e602 PO |
1647 | oidclr(&oid_stat.oid); |
1648 | oid_stat.valid = 0; | |
27b099ae NTND |
1649 | if (dir->exclude_per_dir && |
1650 | /* | |
1651 | * If we know that no files have been added in | |
1652 | * this directory (i.e. valid_cached_dir() has | |
1653 | * been executed and set untracked->valid) .. | |
1654 | */ | |
1655 | (!untracked || !untracked->valid || | |
1656 | /* | |
1657 | * .. and .gitignore does not exist before | |
70c369cd | 1658 | * (i.e. null exclude_oid). Then we can skip |
7687252f DT |
1659 | * loading .gitignore, which would result in |
1660 | * ENOENT anyway. | |
27b099ae | 1661 | */ |
70c369cd | 1662 | !is_null_oid(&untracked->exclude_oid))) { |
95c6f271 | 1663 | /* |
5fdf285e EN |
1664 | * dir->internal.basebuf gets reused by the traversal, |
1665 | * but we need fname to remain unchanged to ensure the | |
1666 | * src member of each struct path_pattern correctly | |
95c6f271 | 1667 | * back-references its source file. Other invocations |
65edd96a | 1668 | * of add_pattern_list provide stable strings, so we |
aceb9429 | 1669 | * strbuf_detach() and free() here in the caller. |
95c6f271 | 1670 | */ |
aceb9429 | 1671 | struct strbuf sb = STRBUF_INIT; |
5fdf285e | 1672 | strbuf_addbuf(&sb, &dir->internal.basebuf); |
aceb9429 | 1673 | strbuf_addstr(&sb, dir->exclude_per_dir); |
caa3d554 | 1674 | pl->src = strbuf_detach(&sb, NULL); |
65edd96a | 1675 | add_patterns(pl->src, pl->src, stk->baselen, pl, istate, |
feb9b779 | 1676 | PATTERN_NOFOLLOW, |
4b33e602 | 1677 | untracked ? &oid_stat : NULL); |
0dcb8d7f | 1678 | } |
5ebf79ad NTND |
1679 | /* |
1680 | * NEEDSWORK: when untracked cache is enabled, prep_exclude() | |
1681 | * will first be called in valid_cached_dir() then maybe many | |
65edd96a DS |
1682 | * times more in last_matching_pattern(). When the cache is |
1683 | * used, last_matching_pattern() will not be called and | |
5ebf79ad NTND |
1684 | * reading .gitignore content will be a waste. |
1685 | * | |
1686 | * So when it's called by valid_cached_dir() and we can get | |
1687 | * .gitignore SHA-1 from the index (i.e. .gitignore is not | |
1688 | * modified on work tree), we could delay reading the | |
1689 | * .gitignore content until we absolutely need it in | |
65edd96a | 1690 | * last_matching_pattern(). Be careful about ignore rule |
5ebf79ad NTND |
1691 | * order, though, if you do that. |
1692 | */ | |
1693 | if (untracked && | |
9001dc2a | 1694 | !oideq(&oid_stat.oid, &untracked->exclude_oid)) { |
5ebf79ad | 1695 | invalidate_gitignore(dir->untracked, untracked); |
70c369cd | 1696 | oidcpy(&untracked->exclude_oid, &oid_stat.oid); |
95c6f271 | 1697 | } |
5fdf285e | 1698 | dir->internal.exclude_stack = stk; |
6cd5c582 KB |
1699 | current = stk->baselen; |
1700 | } | |
5fdf285e | 1701 | strbuf_setlen(&dir->internal.basebuf, baselen); |
6cd5c582 KB |
1702 | } |
1703 | ||
f4cd69a6 AS |
1704 | /* |
1705 | * Loads the exclude lists for the directory containing pathname, then | |
1706 | * scans all exclude lists to determine whether pathname is excluded. | |
1707 | * Returns the exclude_list element which matched, or NULL for | |
1708 | * undecided. | |
1709 | */ | |
65edd96a | 1710 | struct path_pattern *last_matching_pattern(struct dir_struct *dir, |
a0bba65b BW |
1711 | struct index_state *istate, |
1712 | const char *pathname, | |
1713 | int *dtype_p) | |
453ec4bd LT |
1714 | { |
1715 | int pathlen = strlen(pathname); | |
68492fc7 LK |
1716 | const char *basename = strrchr(pathname, '/'); |
1717 | basename = (basename) ? basename+1 : pathname; | |
453ec4bd | 1718 | |
a0bba65b | 1719 | prep_exclude(dir, istate, pathname, basename-pathname); |
c082df24 | 1720 | |
5fdf285e EN |
1721 | if (dir->internal.pattern) |
1722 | return dir->internal.pattern; | |
95c6f271 | 1723 | |
65edd96a | 1724 | return last_matching_pattern_from_lists(dir, istate, pathname, pathlen, |
46aa2f95 | 1725 | basename, dtype_p); |
f4cd69a6 AS |
1726 | } |
1727 | ||
1728 | /* | |
1729 | * Loads the exclude lists for the directory containing pathname, then | |
1730 | * scans all exclude lists to determine whether pathname is excluded. | |
1731 | * Returns 1 if true, otherwise 0. | |
1732 | */ | |
a0bba65b BW |
1733 | int is_excluded(struct dir_struct *dir, struct index_state *istate, |
1734 | const char *pathname, int *dtype_p) | |
f4cd69a6 | 1735 | { |
ab8db613 | 1736 | struct path_pattern *pattern = |
65edd96a | 1737 | last_matching_pattern(dir, istate, pathname, dtype_p); |
ab8db613 | 1738 | if (pattern) |
4ff89ee5 | 1739 | return pattern->flags & PATTERN_FLAG_NEGATIVE ? 0 : 1; |
453ec4bd LT |
1740 | return 0; |
1741 | } | |
1742 | ||
f3fa1838 JH |
1743 | static struct dir_entry *dir_entry_new(const char *pathname, int len) |
1744 | { | |
453ec4bd LT |
1745 | struct dir_entry *ent; |
1746 | ||
96ffc06f | 1747 | FLEX_ALLOC_MEM(ent, name, pathname, len); |
453ec4bd | 1748 | ent->len = len; |
4d06f8ac | 1749 | return ent; |
453ec4bd LT |
1750 | } |
1751 | ||
9e58beca BW |
1752 | static struct dir_entry *dir_add_name(struct dir_struct *dir, |
1753 | struct index_state *istate, | |
1754 | const char *pathname, int len) | |
6815e569 | 1755 | { |
9e58beca | 1756 | if (index_file_exists(istate, pathname, len, ignore_case)) |
6815e569 JK |
1757 | return NULL; |
1758 | ||
5fdf285e | 1759 | ALLOC_GROW(dir->entries, dir->nr+1, dir->internal.alloc); |
6815e569 JK |
1760 | return dir->entries[dir->nr++] = dir_entry_new(pathname, len); |
1761 | } | |
1762 | ||
9e58beca BW |
1763 | struct dir_entry *dir_add_ignored(struct dir_struct *dir, |
1764 | struct index_state *istate, | |
1765 | const char *pathname, int len) | |
2abd31b0 | 1766 | { |
9e58beca | 1767 | if (!index_name_is_other(istate, pathname, len)) |
2abd31b0 JK |
1768 | return NULL; |
1769 | ||
5fdf285e | 1770 | ALLOC_GROW(dir->ignored, dir->ignored_nr+1, dir->internal.ignored_alloc); |
2abd31b0 JK |
1771 | return dir->ignored[dir->ignored_nr++] = dir_entry_new(pathname, len); |
1772 | } | |
1773 | ||
09595258 LT |
1774 | enum exist_status { |
1775 | index_nonexistent = 0, | |
1776 | index_directory, | |
4b05548f | 1777 | index_gitdir |
09595258 LT |
1778 | }; |
1779 | ||
5102c617 | 1780 | /* |
71261027 | 1781 | * Do not use the alphabetically sorted index to look up |
5102c617 | 1782 | * the directory name; instead, use the case insensitive |
ebbd7439 | 1783 | * directory hash. |
5102c617 | 1784 | */ |
ae520e36 BW |
1785 | static enum exist_status directory_exists_in_index_icase(struct index_state *istate, |
1786 | const char *dirname, int len) | |
5102c617 | 1787 | { |
41284eb0 | 1788 | struct cache_entry *ce; |
5102c617 | 1789 | |
ae520e36 | 1790 | if (index_dir_exists(istate, dirname, len)) |
5102c617 JJ |
1791 | return index_directory; |
1792 | ||
ae520e36 | 1793 | ce = index_file_exists(istate, dirname, len, ignore_case); |
41284eb0 | 1794 | if (ce && S_ISGITLINK(ce->ce_mode)) |
5102c617 JJ |
1795 | return index_gitdir; |
1796 | ||
5102c617 JJ |
1797 | return index_nonexistent; |
1798 | } | |
1799 | ||
09595258 LT |
1800 | /* |
1801 | * The index sorts alphabetically by entry name, which | |
1802 | * means that a gitlink sorts as '\0' at the end, while | |
1803 | * a directory (which is defined not as an entry, but as | |
1804 | * the files it contains) will sort with the '/' at the | |
1805 | * end. | |
1806 | */ | |
ae520e36 BW |
1807 | static enum exist_status directory_exists_in_index(struct index_state *istate, |
1808 | const char *dirname, int len) | |
453ec4bd | 1809 | { |
5102c617 JJ |
1810 | int pos; |
1811 | ||
1812 | if (ignore_case) | |
ae520e36 | 1813 | return directory_exists_in_index_icase(istate, dirname, len); |
5102c617 | 1814 | |
ae520e36 | 1815 | pos = index_name_pos(istate, dirname, len); |
09595258 LT |
1816 | if (pos < 0) |
1817 | pos = -pos-1; | |
ae520e36 BW |
1818 | while (pos < istate->cache_nr) { |
1819 | const struct cache_entry *ce = istate->cache[pos++]; | |
09595258 LT |
1820 | unsigned char endchar; |
1821 | ||
1822 | if (strncmp(ce->name, dirname, len)) | |
1823 | break; | |
1824 | endchar = ce->name[len]; | |
1825 | if (endchar > '/') | |
1826 | break; | |
1827 | if (endchar == '/') | |
1828 | return index_directory; | |
7a51ed66 | 1829 | if (!endchar && S_ISGITLINK(ce->ce_mode)) |
09595258 LT |
1830 | return index_gitdir; |
1831 | } | |
1832 | return index_nonexistent; | |
1833 | } | |
1834 | ||
1835 | /* | |
1836 | * When we find a directory when traversing the filesystem, we | |
1837 | * have three distinct cases: | |
1838 | * | |
1839 | * - ignore it | |
1840 | * - see it as a directory | |
1841 | * - recurse into it | |
1842 | * | |
1843 | * and which one we choose depends on a combination of existing | |
1844 | * git index contents and the flags passed into the directory | |
1845 | * traversal routine. | |
1846 | * | |
1847 | * Case 1: If we *already* have entries in the index under that | |
5bd8e2d8 KB |
1848 | * directory name, we always recurse into the directory to see |
1849 | * all the files. | |
09595258 LT |
1850 | * |
1851 | * Case 2: If we *already* have that directory name as a gitlink, | |
1852 | * we always continue to see it as a gitlink, regardless of whether | |
1853 | * there is an actual git directory there or not (it might not | |
1854 | * be checked out as a subproject!) | |
1855 | * | |
1856 | * Case 3: if we didn't have it in the index previously, we | |
1857 | * have a few sub-cases: | |
1858 | * | |
4e689d81 DS |
1859 | * (a) if DIR_SHOW_OTHER_DIRECTORIES flag is set, we show it as |
1860 | * just a directory, unless DIR_HIDE_EMPTY_DIRECTORIES is | |
defd7c7b KB |
1861 | * also true, in which case we need to check if it contains any |
1862 | * untracked and / or ignored files. | |
4e689d81 DS |
1863 | * (b) if it looks like a git directory and we don't have the |
1864 | * DIR_NO_GITLINKS flag, then we treat it as a gitlink, and | |
1865 | * show it as a directory. | |
09595258 LT |
1866 | * (c) otherwise, we recurse into it. |
1867 | */ | |
defd7c7b | 1868 | static enum path_treatment treat_directory(struct dir_struct *dir, |
0ef8e169 | 1869 | struct index_state *istate, |
0dcb8d7f | 1870 | struct untracked_cache_dir *untracked, |
2df179d3 | 1871 | const char *dirname, int len, int baselen, int excluded, |
e1b8c7bd | 1872 | const struct pathspec *pathspec) |
09595258 | 1873 | { |
8d92fb29 EN |
1874 | /* |
1875 | * WARNING: From this function, you can return path_recurse or you | |
1876 | * can call read_directory_recursive() (or neither), but | |
1877 | * you CAN'T DO BOTH. | |
1878 | */ | |
1879 | enum path_treatment state; | |
7f45ab2d | 1880 | int matches_how = 0; |
d6c9a717 | 1881 | int check_only, stop_early; |
16846444 | 1882 | int old_ignored_nr, old_untracked_nr; |
09595258 | 1883 | /* The "len-1" is to strip the final '/' */ |
0bbd0e8b | 1884 | enum exist_status status = directory_exists_in_index(istate, dirname, len-1); |
09595258 | 1885 | |
0bbd0e8b DS |
1886 | if (status == index_directory) |
1887 | return path_recurse; | |
1888 | if (status == index_gitdir) | |
26c986e1 | 1889 | return path_none; |
0bbd0e8b DS |
1890 | if (status != index_nonexistent) |
1891 | BUG("Unhandled value for directory_exists_in_index: %d\n", status); | |
09595258 | 1892 | |
7f45ab2d EN |
1893 | /* |
1894 | * We don't want to descend into paths that don't match the necessary | |
1895 | * patterns. Clearly, if we don't have a pathspec, then we can't check | |
1896 | * for matching patterns. Also, if (excluded) then we know we matched | |
1897 | * the exclusion patterns so as an optimization we can skip checking | |
1898 | * for matching patterns. | |
1899 | */ | |
1900 | if (pathspec && !excluded) { | |
f1f061e1 EN |
1901 | matches_how = match_pathspec_with_flags(istate, pathspec, |
1902 | dirname, len, | |
1903 | 0 /* prefix */, | |
1904 | NULL /* seen */, | |
1905 | DO_MATCH_LEADING_PATHSPEC); | |
7f45ab2d EN |
1906 | if (!matches_how) |
1907 | return path_none; | |
1908 | } | |
09487f2c | 1909 | |
7f45ab2d | 1910 | |
0bbd0e8b DS |
1911 | if ((dir->flags & DIR_SKIP_NESTED_GIT) || |
1912 | !(dir->flags & DIR_NO_GITLINKS)) { | |
27128996 GG |
1913 | /* |
1914 | * Determine if `dirname` is a nested repo by confirming that: | |
1915 | * 1) we are in a nonbare repository, and | |
1916 | * 2) `dirname` is not an immediate parent of `the_repository->gitdir`, | |
1917 | * which could occur if the git_dir or worktree location was | |
1918 | * manually configured by the user; see t2205 testcases 1-3 for | |
1919 | * examples where this matters | |
1920 | */ | |
d6c9a717 | 1921 | int nested_repo; |
0bbd0e8b DS |
1922 | struct strbuf sb = STRBUF_INIT; |
1923 | strbuf_addstr(&sb, dirname); | |
1924 | nested_repo = is_nonbare_repository_dir(&sb); | |
27128996 GG |
1925 | |
1926 | if (nested_repo) { | |
1927 | char *real_dirname, *real_gitdir; | |
1928 | strbuf_addstr(&sb, ".git"); | |
1929 | real_dirname = real_pathdup(sb.buf, 1); | |
1930 | real_gitdir = real_pathdup(the_repository->gitdir, 1); | |
1931 | ||
1932 | nested_repo = !!strcmp(real_dirname, real_gitdir); | |
1933 | free(real_gitdir); | |
1934 | free(real_dirname); | |
1935 | } | |
0bbd0e8b | 1936 | strbuf_release(&sb); |
d6c9a717 GG |
1937 | |
1938 | if (nested_repo) { | |
1939 | if ((dir->flags & DIR_SKIP_NESTED_GIT) || | |
1940 | (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC)) | |
1941 | return path_none; | |
1942 | return excluded ? path_excluded : path_untracked; | |
1943 | } | |
ab282aa5 | 1944 | } |
09595258 | 1945 | |
0bbd0e8b | 1946 | if (!(dir->flags & DIR_SHOW_OTHER_DIRECTORIES)) { |
2df179d3 EN |
1947 | if (excluded && |
1948 | (dir->flags & DIR_SHOW_IGNORED_TOO) && | |
1949 | (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) { | |
eec0f7f2 JM |
1950 | |
1951 | /* | |
1952 | * This is an excluded directory and we are | |
1953 | * showing ignored paths that match an exclude | |
1954 | * pattern. (e.g. show directory as ignored | |
1955 | * only if it matches an exclude pattern). | |
1956 | * This path will either be 'path_excluded` | |
1957 | * (if we are showing empty directories or if | |
1958 | * the directory is not empty), or will be | |
1959 | * 'path_none' (empty directory, and we are | |
1960 | * not showing empty directories). | |
1961 | */ | |
1962 | if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES)) | |
1963 | return path_excluded; | |
1964 | ||
1965 | if (read_directory_recursive(dir, istate, dirname, len, | |
1966 | untracked, 1, 1, pathspec) == path_excluded) | |
1967 | return path_excluded; | |
1968 | ||
1969 | return path_none; | |
1970 | } | |
defd7c7b | 1971 | return path_recurse; |
09595258 LT |
1972 | } |
1973 | ||
aa6e1b21 | 1974 | assert(dir->flags & DIR_SHOW_OTHER_DIRECTORIES); |
721ac4ed | 1975 | |
8d92fb29 EN |
1976 | /* |
1977 | * If we have a pathspec which could match something _below_ this | |
1978 | * directory (e.g. when checking 'subdir/' having a pathspec like | |
1979 | * 'subdir/some/deep/path/file' or 'subdir/widget-*.c'), then we | |
1980 | * need to recurse. | |
1981 | */ | |
7f45ab2d EN |
1982 | if (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC) |
1983 | return path_recurse; | |
8d92fb29 | 1984 | |
aa6e1b21 EN |
1985 | /* Special cases for where this directory is excluded/ignored */ |
1986 | if (excluded) { | |
1987 | /* | |
4e689d81 | 1988 | * If DIR_SHOW_OTHER_DIRECTORIES is set and we're not |
aa6e1b21 EN |
1989 | * hiding empty directories, there is no need to |
1990 | * recurse into an ignored directory. | |
1991 | */ | |
1992 | if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES)) | |
1993 | return path_excluded; | |
1994 | ||
1995 | /* | |
1996 | * Even if we are hiding empty directories, we can still avoid | |
1997 | * recursing into ignored directories for DIR_SHOW_IGNORED_TOO | |
1998 | * if DIR_SHOW_IGNORED_TOO_MODE_MATCHING is also set. | |
1999 | */ | |
2000 | if ((dir->flags & DIR_SHOW_IGNORED_TOO) && | |
2001 | (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) | |
2002 | return path_excluded; | |
2003 | } | |
2004 | ||
8d92fb29 | 2005 | /* |
aa6e1b21 | 2006 | * Other than the path_recurse case above, we only need to |
dd55fc0d | 2007 | * recurse into untracked directories if any of the following |
aa6e1b21 | 2008 | * bits is set: |
dd55fc0d EN |
2009 | * - DIR_SHOW_IGNORED (because then we need to determine if |
2010 | * there are ignored entries below) | |
2011 | * - DIR_SHOW_IGNORED_TOO (same as above) | |
8d92fb29 EN |
2012 | * - DIR_HIDE_EMPTY_DIRECTORIES (because we have to determine if |
2013 | * the directory is empty) | |
2014 | */ | |
aa6e1b21 | 2015 | if (!excluded && |
dd55fc0d EN |
2016 | !(dir->flags & (DIR_SHOW_IGNORED | |
2017 | DIR_SHOW_IGNORED_TOO | | |
aa6e1b21 EN |
2018 | DIR_HIDE_EMPTY_DIRECTORIES))) { |
2019 | return path_untracked; | |
2020 | } | |
8d92fb29 EN |
2021 | |
2022 | /* | |
e6c0be92 EN |
2023 | * Even if we don't want to know all the paths under an untracked or |
2024 | * ignored directory, we may still need to go into the directory to | |
2025 | * determine if it is empty (because with DIR_HIDE_EMPTY_DIRECTORIES, | |
2026 | * an empty directory should be path_none instead of path_excluded or | |
2027 | * path_untracked). | |
8d92fb29 EN |
2028 | */ |
2029 | check_only = ((dir->flags & DIR_HIDE_EMPTY_DIRECTORIES) && | |
2030 | !(dir->flags & DIR_SHOW_IGNORED_TOO)); | |
2031 | ||
2032 | /* | |
2033 | * However, there's another optimization possible as a subset of | |
2034 | * check_only, based on the cases we have to consider: | |
2035 | * A) Directory matches no exclude patterns: | |
2036 | * * Directory is empty => path_none | |
2037 | * * Directory has an untracked file under it => path_untracked | |
2038 | * * Directory has only ignored files under it => path_excluded | |
2039 | * B) Directory matches an exclude pattern: | |
2040 | * * Directory is empty => path_none | |
2041 | * * Directory has an untracked file under it => path_excluded | |
2042 | * * Directory has only ignored files under it => path_excluded | |
2043 | * In case A, we can exit as soon as we've found an untracked | |
2044 | * file but otherwise have to walk all files. In case B, though, | |
2045 | * we can stop at the first file we find under the directory. | |
2046 | */ | |
2047 | stop_early = check_only && excluded; | |
2048 | ||
2049 | /* | |
2050 | * If /every/ file within an untracked directory is ignored, then | |
2051 | * we want to treat the directory as ignored (for e.g. status | |
2052 | * --porcelain), without listing the individual ignored files | |
2053 | * underneath. To do so, we'll save the current ignored_nr, and | |
2054 | * pop all the ones added after it if it turns out the entire | |
16846444 EN |
2055 | * directory is ignored. Also, when DIR_SHOW_IGNORED_TOO and |
2056 | * !DIR_KEEP_UNTRACKED_CONTENTS then we don't want to show | |
2057 | * untracked paths so will need to pop all those off the last | |
2058 | * after we traverse. | |
8d92fb29 EN |
2059 | */ |
2060 | old_ignored_nr = dir->ignored_nr; | |
16846444 | 2061 | old_untracked_nr = dir->nr; |
8d92fb29 EN |
2062 | |
2063 | /* Actually recurse into dirname now, we'll fixup the state later. */ | |
2e5910f2 DT |
2064 | untracked = lookup_untracked(dir->untracked, untracked, |
2065 | dirname + baselen, len - baselen); | |
8d92fb29 EN |
2066 | state = read_directory_recursive(dir, istate, dirname, len, untracked, |
2067 | check_only, stop_early, pathspec); | |
2068 | ||
2069 | /* There are a variety of reasons we may need to fixup the state... */ | |
2070 | if (state == path_excluded) { | |
2071 | /* state == path_excluded implies all paths under | |
2072 | * dirname were ignored... | |
2073 | * | |
2074 | * if running e.g. `git status --porcelain --ignored=matching`, | |
2075 | * then we want to see the subpaths that are ignored. | |
2076 | * | |
2077 | * if running e.g. just `git status --porcelain`, then | |
2078 | * we just want the directory itself to be listed as ignored | |
2079 | * and not the individual paths underneath. | |
2080 | */ | |
2081 | int want_ignored_subpaths = | |
2082 | ((dir->flags & DIR_SHOW_IGNORED_TOO) && | |
2083 | (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)); | |
2084 | ||
2085 | if (want_ignored_subpaths) { | |
2086 | /* | |
2087 | * with --ignored=matching, we want the subpaths | |
2088 | * INSTEAD of the directory itself. | |
2089 | */ | |
2090 | state = path_none; | |
2091 | } else { | |
2092 | int i; | |
2093 | for (i = old_ignored_nr + 1; i<dir->ignored_nr; ++i) | |
2094 | FREE_AND_NULL(dir->ignored[i]); | |
2095 | dir->ignored_nr = old_ignored_nr; | |
2096 | } | |
2097 | } | |
5aaa7fd3 JM |
2098 | |
2099 | /* | |
16846444 EN |
2100 | * We may need to ignore some of the untracked paths we found while |
2101 | * traversing subdirectories. | |
5aaa7fd3 | 2102 | */ |
16846444 EN |
2103 | if ((dir->flags & DIR_SHOW_IGNORED_TOO) && |
2104 | !(dir->flags & DIR_KEEP_UNTRACKED_CONTENTS)) { | |
2105 | int i; | |
2106 | for (i = old_untracked_nr + 1; i<dir->nr; ++i) | |
2107 | FREE_AND_NULL(dir->entries[i]); | |
2108 | dir->nr = old_untracked_nr; | |
2109 | } | |
2110 | ||
5aaa7fd3 | 2111 | /* |
8d92fb29 EN |
2112 | * If there is nothing under the current directory and we are not |
2113 | * hiding empty directories, then we need to report on the | |
2114 | * untracked or ignored status of the directory itself. | |
5aaa7fd3 | 2115 | */ |
8d92fb29 EN |
2116 | if (state == path_none && !(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES)) |
2117 | state = excluded ? path_excluded : path_untracked; | |
2118 | ||
8d92fb29 | 2119 | return state; |
453ec4bd LT |
2120 | } |
2121 | ||
9fc42d60 LT |
2122 | /* |
2123 | * This is an inexact early pruning of any recursive directory | |
2124 | * reading - if the path cannot possibly be in the pathspec, | |
2125 | * return true, and we'll skip it early. | |
2126 | */ | |
e1b8c7bd BW |
2127 | static int simplify_away(const char *path, int pathlen, |
2128 | const struct pathspec *pathspec) | |
9fc42d60 | 2129 | { |
e1b8c7bd | 2130 | int i; |
9fc42d60 | 2131 | |
e1b8c7bd BW |
2132 | if (!pathspec || !pathspec->nr) |
2133 | return 0; | |
2134 | ||
2135 | GUARD_PATHSPEC(pathspec, | |
2136 | PATHSPEC_FROMTOP | | |
2137 | PATHSPEC_MAXDEPTH | | |
2138 | PATHSPEC_LITERAL | | |
2139 | PATHSPEC_GLOB | | |
2140 | PATHSPEC_ICASE | | |
b0db7046 BW |
2141 | PATHSPEC_EXCLUDE | |
2142 | PATHSPEC_ATTR); | |
e1b8c7bd BW |
2143 | |
2144 | for (i = 0; i < pathspec->nr; i++) { | |
2145 | const struct pathspec_item *item = &pathspec->items[i]; | |
2146 | int len = item->nowildcard_len; | |
2147 | ||
2148 | if (len > pathlen) | |
2149 | len = pathlen; | |
2150 | if (!ps_strncmp(item, item->match, path, len)) | |
2151 | return 0; | |
9fc42d60 | 2152 | } |
e1b8c7bd BW |
2153 | |
2154 | return 1; | |
9fc42d60 LT |
2155 | } |
2156 | ||
29209cbe JK |
2157 | /* |
2158 | * This function tells us whether an excluded path matches a | |
2159 | * list of "interesting" pathspecs. That is, whether a path matched | |
2160 | * by any of the pathspecs could possibly be ignored by excluding | |
2161 | * the specified path. This can happen if: | |
2162 | * | |
2163 | * 1. the path is mentioned explicitly in the pathspec | |
2164 | * | |
2165 | * 2. the path is a directory prefix of some element in the | |
2166 | * pathspec | |
2167 | */ | |
e1b8c7bd BW |
2168 | static int exclude_matches_pathspec(const char *path, int pathlen, |
2169 | const struct pathspec *pathspec) | |
2170 | { | |
2171 | int i; | |
2172 | ||
2173 | if (!pathspec || !pathspec->nr) | |
2174 | return 0; | |
2175 | ||
2176 | GUARD_PATHSPEC(pathspec, | |
2177 | PATHSPEC_FROMTOP | | |
2178 | PATHSPEC_MAXDEPTH | | |
2179 | PATHSPEC_LITERAL | | |
2180 | PATHSPEC_GLOB | | |
2181 | PATHSPEC_ICASE | | |
2182 | PATHSPEC_EXCLUDE); | |
2183 | ||
2184 | for (i = 0; i < pathspec->nr; i++) { | |
2185 | const struct pathspec_item *item = &pathspec->items[i]; | |
2186 | int len = item->nowildcard_len; | |
2187 | ||
2188 | if (len == pathlen && | |
2189 | !ps_strncmp(item, item->match, path, pathlen)) | |
2190 | return 1; | |
2191 | if (len > pathlen && | |
2192 | item->match[pathlen] == '/' && | |
2193 | !ps_strncmp(item, item->match, path, pathlen)) | |
2194 | return 1; | |
e96980ef JK |
2195 | } |
2196 | return 0; | |
2197 | } | |
2198 | ||
98f2a687 BW |
2199 | static int get_index_dtype(struct index_state *istate, |
2200 | const char *path, int len) | |
443e061a LT |
2201 | { |
2202 | int pos; | |
9c5e6c80 | 2203 | const struct cache_entry *ce; |
443e061a | 2204 | |
98f2a687 | 2205 | ce = index_file_exists(istate, path, len, 0); |
443e061a LT |
2206 | if (ce) { |
2207 | if (!ce_uptodate(ce)) | |
2208 | return DT_UNKNOWN; | |
2209 | if (S_ISGITLINK(ce->ce_mode)) | |
2210 | return DT_DIR; | |
2211 | /* | |
2212 | * Nobody actually cares about the | |
2213 | * difference between DT_LNK and DT_REG | |
2214 | */ | |
2215 | return DT_REG; | |
2216 | } | |
2217 | ||
2218 | /* Try to look it up as a directory */ | |
98f2a687 | 2219 | pos = index_name_pos(istate, path, len); |
443e061a LT |
2220 | if (pos >= 0) |
2221 | return DT_UNKNOWN; | |
2222 | pos = -pos-1; | |
98f2a687 BW |
2223 | while (pos < istate->cache_nr) { |
2224 | ce = istate->cache[pos++]; | |
443e061a LT |
2225 | if (strncmp(ce->name, path, len)) |
2226 | break; | |
2227 | if (ce->name[len] > '/') | |
2228 | break; | |
2229 | if (ce->name[len] < '/') | |
2230 | continue; | |
2231 | if (!ce_uptodate(ce)) | |
2232 | break; /* continue? */ | |
2233 | return DT_DIR; | |
2234 | } | |
2235 | return DT_UNKNOWN; | |
2236 | } | |
2237 | ||
aa79636f VD |
2238 | unsigned char get_dtype(struct dirent *e, struct strbuf *path, |
2239 | int follow_symlink) | |
6dc10043 VD |
2240 | { |
2241 | struct stat st; | |
2242 | unsigned char dtype = DTYPE(e); | |
2243 | size_t base_path_len; | |
2244 | ||
aa79636f | 2245 | if (dtype != DT_UNKNOWN && !(follow_symlink && dtype == DT_LNK)) |
6dc10043 VD |
2246 | return dtype; |
2247 | ||
aa79636f VD |
2248 | /* |
2249 | * d_type unknown or unfollowed symlink, try to fall back on [l]stat | |
2250 | * results. If [l]stat fails, explicitly set DT_UNKNOWN. | |
2251 | */ | |
6dc10043 VD |
2252 | base_path_len = path->len; |
2253 | strbuf_addstr(path, e->d_name); | |
aa79636f VD |
2254 | if ((follow_symlink && stat(path->buf, &st)) || |
2255 | (!follow_symlink && lstat(path->buf, &st))) | |
6dc10043 VD |
2256 | goto cleanup; |
2257 | ||
2258 | /* determine d_type from st_mode */ | |
2259 | if (S_ISREG(st.st_mode)) | |
2260 | dtype = DT_REG; | |
2261 | else if (S_ISDIR(st.st_mode)) | |
2262 | dtype = DT_DIR; | |
2263 | else if (S_ISLNK(st.st_mode)) | |
2264 | dtype = DT_LNK; | |
2265 | ||
2266 | cleanup: | |
2267 | strbuf_setlen(path, base_path_len); | |
2268 | return dtype; | |
2269 | } | |
2270 | ||
ad6f2157 JK |
2271 | static int resolve_dtype(int dtype, struct index_state *istate, |
2272 | const char *path, int len) | |
07134421 | 2273 | { |
07134421 LT |
2274 | struct stat st; |
2275 | ||
2276 | if (dtype != DT_UNKNOWN) | |
2277 | return dtype; | |
98f2a687 | 2278 | dtype = get_index_dtype(istate, path, len); |
443e061a LT |
2279 | if (dtype != DT_UNKNOWN) |
2280 | return dtype; | |
2281 | if (lstat(path, &st)) | |
07134421 LT |
2282 | return dtype; |
2283 | if (S_ISREG(st.st_mode)) | |
2284 | return DT_REG; | |
2285 | if (S_ISDIR(st.st_mode)) | |
2286 | return DT_DIR; | |
2287 | if (S_ISLNK(st.st_mode)) | |
2288 | return DT_LNK; | |
2289 | return dtype; | |
2290 | } | |
2291 | ||
91a2288b | 2292 | static enum path_treatment treat_path_fast(struct dir_struct *dir, |
91a2288b | 2293 | struct cached_dir *cdir, |
0ef8e169 | 2294 | struct index_state *istate, |
91a2288b NTND |
2295 | struct strbuf *path, |
2296 | int baselen, | |
e1b8c7bd | 2297 | const struct pathspec *pathspec) |
91a2288b | 2298 | { |
8d92fb29 EN |
2299 | /* |
2300 | * WARNING: From this function, you can return path_recurse or you | |
2301 | * can call read_directory_recursive() (or neither), but | |
2302 | * you CAN'T DO BOTH. | |
2303 | */ | |
91a2288b NTND |
2304 | strbuf_setlen(path, baselen); |
2305 | if (!cdir->ucd) { | |
2306 | strbuf_addstr(path, cdir->file); | |
2307 | return path_untracked; | |
2308 | } | |
2309 | strbuf_addstr(path, cdir->ucd->name); | |
2310 | /* treat_one_path() does this before it calls treat_directory() */ | |
00b6c178 | 2311 | strbuf_complete(path, '/'); |
91a2288b NTND |
2312 | if (cdir->ucd->check_only) |
2313 | /* | |
2314 | * check_only is set as a result of treat_directory() getting | |
2315 | * to its bottom. Verify again the same set of directories | |
2316 | * with check_only set. | |
2317 | */ | |
0ef8e169 | 2318 | return read_directory_recursive(dir, istate, path->buf, path->len, |
5aaa7fd3 | 2319 | cdir->ucd, 1, 0, pathspec); |
91a2288b NTND |
2320 | /* |
2321 | * We get path_recurse in the first run when | |
2322 | * directory_exists_in_index() returns index_nonexistent. We | |
2323 | * are sure that new changes in the index does not impact the | |
2324 | * outcome. Return now. | |
2325 | */ | |
2326 | return path_recurse; | |
2327 | } | |
2328 | ||
16e2cfa9 | 2329 | static enum path_treatment treat_path(struct dir_struct *dir, |
0dcb8d7f | 2330 | struct untracked_cache_dir *untracked, |
cf7c6148 | 2331 | struct cached_dir *cdir, |
0ef8e169 | 2332 | struct index_state *istate, |
49dc2cc2 | 2333 | struct strbuf *path, |
16e2cfa9 | 2334 | int baselen, |
e1b8c7bd | 2335 | const struct pathspec *pathspec) |
16e2cfa9 | 2336 | { |
2df179d3 | 2337 | int has_path_in_index, dtype, excluded; |
2eac2a4c | 2338 | |
ad6f2157 | 2339 | if (!cdir->d_name) |
842385b8 | 2340 | return treat_path_fast(dir, cdir, istate, path, |
e1b8c7bd | 2341 | baselen, pathspec); |
ad6f2157 | 2342 | if (is_dot_or_dotdot(cdir->d_name) || !fspathcmp(cdir->d_name, ".git")) |
defd7c7b | 2343 | return path_none; |
49dc2cc2 | 2344 | strbuf_setlen(path, baselen); |
ad6f2157 | 2345 | strbuf_addstr(path, cdir->d_name); |
e1b8c7bd | 2346 | if (simplify_away(path->buf, path->len, pathspec)) |
defd7c7b | 2347 | return path_none; |
16e2cfa9 | 2348 | |
cd129eed | 2349 | dtype = resolve_dtype(cdir->d_type, istate, path->buf, path->len); |
8aaf8d77 KB |
2350 | |
2351 | /* Always exclude indexed files */ | |
cd129eed EN |
2352 | has_path_in_index = !!index_file_exists(istate, path->buf, path->len, |
2353 | ignore_case); | |
2eac2a4c | 2354 | if (dtype != DT_DIR && has_path_in_index) |
defd7c7b | 2355 | return path_none; |
8aaf8d77 | 2356 | |
2eac2a4c JH |
2357 | /* |
2358 | * When we are looking at a directory P in the working tree, | |
2359 | * there are three cases: | |
2360 | * | |
2361 | * (1) P exists in the index. Everything inside the directory P in | |
2362 | * the working tree needs to go when P is checked out from the | |
2363 | * index. | |
2364 | * | |
2365 | * (2) P does not exist in the index, but there is P/Q in the index. | |
2366 | * We know P will stay a directory when we check out the contents | |
2367 | * of the index, but we do not know yet if there is a directory | |
2368 | * P/Q in the working tree to be killed, so we need to recurse. | |
2369 | * | |
2370 | * (3) P does not exist in the index, and there is no P/Q in the index | |
2371 | * to require P to be a directory, either. Only in this case, we | |
2372 | * know that everything inside P will not be killed without | |
2373 | * recursing. | |
2374 | */ | |
2375 | if ((dir->flags & DIR_COLLECT_KILLED_ONLY) && | |
2376 | (dtype == DT_DIR) && | |
de372b1b | 2377 | !has_path_in_index && |
0ef8e169 | 2378 | (directory_exists_in_index(istate, path->buf, path->len) == index_nonexistent)) |
de372b1b | 2379 | return path_none; |
8aaf8d77 | 2380 | |
2df179d3 | 2381 | excluded = is_excluded(dir, istate, path->buf, &dtype); |
53cc5356 JH |
2382 | |
2383 | /* | |
2384 | * Excluded? If we don't explicitly want to show | |
2385 | * ignored files, ignore it | |
2386 | */ | |
2df179d3 | 2387 | if (excluded && !(dir->flags & (DIR_SHOW_IGNORED|DIR_SHOW_IGNORED_TOO))) |
defd7c7b | 2388 | return path_excluded; |
53cc5356 | 2389 | |
53cc5356 JH |
2390 | switch (dtype) { |
2391 | default: | |
defd7c7b | 2392 | return path_none; |
53cc5356 | 2393 | case DT_DIR: |
07966ed1 | 2394 | /* |
8d92fb29 EN |
2395 | * WARNING: Do not ignore/amend the return value from |
2396 | * treat_directory(), and especially do not change it to return | |
2397 | * path_recurse as that can cause exponential slowdown. | |
2398 | * Instead, modify treat_directory() to return the right value. | |
07966ed1 | 2399 | */ |
8d92fb29 EN |
2400 | strbuf_addch(path, '/'); |
2401 | return treat_directory(dir, istate, untracked, | |
2402 | path->buf, path->len, | |
2403 | baselen, excluded, pathspec); | |
53cc5356 JH |
2404 | case DT_REG: |
2405 | case DT_LNK: | |
95c11ecc | 2406 | if (pathspec && |
f1f061e1 EN |
2407 | !match_pathspec(istate, pathspec, path->buf, path->len, |
2408 | 0 /* prefix */, NULL /* seen */, | |
2409 | 0 /* is_dir */)) | |
95c11ecc | 2410 | return path_none; |
cada7308 MÅ |
2411 | if (excluded) |
2412 | return path_excluded; | |
95c11ecc | 2413 | return path_untracked; |
53cc5356 | 2414 | } |
0dcb8d7f NTND |
2415 | } |
2416 | ||
2417 | static void add_untracked(struct untracked_cache_dir *dir, const char *name) | |
2418 | { | |
2419 | if (!dir) | |
2420 | return; | |
2421 | ALLOC_GROW(dir->untracked, dir->untracked_nr + 1, | |
2422 | dir->untracked_alloc); | |
2423 | dir->untracked[dir->untracked_nr++] = xstrdup(name); | |
16e2cfa9 JH |
2424 | } |
2425 | ||
91a2288b NTND |
2426 | static int valid_cached_dir(struct dir_struct *dir, |
2427 | struct untracked_cache_dir *untracked, | |
207a06ce | 2428 | struct index_state *istate, |
91a2288b NTND |
2429 | struct strbuf *path, |
2430 | int check_only) | |
2431 | { | |
2432 | struct stat st; | |
2433 | ||
2434 | if (!untracked) | |
2435 | return 0; | |
2436 | ||
883e248b BP |
2437 | /* |
2438 | * With fsmonitor, we can trust the untracked cache's valid field. | |
2439 | */ | |
2440 | refresh_fsmonitor(istate); | |
2441 | if (!(dir->untracked->use_fsmonitor && untracked->valid)) { | |
2523c4be | 2442 | if (lstat(path->len ? path->buf : ".", &st)) { |
883e248b BP |
2443 | memset(&untracked->stat_data, 0, sizeof(untracked->stat_data)); |
2444 | return 0; | |
2445 | } | |
2446 | if (!untracked->valid || | |
2447 | match_stat_data_racy(istate, &untracked->stat_data, &st)) { | |
883e248b BP |
2448 | fill_stat_data(&untracked->stat_data, &st); |
2449 | return 0; | |
2450 | } | |
91a2288b NTND |
2451 | } |
2452 | ||
b6403131 | 2453 | if (untracked->check_only != !!check_only) |
91a2288b | 2454 | return 0; |
91a2288b NTND |
2455 | |
2456 | /* | |
2457 | * prep_exclude will be called eventually on this directory, | |
65edd96a | 2458 | * but it's called much later in last_matching_pattern(). We |
91a2288b NTND |
2459 | * need it now to determine the validity of the cache for this |
2460 | * path. The next calls will be nearly no-op, the way | |
2461 | * prep_exclude() is designed. | |
2462 | */ | |
2463 | if (path->len && path->buf[path->len - 1] != '/') { | |
2464 | strbuf_addch(path, '/'); | |
207a06ce | 2465 | prep_exclude(dir, istate, path->buf, path->len); |
91a2288b NTND |
2466 | strbuf_setlen(path, path->len - 1); |
2467 | } else | |
207a06ce | 2468 | prep_exclude(dir, istate, path->buf, path->len); |
91a2288b NTND |
2469 | |
2470 | /* hopefully prep_exclude() haven't invalidated this entry... */ | |
2471 | return untracked->valid; | |
2472 | } | |
2473 | ||
cf7c6148 NTND |
2474 | static int open_cached_dir(struct cached_dir *cdir, |
2475 | struct dir_struct *dir, | |
2476 | struct untracked_cache_dir *untracked, | |
207a06ce | 2477 | struct index_state *istate, |
cf7c6148 NTND |
2478 | struct strbuf *path, |
2479 | int check_only) | |
2480 | { | |
b6731550 NTND |
2481 | const char *c_path; |
2482 | ||
cf7c6148 NTND |
2483 | memset(cdir, 0, sizeof(*cdir)); |
2484 | cdir->untracked = untracked; | |
207a06ce | 2485 | if (valid_cached_dir(dir, untracked, istate, path, check_only)) |
91a2288b | 2486 | return 0; |
b6731550 NTND |
2487 | c_path = path->len ? path->buf : "."; |
2488 | cdir->fdir = opendir(c_path); | |
2489 | if (!cdir->fdir) | |
2490 | warning_errno(_("could not open directory '%s'"), c_path); | |
b6403131 NTND |
2491 | if (dir->untracked) { |
2492 | invalidate_directory(dir->untracked, untracked); | |
91a2288b | 2493 | dir->untracked->dir_opened++; |
b6403131 | 2494 | } |
cf7c6148 NTND |
2495 | if (!cdir->fdir) |
2496 | return -1; | |
2497 | return 0; | |
2498 | } | |
2499 | ||
2500 | static int read_cached_dir(struct cached_dir *cdir) | |
2501 | { | |
ad6f2157 JK |
2502 | struct dirent *de; |
2503 | ||
cf7c6148 | 2504 | if (cdir->fdir) { |
b548f0f1 | 2505 | de = readdir_skip_dot_and_dotdot(cdir->fdir); |
ad6f2157 JK |
2506 | if (!de) { |
2507 | cdir->d_name = NULL; | |
2508 | cdir->d_type = DT_UNKNOWN; | |
cf7c6148 | 2509 | return -1; |
ad6f2157 JK |
2510 | } |
2511 | cdir->d_name = de->d_name; | |
2512 | cdir->d_type = DTYPE(de); | |
cf7c6148 NTND |
2513 | return 0; |
2514 | } | |
91a2288b NTND |
2515 | while (cdir->nr_dirs < cdir->untracked->dirs_nr) { |
2516 | struct untracked_cache_dir *d = cdir->untracked->dirs[cdir->nr_dirs]; | |
26cb0182 NTND |
2517 | if (!d->recurse) { |
2518 | cdir->nr_dirs++; | |
2519 | continue; | |
2520 | } | |
91a2288b NTND |
2521 | cdir->ucd = d; |
2522 | cdir->nr_dirs++; | |
2523 | return 0; | |
2524 | } | |
2525 | cdir->ucd = NULL; | |
2526 | if (cdir->nr_files < cdir->untracked->untracked_nr) { | |
2527 | struct untracked_cache_dir *d = cdir->untracked; | |
2528 | cdir->file = d->untracked[cdir->nr_files++]; | |
2529 | return 0; | |
2530 | } | |
cf7c6148 NTND |
2531 | return -1; |
2532 | } | |
2533 | ||
2534 | static void close_cached_dir(struct cached_dir *cdir) | |
2535 | { | |
2536 | if (cdir->fdir) | |
2537 | closedir(cdir->fdir); | |
91a2288b NTND |
2538 | /* |
2539 | * We have gone through this directory and found no untracked | |
2540 | * entries. Mark it valid. | |
2541 | */ | |
26cb0182 | 2542 | if (cdir->untracked) { |
91a2288b | 2543 | cdir->untracked->valid = 1; |
26cb0182 NTND |
2544 | cdir->untracked->recurse = 1; |
2545 | } | |
16e2cfa9 JH |
2546 | } |
2547 | ||
c5c4eddd EN |
2548 | static void add_path_to_appropriate_result_list(struct dir_struct *dir, |
2549 | struct untracked_cache_dir *untracked, | |
2550 | struct cached_dir *cdir, | |
2551 | struct index_state *istate, | |
2552 | struct strbuf *path, | |
2553 | int baselen, | |
2554 | const struct pathspec *pathspec, | |
2555 | enum path_treatment state) | |
2556 | { | |
2557 | /* add the path to the appropriate result list */ | |
2558 | switch (state) { | |
2559 | case path_excluded: | |
2560 | if (dir->flags & DIR_SHOW_IGNORED) | |
2561 | dir_add_name(dir, istate, path->buf, path->len); | |
2562 | else if ((dir->flags & DIR_SHOW_IGNORED_TOO) || | |
2563 | ((dir->flags & DIR_COLLECT_IGNORED) && | |
2564 | exclude_matches_pathspec(path->buf, path->len, | |
2565 | pathspec))) | |
2566 | dir_add_ignored(dir, istate, path->buf, path->len); | |
2567 | break; | |
2568 | ||
2569 | case path_untracked: | |
2570 | if (dir->flags & DIR_SHOW_IGNORED) | |
2571 | break; | |
2572 | dir_add_name(dir, istate, path->buf, path->len); | |
2573 | if (cdir->fdir) | |
2574 | add_untracked(untracked, path->buf + baselen); | |
2575 | break; | |
2576 | ||
2577 | default: | |
2578 | break; | |
2579 | } | |
2580 | } | |
2581 | ||
453ec4bd LT |
2582 | /* |
2583 | * Read a directory tree. We currently ignore anything but | |
2584 | * directories, regular files and symlinks. That's because git | |
2585 | * doesn't handle them at all yet. Maybe that will change some | |
2586 | * day. | |
2587 | * | |
2588 | * Also, we ignore the name ".git" (even if it is not a directory). | |
2589 | * That likely will not change. | |
defd7c7b | 2590 | * |
5aaa7fd3 JM |
2591 | * If 'stop_at_first_file' is specified, 'path_excluded' is returned |
2592 | * to signal that a file was found. This is the least significant value that | |
2593 | * indicates that a file was encountered that does not depend on the order of | |
446f46d8 | 2594 | * whether an untracked or excluded path was encountered first. |
5aaa7fd3 | 2595 | * |
defd7c7b | 2596 | * Returns the most significant path_treatment value encountered in the scan. |
5aaa7fd3 JM |
2597 | * If 'stop_at_first_file' is specified, `path_excluded` is the most |
2598 | * significant path_treatment value that will be returned. | |
453ec4bd | 2599 | */ |
5aaa7fd3 | 2600 | |
defd7c7b | 2601 | static enum path_treatment read_directory_recursive(struct dir_struct *dir, |
0ef8e169 BW |
2602 | struct index_state *istate, const char *base, int baselen, |
2603 | struct untracked_cache_dir *untracked, int check_only, | |
5aaa7fd3 | 2604 | int stop_at_first_file, const struct pathspec *pathspec) |
453ec4bd | 2605 | { |
777b4203 | 2606 | /* |
8d92fb29 EN |
2607 | * WARNING: Do NOT recurse unless path_recurse is returned from |
2608 | * treat_path(). Recursing on any other return value | |
2609 | * can result in exponential slowdown. | |
777b4203 | 2610 | */ |
cf7c6148 | 2611 | struct cached_dir cdir; |
defd7c7b | 2612 | enum path_treatment state, subdir_state, dir_state = path_none; |
bef36921 | 2613 | struct strbuf path = STRBUF_INIT; |
453ec4bd | 2614 | |
bef36921 | 2615 | strbuf_add(&path, base, baselen); |
02cb6753 | 2616 | |
0ef8e169 | 2617 | if (open_cached_dir(&cdir, dir, untracked, istate, &path, check_only)) |
1528d247 | 2618 | goto out; |
5fdf285e | 2619 | dir->internal.visited_directories++; |
1528d247 | 2620 | |
0dcb8d7f NTND |
2621 | if (untracked) |
2622 | untracked->check_only = !!check_only; | |
2623 | ||
cf7c6148 | 2624 | while (!read_cached_dir(&cdir)) { |
defd7c7b | 2625 | /* check how the file or directory should be treated */ |
0ef8e169 | 2626 | state = treat_path(dir, untracked, &cdir, istate, &path, |
e1b8c7bd | 2627 | baselen, pathspec); |
5fdf285e | 2628 | dir->internal.visited_paths++; |
0dcb8d7f | 2629 | |
defd7c7b KB |
2630 | if (state > dir_state) |
2631 | dir_state = state; | |
2632 | ||
2633 | /* recurse into subdir if instructed by treat_path */ | |
8d92fb29 | 2634 | if (state == path_recurse) { |
0dcb8d7f | 2635 | struct untracked_cache_dir *ud; |
5fdf285e EN |
2636 | ud = lookup_untracked(dir->untracked, |
2637 | untracked, | |
0dcb8d7f NTND |
2638 | path.buf + baselen, |
2639 | path.len - baselen); | |
2640 | subdir_state = | |
0ef8e169 | 2641 | read_directory_recursive(dir, istate, path.buf, |
e1b8c7bd | 2642 | path.len, ud, |
5aaa7fd3 | 2643 | check_only, stop_at_first_file, pathspec); |
defd7c7b KB |
2644 | if (subdir_state > dir_state) |
2645 | dir_state = subdir_state; | |
404ebced | 2646 | |
69f272b9 EN |
2647 | if (pathspec && |
2648 | !match_pathspec(istate, pathspec, path.buf, path.len, | |
404ebced EN |
2649 | 0 /* prefix */, NULL, |
2650 | 0 /* do NOT special case dirs */)) | |
2651 | state = path_none; | |
defd7c7b KB |
2652 | } |
2653 | ||
2654 | if (check_only) { | |
5aaa7fd3 JM |
2655 | if (stop_at_first_file) { |
2656 | /* | |
2657 | * If stopping at first file, then | |
2658 | * signal that a file was found by | |
2659 | * returning `path_excluded`. This is | |
2660 | * to return a consistent value | |
2661 | * regardless of whether an ignored or | |
2662 | * excluded file happened to be | |
2663 | * encountered 1st. | |
2664 | * | |
2665 | * In current usage, the | |
2666 | * `stop_at_first_file` is passed when | |
2667 | * an ancestor directory has matched | |
2668 | * an exclude pattern, so any found | |
2669 | * files will be excluded. | |
2670 | */ | |
2671 | if (dir_state >= path_excluded) { | |
2672 | dir_state = path_excluded; | |
2673 | break; | |
2674 | } | |
2675 | } | |
2676 | ||
defd7c7b | 2677 | /* abort early if maximum state has been reached */ |
0dcb8d7f | 2678 | if (dir_state == path_untracked) { |
91a2288b | 2679 | if (cdir.fdir) |
0dcb8d7f | 2680 | add_untracked(untracked, path.buf + baselen); |
defd7c7b | 2681 | break; |
0dcb8d7f | 2682 | } |
0126d141 | 2683 | /* skip the add_path_to_appropriate_result_list() */ |
02cb6753 | 2684 | continue; |
453ec4bd | 2685 | } |
defd7c7b | 2686 | |
c5c4eddd EN |
2687 | add_path_to_appropriate_result_list(dir, untracked, &cdir, |
2688 | istate, &path, baselen, | |
2689 | pathspec, state); | |
453ec4bd | 2690 | } |
cf7c6148 | 2691 | close_cached_dir(&cdir); |
1528d247 | 2692 | out: |
bef36921 | 2693 | strbuf_release(&path); |
453ec4bd | 2694 | |
defd7c7b | 2695 | return dir_state; |
453ec4bd LT |
2696 | } |
2697 | ||
bbf504a9 | 2698 | int cmp_dir_entry(const void *p1, const void *p2) |
453ec4bd LT |
2699 | { |
2700 | const struct dir_entry *e1 = *(const struct dir_entry **)p1; | |
2701 | const struct dir_entry *e2 = *(const struct dir_entry **)p2; | |
2702 | ||
ccdd4a0f | 2703 | return name_compare(e1->name, e1->len, e2->name, e2->len); |
453ec4bd LT |
2704 | } |
2705 | ||
fb898888 | 2706 | /* check if *out lexically strictly contains *in */ |
bbf504a9 | 2707 | int check_dir_entry_contains(const struct dir_entry *out, const struct dir_entry *in) |
fb898888 SL |
2708 | { |
2709 | return (out->len < in->len) && | |
2710 | (out->name[out->len - 1] == '/') && | |
2711 | !memcmp(out->name, in->name, out->len); | |
2712 | } | |
2713 | ||
48ffef96 | 2714 | static int treat_leading_path(struct dir_struct *dir, |
0ef8e169 | 2715 | struct index_state *istate, |
48ffef96 | 2716 | const char *path, int len, |
e1b8c7bd | 2717 | const struct pathspec *pathspec) |
48ffef96 | 2718 | { |
49dc2cc2 | 2719 | struct strbuf sb = STRBUF_INIT; |
ad6f2157 | 2720 | struct strbuf subdir = STRBUF_INIT; |
b9670c1f | 2721 | int prevlen, baselen; |
48ffef96 | 2722 | const char *cp; |
b9670c1f | 2723 | struct cached_dir cdir; |
b9670c1f EN |
2724 | enum path_treatment state = path_none; |
2725 | ||
2726 | /* | |
2727 | * For each directory component of path, we are going to check whether | |
2728 | * that path is relevant given the pathspec. For example, if path is | |
2729 | * foo/bar/baz/ | |
2730 | * then we will ask treat_path() whether we should go into foo, then | |
2731 | * whether we should go into bar, then whether baz is relevant. | |
2732 | * Checking each is important because e.g. if path is | |
2733 | * .git/info/ | |
2734 | * then we need to check .git to know we shouldn't traverse it. | |
2735 | * If the return from treat_path() is: | |
2736 | * * path_none, for any path, we return false. | |
2737 | * * path_recurse, for all path components, we return true | |
2738 | * * <anything else> for some intermediate component, we make sure | |
2739 | * to add that path to the relevant list but return false | |
2740 | * signifying that we shouldn't recurse into it. | |
2741 | */ | |
48ffef96 JH |
2742 | |
2743 | while (len && path[len - 1] == '/') | |
2744 | len--; | |
2745 | if (!len) | |
2746 | return 1; | |
b9670c1f | 2747 | |
b9670c1f | 2748 | memset(&cdir, 0, sizeof(cdir)); |
ad6f2157 | 2749 | cdir.d_type = DT_DIR; |
48ffef96 | 2750 | baselen = 0; |
b9670c1f | 2751 | prevlen = 0; |
48ffef96 | 2752 | while (1) { |
b9670c1f EN |
2753 | prevlen = baselen + !!baselen; |
2754 | cp = path + prevlen; | |
48ffef96 JH |
2755 | cp = memchr(cp, '/', path + len - cp); |
2756 | if (!cp) | |
2757 | baselen = len; | |
2758 | else | |
2759 | baselen = cp - path; | |
b9670c1f | 2760 | strbuf_reset(&sb); |
49dc2cc2 RS |
2761 | strbuf_add(&sb, path, baselen); |
2762 | if (!is_directory(sb.buf)) | |
2763 | break; | |
b9670c1f EN |
2764 | strbuf_reset(&sb); |
2765 | strbuf_add(&sb, path, prevlen); | |
ad6f2157 JK |
2766 | strbuf_reset(&subdir); |
2767 | strbuf_add(&subdir, path+prevlen, baselen-prevlen); | |
2768 | cdir.d_name = subdir.buf; | |
8d92fb29 | 2769 | state = treat_path(dir, NULL, &cdir, istate, &sb, prevlen, pathspec); |
777b4203 | 2770 | |
b9670c1f | 2771 | if (state != path_recurse) |
49dc2cc2 | 2772 | break; /* do not recurse into it */ |
b9670c1f | 2773 | if (len <= baselen) |
49dc2cc2 | 2774 | break; /* finished checking */ |
48ffef96 | 2775 | } |
b9670c1f EN |
2776 | add_path_to_appropriate_result_list(dir, NULL, &cdir, istate, |
2777 | &sb, baselen, pathspec, | |
2778 | state); | |
2779 | ||
ad6f2157 | 2780 | strbuf_release(&subdir); |
49dc2cc2 | 2781 | strbuf_release(&sb); |
b9670c1f | 2782 | return state == path_recurse; |
48ffef96 JH |
2783 | } |
2784 | ||
1e8fef60 NTND |
2785 | static const char *get_ident_string(void) |
2786 | { | |
2787 | static struct strbuf sb = STRBUF_INIT; | |
2788 | struct utsname uts; | |
2789 | ||
2790 | if (sb.len) | |
2791 | return sb.buf; | |
100e4337 | 2792 | if (uname(&uts) < 0) |
1e8fef60 | 2793 | die_errno(_("failed to get kernel name and information")); |
0e0f7618 CC |
2794 | strbuf_addf(&sb, "Location %s, system %s", get_git_work_tree(), |
2795 | uts.sysname); | |
1e8fef60 NTND |
2796 | return sb.buf; |
2797 | } | |
2798 | ||
2799 | static int ident_in_untracked(const struct untracked_cache *uc) | |
2800 | { | |
0e0f7618 CC |
2801 | /* |
2802 | * Previous git versions may have saved many NUL separated | |
2803 | * strings in the "ident" field, but it is insane to manage | |
2804 | * many locations, so just take care of the first one. | |
2805 | */ | |
1e8fef60 | 2806 | |
0e0f7618 | 2807 | return !strcmp(uc->ident.buf, get_ident_string()); |
1e8fef60 NTND |
2808 | } |
2809 | ||
0e0f7618 | 2810 | static void set_untracked_ident(struct untracked_cache *uc) |
1e8fef60 | 2811 | { |
0e0f7618 | 2812 | strbuf_reset(&uc->ident); |
1e8fef60 | 2813 | strbuf_addstr(&uc->ident, get_ident_string()); |
0e0f7618 CC |
2814 | |
2815 | /* | |
2816 | * This strbuf used to contain a list of NUL separated | |
2817 | * strings, so save NUL too for backward compatibility. | |
2818 | */ | |
1e8fef60 NTND |
2819 | strbuf_addch(&uc->ident, 0); |
2820 | } | |
2821 | ||
e6a65355 TK |
2822 | static unsigned new_untracked_cache_flags(struct index_state *istate) |
2823 | { | |
2824 | struct repository *repo = istate->repo; | |
2825 | char *val; | |
2826 | ||
2827 | /* | |
2828 | * This logic is coordinated with the setting of these flags in | |
2829 | * wt-status.c#wt_status_collect_untracked(), and the evaluation | |
2830 | * of the config setting in commit.c#git_status_config() | |
2831 | */ | |
2832 | if (!repo_config_get_string(repo, "status.showuntrackedfiles", &val) && | |
2833 | !strcmp(val, "all")) | |
2834 | return 0; | |
2835 | ||
2836 | /* | |
2837 | * The default, if "all" is not set, is "normal" - leading us here. | |
2838 | * If the value is "none" then it really doesn't matter. | |
2839 | */ | |
2840 | return DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES; | |
2841 | } | |
2842 | ||
2843 | static void new_untracked_cache(struct index_state *istate, int flags) | |
4a4ca479 CC |
2844 | { |
2845 | struct untracked_cache *uc = xcalloc(1, sizeof(*uc)); | |
2846 | strbuf_init(&uc->ident, 100); | |
2847 | uc->exclude_per_dir = ".gitignore"; | |
e6a65355 | 2848 | uc->dir_flags = flags >= 0 ? flags : new_untracked_cache_flags(istate); |
0e0f7618 | 2849 | set_untracked_ident(uc); |
4a4ca479 | 2850 | istate->untracked = uc; |
0e0f7618 | 2851 | istate->cache_changed |= UNTRACKED_CHANGED; |
4a4ca479 CC |
2852 | } |
2853 | ||
2854 | void add_untracked_cache(struct index_state *istate) | |
2855 | { | |
2856 | if (!istate->untracked) { | |
e6a65355 | 2857 | new_untracked_cache(istate, -1); |
0e0f7618 CC |
2858 | } else { |
2859 | if (!ident_in_untracked(istate->untracked)) { | |
2860 | free_untracked_cache(istate->untracked); | |
e6a65355 | 2861 | new_untracked_cache(istate, -1); |
0e0f7618 CC |
2862 | } |
2863 | } | |
4a4ca479 CC |
2864 | } |
2865 | ||
07b29bfd CC |
2866 | void remove_untracked_cache(struct index_state *istate) |
2867 | { | |
2868 | if (istate->untracked) { | |
2869 | free_untracked_cache(istate->untracked); | |
2870 | istate->untracked = NULL; | |
2871 | istate->cache_changed |= UNTRACKED_CHANGED; | |
2872 | } | |
2873 | } | |
2874 | ||
ccad261f NTND |
2875 | static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *dir, |
2876 | int base_len, | |
317956d9 TK |
2877 | const struct pathspec *pathspec, |
2878 | struct index_state *istate) | |
ccad261f NTND |
2879 | { |
2880 | struct untracked_cache_dir *root; | |
026336cb | 2881 | static int untracked_cache_disabled = -1; |
ccad261f | 2882 | |
026336cb JH |
2883 | if (!dir->untracked) |
2884 | return NULL; | |
2885 | if (untracked_cache_disabled < 0) | |
2886 | untracked_cache_disabled = git_env_bool("GIT_DISABLE_UNTRACKED_CACHE", 0); | |
2887 | if (untracked_cache_disabled) | |
ccad261f NTND |
2888 | return NULL; |
2889 | ||
2890 | /* | |
2891 | * We only support $GIT_DIR/info/exclude and core.excludesfile | |
2892 | * as the global ignore rule files. Any other additions | |
2893 | * (e.g. from command line) invalidate the cache. This | |
2894 | * condition also catches running setup_standard_excludes() | |
2895 | * before setting dir->untracked! | |
2896 | */ | |
5fdf285e | 2897 | if (dir->internal.unmanaged_exclude_files) |
ccad261f NTND |
2898 | return NULL; |
2899 | ||
2900 | /* | |
2901 | * Optimize for the main use case only: whole-tree git | |
2902 | * status. More work involved in treat_leading_path() if we | |
2903 | * use cache on just a subset of the worktree. pathspec | |
2904 | * support could make the matter even worse. | |
2905 | */ | |
2906 | if (base_len || (pathspec && pathspec->nr)) | |
2907 | return NULL; | |
2908 | ||
e6a65355 TK |
2909 | /* We don't support collecting ignore files */ |
2910 | if (dir->flags & (DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO | | |
2911 | DIR_COLLECT_IGNORED)) | |
ccad261f NTND |
2912 | return NULL; |
2913 | ||
2914 | /* | |
2915 | * If we use .gitignore in the cache and now you change it to | |
2916 | * .gitexclude, everything will go wrong. | |
2917 | */ | |
2918 | if (dir->exclude_per_dir != dir->untracked->exclude_per_dir && | |
2919 | strcmp(dir->exclude_per_dir, dir->untracked->exclude_per_dir)) | |
2920 | return NULL; | |
2921 | ||
2922 | /* | |
2923 | * EXC_CMDL is not considered in the cache. If people set it, | |
2924 | * skip the cache. | |
2925 | */ | |
5fdf285e | 2926 | if (dir->internal.exclude_list_group[EXC_CMDL].nr) |
ccad261f NTND |
2927 | return NULL; |
2928 | ||
1e8fef60 | 2929 | if (!ident_in_untracked(dir->untracked)) { |
1a07e59c | 2930 | warning(_("untracked cache is disabled on this system or location")); |
1e8fef60 NTND |
2931 | return NULL; |
2932 | } | |
2933 | ||
e6a65355 TK |
2934 | /* |
2935 | * If the untracked structure we received does not have the same flags | |
2936 | * as requested in this run, we're going to need to either discard the | |
2937 | * existing structure (and potentially later recreate), or bypass the | |
2938 | * untracked cache mechanism for this run. | |
2939 | */ | |
2940 | if (dir->flags != dir->untracked->dir_flags) { | |
2941 | /* | |
2942 | * If the untracked structure we received does not have the same flags | |
2943 | * as configured, then we need to reset / create a new "untracked" | |
2944 | * structure to match the new config. | |
2945 | * | |
2946 | * Keeping the saved and used untracked cache consistent with the | |
2947 | * configuration provides an opportunity for frequent users of | |
2948 | * "git status -uall" to leverage the untracked cache by aligning their | |
2949 | * configuration - setting "status.showuntrackedfiles" to "all" or | |
2950 | * "normal" as appropriate. | |
2951 | * | |
2952 | * Previously using -uall (or setting "status.showuntrackedfiles" to | |
2953 | * "all") was incompatible with untracked cache and *consistently* | |
2954 | * caused surprisingly bad performance (with fscache and fsmonitor | |
2955 | * enabled) on Windows. | |
2956 | * | |
2957 | * IMPROVEMENT OPPORTUNITY: If we reworked the untracked cache storage | |
2958 | * to not be as bound up with the desired output in a given run, | |
2959 | * and instead iterated through and stored enough information to | |
2960 | * correctly serve both "modes", then users could get peak performance | |
2961 | * with or without '-uall' regardless of their | |
2962 | * "status.showuntrackedfiles" config. | |
2963 | */ | |
2964 | if (dir->untracked->dir_flags != new_untracked_cache_flags(istate)) { | |
2965 | free_untracked_cache(istate->untracked); | |
2966 | new_untracked_cache(istate, dir->flags); | |
2967 | dir->untracked = istate->untracked; | |
2968 | } | |
2969 | else { | |
2970 | /* | |
2971 | * Current untracked cache data is consistent with config, but not | |
2972 | * usable in this request/run; just bypass untracked cache. | |
2973 | */ | |
2974 | return NULL; | |
2975 | } | |
2976 | } | |
2977 | ||
317956d9 TK |
2978 | if (!dir->untracked->root) { |
2979 | /* Untracked cache existed but is not initialized; fix that */ | |
6347d649 | 2980 | FLEX_ALLOC_STR(dir->untracked->root, name, ""); |
317956d9 TK |
2981 | istate->cache_changed |= UNTRACKED_CHANGED; |
2982 | } | |
ccad261f NTND |
2983 | |
2984 | /* Validate $GIT_DIR/info/exclude and core.excludesfile */ | |
2985 | root = dir->untracked->root; | |
5fdf285e | 2986 | if (!oideq(&dir->internal.ss_info_exclude.oid, |
4b33e602 | 2987 | &dir->untracked->ss_info_exclude.oid)) { |
ccad261f | 2988 | invalidate_gitignore(dir->untracked, root); |
5fdf285e | 2989 | dir->untracked->ss_info_exclude = dir->internal.ss_info_exclude; |
ccad261f | 2990 | } |
5fdf285e | 2991 | if (!oideq(&dir->internal.ss_excludes_file.oid, |
4b33e602 | 2992 | &dir->untracked->ss_excludes_file.oid)) { |
ccad261f | 2993 | invalidate_gitignore(dir->untracked, root); |
5fdf285e | 2994 | dir->untracked->ss_excludes_file = dir->internal.ss_excludes_file; |
ccad261f | 2995 | } |
26cb0182 NTND |
2996 | |
2997 | /* Make sure this directory is not dropped out at saving phase */ | |
2998 | root->recurse = 1; | |
ccad261f NTND |
2999 | return root; |
3000 | } | |
3001 | ||
7f9dd879 EN |
3002 | static void emit_traversal_statistics(struct dir_struct *dir, |
3003 | struct repository *repo, | |
3004 | const char *path, | |
3005 | int path_len) | |
3006 | { | |
3007 | if (!trace2_is_enabled()) | |
3008 | return; | |
3009 | ||
3010 | if (!path_len) { | |
3011 | trace2_data_string("read_directory", repo, "path", ""); | |
3012 | } else { | |
3013 | struct strbuf tmp = STRBUF_INIT; | |
3014 | strbuf_add(&tmp, path, path_len); | |
3015 | trace2_data_string("read_directory", repo, "path", tmp.buf); | |
3016 | strbuf_release(&tmp); | |
3017 | } | |
3018 | ||
7fe1ffda | 3019 | trace2_data_intmax("read_directory", repo, |
5fdf285e | 3020 | "directories-visited", dir->internal.visited_directories); |
7fe1ffda | 3021 | trace2_data_intmax("read_directory", repo, |
5fdf285e | 3022 | "paths-visited", dir->internal.visited_paths); |
7fe1ffda | 3023 | |
7f9dd879 EN |
3024 | if (!dir->untracked) |
3025 | return; | |
3026 | trace2_data_intmax("read_directory", repo, | |
3027 | "node-creation", dir->untracked->dir_created); | |
3028 | trace2_data_intmax("read_directory", repo, | |
3029 | "gitignore-invalidation", | |
3030 | dir->untracked->gitignore_invalidated); | |
3031 | trace2_data_intmax("read_directory", repo, | |
3032 | "directory-invalidation", | |
3033 | dir->untracked->dir_invalidated); | |
3034 | trace2_data_intmax("read_directory", repo, | |
3035 | "opendir", dir->untracked->dir_opened); | |
3036 | } | |
3037 | ||
2c1eb104 BW |
3038 | int read_directory(struct dir_struct *dir, struct index_state *istate, |
3039 | const char *path, int len, const struct pathspec *pathspec) | |
9fc42d60 | 3040 | { |
ccad261f | 3041 | struct untracked_cache_dir *untracked; |
b4189aa8 | 3042 | |
7f9dd879 | 3043 | trace2_region_enter("dir", "read_directory", istate->repo); |
5fdf285e EN |
3044 | dir->internal.visited_paths = 0; |
3045 | dir->internal.visited_directories = 0; | |
c46c406a NTND |
3046 | |
3047 | if (has_symlink_leading_path(path, len)) { | |
7f9dd879 | 3048 | trace2_region_leave("dir", "read_directory", istate->repo); |
725b0605 | 3049 | return dir->nr; |
c46c406a | 3050 | } |
725b0605 | 3051 | |
317956d9 | 3052 | untracked = validate_untracked_cache(dir, len, pathspec, istate); |
ccad261f NTND |
3053 | if (!untracked) |
3054 | /* | |
3055 | * make sure untracked cache code path is disabled, | |
3056 | * e.g. prep_exclude() | |
3057 | */ | |
3058 | dir->untracked = NULL; | |
2c1eb104 | 3059 | if (!len || treat_leading_path(dir, istate, path, len, pathspec)) |
5aaa7fd3 | 3060 | read_directory_recursive(dir, istate, path, len, untracked, 0, 0, pathspec); |
bbf504a9 SL |
3061 | QSORT(dir->entries, dir->nr, cmp_dir_entry); |
3062 | QSORT(dir->ignored, dir->ignored_nr, cmp_dir_entry); | |
fb898888 | 3063 | |
7f9dd879 EN |
3064 | emit_traversal_statistics(dir, istate->repo, path, len); |
3065 | ||
3066 | trace2_region_leave("dir", "read_directory", istate->repo); | |
c9ccb5d3 | 3067 | if (dir->untracked) { |
026336cb | 3068 | static int force_untracked_cache = -1; |
026336cb JH |
3069 | |
3070 | if (force_untracked_cache < 0) | |
3071 | force_untracked_cache = | |
26b89464 DS |
3072 | git_env_bool("GIT_FORCE_UNTRACKED_CACHE", -1); |
3073 | if (force_untracked_cache < 0) | |
3074 | force_untracked_cache = (istate->repo->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE); | |
026336cb | 3075 | if (force_untracked_cache && |
fc9ecbeb | 3076 | dir->untracked == istate->untracked && |
1bbb3dba NTND |
3077 | (dir->untracked->dir_opened || |
3078 | dir->untracked->gitignore_invalidated || | |
3079 | dir->untracked->dir_invalidated)) | |
2c1eb104 BW |
3080 | istate->cache_changed |= UNTRACKED_CHANGED; |
3081 | if (dir->untracked != istate->untracked) { | |
6a83d902 | 3082 | FREE_AND_NULL(dir->untracked); |
1bbb3dba | 3083 | } |
c9ccb5d3 | 3084 | } |
7f9dd879 | 3085 | |
453ec4bd LT |
3086 | return dir->nr; |
3087 | } | |
c91f0d92 | 3088 | |
686a4a06 | 3089 | int file_exists(const char *f) |
c91f0d92 | 3090 | { |
686a4a06 | 3091 | struct stat sb; |
a50f9fc5 | 3092 | return lstat(f, &sb) == 0; |
c91f0d92 | 3093 | } |
e6636747 | 3094 | |
0488481e NTND |
3095 | int repo_file_exists(struct repository *repo, const char *path) |
3096 | { | |
3097 | if (repo != the_repository) | |
3098 | BUG("do not know how to check file existence in arbitrary repo"); | |
3099 | ||
3100 | return file_exists(path); | |
3101 | } | |
3102 | ||
63ec5e1f JS |
3103 | static int cmp_icase(char a, char b) |
3104 | { | |
3105 | if (a == b) | |
3106 | return 0; | |
3107 | if (ignore_case) | |
3108 | return toupper(a) - toupper(b); | |
3109 | return a - b; | |
3110 | } | |
3111 | ||
e6636747 | 3112 | /* |
9b125da4 NTND |
3113 | * Given two normalized paths (a trailing slash is ok), if subdir is |
3114 | * outside dir, return -1. Otherwise return the offset in subdir that | |
3115 | * can be used as relative path to dir. | |
e6636747 | 3116 | */ |
9b125da4 | 3117 | int dir_inside_of(const char *subdir, const char *dir) |
e6636747 | 3118 | { |
9b125da4 | 3119 | int offset = 0; |
e6636747 | 3120 | |
9b125da4 | 3121 | assert(dir && subdir && *dir && *subdir); |
e6636747 | 3122 | |
63ec5e1f | 3123 | while (*dir && *subdir && !cmp_icase(*dir, *subdir)) { |
e6636747 | 3124 | dir++; |
9b125da4 NTND |
3125 | subdir++; |
3126 | offset++; | |
490544b1 | 3127 | } |
9b125da4 NTND |
3128 | |
3129 | /* hel[p]/me vs hel[l]/yeah */ | |
3130 | if (*dir && *subdir) | |
3131 | return -1; | |
3132 | ||
3133 | if (!*subdir) | |
3134 | return !*dir ? offset : -1; /* same dir */ | |
3135 | ||
3136 | /* foo/[b]ar vs foo/[] */ | |
3137 | if (is_dir_sep(dir[-1])) | |
3138 | return is_dir_sep(subdir[-1]) ? offset : -1; | |
3139 | ||
3140 | /* foo[/]bar vs foo[] */ | |
3141 | return is_dir_sep(*subdir) ? offset + 1 : -1; | |
e6636747 JS |
3142 | } |
3143 | ||
3144 | int is_inside_dir(const char *dir) | |
3145 | { | |
56b9f6e7 RS |
3146 | char *cwd; |
3147 | int rc; | |
3148 | ||
b892913d NTND |
3149 | if (!dir) |
3150 | return 0; | |
56b9f6e7 RS |
3151 | |
3152 | cwd = xgetcwd(); | |
3153 | rc = (dir_inside_of(cwd, dir) >= 0); | |
3154 | free(cwd); | |
3155 | return rc; | |
e6636747 | 3156 | } |
7155b727 | 3157 | |
55892d23 AP |
3158 | int is_empty_dir(const char *path) |
3159 | { | |
3160 | DIR *dir = opendir(path); | |
3161 | struct dirent *e; | |
3162 | int ret = 1; | |
3163 | ||
3164 | if (!dir) | |
3165 | return 0; | |
3166 | ||
b548f0f1 EN |
3167 | e = readdir_skip_dot_and_dotdot(dir); |
3168 | if (e) | |
3169 | ret = 0; | |
55892d23 AP |
3170 | |
3171 | closedir(dir); | |
3172 | return ret; | |
3173 | } | |
3174 | ||
ed86301f AR |
3175 | char *git_url_basename(const char *repo, int is_bundle, int is_bare) |
3176 | { | |
3177 | const char *end = repo + strlen(repo), *start, *ptr; | |
3178 | size_t len; | |
3179 | char *dir; | |
3180 | ||
3181 | /* | |
3182 | * Skip scheme. | |
3183 | */ | |
3184 | start = strstr(repo, "://"); | |
afe8a907 | 3185 | if (!start) |
ed86301f AR |
3186 | start = repo; |
3187 | else | |
3188 | start += 3; | |
3189 | ||
3190 | /* | |
3191 | * Skip authentication data. The stripping does happen | |
3192 | * greedily, such that we strip up to the last '@' inside | |
3193 | * the host part. | |
3194 | */ | |
3195 | for (ptr = start; ptr < end && !is_dir_sep(*ptr); ptr++) { | |
3196 | if (*ptr == '@') | |
3197 | start = ptr + 1; | |
3198 | } | |
3199 | ||
3200 | /* | |
3201 | * Strip trailing spaces, slashes and /.git | |
3202 | */ | |
3203 | while (start < end && (is_dir_sep(end[-1]) || isspace(end[-1]))) | |
3204 | end--; | |
3205 | if (end - start > 5 && is_dir_sep(end[-5]) && | |
3206 | !strncmp(end - 4, ".git", 4)) { | |
3207 | end -= 5; | |
3208 | while (start < end && is_dir_sep(end[-1])) | |
3209 | end--; | |
3210 | } | |
3211 | ||
2acf4cf0 JS |
3212 | /* |
3213 | * It should not be possible to overflow `ptrdiff_t` by passing in an | |
3214 | * insanely long URL, but GCC does not know that and will complain | |
3215 | * without this check. | |
3216 | */ | |
3217 | if (end - start < 0) | |
3218 | die(_("No directory name could be guessed.\n" | |
3219 | "Please specify a directory on the command line")); | |
3220 | ||
ed86301f AR |
3221 | /* |
3222 | * Strip trailing port number if we've got only a | |
3223 | * hostname (that is, there is no dir separator but a | |
3224 | * colon). This check is required such that we do not | |
3225 | * strip URI's like '/foo/bar:2222.git', which should | |
3226 | * result in a dir '2222' being guessed due to backwards | |
3227 | * compatibility. | |
3228 | */ | |
3229 | if (memchr(start, '/', end - start) == NULL | |
3230 | && memchr(start, ':', end - start) != NULL) { | |
3231 | ptr = end; | |
3232 | while (start < ptr && isdigit(ptr[-1]) && ptr[-1] != ':') | |
3233 | ptr--; | |
3234 | if (start < ptr && ptr[-1] == ':') | |
3235 | end = ptr - 1; | |
3236 | } | |
3237 | ||
3238 | /* | |
3239 | * Find last component. To remain backwards compatible we | |
3240 | * also regard colons as path separators, such that | |
3241 | * cloning a repository 'foo:bar.git' would result in a | |
3242 | * directory 'bar' being guessed. | |
3243 | */ | |
3244 | ptr = end; | |
3245 | while (start < ptr && !is_dir_sep(ptr[-1]) && ptr[-1] != ':') | |
3246 | ptr--; | |
3247 | start = ptr; | |
3248 | ||
3249 | /* | |
3250 | * Strip .{bundle,git}. | |
3251 | */ | |
3252 | len = end - start; | |
3253 | strip_suffix_mem(start, &len, is_bundle ? ".bundle" : ".git"); | |
3254 | ||
3255 | if (!len || (len == 1 && *start == '/')) | |
3256 | die(_("No directory name could be guessed.\n" | |
3257 | "Please specify a directory on the command line")); | |
3258 | ||
3259 | if (is_bare) | |
3260 | dir = xstrfmt("%.*s.git", (int)len, start); | |
3261 | else | |
3262 | dir = xstrndup(start, len); | |
3263 | /* | |
3264 | * Replace sequences of 'control' characters and whitespace | |
3265 | * with one ascii space, remove leading and trailing spaces. | |
3266 | */ | |
3267 | if (*dir) { | |
3268 | char *out = dir; | |
3269 | int prev_space = 1 /* strip leading whitespace */; | |
3270 | for (end = dir; *end; ++end) { | |
3271 | char ch = *end; | |
3272 | if ((unsigned char)ch < '\x20') | |
3273 | ch = '\x20'; | |
3274 | if (isspace(ch)) { | |
3275 | if (prev_space) | |
3276 | continue; | |
3277 | prev_space = 1; | |
3278 | } else | |
3279 | prev_space = 0; | |
3280 | *out++ = ch; | |
3281 | } | |
3282 | *out = '\0'; | |
3283 | if (out > dir && prev_space) | |
3284 | out[-1] = '\0'; | |
3285 | } | |
3286 | return dir; | |
3287 | } | |
3288 | ||
3289 | void strip_dir_trailing_slashes(char *dir) | |
3290 | { | |
3291 | char *end = dir + strlen(dir); | |
3292 | ||
3293 | while (dir < end - 1 && is_dir_sep(end[-1])) | |
3294 | end--; | |
3295 | *end = '\0'; | |
3296 | } | |
3297 | ||
ae2f203e | 3298 | static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up) |
7155b727 | 3299 | { |
a0f4afbe | 3300 | DIR *dir; |
7155b727 | 3301 | struct dirent *e; |
ae2f203e | 3302 | int ret = 0, original_len = path->len, len, kept_down = 0; |
a0f4afbe | 3303 | int only_empty = (flag & REMOVE_DIR_EMPTY_ONLY); |
c844a803 | 3304 | int keep_toplevel = (flag & REMOVE_DIR_KEEP_TOPLEVEL); |
580a5d7f | 3305 | int purge_original_cwd = (flag & REMOVE_DIR_PURGE_ORIGINAL_CWD); |
1053fe82 | 3306 | struct object_id submodule_head; |
7155b727 | 3307 | |
a0f4afbe | 3308 | if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) && |
a98e6101 | 3309 | !resolve_gitlink_ref(path->buf, "HEAD", &submodule_head)) { |
a0f4afbe | 3310 | /* Do not descend and nuke a nested git work tree. */ |
ae2f203e JH |
3311 | if (kept_up) |
3312 | *kept_up = 1; | |
a0f4afbe | 3313 | return 0; |
ae2f203e | 3314 | } |
a0f4afbe | 3315 | |
ae2f203e | 3316 | flag &= ~REMOVE_DIR_KEEP_TOPLEVEL; |
a0f4afbe | 3317 | dir = opendir(path->buf); |
c844a803 | 3318 | if (!dir) { |
863808cd MH |
3319 | if (errno == ENOENT) |
3320 | return keep_toplevel ? -1 : 0; | |
3321 | else if (errno == EACCES && !keep_toplevel) | |
ecb2c282 MH |
3322 | /* |
3323 | * An empty dir could be removable even if it | |
3324 | * is unreadable: | |
3325 | */ | |
c844a803 JH |
3326 | return rmdir(path->buf); |
3327 | else | |
3328 | return -1; | |
3329 | } | |
00b6c178 | 3330 | strbuf_complete(path, '/'); |
7155b727 JS |
3331 | |
3332 | len = path->len; | |
b548f0f1 | 3333 | while ((e = readdir_skip_dot_and_dotdot(dir)) != NULL) { |
7155b727 | 3334 | struct stat st; |
7155b727 JS |
3335 | |
3336 | strbuf_setlen(path, len); | |
3337 | strbuf_addstr(path, e->d_name); | |
863808cd MH |
3338 | if (lstat(path->buf, &st)) { |
3339 | if (errno == ENOENT) | |
3340 | /* | |
3341 | * file disappeared, which is what we | |
3342 | * wanted anyway | |
3343 | */ | |
3344 | continue; | |
15beaaa3 | 3345 | /* fall through */ |
863808cd | 3346 | } else if (S_ISDIR(st.st_mode)) { |
ae2f203e | 3347 | if (!remove_dir_recurse(path, flag, &kept_down)) |
7155b727 | 3348 | continue; /* happy */ |
863808cd MH |
3349 | } else if (!only_empty && |
3350 | (!unlink(path->buf) || errno == ENOENT)) { | |
7155b727 | 3351 | continue; /* happy, too */ |
863808cd | 3352 | } |
7155b727 JS |
3353 | |
3354 | /* path too long, stat fails, or non-directory still exists */ | |
3355 | ret = -1; | |
3356 | break; | |
3357 | } | |
3358 | closedir(dir); | |
3359 | ||
3360 | strbuf_setlen(path, original_len); | |
580a5d7f EN |
3361 | if (!ret && !keep_toplevel && !kept_down) { |
3362 | if (!purge_original_cwd && | |
3363 | startup_info->original_cwd && | |
3364 | !strcmp(startup_info->original_cwd, path->buf)) | |
3365 | ret = -1; /* Do not remove current working directory */ | |
3366 | else | |
3367 | ret = (!rmdir(path->buf) || errno == ENOENT) ? 0 : -1; | |
3368 | } else if (kept_up) | |
ae2f203e JH |
3369 | /* |
3370 | * report the uplevel that it is not an error that we | |
3371 | * did not rmdir() our directory. | |
3372 | */ | |
3373 | *kept_up = !ret; | |
7155b727 JS |
3374 | return ret; |
3375 | } | |
039bc64e | 3376 | |
ae2f203e JH |
3377 | int remove_dir_recursively(struct strbuf *path, int flag) |
3378 | { | |
3379 | return remove_dir_recurse(path, flag, NULL); | |
3380 | } | |
3381 | ||
f932729c JK |
3382 | static GIT_PATH_FUNC(git_path_info_exclude, "info/exclude") |
3383 | ||
039bc64e JH |
3384 | void setup_standard_excludes(struct dir_struct *dir) |
3385 | { | |
039bc64e | 3386 | dir->exclude_per_dir = ".gitignore"; |
099d2d86 | 3387 | |
51d18631 | 3388 | /* core.excludesfile defaulting to $XDG_CONFIG_HOME/git/ignore */ |
2845ce7f PT |
3389 | if (!excludes_file) |
3390 | excludes_file = xdg_config_home("ignore"); | |
4698c8fe | 3391 | if (excludes_file && !access_or_warn(excludes_file, R_OK, 0)) |
65edd96a | 3392 | add_patterns_from_file_1(dir, excludes_file, |
5fdf285e | 3393 | dir->untracked ? &dir->internal.ss_excludes_file : NULL); |
099d2d86 JH |
3394 | |
3395 | /* per repository user preference */ | |
f0056f64 JK |
3396 | if (startup_info->have_repository) { |
3397 | const char *path = git_path_info_exclude(); | |
3398 | if (!access_or_warn(path, R_OK, 0)) | |
65edd96a | 3399 | add_patterns_from_file_1(dir, path, |
5fdf285e | 3400 | dir->untracked ? &dir->internal.ss_info_exclude : NULL); |
f0056f64 | 3401 | } |
039bc64e | 3402 | } |
4a92d1bf | 3403 | |
dd23022a DS |
3404 | char *get_sparse_checkout_filename(void) |
3405 | { | |
3406 | return git_pathdup("info/sparse-checkout"); | |
3407 | } | |
3408 | ||
3409 | int get_sparse_checkout_patterns(struct pattern_list *pl) | |
3410 | { | |
3411 | int res; | |
3412 | char *sparse_filename = get_sparse_checkout_filename(); | |
3413 | ||
3414 | pl->use_cone_patterns = core_sparse_checkout_cone; | |
1679d60b | 3415 | res = add_patterns_from_file_to_list(sparse_filename, "", 0, pl, NULL, 0); |
dd23022a DS |
3416 | |
3417 | free(sparse_filename); | |
3418 | return res; | |
3419 | } | |
3420 | ||
4a92d1bf AR |
3421 | int remove_path(const char *name) |
3422 | { | |
3423 | char *slash; | |
3424 | ||
c7054209 | 3425 | if (unlink(name) && !is_missing_file_error(errno)) |
4a92d1bf AR |
3426 | return -1; |
3427 | ||
3428 | slash = strrchr(name, '/'); | |
3429 | if (slash) { | |
3430 | char *dirs = xstrdup(name); | |
3431 | slash = dirs + (slash - name); | |
3432 | do { | |
3433 | *slash = '\0'; | |
63bbe8be EN |
3434 | if (startup_info->original_cwd && |
3435 | !strcmp(startup_info->original_cwd, dirs)) | |
3436 | break; | |
3fc0d131 | 3437 | } while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/'))); |
4a92d1bf AR |
3438 | free(dirs); |
3439 | } | |
3440 | return 0; | |
3441 | } | |
3442 | ||
270be816 | 3443 | /* |
dad4f23c EN |
3444 | * Frees memory within dir which was allocated, and resets fields for further |
3445 | * use. Does not free dir itself. | |
270be816 | 3446 | */ |
eceba532 | 3447 | void dir_clear(struct dir_struct *dir) |
270be816 AS |
3448 | { |
3449 | int i, j; | |
3450 | struct exclude_list_group *group; | |
caa3d554 | 3451 | struct pattern_list *pl; |
270be816 | 3452 | struct exclude_stack *stk; |
ce93a4c6 | 3453 | struct dir_struct new = DIR_INIT; |
270be816 AS |
3454 | |
3455 | for (i = EXC_CMDL; i <= EXC_FILE; i++) { | |
5fdf285e | 3456 | group = &dir->internal.exclude_list_group[i]; |
270be816 | 3457 | for (j = 0; j < group->nr; j++) { |
caa3d554 | 3458 | pl = &group->pl[j]; |
270be816 | 3459 | if (i == EXC_DIRS) |
caa3d554 | 3460 | free((char *)pl->src); |
65edd96a | 3461 | clear_pattern_list(pl); |
270be816 | 3462 | } |
caa3d554 | 3463 | free(group->pl); |
270be816 AS |
3464 | } |
3465 | ||
dad4f23c EN |
3466 | for (i = 0; i < dir->ignored_nr; i++) |
3467 | free(dir->ignored[i]); | |
3468 | for (i = 0; i < dir->nr; i++) | |
3469 | free(dir->entries[i]); | |
3470 | free(dir->ignored); | |
3471 | free(dir->entries); | |
3472 | ||
5fdf285e | 3473 | stk = dir->internal.exclude_stack; |
270be816 AS |
3474 | while (stk) { |
3475 | struct exclude_stack *prev = stk->prev; | |
3476 | free(stk); | |
3477 | stk = prev; | |
3478 | } | |
5fdf285e | 3479 | strbuf_release(&dir->internal.basebuf); |
dad4f23c | 3480 | |
ce93a4c6 | 3481 | memcpy(dir, &new, sizeof(*dir)); |
270be816 | 3482 | } |
83c094ad NTND |
3483 | |
3484 | struct ondisk_untracked_cache { | |
3485 | struct stat_data info_exclude_stat; | |
3486 | struct stat_data excludes_file_stat; | |
3487 | uint32_t dir_flags; | |
83c094ad NTND |
3488 | }; |
3489 | ||
268ba201 | 3490 | #define ouc_offset(x) offsetof(struct ondisk_untracked_cache, x) |
83c094ad NTND |
3491 | |
3492 | struct write_data { | |
3493 | int index; /* number of written untracked_cache_dir */ | |
3494 | struct ewah_bitmap *check_only; /* from untracked_cache_dir */ | |
3495 | struct ewah_bitmap *valid; /* from untracked_cache_dir */ | |
3496 | struct ewah_bitmap *sha1_valid; /* set if exclude_sha1 is not null */ | |
3497 | struct strbuf out; | |
3498 | struct strbuf sb_stat; | |
3499 | struct strbuf sb_sha1; | |
3500 | }; | |
3501 | ||
3502 | static void stat_data_to_disk(struct stat_data *to, const struct stat_data *from) | |
3503 | { | |
3504 | to->sd_ctime.sec = htonl(from->sd_ctime.sec); | |
3505 | to->sd_ctime.nsec = htonl(from->sd_ctime.nsec); | |
3506 | to->sd_mtime.sec = htonl(from->sd_mtime.sec); | |
3507 | to->sd_mtime.nsec = htonl(from->sd_mtime.nsec); | |
3508 | to->sd_dev = htonl(from->sd_dev); | |
3509 | to->sd_ino = htonl(from->sd_ino); | |
3510 | to->sd_uid = htonl(from->sd_uid); | |
3511 | to->sd_gid = htonl(from->sd_gid); | |
3512 | to->sd_size = htonl(from->sd_size); | |
3513 | } | |
3514 | ||
3515 | static void write_one_dir(struct untracked_cache_dir *untracked, | |
3516 | struct write_data *wd) | |
3517 | { | |
3518 | struct stat_data stat_data; | |
3519 | struct strbuf *out = &wd->out; | |
3520 | unsigned char intbuf[16]; | |
3521 | unsigned int intlen, value; | |
3522 | int i = wd->index++; | |
3523 | ||
3524 | /* | |
3525 | * untracked_nr should be reset whenever valid is clear, but | |
3526 | * for safety.. | |
3527 | */ | |
3528 | if (!untracked->valid) { | |
3529 | untracked->untracked_nr = 0; | |
3530 | untracked->check_only = 0; | |
3531 | } | |
3532 | ||
3533 | if (untracked->check_only) | |
3534 | ewah_set(wd->check_only, i); | |
3535 | if (untracked->valid) { | |
3536 | ewah_set(wd->valid, i); | |
3537 | stat_data_to_disk(&stat_data, &untracked->stat_data); | |
3538 | strbuf_add(&wd->sb_stat, &stat_data, sizeof(stat_data)); | |
3539 | } | |
70c369cd | 3540 | if (!is_null_oid(&untracked->exclude_oid)) { |
83c094ad | 3541 | ewah_set(wd->sha1_valid, i); |
70c369cd | 3542 | strbuf_add(&wd->sb_sha1, untracked->exclude_oid.hash, |
3543 | the_hash_algo->rawsz); | |
83c094ad NTND |
3544 | } |
3545 | ||
3546 | intlen = encode_varint(untracked->untracked_nr, intbuf); | |
3547 | strbuf_add(out, intbuf, intlen); | |
3548 | ||
3549 | /* skip non-recurse directories */ | |
3550 | for (i = 0, value = 0; i < untracked->dirs_nr; i++) | |
3551 | if (untracked->dirs[i]->recurse) | |
3552 | value++; | |
3553 | intlen = encode_varint(value, intbuf); | |
3554 | strbuf_add(out, intbuf, intlen); | |
3555 | ||
3556 | strbuf_add(out, untracked->name, strlen(untracked->name) + 1); | |
3557 | ||
3558 | for (i = 0; i < untracked->untracked_nr; i++) | |
3559 | strbuf_add(out, untracked->untracked[i], | |
3560 | strlen(untracked->untracked[i]) + 1); | |
3561 | ||
3562 | for (i = 0; i < untracked->dirs_nr; i++) | |
3563 | if (untracked->dirs[i]->recurse) | |
3564 | write_one_dir(untracked->dirs[i], wd); | |
3565 | } | |
3566 | ||
3567 | void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked) | |
3568 | { | |
3569 | struct ondisk_untracked_cache *ouc; | |
3570 | struct write_data wd; | |
3571 | unsigned char varbuf[16]; | |
e0b83735 | 3572 | int varint_len; |
3899b88b | 3573 | const unsigned hashsz = the_hash_algo->rawsz; |
e0b83735 | 3574 | |
ca56dadb | 3575 | CALLOC_ARRAY(ouc, 1); |
83c094ad NTND |
3576 | stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclude.stat); |
3577 | stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_file.stat); | |
83c094ad | 3578 | ouc->dir_flags = htonl(untracked->dir_flags); |
1e8fef60 NTND |
3579 | |
3580 | varint_len = encode_varint(untracked->ident.len, varbuf); | |
3581 | strbuf_add(out, varbuf, varint_len); | |
8109984d | 3582 | strbuf_addbuf(out, &untracked->ident); |
1e8fef60 | 3583 | |
3899b88b | 3584 | strbuf_add(out, ouc, sizeof(*ouc)); |
3585 | strbuf_add(out, untracked->ss_info_exclude.oid.hash, hashsz); | |
3586 | strbuf_add(out, untracked->ss_excludes_file.oid.hash, hashsz); | |
3587 | strbuf_add(out, untracked->exclude_per_dir, strlen(untracked->exclude_per_dir) + 1); | |
6a83d902 | 3588 | FREE_AND_NULL(ouc); |
83c094ad NTND |
3589 | |
3590 | if (!untracked->root) { | |
3591 | varint_len = encode_varint(0, varbuf); | |
3592 | strbuf_add(out, varbuf, varint_len); | |
3593 | return; | |
3594 | } | |
3595 | ||
3596 | wd.index = 0; | |
3597 | wd.check_only = ewah_new(); | |
3598 | wd.valid = ewah_new(); | |
3599 | wd.sha1_valid = ewah_new(); | |
3600 | strbuf_init(&wd.out, 1024); | |
3601 | strbuf_init(&wd.sb_stat, 1024); | |
3602 | strbuf_init(&wd.sb_sha1, 1024); | |
3603 | write_one_dir(untracked->root, &wd); | |
3604 | ||
3605 | varint_len = encode_varint(wd.index, varbuf); | |
3606 | strbuf_add(out, varbuf, varint_len); | |
3607 | strbuf_addbuf(out, &wd.out); | |
3608 | ewah_serialize_strbuf(wd.valid, out); | |
3609 | ewah_serialize_strbuf(wd.check_only, out); | |
3610 | ewah_serialize_strbuf(wd.sha1_valid, out); | |
3611 | strbuf_addbuf(out, &wd.sb_stat); | |
3612 | strbuf_addbuf(out, &wd.sb_sha1); | |
3613 | strbuf_addch(out, '\0'); /* safe guard for string lists */ | |
3614 | ||
3615 | ewah_free(wd.valid); | |
3616 | ewah_free(wd.check_only); | |
3617 | ewah_free(wd.sha1_valid); | |
3618 | strbuf_release(&wd.out); | |
3619 | strbuf_release(&wd.sb_stat); | |
3620 | strbuf_release(&wd.sb_sha1); | |
3621 | } | |
f9e6c649 NTND |
3622 | |
3623 | static void free_untracked(struct untracked_cache_dir *ucd) | |
3624 | { | |
3625 | int i; | |
3626 | if (!ucd) | |
3627 | return; | |
3628 | for (i = 0; i < ucd->dirs_nr; i++) | |
3629 | free_untracked(ucd->dirs[i]); | |
3630 | for (i = 0; i < ucd->untracked_nr; i++) | |
3631 | free(ucd->untracked[i]); | |
3632 | free(ucd->untracked); | |
3633 | free(ucd->dirs); | |
3634 | free(ucd); | |
3635 | } | |
3636 | ||
3637 | void free_untracked_cache(struct untracked_cache *uc) | |
3638 | { | |
083fd1a2 ÆAB |
3639 | if (!uc) |
3640 | return; | |
3641 | ||
3642 | free(uc->exclude_per_dir_to_free); | |
3643 | strbuf_release(&uc->ident); | |
3644 | free_untracked(uc->root); | |
f9e6c649 NTND |
3645 | free(uc); |
3646 | } | |
3647 | ||
3648 | struct read_data { | |
3649 | int index; | |
3650 | struct untracked_cache_dir **ucd; | |
3651 | struct ewah_bitmap *check_only; | |
3652 | struct ewah_bitmap *valid; | |
3653 | struct ewah_bitmap *sha1_valid; | |
3654 | const unsigned char *data; | |
3655 | const unsigned char *end; | |
3656 | }; | |
3657 | ||
268ba201 | 3658 | static void stat_data_from_disk(struct stat_data *to, const unsigned char *data) |
f9e6c649 | 3659 | { |
268ba201 RS |
3660 | memcpy(to, data, sizeof(*to)); |
3661 | to->sd_ctime.sec = ntohl(to->sd_ctime.sec); | |
3662 | to->sd_ctime.nsec = ntohl(to->sd_ctime.nsec); | |
3663 | to->sd_mtime.sec = ntohl(to->sd_mtime.sec); | |
3664 | to->sd_mtime.nsec = ntohl(to->sd_mtime.nsec); | |
3665 | to->sd_dev = ntohl(to->sd_dev); | |
3666 | to->sd_ino = ntohl(to->sd_ino); | |
3667 | to->sd_uid = ntohl(to->sd_uid); | |
3668 | to->sd_gid = ntohl(to->sd_gid); | |
3669 | to->sd_size = ntohl(to->sd_size); | |
f9e6c649 NTND |
3670 | } |
3671 | ||
3672 | static int read_one_dir(struct untracked_cache_dir **untracked_, | |
3673 | struct read_data *rd) | |
3674 | { | |
3675 | struct untracked_cache_dir ud, *untracked; | |
b511d6d5 | 3676 | const unsigned char *data = rd->data, *end = rd->end; |
c6909f99 | 3677 | const unsigned char *eos; |
f9e6c649 | 3678 | unsigned int value; |
08bf354d | 3679 | int i; |
f9e6c649 NTND |
3680 | |
3681 | memset(&ud, 0, sizeof(ud)); | |
3682 | ||
b511d6d5 JK |
3683 | value = decode_varint(&data); |
3684 | if (data > end) | |
f9e6c649 NTND |
3685 | return -1; |
3686 | ud.recurse = 1; | |
3687 | ud.untracked_alloc = value; | |
3688 | ud.untracked_nr = value; | |
3689 | if (ud.untracked_nr) | |
b32fa95f | 3690 | ALLOC_ARRAY(ud.untracked, ud.untracked_nr); |
f9e6c649 | 3691 | |
b511d6d5 JK |
3692 | ud.dirs_alloc = ud.dirs_nr = decode_varint(&data); |
3693 | if (data > end) | |
f9e6c649 | 3694 | return -1; |
b32fa95f | 3695 | ALLOC_ARRAY(ud.dirs, ud.dirs_nr); |
f9e6c649 | 3696 | |
c6909f99 JK |
3697 | eos = memchr(data, '\0', end - data); |
3698 | if (!eos || eos == end) | |
f9e6c649 | 3699 | return -1; |
c6909f99 | 3700 | |
08bf354d | 3701 | *untracked_ = untracked = xmalloc(st_add3(sizeof(*untracked), eos - data, 1)); |
f9e6c649 | 3702 | memcpy(untracked, &ud, sizeof(ud)); |
08bf354d | 3703 | memcpy(untracked->name, data, eos - data + 1); |
b511d6d5 | 3704 | data = eos + 1; |
f9e6c649 NTND |
3705 | |
3706 | for (i = 0; i < untracked->untracked_nr; i++) { | |
c6909f99 JK |
3707 | eos = memchr(data, '\0', end - data); |
3708 | if (!eos || eos == end) | |
f9e6c649 | 3709 | return -1; |
08bf354d | 3710 | untracked->untracked[i] = xmemdupz(data, eos - data); |
b511d6d5 | 3711 | data = eos + 1; |
f9e6c649 NTND |
3712 | } |
3713 | ||
3714 | rd->ucd[rd->index++] = untracked; | |
3715 | rd->data = data; | |
3716 | ||
3717 | for (i = 0; i < untracked->dirs_nr; i++) { | |
08bf354d | 3718 | if (read_one_dir(untracked->dirs + i, rd) < 0) |
f9e6c649 NTND |
3719 | return -1; |
3720 | } | |
3721 | return 0; | |
3722 | } | |
3723 | ||
3724 | static void set_check_only(size_t pos, void *cb) | |
3725 | { | |
3726 | struct read_data *rd = cb; | |
3727 | struct untracked_cache_dir *ud = rd->ucd[pos]; | |
3728 | ud->check_only = 1; | |
3729 | } | |
3730 | ||
3731 | static void read_stat(size_t pos, void *cb) | |
3732 | { | |
3733 | struct read_data *rd = cb; | |
3734 | struct untracked_cache_dir *ud = rd->ucd[pos]; | |
3735 | if (rd->data + sizeof(struct stat_data) > rd->end) { | |
3736 | rd->data = rd->end + 1; | |
3737 | return; | |
3738 | } | |
268ba201 | 3739 | stat_data_from_disk(&ud->stat_data, rd->data); |
f9e6c649 NTND |
3740 | rd->data += sizeof(struct stat_data); |
3741 | ud->valid = 1; | |
3742 | } | |
3743 | ||
70c369cd | 3744 | static void read_oid(size_t pos, void *cb) |
f9e6c649 NTND |
3745 | { |
3746 | struct read_data *rd = cb; | |
3747 | struct untracked_cache_dir *ud = rd->ucd[pos]; | |
70c369cd | 3748 | if (rd->data + the_hash_algo->rawsz > rd->end) { |
f9e6c649 NTND |
3749 | rd->data = rd->end + 1; |
3750 | return; | |
3751 | } | |
92e2cab9 | 3752 | oidread(&ud->exclude_oid, rd->data); |
70c369cd | 3753 | rd->data += the_hash_algo->rawsz; |
f9e6c649 NTND |
3754 | } |
3755 | ||
4b33e602 PO |
3756 | static void load_oid_stat(struct oid_stat *oid_stat, const unsigned char *data, |
3757 | const unsigned char *sha1) | |
f9e6c649 | 3758 | { |
4b33e602 | 3759 | stat_data_from_disk(&oid_stat->stat, data); |
92e2cab9 | 3760 | oidread(&oid_stat->oid, sha1); |
4b33e602 | 3761 | oid_stat->valid = 1; |
f9e6c649 NTND |
3762 | } |
3763 | ||
3764 | struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz) | |
3765 | { | |
f9e6c649 NTND |
3766 | struct untracked_cache *uc; |
3767 | struct read_data rd; | |
3768 | const unsigned char *next = data, *end = (const unsigned char *)data + sz; | |
1e8fef60 | 3769 | const char *ident; |
1140bf01 JK |
3770 | int ident_len; |
3771 | ssize_t len; | |
268ba201 | 3772 | const char *exclude_per_dir; |
3899b88b | 3773 | const unsigned hashsz = the_hash_algo->rawsz; |
3774 | const unsigned offset = sizeof(struct ondisk_untracked_cache); | |
3775 | const unsigned exclude_per_dir_offset = offset + 2 * hashsz; | |
f9e6c649 NTND |
3776 | |
3777 | if (sz <= 1 || end[-1] != '\0') | |
3778 | return NULL; | |
3779 | end--; | |
3780 | ||
1e8fef60 NTND |
3781 | ident_len = decode_varint(&next); |
3782 | if (next + ident_len > end) | |
3783 | return NULL; | |
3784 | ident = (const char *)next; | |
3785 | next += ident_len; | |
3786 | ||
3899b88b | 3787 | if (next + exclude_per_dir_offset + 1 > end) |
f9e6c649 NTND |
3788 | return NULL; |
3789 | ||
ca56dadb | 3790 | CALLOC_ARRAY(uc, 1); |
1e8fef60 NTND |
3791 | strbuf_init(&uc->ident, ident_len); |
3792 | strbuf_add(&uc->ident, ident, ident_len); | |
4b33e602 PO |
3793 | load_oid_stat(&uc->ss_info_exclude, |
3794 | next + ouc_offset(info_exclude_stat), | |
3899b88b | 3795 | next + offset); |
4b33e602 PO |
3796 | load_oid_stat(&uc->ss_excludes_file, |
3797 | next + ouc_offset(excludes_file_stat), | |
3899b88b | 3798 | next + offset + hashsz); |
268ba201 | 3799 | uc->dir_flags = get_be32(next + ouc_offset(dir_flags)); |
3899b88b | 3800 | exclude_per_dir = (const char *)next + exclude_per_dir_offset; |
083fd1a2 | 3801 | uc->exclude_per_dir = uc->exclude_per_dir_to_free = xstrdup(exclude_per_dir); |
f9e6c649 | 3802 | /* NUL after exclude_per_dir is covered by sizeof(*ouc) */ |
3899b88b | 3803 | next += exclude_per_dir_offset + strlen(exclude_per_dir) + 1; |
f9e6c649 NTND |
3804 | if (next >= end) |
3805 | goto done2; | |
3806 | ||
3807 | len = decode_varint(&next); | |
3808 | if (next > end || len == 0) | |
3809 | goto done2; | |
3810 | ||
3811 | rd.valid = ewah_new(); | |
3812 | rd.check_only = ewah_new(); | |
3813 | rd.sha1_valid = ewah_new(); | |
3814 | rd.data = next; | |
3815 | rd.end = end; | |
3816 | rd.index = 0; | |
b32fa95f | 3817 | ALLOC_ARRAY(rd.ucd, len); |
f9e6c649 NTND |
3818 | |
3819 | if (read_one_dir(&uc->root, &rd) || rd.index != len) | |
3820 | goto done; | |
3821 | ||
3822 | next = rd.data; | |
3823 | len = ewah_read_mmap(rd.valid, next, end - next); | |
3824 | if (len < 0) | |
3825 | goto done; | |
3826 | ||
3827 | next += len; | |
3828 | len = ewah_read_mmap(rd.check_only, next, end - next); | |
3829 | if (len < 0) | |
3830 | goto done; | |
3831 | ||
3832 | next += len; | |
3833 | len = ewah_read_mmap(rd.sha1_valid, next, end - next); | |
3834 | if (len < 0) | |
3835 | goto done; | |
3836 | ||
3837 | ewah_each_bit(rd.check_only, set_check_only, &rd); | |
3838 | rd.data = next + len; | |
3839 | ewah_each_bit(rd.valid, read_stat, &rd); | |
70c369cd | 3840 | ewah_each_bit(rd.sha1_valid, read_oid, &rd); |
f9e6c649 NTND |
3841 | next = rd.data; |
3842 | ||
3843 | done: | |
3844 | free(rd.ucd); | |
3845 | ewah_free(rd.valid); | |
3846 | ewah_free(rd.check_only); | |
3847 | ewah_free(rd.sha1_valid); | |
3848 | done2: | |
3849 | if (next != end) { | |
3850 | free_untracked_cache(uc); | |
3851 | uc = NULL; | |
3852 | } | |
3853 | return uc; | |
3854 | } | |
e931371a | 3855 | |
73f9145f NTND |
3856 | static void invalidate_one_directory(struct untracked_cache *uc, |
3857 | struct untracked_cache_dir *ucd) | |
3858 | { | |
3859 | uc->dir_invalidated++; | |
3860 | ucd->valid = 0; | |
3861 | ucd->untracked_nr = 0; | |
3862 | } | |
3863 | ||
3864 | /* | |
3865 | * Normally when an entry is added or removed from a directory, | |
3866 | * invalidating that directory is enough. No need to touch its | |
3867 | * ancestors. When a directory is shown as "foo/bar/" in git-status | |
3868 | * however, deleting or adding an entry may have cascading effect. | |
3869 | * | |
3870 | * Say the "foo/bar/file" has become untracked, we need to tell the | |
3871 | * untracked_cache_dir of "foo" that "bar/" is not an untracked | |
3872 | * directory any more (because "bar" is managed by foo as an untracked | |
3873 | * "file"). | |
3874 | * | |
3875 | * Similarly, if "foo/bar/file" moves from untracked to tracked and it | |
3876 | * was the last untracked entry in the entire "foo", we should show | |
3877 | * "foo/" instead. Which means we have to invalidate past "bar" up to | |
3878 | * "foo". | |
3879 | * | |
3880 | * This function traverses all directories from root to leaf. If there | |
3881 | * is a chance of one of the above cases happening, we invalidate back | |
3882 | * to root. Otherwise we just invalidate the leaf. There may be a more | |
3883 | * sophisticated way than checking for SHOW_OTHER_DIRECTORIES to | |
3884 | * detect these cases and avoid unnecessary invalidation, for example, | |
3885 | * checking for the untracked entry named "bar/" in "foo", but for now | |
3886 | * stick to something safe and simple. | |
3887 | */ | |
3888 | static int invalidate_one_component(struct untracked_cache *uc, | |
3889 | struct untracked_cache_dir *dir, | |
3890 | const char *path, int len) | |
3891 | { | |
3892 | const char *rest = strchr(path, '/'); | |
3893 | ||
3894 | if (rest) { | |
3895 | int component_len = rest - path; | |
3896 | struct untracked_cache_dir *d = | |
3897 | lookup_untracked(uc, dir, path, component_len); | |
3898 | int ret = | |
3899 | invalidate_one_component(uc, d, rest + 1, | |
3900 | len - (component_len + 1)); | |
3901 | if (ret) | |
3902 | invalidate_one_directory(uc, dir); | |
3903 | return ret; | |
3904 | } | |
3905 | ||
3906 | invalidate_one_directory(uc, dir); | |
3907 | return uc->dir_flags & DIR_SHOW_OTHER_DIRECTORIES; | |
3908 | } | |
3909 | ||
e931371a | 3910 | void untracked_cache_invalidate_path(struct index_state *istate, |
0cacebf0 | 3911 | const char *path, int safe_path) |
e931371a | 3912 | { |
e931371a NTND |
3913 | if (!istate->untracked || !istate->untracked->root) |
3914 | return; | |
68f95b26 | 3915 | if (!safe_path && !verify_path(path, 0)) |
0cacebf0 | 3916 | return; |
73f9145f NTND |
3917 | invalidate_one_component(istate->untracked, istate->untracked->root, |
3918 | path, strlen(path)); | |
e931371a NTND |
3919 | } |
3920 | ||
3921 | void untracked_cache_remove_from_index(struct index_state *istate, | |
3922 | const char *path) | |
3923 | { | |
0cacebf0 | 3924 | untracked_cache_invalidate_path(istate, path, 1); |
e931371a NTND |
3925 | } |
3926 | ||
3927 | void untracked_cache_add_to_index(struct index_state *istate, | |
3928 | const char *path) | |
3929 | { | |
0cacebf0 | 3930 | untracked_cache_invalidate_path(istate, path, 1); |
e931371a | 3931 | } |
47e83eb3 | 3932 | |
da62f786 SB |
3933 | static void connect_wt_gitdir_in_nested(const char *sub_worktree, |
3934 | const char *sub_gitdir) | |
3935 | { | |
3936 | int i; | |
3937 | struct repository subrepo; | |
3938 | struct strbuf sub_wt = STRBUF_INIT; | |
3939 | struct strbuf sub_gd = STRBUF_INIT; | |
3940 | ||
3941 | const struct submodule *sub; | |
3942 | ||
3943 | /* If the submodule has no working tree, we can ignore it. */ | |
3944 | if (repo_init(&subrepo, sub_gitdir, sub_worktree)) | |
3945 | return; | |
3946 | ||
3947 | if (repo_read_index(&subrepo) < 0) | |
a80897c1 | 3948 | die(_("index file corrupt in repo %s"), subrepo.gitdir); |
da62f786 | 3949 | |
d425f651 DS |
3950 | /* TODO: audit for interaction with sparse-index. */ |
3951 | ensure_full_index(subrepo.index); | |
da62f786 SB |
3952 | for (i = 0; i < subrepo.index->cache_nr; i++) { |
3953 | const struct cache_entry *ce = subrepo.index->cache[i]; | |
3954 | ||
3955 | if (!S_ISGITLINK(ce->ce_mode)) | |
3956 | continue; | |
3957 | ||
3958 | while (i + 1 < subrepo.index->cache_nr && | |
3959 | !strcmp(ce->name, subrepo.index->cache[i + 1]->name)) | |
3960 | /* | |
3961 | * Skip entries with the same name in different stages | |
3962 | * to make sure an entry is returned only once. | |
3963 | */ | |
3964 | i++; | |
3965 | ||
14228447 | 3966 | sub = submodule_from_path(&subrepo, null_oid(), ce->name); |
da62f786 SB |
3967 | if (!sub || !is_submodule_active(&subrepo, ce->name)) |
3968 | /* .gitmodules broken or inactive sub */ | |
3969 | continue; | |
3970 | ||
3971 | strbuf_reset(&sub_wt); | |
3972 | strbuf_reset(&sub_gd); | |
3973 | strbuf_addf(&sub_wt, "%s/%s", sub_worktree, sub->path); | |
ce125d43 | 3974 | submodule_name_to_gitdir(&sub_gd, &subrepo, sub->name); |
da62f786 SB |
3975 | |
3976 | connect_work_tree_and_git_dir(sub_wt.buf, sub_gd.buf, 1); | |
3977 | } | |
3978 | strbuf_release(&sub_wt); | |
3979 | strbuf_release(&sub_gd); | |
3980 | repo_clear(&subrepo); | |
3981 | } | |
3982 | ||
3983 | void connect_work_tree_and_git_dir(const char *work_tree_, | |
3984 | const char *git_dir_, | |
3985 | int recurse_into_nested) | |
47e83eb3 | 3986 | { |
365444a6 SB |
3987 | struct strbuf gitfile_sb = STRBUF_INIT; |
3988 | struct strbuf cfg_sb = STRBUF_INIT; | |
47e83eb3 | 3989 | struct strbuf rel_path = STRBUF_INIT; |
365444a6 | 3990 | char *git_dir, *work_tree; |
47e83eb3 | 3991 | |
365444a6 SB |
3992 | /* Prepare .git file */ |
3993 | strbuf_addf(&gitfile_sb, "%s/.git", work_tree_); | |
3994 | if (safe_create_leading_directories_const(gitfile_sb.buf)) | |
3995 | die(_("could not create directories for %s"), gitfile_sb.buf); | |
3996 | ||
3997 | /* Prepare config file */ | |
3998 | strbuf_addf(&cfg_sb, "%s/config", git_dir_); | |
3999 | if (safe_create_leading_directories_const(cfg_sb.buf)) | |
4000 | die(_("could not create directories for %s"), cfg_sb.buf); | |
47e83eb3 | 4001 | |
e394fa01 JH |
4002 | git_dir = real_pathdup(git_dir_, 1); |
4003 | work_tree = real_pathdup(work_tree_, 1); | |
365444a6 SB |
4004 | |
4005 | /* Write .git file */ | |
4006 | write_file(gitfile_sb.buf, "gitdir: %s", | |
4007 | relative_path(git_dir, work_tree, &rel_path)); | |
47e83eb3 | 4008 | /* Update core.worktree setting */ |
365444a6 | 4009 | git_config_set_in_file(cfg_sb.buf, "core.worktree", |
47e83eb3 SB |
4010 | relative_path(work_tree, git_dir, &rel_path)); |
4011 | ||
365444a6 SB |
4012 | strbuf_release(&gitfile_sb); |
4013 | strbuf_release(&cfg_sb); | |
47e83eb3 | 4014 | strbuf_release(&rel_path); |
da62f786 SB |
4015 | |
4016 | if (recurse_into_nested) | |
4017 | connect_wt_gitdir_in_nested(work_tree, git_dir); | |
4018 | ||
47e83eb3 SB |
4019 | free(work_tree); |
4020 | free(git_dir); | |
4021 | } | |
f6f85861 SB |
4022 | |
4023 | /* | |
4024 | * Migrate the git directory of the given path from old_git_dir to new_git_dir. | |
4025 | */ | |
4026 | void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_git_dir) | |
4027 | { | |
4028 | if (rename(old_git_dir, new_git_dir) < 0) | |
4029 | die_errno(_("could not migrate git directory from '%s' to '%s'"), | |
4030 | old_git_dir, new_git_dir); | |
4031 | ||
da62f786 | 4032 | connect_work_tree_and_git_dir(path, new_git_dir, 0); |
f6f85861 | 4033 | } |
9fd512c8 ÆAB |
4034 | |
4035 | int path_match_flags(const char *const str, const enum path_match_flags flags) | |
4036 | { | |
4037 | const char *p = str; | |
4038 | ||
4039 | if (flags & PATH_MATCH_NATIVE && | |
4040 | flags & PATH_MATCH_XPLATFORM) | |
4041 | BUG("path_match_flags() must get one match kind, not multiple!"); | |
4042 | else if (!(flags & PATH_MATCH_KINDS_MASK)) | |
4043 | BUG("path_match_flags() must get at least one match kind!"); | |
4044 | ||
4045 | if (flags & PATH_MATCH_STARTS_WITH_DOT_SLASH && | |
4046 | flags & PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH) | |
4047 | BUG("path_match_flags() must get one platform kind, not multiple!"); | |
4048 | else if (!(flags & PATH_MATCH_PLATFORM_MASK)) | |
4049 | BUG("path_match_flags() must get at least one platform kind!"); | |
4050 | ||
4051 | if (*p++ != '.') | |
4052 | return 0; | |
4053 | if (flags & PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH && | |
4054 | *p++ != '.') | |
4055 | return 0; | |
4056 | ||
4057 | if (flags & PATH_MATCH_NATIVE) | |
4058 | return is_dir_sep(*p); | |
4059 | else if (flags & PATH_MATCH_XPLATFORM) | |
4060 | return is_xplatform_dir_sep(*p); | |
4061 | BUG("unreachable"); | |
4062 | } |