]>
Commit | Line | Data |
---|---|---|
453ec4bd LT |
1 | /* |
2 | * This handles recursive filename detection with exclude | |
3 | * files, index knowledge etc.. | |
4 | * | |
95a68344 AS |
5 | * See Documentation/technical/api-directory-listing.txt |
6 | * | |
453ec4bd LT |
7 | * Copyright (C) Linus Torvalds, 2005-2006 |
8 | * Junio Hamano, 2005-2006 | |
9 | */ | |
12cd0bf9 | 10 | #define NO_THE_INDEX_COMPATIBILITY_MACROS |
453ec4bd LT |
11 | #include "cache.h" |
12 | #include "dir.h" | |
b0db7046 | 13 | #include "attr.h" |
09595258 | 14 | #include "refs.h" |
237ec6e4 | 15 | #include "wildmatch.h" |
64acde94 | 16 | #include "pathspec.h" |
dde843e7 | 17 | #include "utf8.h" |
83c094ad NTND |
18 | #include "varint.h" |
19 | #include "ewah/ewok.h" | |
453ec4bd | 20 | |
defd7c7b KB |
21 | /* |
22 | * Tells read_directory_recursive how a file or directory should be treated. | |
23 | * Values are ordered by significance, e.g. if a directory contains both | |
24 | * excluded and untracked files, it is listed as untracked because | |
25 | * path_untracked > path_excluded. | |
26 | */ | |
27 | enum path_treatment { | |
28 | path_none = 0, | |
29 | path_recurse, | |
30 | path_excluded, | |
31 | path_untracked | |
32 | }; | |
33 | ||
cf7c6148 NTND |
34 | /* |
35 | * Support data structure for our opendir/readdir/closedir wrappers | |
36 | */ | |
37 | struct cached_dir { | |
38 | DIR *fdir; | |
39 | struct untracked_cache_dir *untracked; | |
91a2288b NTND |
40 | int nr_files; |
41 | int nr_dirs; | |
42 | ||
cf7c6148 | 43 | struct dirent *de; |
91a2288b NTND |
44 | const char *file; |
45 | struct untracked_cache_dir *ucd; | |
cf7c6148 NTND |
46 | }; |
47 | ||
defd7c7b | 48 | static enum path_treatment read_directory_recursive(struct dir_struct *dir, |
0dcb8d7f | 49 | const char *path, int len, struct untracked_cache_dir *untracked, |
e1b8c7bd | 50 | int check_only, const struct pathspec *pathspec); |
98f2a687 BW |
51 | static int get_dtype(struct dirent *de, struct index_state *istate, |
52 | const char *path, int len); | |
09595258 | 53 | |
ba0897e6 | 54 | int fspathcmp(const char *a, const char *b) |
8cf2a84e JJ |
55 | { |
56 | return ignore_case ? strcasecmp(a, b) : strcmp(a, b); | |
57 | } | |
58 | ||
ba0897e6 | 59 | int fspathncmp(const char *a, const char *b, size_t count) |
8cf2a84e JJ |
60 | { |
61 | return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count); | |
62 | } | |
63 | ||
1f26ce61 CB |
64 | int git_fnmatch(const struct pathspec_item *item, |
65 | const char *pattern, const char *string, | |
66 | int prefix) | |
5d74762d | 67 | { |
5d74762d | 68 | if (prefix > 0) { |
93d93537 | 69 | if (ps_strncmp(item, pattern, string, prefix)) |
eb07894f | 70 | return WM_NOMATCH; |
5d74762d NTND |
71 | pattern += prefix; |
72 | string += prefix; | |
73 | } | |
bd30c2e4 | 74 | if (item->flags & PATHSPEC_ONESTAR) { |
8c6abbcd NTND |
75 | int pattern_len = strlen(++pattern); |
76 | int string_len = strlen(string); | |
77 | return string_len < pattern_len || | |
93d93537 NTND |
78 | ps_strcmp(item, pattern, |
79 | string + string_len - pattern_len); | |
8c6abbcd | 80 | } |
bd30c2e4 | 81 | if (item->magic & PATHSPEC_GLOB) |
93d93537 NTND |
82 | return wildmatch(pattern, string, |
83 | WM_PATHNAME | | |
84 | (item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0), | |
85 | NULL); | |
bd30c2e4 NTND |
86 | else |
87 | /* wildmatch has not learned no FNM_PATHNAME mode yet */ | |
eb07894f NTND |
88 | return wildmatch(pattern, string, |
89 | item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0, | |
90 | NULL); | |
5d74762d NTND |
91 | } |
92 | ||
0b6e56df JH |
93 | static int fnmatch_icase_mem(const char *pattern, int patternlen, |
94 | const char *string, int stringlen, | |
95 | int flags) | |
96 | { | |
97 | int match_status; | |
98 | struct strbuf pat_buf = STRBUF_INIT; | |
99 | struct strbuf str_buf = STRBUF_INIT; | |
100 | const char *use_pat = pattern; | |
101 | const char *use_str = string; | |
102 | ||
103 | if (pattern[patternlen]) { | |
104 | strbuf_add(&pat_buf, pattern, patternlen); | |
105 | use_pat = pat_buf.buf; | |
106 | } | |
107 | if (string[stringlen]) { | |
108 | strbuf_add(&str_buf, string, stringlen); | |
109 | use_str = str_buf.buf; | |
110 | } | |
111 | ||
f30366b2 JH |
112 | if (ignore_case) |
113 | flags |= WM_CASEFOLD; | |
114 | match_status = wildmatch(use_pat, use_str, flags, NULL); | |
0b6e56df JH |
115 | |
116 | strbuf_release(&pat_buf); | |
117 | strbuf_release(&str_buf); | |
118 | ||
119 | return match_status; | |
120 | } | |
121 | ||
827f4d6c | 122 | static size_t common_prefix_len(const struct pathspec *pathspec) |
3c6a370b | 123 | { |
827f4d6c | 124 | int n; |
4a085b16 | 125 | size_t max = 0; |
3c6a370b | 126 | |
93d93537 NTND |
127 | /* |
128 | * ":(icase)path" is treated as a pathspec full of | |
129 | * wildcard. In other words, only prefix is considered common | |
130 | * prefix. If the pathspec is abc/foo abc/bar, running in | |
131 | * subdir xyz, the common prefix is still xyz, not xuz/abc as | |
132 | * in non-:(icase). | |
133 | */ | |
5c6933d2 NTND |
134 | GUARD_PATHSPEC(pathspec, |
135 | PATHSPEC_FROMTOP | | |
136 | PATHSPEC_MAXDEPTH | | |
bd30c2e4 | 137 | PATHSPEC_LITERAL | |
93d93537 | 138 | PATHSPEC_GLOB | |
ef79b1f8 | 139 | PATHSPEC_ICASE | |
b0db7046 BW |
140 | PATHSPEC_EXCLUDE | |
141 | PATHSPEC_ATTR); | |
4a085b16 | 142 | |
827f4d6c | 143 | for (n = 0; n < pathspec->nr; n++) { |
93d93537 | 144 | size_t i = 0, len = 0, item_len; |
ef79b1f8 NTND |
145 | if (pathspec->items[n].magic & PATHSPEC_EXCLUDE) |
146 | continue; | |
93d93537 NTND |
147 | if (pathspec->items[n].magic & PATHSPEC_ICASE) |
148 | item_len = pathspec->items[n].prefix; | |
149 | else | |
150 | item_len = pathspec->items[n].nowildcard_len; | |
151 | while (i < item_len && (n == 0 || i < max)) { | |
827f4d6c NTND |
152 | char c = pathspec->items[n].match[i]; |
153 | if (c != pathspec->items[0].match[i]) | |
4a085b16 JH |
154 | break; |
155 | if (c == '/') | |
156 | len = i + 1; | |
827f4d6c | 157 | i++; |
4a085b16 | 158 | } |
827f4d6c | 159 | if (n == 0 || len < max) { |
4a085b16 JH |
160 | max = len; |
161 | if (!max) | |
162 | break; | |
163 | } | |
3c6a370b | 164 | } |
4a085b16 | 165 | return max; |
3c6a370b LT |
166 | } |
167 | ||
f950eb95 CB |
168 | /* |
169 | * Returns a copy of the longest leading path common among all | |
170 | * pathspecs. | |
171 | */ | |
827f4d6c | 172 | char *common_prefix(const struct pathspec *pathspec) |
f950eb95 CB |
173 | { |
174 | unsigned long len = common_prefix_len(pathspec); | |
175 | ||
827f4d6c | 176 | return len ? xmemdupz(pathspec->items[0].match, len) : NULL; |
f950eb95 CB |
177 | } |
178 | ||
7327d3d1 | 179 | int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec) |
1d8842d9 | 180 | { |
bec5ab89 | 181 | const char *prefix; |
966de302 | 182 | size_t prefix_len; |
1d8842d9 LT |
183 | |
184 | /* | |
185 | * Calculate common prefix for the pathspec, and | |
186 | * use that to optimize the directory walk | |
187 | */ | |
bec5ab89 RS |
188 | prefix_len = common_prefix_len(pathspec); |
189 | prefix = prefix_len ? pathspec->items[0].match : ""; | |
1d8842d9 LT |
190 | |
191 | /* Read the directory and prune it */ | |
966de302 BW |
192 | read_directory(dir, prefix, prefix_len, pathspec); |
193 | ||
966de302 | 194 | return prefix_len; |
1d8842d9 LT |
195 | } |
196 | ||
bc96cc87 NTND |
197 | int within_depth(const char *name, int namelen, |
198 | int depth, int max_depth) | |
199 | { | |
200 | const char *cp = name, *cpe = name + namelen; | |
201 | ||
202 | while (cp < cpe) { | |
203 | if (*cp++ != '/') | |
204 | continue; | |
205 | depth++; | |
206 | if (depth > max_depth) | |
207 | return 0; | |
208 | } | |
209 | return 1; | |
210 | } | |
211 | ||
75a6315f BW |
212 | #define DO_MATCH_EXCLUDE (1<<0) |
213 | #define DO_MATCH_DIRECTORY (1<<1) | |
214 | #define DO_MATCH_SUBMODULE (1<<2) | |
42b0874a | 215 | |
b0db7046 BW |
216 | static int match_attrs(const char *name, int namelen, |
217 | const struct pathspec_item *item) | |
218 | { | |
219 | int i; | |
220 | ||
221 | git_check_attr(name, item->attr_check); | |
222 | for (i = 0; i < item->attr_match_nr; i++) { | |
223 | const char *value; | |
224 | int matched; | |
225 | enum attr_match_mode match_mode; | |
226 | ||
227 | value = item->attr_check->items[i].value; | |
228 | match_mode = item->attr_match[i].match_mode; | |
229 | ||
230 | if (ATTR_TRUE(value)) | |
231 | matched = (match_mode == MATCH_SET); | |
232 | else if (ATTR_FALSE(value)) | |
233 | matched = (match_mode == MATCH_UNSET); | |
234 | else if (ATTR_UNSET(value)) | |
235 | matched = (match_mode == MATCH_UNSPECIFIED); | |
236 | else | |
237 | matched = (match_mode == MATCH_VALUE && | |
238 | !strcmp(item->attr_match[i].value, value)); | |
239 | if (!matched) | |
240 | return 0; | |
241 | } | |
242 | ||
243 | return 1; | |
244 | } | |
245 | ||
61cf2820 NTND |
246 | /* |
247 | * Does 'match' match the given name? | |
248 | * A match is found if | |
249 | * | |
250 | * (1) the 'match' string is leading directory of 'name', or | |
251 | * (2) the 'match' string is a wildcard and matches 'name', or | |
252 | * (3) the 'match' string is exactly the same as 'name'. | |
253 | * | |
254 | * and the return value tells which case it was. | |
255 | * | |
256 | * It returns 0 when there is no match. | |
257 | */ | |
258 | static int match_pathspec_item(const struct pathspec_item *item, int prefix, | |
42b0874a | 259 | const char *name, int namelen, unsigned flags) |
61cf2820 NTND |
260 | { |
261 | /* name/namelen has prefix cut off by caller */ | |
262 | const char *match = item->match + prefix; | |
263 | int matchlen = item->len - prefix; | |
264 | ||
93d93537 NTND |
265 | /* |
266 | * The normal call pattern is: | |
267 | * 1. prefix = common_prefix_len(ps); | |
268 | * 2. prune something, or fill_directory | |
854b0959 | 269 | * 3. match_pathspec() |
93d93537 NTND |
270 | * |
271 | * 'prefix' at #1 may be shorter than the command's prefix and | |
272 | * it's ok for #2 to match extra files. Those extras will be | |
273 | * trimmed at #3. | |
274 | * | |
275 | * Suppose the pathspec is 'foo' and '../bar' running from | |
276 | * subdir 'xyz'. The common prefix at #1 will be empty, thanks | |
277 | * to "../". We may have xyz/foo _and_ XYZ/foo after #2. The | |
278 | * user does not want XYZ/foo, only the "foo" part should be | |
279 | * case-insensitive. We need to filter out XYZ/foo here. In | |
280 | * other words, we do not trust the caller on comparing the | |
281 | * prefix part when :(icase) is involved. We do exact | |
282 | * comparison ourselves. | |
283 | * | |
284 | * Normally the caller (common_prefix_len() in fact) does | |
285 | * _exact_ matching on name[-prefix+1..-1] and we do not need | |
286 | * to check that part. Be defensive and check it anyway, in | |
287 | * case common_prefix_len is changed, or a new caller is | |
288 | * introduced that does not use common_prefix_len. | |
289 | * | |
290 | * If the penalty turns out too high when prefix is really | |
291 | * long, maybe change it to | |
292 | * strncmp(match, name, item->prefix - prefix) | |
293 | */ | |
294 | if (item->prefix && (item->magic & PATHSPEC_ICASE) && | |
295 | strncmp(item->match, name - prefix, item->prefix)) | |
296 | return 0; | |
297 | ||
b0db7046 BW |
298 | if (item->attr_match_nr && !match_attrs(name, namelen, item)) |
299 | return 0; | |
300 | ||
61cf2820 NTND |
301 | /* If the match was just the prefix, we matched */ |
302 | if (!*match) | |
303 | return MATCHED_RECURSIVELY; | |
304 | ||
93d93537 | 305 | if (matchlen <= namelen && !ps_strncmp(item, match, name, matchlen)) { |
61cf2820 NTND |
306 | if (matchlen == namelen) |
307 | return MATCHED_EXACTLY; | |
308 | ||
309 | if (match[matchlen-1] == '/' || name[matchlen] == '/') | |
310 | return MATCHED_RECURSIVELY; | |
68690fdd NTND |
311 | } else if ((flags & DO_MATCH_DIRECTORY) && |
312 | match[matchlen - 1] == '/' && | |
313 | namelen == matchlen - 1 && | |
314 | !ps_strncmp(item, match, name, namelen)) | |
315 | return MATCHED_EXACTLY; | |
61cf2820 | 316 | |
5d74762d | 317 | if (item->nowildcard_len < item->len && |
bd30c2e4 | 318 | !git_fnmatch(item, match, name, |
8c6abbcd | 319 | item->nowildcard_len - prefix)) |
61cf2820 NTND |
320 | return MATCHED_FNMATCH; |
321 | ||
75a6315f BW |
322 | /* Perform checks to see if "name" is a super set of the pathspec */ |
323 | if (flags & DO_MATCH_SUBMODULE) { | |
324 | /* name is a literal prefix of the pathspec */ | |
325 | if ((namelen < matchlen) && | |
326 | (match[namelen] == '/') && | |
327 | !ps_strncmp(item, match, name, namelen)) | |
328 | return MATCHED_RECURSIVELY; | |
329 | ||
330 | /* name" doesn't match up to the first wild character */ | |
331 | if (item->nowildcard_len < item->len && | |
332 | ps_strncmp(item, match, name, | |
333 | item->nowildcard_len - prefix)) | |
334 | return 0; | |
335 | ||
336 | /* | |
337 | * Here is where we would perform a wildmatch to check if | |
338 | * "name" can be matched as a directory (or a prefix) against | |
339 | * the pathspec. Since wildmatch doesn't have this capability | |
340 | * at the present we have to punt and say that it is a match, | |
341 | * potentially returning a false positive | |
342 | * The submodules themselves will be able to perform more | |
343 | * accurate matching to determine if the pathspec matches. | |
344 | */ | |
345 | return MATCHED_RECURSIVELY; | |
346 | } | |
347 | ||
61cf2820 NTND |
348 | return 0; |
349 | } | |
350 | ||
351 | /* | |
52ed1894 AS |
352 | * Given a name and a list of pathspecs, returns the nature of the |
353 | * closest (i.e. most specific) match of the name to any of the | |
354 | * pathspecs. | |
355 | * | |
356 | * The caller typically calls this multiple times with the same | |
357 | * pathspec and seen[] array but with different name/namelen | |
358 | * (e.g. entries from the index) and is interested in seeing if and | |
359 | * how each pathspec matches all the names it calls this function | |
360 | * with. A mark is left in the seen[] array for each pathspec element | |
361 | * indicating the closest type of match that element achieved, so if | |
362 | * seen[n] remains zero after multiple invocations, that means the nth | |
363 | * pathspec did not match any names, which could indicate that the | |
364 | * user mistyped the nth pathspec. | |
61cf2820 | 365 | */ |
854b0959 NTND |
366 | static int do_match_pathspec(const struct pathspec *ps, |
367 | const char *name, int namelen, | |
368 | int prefix, char *seen, | |
42b0874a | 369 | unsigned flags) |
61cf2820 | 370 | { |
42b0874a | 371 | int i, retval = 0, exclude = flags & DO_MATCH_EXCLUDE; |
61cf2820 | 372 | |
5c6933d2 NTND |
373 | GUARD_PATHSPEC(ps, |
374 | PATHSPEC_FROMTOP | | |
375 | PATHSPEC_MAXDEPTH | | |
bd30c2e4 | 376 | PATHSPEC_LITERAL | |
93d93537 | 377 | PATHSPEC_GLOB | |
ef79b1f8 | 378 | PATHSPEC_ICASE | |
b0db7046 BW |
379 | PATHSPEC_EXCLUDE | |
380 | PATHSPEC_ATTR); | |
8f4f8f45 | 381 | |
61cf2820 | 382 | if (!ps->nr) { |
6330a171 NTND |
383 | if (!ps->recursive || |
384 | !(ps->magic & PATHSPEC_MAXDEPTH) || | |
385 | ps->max_depth == -1) | |
61cf2820 NTND |
386 | return MATCHED_RECURSIVELY; |
387 | ||
388 | if (within_depth(name, namelen, 0, ps->max_depth)) | |
389 | return MATCHED_EXACTLY; | |
390 | else | |
391 | return 0; | |
392 | } | |
393 | ||
394 | name += prefix; | |
395 | namelen -= prefix; | |
396 | ||
397 | for (i = ps->nr - 1; i >= 0; i--) { | |
398 | int how; | |
ef79b1f8 NTND |
399 | |
400 | if ((!exclude && ps->items[i].magic & PATHSPEC_EXCLUDE) || | |
401 | ( exclude && !(ps->items[i].magic & PATHSPEC_EXCLUDE))) | |
402 | continue; | |
403 | ||
61cf2820 NTND |
404 | if (seen && seen[i] == MATCHED_EXACTLY) |
405 | continue; | |
ef79b1f8 NTND |
406 | /* |
407 | * Make exclude patterns optional and never report | |
408 | * "pathspec ':(exclude)foo' matches no files" | |
409 | */ | |
410 | if (seen && ps->items[i].magic & PATHSPEC_EXCLUDE) | |
411 | seen[i] = MATCHED_FNMATCH; | |
42b0874a NTND |
412 | how = match_pathspec_item(ps->items+i, prefix, name, |
413 | namelen, flags); | |
6330a171 NTND |
414 | if (ps->recursive && |
415 | (ps->magic & PATHSPEC_MAXDEPTH) && | |
416 | ps->max_depth != -1 && | |
61cf2820 NTND |
417 | how && how != MATCHED_FNMATCH) { |
418 | int len = ps->items[i].len; | |
419 | if (name[len] == '/') | |
420 | len++; | |
421 | if (within_depth(name+len, namelen-len, 0, ps->max_depth)) | |
422 | how = MATCHED_EXACTLY; | |
423 | else | |
424 | how = 0; | |
425 | } | |
426 | if (how) { | |
427 | if (retval < how) | |
428 | retval = how; | |
429 | if (seen && seen[i] < how) | |
430 | seen[i] = how; | |
431 | } | |
432 | } | |
433 | return retval; | |
434 | } | |
435 | ||
854b0959 NTND |
436 | int match_pathspec(const struct pathspec *ps, |
437 | const char *name, int namelen, | |
ae8d0824 | 438 | int prefix, char *seen, int is_dir) |
ef79b1f8 NTND |
439 | { |
440 | int positive, negative; | |
ae8d0824 | 441 | unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0; |
42b0874a NTND |
442 | positive = do_match_pathspec(ps, name, namelen, |
443 | prefix, seen, flags); | |
ef79b1f8 NTND |
444 | if (!(ps->magic & PATHSPEC_EXCLUDE) || !positive) |
445 | return positive; | |
42b0874a NTND |
446 | negative = do_match_pathspec(ps, name, namelen, |
447 | prefix, seen, | |
448 | flags | DO_MATCH_EXCLUDE); | |
ef79b1f8 NTND |
449 | return negative ? 0 : positive; |
450 | } | |
451 | ||
75a6315f BW |
452 | /** |
453 | * Check if a submodule is a superset of the pathspec | |
454 | */ | |
455 | int submodule_path_match(const struct pathspec *ps, | |
456 | const char *submodule_name, | |
457 | char *seen) | |
458 | { | |
459 | int matched = do_match_pathspec(ps, submodule_name, | |
460 | strlen(submodule_name), | |
461 | 0, seen, | |
462 | DO_MATCH_DIRECTORY | | |
463 | DO_MATCH_SUBMODULE); | |
464 | return matched; | |
465 | } | |
466 | ||
777c55a6 JH |
467 | int report_path_error(const char *ps_matched, |
468 | const struct pathspec *pathspec, | |
469 | const char *prefix) | |
470 | { | |
471 | /* | |
472 | * Make sure all pathspec matched; otherwise it is an error. | |
473 | */ | |
777c55a6 JH |
474 | int num, errors = 0; |
475 | for (num = 0; num < pathspec->nr; num++) { | |
476 | int other, found_dup; | |
477 | ||
478 | if (ps_matched[num]) | |
479 | continue; | |
480 | /* | |
481 | * The caller might have fed identical pathspec | |
482 | * twice. Do not barf on such a mistake. | |
483 | * FIXME: parse_pathspec should have eliminated | |
484 | * duplicate pathspec. | |
485 | */ | |
486 | for (found_dup = other = 0; | |
487 | !found_dup && other < pathspec->nr; | |
488 | other++) { | |
489 | if (other == num || !ps_matched[other]) | |
490 | continue; | |
491 | if (!strcmp(pathspec->items[other].original, | |
492 | pathspec->items[num].original)) | |
493 | /* | |
494 | * Ok, we have a match already. | |
495 | */ | |
496 | found_dup = 1; | |
497 | } | |
498 | if (found_dup) | |
499 | continue; | |
500 | ||
501 | error("pathspec '%s' did not match any file(s) known to git.", | |
502 | pathspec->items[num].original); | |
503 | errors++; | |
504 | } | |
777c55a6 JH |
505 | return errors; |
506 | } | |
507 | ||
fcd631ed NTND |
508 | /* |
509 | * Return the length of the "simple" part of a path match limiter. | |
510 | */ | |
87323bda | 511 | int simple_length(const char *match) |
fcd631ed NTND |
512 | { |
513 | int len = -1; | |
514 | ||
515 | for (;;) { | |
516 | unsigned char c = *match++; | |
517 | len++; | |
518 | if (c == '\0' || is_glob_special(c)) | |
519 | return len; | |
520 | } | |
521 | } | |
522 | ||
87323bda | 523 | int no_wildcard(const char *string) |
68492fc7 | 524 | { |
fcd631ed | 525 | return string[simple_length(string)] == '\0'; |
68492fc7 LK |
526 | } |
527 | ||
82dce998 NTND |
528 | void parse_exclude_pattern(const char **pattern, |
529 | int *patternlen, | |
f8708998 | 530 | unsigned *flags, |
82dce998 | 531 | int *nowildcardlen) |
84460eec NTND |
532 | { |
533 | const char *p = *pattern; | |
534 | size_t i, len; | |
535 | ||
536 | *flags = 0; | |
537 | if (*p == '!') { | |
538 | *flags |= EXC_FLAG_NEGATIVE; | |
539 | p++; | |
540 | } | |
541 | len = strlen(p); | |
542 | if (len && p[len - 1] == '/') { | |
543 | len--; | |
544 | *flags |= EXC_FLAG_MUSTBEDIR; | |
545 | } | |
546 | for (i = 0; i < len; i++) { | |
547 | if (p[i] == '/') | |
548 | break; | |
549 | } | |
550 | if (i == len) | |
551 | *flags |= EXC_FLAG_NODIR; | |
552 | *nowildcardlen = simple_length(p); | |
553 | /* | |
554 | * we should have excluded the trailing slash from 'p' too, | |
555 | * but that's one more allocation. Instead just make sure | |
556 | * nowildcardlen does not exceed real patternlen | |
557 | */ | |
558 | if (*nowildcardlen > len) | |
559 | *nowildcardlen = len; | |
560 | if (*p == '*' && no_wildcard(p + 1)) | |
561 | *flags |= EXC_FLAG_ENDSWITH; | |
562 | *pattern = p; | |
563 | *patternlen = len; | |
564 | } | |
565 | ||
453ec4bd | 566 | void add_exclude(const char *string, const char *base, |
c04318e4 | 567 | int baselen, struct exclude_list *el, int srcpos) |
453ec4bd | 568 | { |
d6b8fc30 | 569 | struct exclude *x; |
84460eec | 570 | int patternlen; |
f8708998 | 571 | unsigned flags; |
84460eec | 572 | int nowildcardlen; |
453ec4bd | 573 | |
84460eec NTND |
574 | parse_exclude_pattern(&string, &patternlen, &flags, &nowildcardlen); |
575 | if (flags & EXC_FLAG_MUSTBEDIR) { | |
96ffc06f | 576 | FLEXPTR_ALLOC_MEM(x, pattern, string, patternlen); |
d6b8fc30 JH |
577 | } else { |
578 | x = xmalloc(sizeof(*x)); | |
579 | x->pattern = string; | |
580 | } | |
84460eec NTND |
581 | x->patternlen = patternlen; |
582 | x->nowildcardlen = nowildcardlen; | |
453ec4bd LT |
583 | x->base = base; |
584 | x->baselen = baselen; | |
d6b8fc30 | 585 | x->flags = flags; |
c04318e4 | 586 | x->srcpos = srcpos; |
840fc334 AS |
587 | ALLOC_GROW(el->excludes, el->nr + 1, el->alloc); |
588 | el->excludes[el->nr++] = x; | |
c04318e4 | 589 | x->el = el; |
453ec4bd LT |
590 | } |
591 | ||
6f52b741 BW |
592 | static void *read_skip_worktree_file_from_index(const struct index_state *istate, |
593 | const char *path, size_t *size, | |
55fe6f51 | 594 | struct sha1_stat *sha1_stat) |
c28b3d6e NTND |
595 | { |
596 | int pos, len; | |
597 | unsigned long sz; | |
598 | enum object_type type; | |
599 | void *data; | |
c28b3d6e NTND |
600 | |
601 | len = strlen(path); | |
6f52b741 | 602 | pos = index_name_pos(istate, path, len); |
c28b3d6e NTND |
603 | if (pos < 0) |
604 | return NULL; | |
6f52b741 | 605 | if (!ce_skip_worktree(istate->cache[pos])) |
c28b3d6e | 606 | return NULL; |
6f52b741 | 607 | data = read_sha1_file(istate->cache[pos]->oid.hash, &type, &sz); |
c28b3d6e NTND |
608 | if (!data || type != OBJ_BLOB) { |
609 | free(data); | |
610 | return NULL; | |
611 | } | |
612 | *size = xsize_t(sz); | |
55fe6f51 NTND |
613 | if (sha1_stat) { |
614 | memset(&sha1_stat->stat, 0, sizeof(sha1_stat->stat)); | |
6f52b741 | 615 | hashcpy(sha1_stat->sha1, istate->cache[pos]->oid.hash); |
55fe6f51 | 616 | } |
c28b3d6e NTND |
617 | return data; |
618 | } | |
619 | ||
f6198812 AS |
620 | /* |
621 | * Frees memory within el which was allocated for exclude patterns and | |
622 | * the file buffer. Does not free el itself. | |
623 | */ | |
624 | void clear_exclude_list(struct exclude_list *el) | |
0fd0e241 NTND |
625 | { |
626 | int i; | |
627 | ||
5cee3493 | 628 | for (i = 0; i < el->nr; i++) |
0fd0e241 NTND |
629 | free(el->excludes[i]); |
630 | free(el->excludes); | |
c082df24 | 631 | free(el->filebuf); |
0fd0e241 | 632 | |
2653a8c6 | 633 | memset(el, 0, sizeof(*el)); |
0fd0e241 NTND |
634 | } |
635 | ||
7e2e4b37 | 636 | static void trim_trailing_spaces(char *buf) |
16402b99 | 637 | { |
e61a6c1d PB |
638 | char *p, *last_space = NULL; |
639 | ||
640 | for (p = buf; *p; p++) | |
641 | switch (*p) { | |
642 | case ' ': | |
643 | if (!last_space) | |
644 | last_space = p; | |
645 | break; | |
646 | case '\\': | |
647 | p++; | |
648 | if (!*p) | |
649 | return; | |
650 | /* fallthrough */ | |
651 | default: | |
652 | last_space = NULL; | |
653 | } | |
654 | ||
655 | if (last_space) | |
656 | *last_space = '\0'; | |
16402b99 NTND |
657 | } |
658 | ||
0dcb8d7f NTND |
659 | /* |
660 | * Given a subdirectory name and "dir" of the current directory, | |
661 | * search the subdir in "dir" and return it, or create a new one if it | |
662 | * does not exist in "dir". | |
663 | * | |
664 | * If "name" has the trailing slash, it'll be excluded in the search. | |
665 | */ | |
666 | static struct untracked_cache_dir *lookup_untracked(struct untracked_cache *uc, | |
667 | struct untracked_cache_dir *dir, | |
668 | const char *name, int len) | |
669 | { | |
670 | int first, last; | |
671 | struct untracked_cache_dir *d; | |
672 | if (!dir) | |
673 | return NULL; | |
674 | if (len && name[len - 1] == '/') | |
675 | len--; | |
676 | first = 0; | |
677 | last = dir->dirs_nr; | |
678 | while (last > first) { | |
679 | int cmp, next = (last + first) >> 1; | |
680 | d = dir->dirs[next]; | |
681 | cmp = strncmp(name, d->name, len); | |
682 | if (!cmp && strlen(d->name) > len) | |
683 | cmp = -1; | |
684 | if (!cmp) | |
685 | return d; | |
686 | if (cmp < 0) { | |
687 | last = next; | |
688 | continue; | |
689 | } | |
690 | first = next+1; | |
691 | } | |
692 | ||
693 | uc->dir_created++; | |
96ffc06f | 694 | FLEX_ALLOC_MEM(d, name, name, len); |
0dcb8d7f NTND |
695 | |
696 | ALLOC_GROW(dir->dirs, dir->dirs_nr + 1, dir->dirs_alloc); | |
697 | memmove(dir->dirs + first + 1, dir->dirs + first, | |
698 | (dir->dirs_nr - first) * sizeof(*dir->dirs)); | |
699 | dir->dirs_nr++; | |
700 | dir->dirs[first] = d; | |
701 | return d; | |
702 | } | |
703 | ||
ccad261f NTND |
704 | static void do_invalidate_gitignore(struct untracked_cache_dir *dir) |
705 | { | |
706 | int i; | |
707 | dir->valid = 0; | |
708 | dir->untracked_nr = 0; | |
709 | for (i = 0; i < dir->dirs_nr; i++) | |
710 | do_invalidate_gitignore(dir->dirs[i]); | |
711 | } | |
712 | ||
713 | static void invalidate_gitignore(struct untracked_cache *uc, | |
714 | struct untracked_cache_dir *dir) | |
715 | { | |
716 | uc->gitignore_invalidated++; | |
717 | do_invalidate_gitignore(dir); | |
718 | } | |
719 | ||
91a2288b NTND |
720 | static void invalidate_directory(struct untracked_cache *uc, |
721 | struct untracked_cache_dir *dir) | |
722 | { | |
26cb0182 | 723 | int i; |
91a2288b NTND |
724 | uc->dir_invalidated++; |
725 | dir->valid = 0; | |
726 | dir->untracked_nr = 0; | |
26cb0182 NTND |
727 | for (i = 0; i < dir->dirs_nr; i++) |
728 | dir->dirs[i]->recurse = 0; | |
91a2288b NTND |
729 | } |
730 | ||
55fe6f51 NTND |
731 | /* |
732 | * Given a file with name "fname", read it (either from disk, or from | |
733 | * the index if "check_index" is non-zero), parse it and store the | |
734 | * exclude rules in "el". | |
735 | * | |
736 | * If "ss" is not NULL, compute SHA-1 of the exclude file and fill | |
737 | * stat data from disk (only valid if add_excludes returns zero). If | |
738 | * ss_valid is non-zero, "ss" must contain good value as input. | |
739 | */ | |
740 | static int add_excludes(const char *fname, const char *base, int baselen, | |
741 | struct exclude_list *el, int check_index, | |
742 | struct sha1_stat *sha1_stat) | |
453ec4bd | 743 | { |
c470701a | 744 | struct stat st; |
c04318e4 | 745 | int fd, i, lineno = 1; |
9d14017a | 746 | size_t size = 0; |
453ec4bd LT |
747 | char *buf, *entry; |
748 | ||
749 | fd = open(fname, O_RDONLY); | |
c28b3d6e | 750 | if (fd < 0 || fstat(fd, &st) < 0) { |
69660731 | 751 | if (errno != ENOENT) |
55b38a48 | 752 | warn_on_inaccessible(fname); |
c28b3d6e NTND |
753 | if (0 <= fd) |
754 | close(fd); | |
755 | if (!check_index || | |
6f52b741 | 756 | (buf = read_skip_worktree_file_from_index(&the_index, fname, &size, sha1_stat)) == NULL) |
c28b3d6e | 757 | return -1; |
45d76f17 NTND |
758 | if (size == 0) { |
759 | free(buf); | |
760 | return 0; | |
761 | } | |
762 | if (buf[size-1] != '\n') { | |
50a6c8ef | 763 | buf = xrealloc(buf, st_add(size, 1)); |
45d76f17 NTND |
764 | buf[size++] = '\n'; |
765 | } | |
d961baa8 | 766 | } else { |
c28b3d6e NTND |
767 | size = xsize_t(st.st_size); |
768 | if (size == 0) { | |
55fe6f51 NTND |
769 | if (sha1_stat) { |
770 | fill_stat_data(&sha1_stat->stat, &st); | |
771 | hashcpy(sha1_stat->sha1, EMPTY_BLOB_SHA1_BIN); | |
772 | sha1_stat->valid = 1; | |
773 | } | |
c28b3d6e NTND |
774 | close(fd); |
775 | return 0; | |
776 | } | |
3733e694 | 777 | buf = xmallocz(size); |
c28b3d6e | 778 | if (read_in_full(fd, buf, size) != size) { |
45d76f17 | 779 | free(buf); |
c28b3d6e NTND |
780 | close(fd); |
781 | return -1; | |
782 | } | |
45d76f17 | 783 | buf[size++] = '\n'; |
c28b3d6e | 784 | close(fd); |
55fe6f51 NTND |
785 | if (sha1_stat) { |
786 | int pos; | |
787 | if (sha1_stat->valid && | |
ed4efab1 | 788 | !match_stat_data_racy(&the_index, &sha1_stat->stat, &st)) |
55fe6f51 NTND |
789 | ; /* no content change, ss->sha1 still good */ |
790 | else if (check_index && | |
12cd0bf9 BW |
791 | (pos = index_name_pos(&the_index, fname, strlen(fname))) >= 0 && |
792 | !ce_stage(the_index.cache[pos]) && | |
793 | ce_uptodate(the_index.cache[pos]) && | |
55fe6f51 | 794 | !would_convert_to_git(fname)) |
99d1a986 | 795 | hashcpy(sha1_stat->sha1, |
12cd0bf9 | 796 | the_index.cache[pos]->oid.hash); |
55fe6f51 NTND |
797 | else |
798 | hash_sha1_file(buf, size, "blob", sha1_stat->sha1); | |
799 | fill_stat_data(&sha1_stat->stat, &st); | |
800 | sha1_stat->valid = 1; | |
801 | } | |
6ba78238 | 802 | } |
453ec4bd | 803 | |
c082df24 | 804 | el->filebuf = buf; |
245e1c19 | 805 | |
dde843e7 JH |
806 | if (skip_utf8_bom(&buf, size)) |
807 | size -= buf - el->filebuf; | |
808 | ||
453ec4bd | 809 | entry = buf; |
245e1c19 | 810 | |
45d76f17 NTND |
811 | for (i = 0; i < size; i++) { |
812 | if (buf[i] == '\n') { | |
453ec4bd LT |
813 | if (entry != buf + i && entry[0] != '#') { |
814 | buf[i - (i && buf[i-1] == '\r')] = 0; | |
7e2e4b37 | 815 | trim_trailing_spaces(entry); |
c04318e4 | 816 | add_exclude(entry, base, baselen, el, lineno); |
453ec4bd | 817 | } |
c04318e4 | 818 | lineno++; |
453ec4bd LT |
819 | entry = buf + i + 1; |
820 | } | |
821 | } | |
822 | return 0; | |
453ec4bd LT |
823 | } |
824 | ||
55fe6f51 NTND |
825 | int add_excludes_from_file_to_list(const char *fname, const char *base, |
826 | int baselen, struct exclude_list *el, | |
827 | int check_index) | |
828 | { | |
829 | return add_excludes(fname, base, baselen, el, check_index, NULL); | |
830 | } | |
831 | ||
c04318e4 AS |
832 | struct exclude_list *add_exclude_list(struct dir_struct *dir, |
833 | int group_type, const char *src) | |
c082df24 AS |
834 | { |
835 | struct exclude_list *el; | |
836 | struct exclude_list_group *group; | |
837 | ||
838 | group = &dir->exclude_list_group[group_type]; | |
839 | ALLOC_GROW(group->el, group->nr + 1, group->alloc); | |
840 | el = &group->el[group->nr++]; | |
841 | memset(el, 0, sizeof(*el)); | |
c04318e4 | 842 | el->src = src; |
c082df24 AS |
843 | return el; |
844 | } | |
845 | ||
846 | /* | |
847 | * Used to set up core.excludesfile and .git/info/exclude lists. | |
848 | */ | |
0dcb8d7f NTND |
849 | static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname, |
850 | struct sha1_stat *sha1_stat) | |
453ec4bd | 851 | { |
c082df24 | 852 | struct exclude_list *el; |
ccad261f NTND |
853 | /* |
854 | * catch setup_standard_excludes() that's called before | |
855 | * dir->untracked is assigned. That function behaves | |
856 | * differently when dir->untracked is non-NULL. | |
857 | */ | |
858 | if (!dir->untracked) | |
859 | dir->unmanaged_exclude_files++; | |
c04318e4 | 860 | el = add_exclude_list(dir, EXC_FILE, fname); |
0dcb8d7f | 861 | if (add_excludes(fname, "", 0, el, 0, sha1_stat) < 0) |
453ec4bd LT |
862 | die("cannot use %s as an exclude file", fname); |
863 | } | |
864 | ||
0dcb8d7f NTND |
865 | void add_excludes_from_file(struct dir_struct *dir, const char *fname) |
866 | { | |
ccad261f | 867 | dir->unmanaged_exclude_files++; /* see validate_untracked_cache() */ |
0dcb8d7f NTND |
868 | add_excludes_from_file_1(dir, fname, NULL); |
869 | } | |
870 | ||
82dce998 NTND |
871 | int match_basename(const char *basename, int basenamelen, |
872 | const char *pattern, int prefix, int patternlen, | |
f8708998 | 873 | unsigned flags) |
593cb880 NTND |
874 | { |
875 | if (prefix == patternlen) { | |
0b6e56df | 876 | if (patternlen == basenamelen && |
ba0897e6 | 877 | !fspathncmp(pattern, basename, basenamelen)) |
593cb880 NTND |
878 | return 1; |
879 | } else if (flags & EXC_FLAG_ENDSWITH) { | |
0b6e56df | 880 | /* "*literal" matching against "fooliteral" */ |
593cb880 | 881 | if (patternlen - 1 <= basenamelen && |
ba0897e6 | 882 | !fspathncmp(pattern + 1, |
0b6e56df JH |
883 | basename + basenamelen - (patternlen - 1), |
884 | patternlen - 1)) | |
593cb880 NTND |
885 | return 1; |
886 | } else { | |
0b6e56df JH |
887 | if (fnmatch_icase_mem(pattern, patternlen, |
888 | basename, basenamelen, | |
889 | 0) == 0) | |
593cb880 NTND |
890 | return 1; |
891 | } | |
892 | return 0; | |
893 | } | |
894 | ||
82dce998 NTND |
895 | int match_pathname(const char *pathname, int pathlen, |
896 | const char *base, int baselen, | |
897 | const char *pattern, int prefix, int patternlen, | |
f8708998 | 898 | unsigned flags) |
b5592632 NTND |
899 | { |
900 | const char *name; | |
901 | int namelen; | |
902 | ||
903 | /* | |
904 | * match with FNM_PATHNAME; the pattern has base implicitly | |
905 | * in front of it. | |
906 | */ | |
907 | if (*pattern == '/') { | |
908 | pattern++; | |
982ac873 | 909 | patternlen--; |
b5592632 NTND |
910 | prefix--; |
911 | } | |
912 | ||
913 | /* | |
914 | * baselen does not count the trailing slash. base[] may or | |
915 | * may not end with a trailing slash though. | |
916 | */ | |
917 | if (pathlen < baselen + 1 || | |
918 | (baselen && pathname[baselen] != '/') || | |
ba0897e6 | 919 | fspathncmp(pathname, base, baselen)) |
b5592632 NTND |
920 | return 0; |
921 | ||
922 | namelen = baselen ? pathlen - baselen - 1 : pathlen; | |
923 | name = pathname + pathlen - namelen; | |
924 | ||
925 | if (prefix) { | |
926 | /* | |
927 | * if the non-wildcard part is longer than the | |
928 | * remaining pathname, surely it cannot match. | |
929 | */ | |
930 | if (prefix > namelen) | |
931 | return 0; | |
932 | ||
ba0897e6 | 933 | if (fspathncmp(pattern, name, prefix)) |
b5592632 NTND |
934 | return 0; |
935 | pattern += prefix; | |
ab3aebc1 | 936 | patternlen -= prefix; |
b5592632 NTND |
937 | name += prefix; |
938 | namelen -= prefix; | |
ab3aebc1 JK |
939 | |
940 | /* | |
941 | * If the whole pattern did not have a wildcard, | |
942 | * then our prefix match is all we need; we | |
943 | * do not need to call fnmatch at all. | |
944 | */ | |
5cee3493 | 945 | if (!patternlen && !namelen) |
ab3aebc1 | 946 | return 1; |
b5592632 NTND |
947 | } |
948 | ||
ab3aebc1 JK |
949 | return fnmatch_icase_mem(pattern, patternlen, |
950 | name, namelen, | |
f30366b2 | 951 | WM_PATHNAME) == 0; |
b5592632 NTND |
952 | } |
953 | ||
578cd7c3 AS |
954 | /* |
955 | * Scan the given exclude list in reverse to see whether pathname | |
956 | * should be ignored. The first match (i.e. the last on the list), if | |
957 | * any, determines the fate. Returns the exclude_list element which | |
958 | * matched, or NULL for undecided. | |
453ec4bd | 959 | */ |
578cd7c3 AS |
960 | static struct exclude *last_exclude_matching_from_list(const char *pathname, |
961 | int pathlen, | |
962 | const char *basename, | |
963 | int *dtype, | |
964 | struct exclude_list *el) | |
453ec4bd | 965 | { |
e6efecc4 | 966 | struct exclude *exc = NULL; /* undecided */ |
5cee3493 | 967 | int i; |
453ec4bd | 968 | |
35a94d44 | 969 | if (!el->nr) |
578cd7c3 | 970 | return NULL; /* undefined */ |
d6b8fc30 | 971 | |
35a94d44 NTND |
972 | for (i = el->nr - 1; 0 <= i; i--) { |
973 | struct exclude *x = el->excludes[i]; | |
b5592632 | 974 | const char *exclude = x->pattern; |
b5592632 | 975 | int prefix = x->nowildcardlen; |
35a94d44 NTND |
976 | |
977 | if (x->flags & EXC_FLAG_MUSTBEDIR) { | |
978 | if (*dtype == DT_UNKNOWN) | |
98f2a687 | 979 | *dtype = get_dtype(NULL, &the_index, pathname, pathlen); |
35a94d44 NTND |
980 | if (*dtype != DT_DIR) |
981 | continue; | |
982 | } | |
d6b8fc30 | 983 | |
35a94d44 | 984 | if (x->flags & EXC_FLAG_NODIR) { |
593cb880 NTND |
985 | if (match_basename(basename, |
986 | pathlen - (basename - pathname), | |
987 | exclude, prefix, x->patternlen, | |
e6efecc4 NTND |
988 | x->flags)) { |
989 | exc = x; | |
990 | break; | |
991 | } | |
35a94d44 NTND |
992 | continue; |
993 | } | |
994 | ||
b5592632 NTND |
995 | assert(x->baselen == 0 || x->base[x->baselen - 1] == '/'); |
996 | if (match_pathname(pathname, pathlen, | |
997 | x->base, x->baselen ? x->baselen - 1 : 0, | |
e6efecc4 NTND |
998 | exclude, prefix, x->patternlen, x->flags)) { |
999 | exc = x; | |
1000 | break; | |
1001 | } | |
453ec4bd | 1002 | } |
e6efecc4 | 1003 | return exc; |
578cd7c3 AS |
1004 | } |
1005 | ||
1006 | /* | |
1007 | * Scan the list and let the last match determine the fate. | |
1008 | * Return 1 for exclude, 0 for include and -1 for undecided. | |
1009 | */ | |
1010 | int is_excluded_from_list(const char *pathname, | |
1011 | int pathlen, const char *basename, int *dtype, | |
1012 | struct exclude_list *el) | |
1013 | { | |
1014 | struct exclude *exclude; | |
1015 | exclude = last_exclude_matching_from_list(pathname, pathlen, basename, dtype, el); | |
1016 | if (exclude) | |
1017 | return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1; | |
453ec4bd LT |
1018 | return -1; /* undecided */ |
1019 | } | |
1020 | ||
46aa2f95 KB |
1021 | static struct exclude *last_exclude_matching_from_lists(struct dir_struct *dir, |
1022 | const char *pathname, int pathlen, const char *basename, | |
1023 | int *dtype_p) | |
1024 | { | |
1025 | int i, j; | |
1026 | struct exclude_list_group *group; | |
1027 | struct exclude *exclude; | |
1028 | for (i = EXC_CMDL; i <= EXC_FILE; i++) { | |
1029 | group = &dir->exclude_list_group[i]; | |
1030 | for (j = group->nr - 1; j >= 0; j--) { | |
1031 | exclude = last_exclude_matching_from_list( | |
1032 | pathname, pathlen, basename, dtype_p, | |
1033 | &group->el[j]); | |
1034 | if (exclude) | |
1035 | return exclude; | |
1036 | } | |
1037 | } | |
1038 | return NULL; | |
1039 | } | |
1040 | ||
6cd5c582 KB |
1041 | /* |
1042 | * Loads the per-directory exclude list for the substring of base | |
1043 | * which has a char length of baselen. | |
1044 | */ | |
1045 | static void prep_exclude(struct dir_struct *dir, const char *base, int baselen) | |
1046 | { | |
1047 | struct exclude_list_group *group; | |
1048 | struct exclude_list *el; | |
1049 | struct exclude_stack *stk = NULL; | |
0dcb8d7f | 1050 | struct untracked_cache_dir *untracked; |
6cd5c582 KB |
1051 | int current; |
1052 | ||
6cd5c582 KB |
1053 | group = &dir->exclude_list_group[EXC_DIRS]; |
1054 | ||
d961baa8 NTND |
1055 | /* |
1056 | * Pop the exclude lists from the EXCL_DIRS exclude_list_group | |
6cd5c582 | 1057 | * which originate from directories not in the prefix of the |
d961baa8 NTND |
1058 | * path being checked. |
1059 | */ | |
6cd5c582 KB |
1060 | while ((stk = dir->exclude_stack) != NULL) { |
1061 | if (stk->baselen <= baselen && | |
aceb9429 | 1062 | !strncmp(dir->basebuf.buf, base, stk->baselen)) |
6cd5c582 KB |
1063 | break; |
1064 | el = &group->el[dir->exclude_stack->exclude_ix]; | |
1065 | dir->exclude_stack = stk->prev; | |
95c6f271 | 1066 | dir->exclude = NULL; |
aceb9429 | 1067 | free((char *)el->src); /* see strbuf_detach() below */ |
6cd5c582 KB |
1068 | clear_exclude_list(el); |
1069 | free(stk); | |
1070 | group->nr--; | |
1071 | } | |
1072 | ||
95c6f271 KB |
1073 | /* Skip traversing into sub directories if the parent is excluded */ |
1074 | if (dir->exclude) | |
1075 | return; | |
1076 | ||
aceb9429 NTND |
1077 | /* |
1078 | * Lazy initialization. All call sites currently just | |
1079 | * memset(dir, 0, sizeof(*dir)) before use. Changing all of | |
1080 | * them seems lots of work for little benefit. | |
1081 | */ | |
1082 | if (!dir->basebuf.buf) | |
1083 | strbuf_init(&dir->basebuf, PATH_MAX); | |
1084 | ||
6cd5c582 KB |
1085 | /* Read from the parent directories and push them down. */ |
1086 | current = stk ? stk->baselen : -1; | |
aceb9429 | 1087 | strbuf_setlen(&dir->basebuf, current < 0 ? 0 : current); |
0dcb8d7f NTND |
1088 | if (dir->untracked) |
1089 | untracked = stk ? stk->ucd : dir->untracked->root; | |
1090 | else | |
1091 | untracked = NULL; | |
1092 | ||
6cd5c582 | 1093 | while (current < baselen) { |
6cd5c582 | 1094 | const char *cp; |
0dcb8d7f | 1095 | struct sha1_stat sha1_stat; |
6cd5c582 | 1096 | |
03e11a71 | 1097 | stk = xcalloc(1, sizeof(*stk)); |
6cd5c582 KB |
1098 | if (current < 0) { |
1099 | cp = base; | |
1100 | current = 0; | |
d961baa8 | 1101 | } else { |
6cd5c582 KB |
1102 | cp = strchr(base + current + 1, '/'); |
1103 | if (!cp) | |
1104 | die("oops in prep_exclude"); | |
1105 | cp++; | |
0dcb8d7f NTND |
1106 | untracked = |
1107 | lookup_untracked(dir->untracked, untracked, | |
1108 | base + current, | |
1109 | cp - base - current); | |
6cd5c582 KB |
1110 | } |
1111 | stk->prev = dir->exclude_stack; | |
1112 | stk->baselen = cp - base; | |
95c6f271 | 1113 | stk->exclude_ix = group->nr; |
0dcb8d7f | 1114 | stk->ucd = untracked; |
95c6f271 | 1115 | el = add_exclude_list(dir, EXC_DIRS, NULL); |
aceb9429 NTND |
1116 | strbuf_add(&dir->basebuf, base + current, stk->baselen - current); |
1117 | assert(stk->baselen == dir->basebuf.len); | |
95c6f271 KB |
1118 | |
1119 | /* Abort if the directory is excluded */ | |
1120 | if (stk->baselen) { | |
1121 | int dt = DT_DIR; | |
aceb9429 | 1122 | dir->basebuf.buf[stk->baselen - 1] = 0; |
95c6f271 | 1123 | dir->exclude = last_exclude_matching_from_lists(dir, |
aceb9429 NTND |
1124 | dir->basebuf.buf, stk->baselen - 1, |
1125 | dir->basebuf.buf + current, &dt); | |
1126 | dir->basebuf.buf[stk->baselen - 1] = '/'; | |
c3c327de KB |
1127 | if (dir->exclude && |
1128 | dir->exclude->flags & EXC_FLAG_NEGATIVE) | |
1129 | dir->exclude = NULL; | |
95c6f271 | 1130 | if (dir->exclude) { |
95c6f271 KB |
1131 | dir->exclude_stack = stk; |
1132 | return; | |
1133 | } | |
1134 | } | |
1135 | ||
aceb9429 | 1136 | /* Try to read per-directory file */ |
0dcb8d7f NTND |
1137 | hashclr(sha1_stat.sha1); |
1138 | sha1_stat.valid = 0; | |
27b099ae NTND |
1139 | if (dir->exclude_per_dir && |
1140 | /* | |
1141 | * If we know that no files have been added in | |
1142 | * this directory (i.e. valid_cached_dir() has | |
1143 | * been executed and set untracked->valid) .. | |
1144 | */ | |
1145 | (!untracked || !untracked->valid || | |
1146 | /* | |
1147 | * .. and .gitignore does not exist before | |
7687252f DT |
1148 | * (i.e. null exclude_sha1). Then we can skip |
1149 | * loading .gitignore, which would result in | |
1150 | * ENOENT anyway. | |
27b099ae NTND |
1151 | */ |
1152 | !is_null_sha1(untracked->exclude_sha1))) { | |
95c6f271 KB |
1153 | /* |
1154 | * dir->basebuf gets reused by the traversal, but we | |
1155 | * need fname to remain unchanged to ensure the src | |
1156 | * member of each struct exclude correctly | |
1157 | * back-references its source file. Other invocations | |
1158 | * of add_exclude_list provide stable strings, so we | |
aceb9429 | 1159 | * strbuf_detach() and free() here in the caller. |
95c6f271 | 1160 | */ |
aceb9429 NTND |
1161 | struct strbuf sb = STRBUF_INIT; |
1162 | strbuf_addbuf(&sb, &dir->basebuf); | |
1163 | strbuf_addstr(&sb, dir->exclude_per_dir); | |
1164 | el->src = strbuf_detach(&sb, NULL); | |
0dcb8d7f NTND |
1165 | add_excludes(el->src, el->src, stk->baselen, el, 1, |
1166 | untracked ? &sha1_stat : NULL); | |
1167 | } | |
5ebf79ad NTND |
1168 | /* |
1169 | * NEEDSWORK: when untracked cache is enabled, prep_exclude() | |
1170 | * will first be called in valid_cached_dir() then maybe many | |
1171 | * times more in last_exclude_matching(). When the cache is | |
1172 | * used, last_exclude_matching() will not be called and | |
1173 | * reading .gitignore content will be a waste. | |
1174 | * | |
1175 | * So when it's called by valid_cached_dir() and we can get | |
1176 | * .gitignore SHA-1 from the index (i.e. .gitignore is not | |
1177 | * modified on work tree), we could delay reading the | |
1178 | * .gitignore content until we absolutely need it in | |
1179 | * last_exclude_matching(). Be careful about ignore rule | |
1180 | * order, though, if you do that. | |
1181 | */ | |
1182 | if (untracked && | |
1183 | hashcmp(sha1_stat.sha1, untracked->exclude_sha1)) { | |
1184 | invalidate_gitignore(dir->untracked, untracked); | |
0dcb8d7f | 1185 | hashcpy(untracked->exclude_sha1, sha1_stat.sha1); |
95c6f271 | 1186 | } |
6cd5c582 KB |
1187 | dir->exclude_stack = stk; |
1188 | current = stk->baselen; | |
1189 | } | |
aceb9429 | 1190 | strbuf_setlen(&dir->basebuf, baselen); |
6cd5c582 KB |
1191 | } |
1192 | ||
f4cd69a6 AS |
1193 | /* |
1194 | * Loads the exclude lists for the directory containing pathname, then | |
1195 | * scans all exclude lists to determine whether pathname is excluded. | |
1196 | * Returns the exclude_list element which matched, or NULL for | |
1197 | * undecided. | |
1198 | */ | |
b07bc8c8 | 1199 | struct exclude *last_exclude_matching(struct dir_struct *dir, |
f4cd69a6 AS |
1200 | const char *pathname, |
1201 | int *dtype_p) | |
453ec4bd LT |
1202 | { |
1203 | int pathlen = strlen(pathname); | |
68492fc7 LK |
1204 | const char *basename = strrchr(pathname, '/'); |
1205 | basename = (basename) ? basename+1 : pathname; | |
453ec4bd | 1206 | |
63d285c8 | 1207 | prep_exclude(dir, pathname, basename-pathname); |
c082df24 | 1208 | |
95c6f271 KB |
1209 | if (dir->exclude) |
1210 | return dir->exclude; | |
1211 | ||
46aa2f95 KB |
1212 | return last_exclude_matching_from_lists(dir, pathname, pathlen, |
1213 | basename, dtype_p); | |
f4cd69a6 AS |
1214 | } |
1215 | ||
1216 | /* | |
1217 | * Loads the exclude lists for the directory containing pathname, then | |
1218 | * scans all exclude lists to determine whether pathname is excluded. | |
1219 | * Returns 1 if true, otherwise 0. | |
1220 | */ | |
b07bc8c8 | 1221 | int is_excluded(struct dir_struct *dir, const char *pathname, int *dtype_p) |
f4cd69a6 AS |
1222 | { |
1223 | struct exclude *exclude = | |
1224 | last_exclude_matching(dir, pathname, dtype_p); | |
1225 | if (exclude) | |
1226 | return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1; | |
453ec4bd LT |
1227 | return 0; |
1228 | } | |
1229 | ||
f3fa1838 JH |
1230 | static struct dir_entry *dir_entry_new(const char *pathname, int len) |
1231 | { | |
453ec4bd LT |
1232 | struct dir_entry *ent; |
1233 | ||
96ffc06f | 1234 | FLEX_ALLOC_MEM(ent, name, pathname, len); |
453ec4bd | 1235 | ent->len = len; |
4d06f8ac | 1236 | return ent; |
453ec4bd LT |
1237 | } |
1238 | ||
159b3212 | 1239 | static struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len) |
6815e569 | 1240 | { |
12cd0bf9 | 1241 | if (index_file_exists(&the_index, pathname, len, ignore_case)) |
6815e569 JK |
1242 | return NULL; |
1243 | ||
25fd2f7a | 1244 | ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc); |
6815e569 JK |
1245 | return dir->entries[dir->nr++] = dir_entry_new(pathname, len); |
1246 | } | |
1247 | ||
108da0db | 1248 | struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len) |
2abd31b0 | 1249 | { |
12cd0bf9 | 1250 | if (!index_name_is_other(&the_index, pathname, len)) |
2abd31b0 JK |
1251 | return NULL; |
1252 | ||
25fd2f7a | 1253 | ALLOC_GROW(dir->ignored, dir->ignored_nr+1, dir->ignored_alloc); |
2abd31b0 JK |
1254 | return dir->ignored[dir->ignored_nr++] = dir_entry_new(pathname, len); |
1255 | } | |
1256 | ||
09595258 LT |
1257 | enum exist_status { |
1258 | index_nonexistent = 0, | |
1259 | index_directory, | |
4b05548f | 1260 | index_gitdir |
09595258 LT |
1261 | }; |
1262 | ||
5102c617 | 1263 | /* |
71261027 | 1264 | * Do not use the alphabetically sorted index to look up |
5102c617 | 1265 | * the directory name; instead, use the case insensitive |
ebbd7439 | 1266 | * directory hash. |
5102c617 | 1267 | */ |
ae520e36 BW |
1268 | static enum exist_status directory_exists_in_index_icase(struct index_state *istate, |
1269 | const char *dirname, int len) | |
5102c617 | 1270 | { |
41284eb0 | 1271 | struct cache_entry *ce; |
5102c617 | 1272 | |
ae520e36 | 1273 | if (index_dir_exists(istate, dirname, len)) |
5102c617 JJ |
1274 | return index_directory; |
1275 | ||
ae520e36 | 1276 | ce = index_file_exists(istate, dirname, len, ignore_case); |
41284eb0 | 1277 | if (ce && S_ISGITLINK(ce->ce_mode)) |
5102c617 JJ |
1278 | return index_gitdir; |
1279 | ||
5102c617 JJ |
1280 | return index_nonexistent; |
1281 | } | |
1282 | ||
09595258 LT |
1283 | /* |
1284 | * The index sorts alphabetically by entry name, which | |
1285 | * means that a gitlink sorts as '\0' at the end, while | |
1286 | * a directory (which is defined not as an entry, but as | |
1287 | * the files it contains) will sort with the '/' at the | |
1288 | * end. | |
1289 | */ | |
ae520e36 BW |
1290 | static enum exist_status directory_exists_in_index(struct index_state *istate, |
1291 | const char *dirname, int len) | |
453ec4bd | 1292 | { |
5102c617 JJ |
1293 | int pos; |
1294 | ||
1295 | if (ignore_case) | |
ae520e36 | 1296 | return directory_exists_in_index_icase(istate, dirname, len); |
5102c617 | 1297 | |
ae520e36 | 1298 | pos = index_name_pos(istate, dirname, len); |
09595258 LT |
1299 | if (pos < 0) |
1300 | pos = -pos-1; | |
ae520e36 BW |
1301 | while (pos < istate->cache_nr) { |
1302 | const struct cache_entry *ce = istate->cache[pos++]; | |
09595258 LT |
1303 | unsigned char endchar; |
1304 | ||
1305 | if (strncmp(ce->name, dirname, len)) | |
1306 | break; | |
1307 | endchar = ce->name[len]; | |
1308 | if (endchar > '/') | |
1309 | break; | |
1310 | if (endchar == '/') | |
1311 | return index_directory; | |
7a51ed66 | 1312 | if (!endchar && S_ISGITLINK(ce->ce_mode)) |
09595258 LT |
1313 | return index_gitdir; |
1314 | } | |
1315 | return index_nonexistent; | |
1316 | } | |
1317 | ||
1318 | /* | |
1319 | * When we find a directory when traversing the filesystem, we | |
1320 | * have three distinct cases: | |
1321 | * | |
1322 | * - ignore it | |
1323 | * - see it as a directory | |
1324 | * - recurse into it | |
1325 | * | |
1326 | * and which one we choose depends on a combination of existing | |
1327 | * git index contents and the flags passed into the directory | |
1328 | * traversal routine. | |
1329 | * | |
1330 | * Case 1: If we *already* have entries in the index under that | |
5bd8e2d8 KB |
1331 | * directory name, we always recurse into the directory to see |
1332 | * all the files. | |
09595258 LT |
1333 | * |
1334 | * Case 2: If we *already* have that directory name as a gitlink, | |
1335 | * we always continue to see it as a gitlink, regardless of whether | |
1336 | * there is an actual git directory there or not (it might not | |
1337 | * be checked out as a subproject!) | |
1338 | * | |
1339 | * Case 3: if we didn't have it in the index previously, we | |
1340 | * have a few sub-cases: | |
1341 | * | |
1342 | * (a) if "show_other_directories" is true, we show it as | |
1343 | * just a directory, unless "hide_empty_directories" is | |
defd7c7b KB |
1344 | * also true, in which case we need to check if it contains any |
1345 | * untracked and / or ignored files. | |
09595258 | 1346 | * (b) if it looks like a git directory, and we don't have |
302b9282 | 1347 | * 'no_gitlinks' set we treat it as a gitlink, and show it |
09595258 LT |
1348 | * as a directory. |
1349 | * (c) otherwise, we recurse into it. | |
1350 | */ | |
defd7c7b | 1351 | static enum path_treatment treat_directory(struct dir_struct *dir, |
0dcb8d7f | 1352 | struct untracked_cache_dir *untracked, |
2e5910f2 | 1353 | const char *dirname, int len, int baselen, int exclude, |
e1b8c7bd | 1354 | const struct pathspec *pathspec) |
09595258 LT |
1355 | { |
1356 | /* The "len-1" is to strip the final '/' */ | |
ae520e36 | 1357 | switch (directory_exists_in_index(&the_index, dirname, len-1)) { |
09595258 | 1358 | case index_directory: |
defd7c7b | 1359 | return path_recurse; |
09595258 LT |
1360 | |
1361 | case index_gitdir: | |
26c986e1 | 1362 | return path_none; |
09595258 LT |
1363 | |
1364 | case index_nonexistent: | |
7c4c97c0 | 1365 | if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES) |
09595258 | 1366 | break; |
7c4c97c0 | 1367 | if (!(dir->flags & DIR_NO_GITLINKS)) { |
09595258 LT |
1368 | unsigned char sha1[20]; |
1369 | if (resolve_gitlink_ref(dirname, "HEAD", sha1) == 0) | |
defd7c7b | 1370 | return path_untracked; |
09595258 | 1371 | } |
defd7c7b | 1372 | return path_recurse; |
09595258 LT |
1373 | } |
1374 | ||
1375 | /* This is the "show_other_directories" case */ | |
721ac4ed | 1376 | |
184d2a8e | 1377 | if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES)) |
defd7c7b KB |
1378 | return exclude ? path_excluded : path_untracked; |
1379 | ||
2e5910f2 DT |
1380 | untracked = lookup_untracked(dir->untracked, untracked, |
1381 | dirname + baselen, len - baselen); | |
0dcb8d7f | 1382 | return read_directory_recursive(dir, dirname, len, |
e1b8c7bd | 1383 | untracked, 1, pathspec); |
453ec4bd LT |
1384 | } |
1385 | ||
9fc42d60 LT |
1386 | /* |
1387 | * This is an inexact early pruning of any recursive directory | |
1388 | * reading - if the path cannot possibly be in the pathspec, | |
1389 | * return true, and we'll skip it early. | |
1390 | */ | |
e1b8c7bd BW |
1391 | static int simplify_away(const char *path, int pathlen, |
1392 | const struct pathspec *pathspec) | |
9fc42d60 | 1393 | { |
e1b8c7bd | 1394 | int i; |
9fc42d60 | 1395 | |
e1b8c7bd BW |
1396 | if (!pathspec || !pathspec->nr) |
1397 | return 0; | |
1398 | ||
1399 | GUARD_PATHSPEC(pathspec, | |
1400 | PATHSPEC_FROMTOP | | |
1401 | PATHSPEC_MAXDEPTH | | |
1402 | PATHSPEC_LITERAL | | |
1403 | PATHSPEC_GLOB | | |
1404 | PATHSPEC_ICASE | | |
b0db7046 BW |
1405 | PATHSPEC_EXCLUDE | |
1406 | PATHSPEC_ATTR); | |
e1b8c7bd BW |
1407 | |
1408 | for (i = 0; i < pathspec->nr; i++) { | |
1409 | const struct pathspec_item *item = &pathspec->items[i]; | |
1410 | int len = item->nowildcard_len; | |
1411 | ||
1412 | if (len > pathlen) | |
1413 | len = pathlen; | |
1414 | if (!ps_strncmp(item, item->match, path, len)) | |
1415 | return 0; | |
9fc42d60 | 1416 | } |
e1b8c7bd BW |
1417 | |
1418 | return 1; | |
9fc42d60 LT |
1419 | } |
1420 | ||
29209cbe JK |
1421 | /* |
1422 | * This function tells us whether an excluded path matches a | |
1423 | * list of "interesting" pathspecs. That is, whether a path matched | |
1424 | * by any of the pathspecs could possibly be ignored by excluding | |
1425 | * the specified path. This can happen if: | |
1426 | * | |
1427 | * 1. the path is mentioned explicitly in the pathspec | |
1428 | * | |
1429 | * 2. the path is a directory prefix of some element in the | |
1430 | * pathspec | |
1431 | */ | |
e1b8c7bd BW |
1432 | static int exclude_matches_pathspec(const char *path, int pathlen, |
1433 | const struct pathspec *pathspec) | |
1434 | { | |
1435 | int i; | |
1436 | ||
1437 | if (!pathspec || !pathspec->nr) | |
1438 | return 0; | |
1439 | ||
1440 | GUARD_PATHSPEC(pathspec, | |
1441 | PATHSPEC_FROMTOP | | |
1442 | PATHSPEC_MAXDEPTH | | |
1443 | PATHSPEC_LITERAL | | |
1444 | PATHSPEC_GLOB | | |
1445 | PATHSPEC_ICASE | | |
1446 | PATHSPEC_EXCLUDE); | |
1447 | ||
1448 | for (i = 0; i < pathspec->nr; i++) { | |
1449 | const struct pathspec_item *item = &pathspec->items[i]; | |
1450 | int len = item->nowildcard_len; | |
1451 | ||
1452 | if (len == pathlen && | |
1453 | !ps_strncmp(item, item->match, path, pathlen)) | |
1454 | return 1; | |
1455 | if (len > pathlen && | |
1456 | item->match[pathlen] == '/' && | |
1457 | !ps_strncmp(item, item->match, path, pathlen)) | |
1458 | return 1; | |
e96980ef JK |
1459 | } |
1460 | return 0; | |
1461 | } | |
1462 | ||
98f2a687 BW |
1463 | static int get_index_dtype(struct index_state *istate, |
1464 | const char *path, int len) | |
443e061a LT |
1465 | { |
1466 | int pos; | |
9c5e6c80 | 1467 | const struct cache_entry *ce; |
443e061a | 1468 | |
98f2a687 | 1469 | ce = index_file_exists(istate, path, len, 0); |
443e061a LT |
1470 | if (ce) { |
1471 | if (!ce_uptodate(ce)) | |
1472 | return DT_UNKNOWN; | |
1473 | if (S_ISGITLINK(ce->ce_mode)) | |
1474 | return DT_DIR; | |
1475 | /* | |
1476 | * Nobody actually cares about the | |
1477 | * difference between DT_LNK and DT_REG | |
1478 | */ | |
1479 | return DT_REG; | |
1480 | } | |
1481 | ||
1482 | /* Try to look it up as a directory */ | |
98f2a687 | 1483 | pos = index_name_pos(istate, path, len); |
443e061a LT |
1484 | if (pos >= 0) |
1485 | return DT_UNKNOWN; | |
1486 | pos = -pos-1; | |
98f2a687 BW |
1487 | while (pos < istate->cache_nr) { |
1488 | ce = istate->cache[pos++]; | |
443e061a LT |
1489 | if (strncmp(ce->name, path, len)) |
1490 | break; | |
1491 | if (ce->name[len] > '/') | |
1492 | break; | |
1493 | if (ce->name[len] < '/') | |
1494 | continue; | |
1495 | if (!ce_uptodate(ce)) | |
1496 | break; /* continue? */ | |
1497 | return DT_DIR; | |
1498 | } | |
1499 | return DT_UNKNOWN; | |
1500 | } | |
1501 | ||
98f2a687 BW |
1502 | static int get_dtype(struct dirent *de, struct index_state *istate, |
1503 | const char *path, int len) | |
07134421 | 1504 | { |
6831a88a | 1505 | int dtype = de ? DTYPE(de) : DT_UNKNOWN; |
07134421 LT |
1506 | struct stat st; |
1507 | ||
1508 | if (dtype != DT_UNKNOWN) | |
1509 | return dtype; | |
98f2a687 | 1510 | dtype = get_index_dtype(istate, path, len); |
443e061a LT |
1511 | if (dtype != DT_UNKNOWN) |
1512 | return dtype; | |
1513 | if (lstat(path, &st)) | |
07134421 LT |
1514 | return dtype; |
1515 | if (S_ISREG(st.st_mode)) | |
1516 | return DT_REG; | |
1517 | if (S_ISDIR(st.st_mode)) | |
1518 | return DT_DIR; | |
1519 | if (S_ISLNK(st.st_mode)) | |
1520 | return DT_LNK; | |
1521 | return dtype; | |
1522 | } | |
1523 | ||
16e2cfa9 | 1524 | static enum path_treatment treat_one_path(struct dir_struct *dir, |
0dcb8d7f | 1525 | struct untracked_cache_dir *untracked, |
49dc2cc2 | 1526 | struct strbuf *path, |
2e5910f2 | 1527 | int baselen, |
e1b8c7bd | 1528 | const struct pathspec *pathspec, |
16e2cfa9 | 1529 | int dtype, struct dirent *de) |
53cc5356 | 1530 | { |
8aaf8d77 | 1531 | int exclude; |
12cd0bf9 | 1532 | int has_path_in_index = !!index_file_exists(&the_index, path->buf, path->len, ignore_case); |
2eac2a4c | 1533 | |
8aaf8d77 | 1534 | if (dtype == DT_UNKNOWN) |
98f2a687 | 1535 | dtype = get_dtype(de, &the_index, path->buf, path->len); |
8aaf8d77 KB |
1536 | |
1537 | /* Always exclude indexed files */ | |
2eac2a4c | 1538 | if (dtype != DT_DIR && has_path_in_index) |
defd7c7b | 1539 | return path_none; |
8aaf8d77 | 1540 | |
2eac2a4c JH |
1541 | /* |
1542 | * When we are looking at a directory P in the working tree, | |
1543 | * there are three cases: | |
1544 | * | |
1545 | * (1) P exists in the index. Everything inside the directory P in | |
1546 | * the working tree needs to go when P is checked out from the | |
1547 | * index. | |
1548 | * | |
1549 | * (2) P does not exist in the index, but there is P/Q in the index. | |
1550 | * We know P will stay a directory when we check out the contents | |
1551 | * of the index, but we do not know yet if there is a directory | |
1552 | * P/Q in the working tree to be killed, so we need to recurse. | |
1553 | * | |
1554 | * (3) P does not exist in the index, and there is no P/Q in the index | |
1555 | * to require P to be a directory, either. Only in this case, we | |
1556 | * know that everything inside P will not be killed without | |
1557 | * recursing. | |
1558 | */ | |
1559 | if ((dir->flags & DIR_COLLECT_KILLED_ONLY) && | |
1560 | (dtype == DT_DIR) && | |
de372b1b | 1561 | !has_path_in_index && |
ae520e36 | 1562 | (directory_exists_in_index(&the_index, path->buf, path->len) == index_nonexistent)) |
de372b1b | 1563 | return path_none; |
8aaf8d77 KB |
1564 | |
1565 | exclude = is_excluded(dir, path->buf, &dtype); | |
53cc5356 JH |
1566 | |
1567 | /* | |
1568 | * Excluded? If we don't explicitly want to show | |
1569 | * ignored files, ignore it | |
1570 | */ | |
0aaf62b6 | 1571 | if (exclude && !(dir->flags & (DIR_SHOW_IGNORED|DIR_SHOW_IGNORED_TOO))) |
defd7c7b | 1572 | return path_excluded; |
53cc5356 | 1573 | |
53cc5356 JH |
1574 | switch (dtype) { |
1575 | default: | |
defd7c7b | 1576 | return path_none; |
53cc5356 | 1577 | case DT_DIR: |
49dc2cc2 | 1578 | strbuf_addch(path, '/'); |
2e5910f2 | 1579 | return treat_directory(dir, untracked, path->buf, path->len, |
e1b8c7bd | 1580 | baselen, exclude, pathspec); |
53cc5356 JH |
1581 | case DT_REG: |
1582 | case DT_LNK: | |
defd7c7b | 1583 | return exclude ? path_excluded : path_untracked; |
53cc5356 | 1584 | } |
53cc5356 JH |
1585 | } |
1586 | ||
91a2288b NTND |
1587 | static enum path_treatment treat_path_fast(struct dir_struct *dir, |
1588 | struct untracked_cache_dir *untracked, | |
1589 | struct cached_dir *cdir, | |
1590 | struct strbuf *path, | |
1591 | int baselen, | |
e1b8c7bd | 1592 | const struct pathspec *pathspec) |
91a2288b NTND |
1593 | { |
1594 | strbuf_setlen(path, baselen); | |
1595 | if (!cdir->ucd) { | |
1596 | strbuf_addstr(path, cdir->file); | |
1597 | return path_untracked; | |
1598 | } | |
1599 | strbuf_addstr(path, cdir->ucd->name); | |
1600 | /* treat_one_path() does this before it calls treat_directory() */ | |
00b6c178 | 1601 | strbuf_complete(path, '/'); |
91a2288b NTND |
1602 | if (cdir->ucd->check_only) |
1603 | /* | |
1604 | * check_only is set as a result of treat_directory() getting | |
1605 | * to its bottom. Verify again the same set of directories | |
1606 | * with check_only set. | |
1607 | */ | |
1608 | return read_directory_recursive(dir, path->buf, path->len, | |
e1b8c7bd | 1609 | cdir->ucd, 1, pathspec); |
91a2288b NTND |
1610 | /* |
1611 | * We get path_recurse in the first run when | |
1612 | * directory_exists_in_index() returns index_nonexistent. We | |
1613 | * are sure that new changes in the index does not impact the | |
1614 | * outcome. Return now. | |
1615 | */ | |
1616 | return path_recurse; | |
1617 | } | |
1618 | ||
16e2cfa9 | 1619 | static enum path_treatment treat_path(struct dir_struct *dir, |
0dcb8d7f | 1620 | struct untracked_cache_dir *untracked, |
cf7c6148 | 1621 | struct cached_dir *cdir, |
49dc2cc2 | 1622 | struct strbuf *path, |
16e2cfa9 | 1623 | int baselen, |
e1b8c7bd | 1624 | const struct pathspec *pathspec) |
16e2cfa9 JH |
1625 | { |
1626 | int dtype; | |
cf7c6148 | 1627 | struct dirent *de = cdir->de; |
16e2cfa9 | 1628 | |
91a2288b NTND |
1629 | if (!de) |
1630 | return treat_path_fast(dir, untracked, cdir, path, | |
e1b8c7bd | 1631 | baselen, pathspec); |
16e2cfa9 | 1632 | if (is_dot_or_dotdot(de->d_name) || !strcmp(de->d_name, ".git")) |
defd7c7b | 1633 | return path_none; |
49dc2cc2 RS |
1634 | strbuf_setlen(path, baselen); |
1635 | strbuf_addstr(path, de->d_name); | |
e1b8c7bd | 1636 | if (simplify_away(path->buf, path->len, pathspec)) |
defd7c7b | 1637 | return path_none; |
16e2cfa9 JH |
1638 | |
1639 | dtype = DTYPE(de); | |
e1b8c7bd | 1640 | return treat_one_path(dir, untracked, path, baselen, pathspec, dtype, de); |
0dcb8d7f NTND |
1641 | } |
1642 | ||
1643 | static void add_untracked(struct untracked_cache_dir *dir, const char *name) | |
1644 | { | |
1645 | if (!dir) | |
1646 | return; | |
1647 | ALLOC_GROW(dir->untracked, dir->untracked_nr + 1, | |
1648 | dir->untracked_alloc); | |
1649 | dir->untracked[dir->untracked_nr++] = xstrdup(name); | |
16e2cfa9 JH |
1650 | } |
1651 | ||
91a2288b NTND |
1652 | static int valid_cached_dir(struct dir_struct *dir, |
1653 | struct untracked_cache_dir *untracked, | |
1654 | struct strbuf *path, | |
1655 | int check_only) | |
1656 | { | |
1657 | struct stat st; | |
1658 | ||
1659 | if (!untracked) | |
1660 | return 0; | |
1661 | ||
1662 | if (stat(path->len ? path->buf : ".", &st)) { | |
1663 | invalidate_directory(dir->untracked, untracked); | |
1664 | memset(&untracked->stat_data, 0, sizeof(untracked->stat_data)); | |
1665 | return 0; | |
1666 | } | |
1667 | if (!untracked->valid || | |
ed4efab1 | 1668 | match_stat_data_racy(&the_index, &untracked->stat_data, &st)) { |
91a2288b NTND |
1669 | if (untracked->valid) |
1670 | invalidate_directory(dir->untracked, untracked); | |
1671 | fill_stat_data(&untracked->stat_data, &st); | |
1672 | return 0; | |
1673 | } | |
1674 | ||
1675 | if (untracked->check_only != !!check_only) { | |
1676 | invalidate_directory(dir->untracked, untracked); | |
1677 | return 0; | |
1678 | } | |
1679 | ||
1680 | /* | |
1681 | * prep_exclude will be called eventually on this directory, | |
1682 | * but it's called much later in last_exclude_matching(). We | |
1683 | * need it now to determine the validity of the cache for this | |
1684 | * path. The next calls will be nearly no-op, the way | |
1685 | * prep_exclude() is designed. | |
1686 | */ | |
1687 | if (path->len && path->buf[path->len - 1] != '/') { | |
1688 | strbuf_addch(path, '/'); | |
1689 | prep_exclude(dir, path->buf, path->len); | |
1690 | strbuf_setlen(path, path->len - 1); | |
1691 | } else | |
1692 | prep_exclude(dir, path->buf, path->len); | |
1693 | ||
1694 | /* hopefully prep_exclude() haven't invalidated this entry... */ | |
1695 | return untracked->valid; | |
1696 | } | |
1697 | ||
cf7c6148 NTND |
1698 | static int open_cached_dir(struct cached_dir *cdir, |
1699 | struct dir_struct *dir, | |
1700 | struct untracked_cache_dir *untracked, | |
1701 | struct strbuf *path, | |
1702 | int check_only) | |
1703 | { | |
1704 | memset(cdir, 0, sizeof(*cdir)); | |
1705 | cdir->untracked = untracked; | |
91a2288b NTND |
1706 | if (valid_cached_dir(dir, untracked, path, check_only)) |
1707 | return 0; | |
cf7c6148 | 1708 | cdir->fdir = opendir(path->len ? path->buf : "."); |
91a2288b NTND |
1709 | if (dir->untracked) |
1710 | dir->untracked->dir_opened++; | |
cf7c6148 NTND |
1711 | if (!cdir->fdir) |
1712 | return -1; | |
1713 | return 0; | |
1714 | } | |
1715 | ||
1716 | static int read_cached_dir(struct cached_dir *cdir) | |
1717 | { | |
1718 | if (cdir->fdir) { | |
1719 | cdir->de = readdir(cdir->fdir); | |
1720 | if (!cdir->de) | |
1721 | return -1; | |
1722 | return 0; | |
1723 | } | |
91a2288b NTND |
1724 | while (cdir->nr_dirs < cdir->untracked->dirs_nr) { |
1725 | struct untracked_cache_dir *d = cdir->untracked->dirs[cdir->nr_dirs]; | |
26cb0182 NTND |
1726 | if (!d->recurse) { |
1727 | cdir->nr_dirs++; | |
1728 | continue; | |
1729 | } | |
91a2288b NTND |
1730 | cdir->ucd = d; |
1731 | cdir->nr_dirs++; | |
1732 | return 0; | |
1733 | } | |
1734 | cdir->ucd = NULL; | |
1735 | if (cdir->nr_files < cdir->untracked->untracked_nr) { | |
1736 | struct untracked_cache_dir *d = cdir->untracked; | |
1737 | cdir->file = d->untracked[cdir->nr_files++]; | |
1738 | return 0; | |
1739 | } | |
cf7c6148 NTND |
1740 | return -1; |
1741 | } | |
1742 | ||
1743 | static void close_cached_dir(struct cached_dir *cdir) | |
1744 | { | |
1745 | if (cdir->fdir) | |
1746 | closedir(cdir->fdir); | |
91a2288b NTND |
1747 | /* |
1748 | * We have gone through this directory and found no untracked | |
1749 | * entries. Mark it valid. | |
1750 | */ | |
26cb0182 | 1751 | if (cdir->untracked) { |
91a2288b | 1752 | cdir->untracked->valid = 1; |
26cb0182 NTND |
1753 | cdir->untracked->recurse = 1; |
1754 | } | |
16e2cfa9 JH |
1755 | } |
1756 | ||
453ec4bd LT |
1757 | /* |
1758 | * Read a directory tree. We currently ignore anything but | |
1759 | * directories, regular files and symlinks. That's because git | |
1760 | * doesn't handle them at all yet. Maybe that will change some | |
1761 | * day. | |
1762 | * | |
1763 | * Also, we ignore the name ".git" (even if it is not a directory). | |
1764 | * That likely will not change. | |
defd7c7b KB |
1765 | * |
1766 | * Returns the most significant path_treatment value encountered in the scan. | |
453ec4bd | 1767 | */ |
defd7c7b | 1768 | static enum path_treatment read_directory_recursive(struct dir_struct *dir, |
53cc5356 | 1769 | const char *base, int baselen, |
0dcb8d7f | 1770 | struct untracked_cache_dir *untracked, int check_only, |
e1b8c7bd | 1771 | const struct pathspec *pathspec) |
453ec4bd | 1772 | { |
cf7c6148 | 1773 | struct cached_dir cdir; |
defd7c7b | 1774 | enum path_treatment state, subdir_state, dir_state = path_none; |
bef36921 | 1775 | struct strbuf path = STRBUF_INIT; |
453ec4bd | 1776 | |
bef36921 | 1777 | strbuf_add(&path, base, baselen); |
02cb6753 | 1778 | |
cf7c6148 | 1779 | if (open_cached_dir(&cdir, dir, untracked, &path, check_only)) |
1528d247 RS |
1780 | goto out; |
1781 | ||
0dcb8d7f NTND |
1782 | if (untracked) |
1783 | untracked->check_only = !!check_only; | |
1784 | ||
cf7c6148 | 1785 | while (!read_cached_dir(&cdir)) { |
defd7c7b | 1786 | /* check how the file or directory should be treated */ |
e1b8c7bd BW |
1787 | state = treat_path(dir, untracked, &cdir, &path, |
1788 | baselen, pathspec); | |
0dcb8d7f | 1789 | |
defd7c7b KB |
1790 | if (state > dir_state) |
1791 | dir_state = state; | |
1792 | ||
1793 | /* recurse into subdir if instructed by treat_path */ | |
1794 | if (state == path_recurse) { | |
0dcb8d7f NTND |
1795 | struct untracked_cache_dir *ud; |
1796 | ud = lookup_untracked(dir->untracked, untracked, | |
1797 | path.buf + baselen, | |
1798 | path.len - baselen); | |
1799 | subdir_state = | |
e1b8c7bd BW |
1800 | read_directory_recursive(dir, path.buf, |
1801 | path.len, ud, | |
1802 | check_only, pathspec); | |
defd7c7b KB |
1803 | if (subdir_state > dir_state) |
1804 | dir_state = subdir_state; | |
1805 | } | |
1806 | ||
1807 | if (check_only) { | |
1808 | /* abort early if maximum state has been reached */ | |
0dcb8d7f | 1809 | if (dir_state == path_untracked) { |
91a2288b | 1810 | if (cdir.fdir) |
0dcb8d7f | 1811 | add_untracked(untracked, path.buf + baselen); |
defd7c7b | 1812 | break; |
0dcb8d7f | 1813 | } |
defd7c7b | 1814 | /* skip the dir_add_* part */ |
02cb6753 | 1815 | continue; |
453ec4bd | 1816 | } |
defd7c7b KB |
1817 | |
1818 | /* add the path to the appropriate result list */ | |
1819 | switch (state) { | |
1820 | case path_excluded: | |
1821 | if (dir->flags & DIR_SHOW_IGNORED) | |
1822 | dir_add_name(dir, path.buf, path.len); | |
0aaf62b6 KB |
1823 | else if ((dir->flags & DIR_SHOW_IGNORED_TOO) || |
1824 | ((dir->flags & DIR_COLLECT_IGNORED) && | |
1825 | exclude_matches_pathspec(path.buf, path.len, | |
e1b8c7bd | 1826 | pathspec))) |
0aaf62b6 | 1827 | dir_add_ignored(dir, path.buf, path.len); |
defd7c7b KB |
1828 | break; |
1829 | ||
1830 | case path_untracked: | |
0dcb8d7f NTND |
1831 | if (dir->flags & DIR_SHOW_IGNORED) |
1832 | break; | |
1833 | dir_add_name(dir, path.buf, path.len); | |
91a2288b | 1834 | if (cdir.fdir) |
0dcb8d7f | 1835 | add_untracked(untracked, path.buf + baselen); |
1528d247 | 1836 | break; |
defd7c7b KB |
1837 | |
1838 | default: | |
1839 | break; | |
1840 | } | |
453ec4bd | 1841 | } |
cf7c6148 | 1842 | close_cached_dir(&cdir); |
1528d247 | 1843 | out: |
bef36921 | 1844 | strbuf_release(&path); |
453ec4bd | 1845 | |
defd7c7b | 1846 | return dir_state; |
453ec4bd LT |
1847 | } |
1848 | ||
1849 | static int cmp_name(const void *p1, const void *p2) | |
1850 | { | |
1851 | const struct dir_entry *e1 = *(const struct dir_entry **)p1; | |
1852 | const struct dir_entry *e2 = *(const struct dir_entry **)p2; | |
1853 | ||
ccdd4a0f | 1854 | return name_compare(e1->name, e1->len, e2->name, e2->len); |
453ec4bd LT |
1855 | } |
1856 | ||
48ffef96 JH |
1857 | static int treat_leading_path(struct dir_struct *dir, |
1858 | const char *path, int len, | |
e1b8c7bd | 1859 | const struct pathspec *pathspec) |
48ffef96 | 1860 | { |
49dc2cc2 RS |
1861 | struct strbuf sb = STRBUF_INIT; |
1862 | int baselen, rc = 0; | |
48ffef96 | 1863 | const char *cp; |
be8a84c5 | 1864 | int old_flags = dir->flags; |
48ffef96 JH |
1865 | |
1866 | while (len && path[len - 1] == '/') | |
1867 | len--; | |
1868 | if (!len) | |
1869 | return 1; | |
1870 | baselen = 0; | |
be8a84c5 | 1871 | dir->flags &= ~DIR_SHOW_OTHER_DIRECTORIES; |
48ffef96 JH |
1872 | while (1) { |
1873 | cp = path + baselen + !!baselen; | |
1874 | cp = memchr(cp, '/', path + len - cp); | |
1875 | if (!cp) | |
1876 | baselen = len; | |
1877 | else | |
1878 | baselen = cp - path; | |
49dc2cc2 RS |
1879 | strbuf_setlen(&sb, 0); |
1880 | strbuf_add(&sb, path, baselen); | |
1881 | if (!is_directory(sb.buf)) | |
1882 | break; | |
e1b8c7bd | 1883 | if (simplify_away(sb.buf, sb.len, pathspec)) |
49dc2cc2 | 1884 | break; |
e1b8c7bd | 1885 | if (treat_one_path(dir, NULL, &sb, baselen, pathspec, |
defd7c7b | 1886 | DT_DIR, NULL) == path_none) |
49dc2cc2 RS |
1887 | break; /* do not recurse into it */ |
1888 | if (len <= baselen) { | |
1889 | rc = 1; | |
1890 | break; /* finished checking */ | |
1891 | } | |
48ffef96 | 1892 | } |
49dc2cc2 | 1893 | strbuf_release(&sb); |
be8a84c5 | 1894 | dir->flags = old_flags; |
49dc2cc2 | 1895 | return rc; |
48ffef96 JH |
1896 | } |
1897 | ||
1e8fef60 NTND |
1898 | static const char *get_ident_string(void) |
1899 | { | |
1900 | static struct strbuf sb = STRBUF_INIT; | |
1901 | struct utsname uts; | |
1902 | ||
1903 | if (sb.len) | |
1904 | return sb.buf; | |
100e4337 | 1905 | if (uname(&uts) < 0) |
1e8fef60 | 1906 | die_errno(_("failed to get kernel name and information")); |
0e0f7618 CC |
1907 | strbuf_addf(&sb, "Location %s, system %s", get_git_work_tree(), |
1908 | uts.sysname); | |
1e8fef60 NTND |
1909 | return sb.buf; |
1910 | } | |
1911 | ||
1912 | static int ident_in_untracked(const struct untracked_cache *uc) | |
1913 | { | |
0e0f7618 CC |
1914 | /* |
1915 | * Previous git versions may have saved many NUL separated | |
1916 | * strings in the "ident" field, but it is insane to manage | |
1917 | * many locations, so just take care of the first one. | |
1918 | */ | |
1e8fef60 | 1919 | |
0e0f7618 | 1920 | return !strcmp(uc->ident.buf, get_ident_string()); |
1e8fef60 NTND |
1921 | } |
1922 | ||
0e0f7618 | 1923 | static void set_untracked_ident(struct untracked_cache *uc) |
1e8fef60 | 1924 | { |
0e0f7618 | 1925 | strbuf_reset(&uc->ident); |
1e8fef60 | 1926 | strbuf_addstr(&uc->ident, get_ident_string()); |
0e0f7618 CC |
1927 | |
1928 | /* | |
1929 | * This strbuf used to contain a list of NUL separated | |
1930 | * strings, so save NUL too for backward compatibility. | |
1931 | */ | |
1e8fef60 NTND |
1932 | strbuf_addch(&uc->ident, 0); |
1933 | } | |
1934 | ||
4a4ca479 CC |
1935 | static void new_untracked_cache(struct index_state *istate) |
1936 | { | |
1937 | struct untracked_cache *uc = xcalloc(1, sizeof(*uc)); | |
1938 | strbuf_init(&uc->ident, 100); | |
1939 | uc->exclude_per_dir = ".gitignore"; | |
1940 | /* should be the same flags used by git-status */ | |
1941 | uc->dir_flags = DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES; | |
0e0f7618 | 1942 | set_untracked_ident(uc); |
4a4ca479 | 1943 | istate->untracked = uc; |
0e0f7618 | 1944 | istate->cache_changed |= UNTRACKED_CHANGED; |
4a4ca479 CC |
1945 | } |
1946 | ||
1947 | void add_untracked_cache(struct index_state *istate) | |
1948 | { | |
1949 | if (!istate->untracked) { | |
1950 | new_untracked_cache(istate); | |
0e0f7618 CC |
1951 | } else { |
1952 | if (!ident_in_untracked(istate->untracked)) { | |
1953 | free_untracked_cache(istate->untracked); | |
1954 | new_untracked_cache(istate); | |
1955 | } | |
1956 | } | |
4a4ca479 CC |
1957 | } |
1958 | ||
07b29bfd CC |
1959 | void remove_untracked_cache(struct index_state *istate) |
1960 | { | |
1961 | if (istate->untracked) { | |
1962 | free_untracked_cache(istate->untracked); | |
1963 | istate->untracked = NULL; | |
1964 | istate->cache_changed |= UNTRACKED_CHANGED; | |
1965 | } | |
1966 | } | |
1967 | ||
ccad261f NTND |
1968 | static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *dir, |
1969 | int base_len, | |
1970 | const struct pathspec *pathspec) | |
1971 | { | |
1972 | struct untracked_cache_dir *root; | |
1973 | ||
76e6b090 | 1974 | if (!dir->untracked || getenv("GIT_DISABLE_UNTRACKED_CACHE")) |
ccad261f NTND |
1975 | return NULL; |
1976 | ||
1977 | /* | |
1978 | * We only support $GIT_DIR/info/exclude and core.excludesfile | |
1979 | * as the global ignore rule files. Any other additions | |
1980 | * (e.g. from command line) invalidate the cache. This | |
1981 | * condition also catches running setup_standard_excludes() | |
1982 | * before setting dir->untracked! | |
1983 | */ | |
1984 | if (dir->unmanaged_exclude_files) | |
1985 | return NULL; | |
1986 | ||
1987 | /* | |
1988 | * Optimize for the main use case only: whole-tree git | |
1989 | * status. More work involved in treat_leading_path() if we | |
1990 | * use cache on just a subset of the worktree. pathspec | |
1991 | * support could make the matter even worse. | |
1992 | */ | |
1993 | if (base_len || (pathspec && pathspec->nr)) | |
1994 | return NULL; | |
1995 | ||
1996 | /* Different set of flags may produce different results */ | |
1997 | if (dir->flags != dir->untracked->dir_flags || | |
1998 | /* | |
1999 | * See treat_directory(), case index_nonexistent. Without | |
2000 | * this flag, we may need to also cache .git file content | |
2001 | * for the resolve_gitlink_ref() call, which we don't. | |
2002 | */ | |
2003 | !(dir->flags & DIR_SHOW_OTHER_DIRECTORIES) || | |
2004 | /* We don't support collecting ignore files */ | |
2005 | (dir->flags & (DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO | | |
2006 | DIR_COLLECT_IGNORED))) | |
2007 | return NULL; | |
2008 | ||
2009 | /* | |
2010 | * If we use .gitignore in the cache and now you change it to | |
2011 | * .gitexclude, everything will go wrong. | |
2012 | */ | |
2013 | if (dir->exclude_per_dir != dir->untracked->exclude_per_dir && | |
2014 | strcmp(dir->exclude_per_dir, dir->untracked->exclude_per_dir)) | |
2015 | return NULL; | |
2016 | ||
2017 | /* | |
2018 | * EXC_CMDL is not considered in the cache. If people set it, | |
2019 | * skip the cache. | |
2020 | */ | |
2021 | if (dir->exclude_list_group[EXC_CMDL].nr) | |
2022 | return NULL; | |
2023 | ||
1e8fef60 | 2024 | if (!ident_in_untracked(dir->untracked)) { |
0e0f7618 | 2025 | warning(_("Untracked cache is disabled on this system or location.")); |
1e8fef60 NTND |
2026 | return NULL; |
2027 | } | |
2028 | ||
ccad261f NTND |
2029 | if (!dir->untracked->root) { |
2030 | const int len = sizeof(*dir->untracked->root); | |
2031 | dir->untracked->root = xmalloc(len); | |
2032 | memset(dir->untracked->root, 0, len); | |
2033 | } | |
2034 | ||
2035 | /* Validate $GIT_DIR/info/exclude and core.excludesfile */ | |
2036 | root = dir->untracked->root; | |
2037 | if (hashcmp(dir->ss_info_exclude.sha1, | |
2038 | dir->untracked->ss_info_exclude.sha1)) { | |
2039 | invalidate_gitignore(dir->untracked, root); | |
2040 | dir->untracked->ss_info_exclude = dir->ss_info_exclude; | |
2041 | } | |
2042 | if (hashcmp(dir->ss_excludes_file.sha1, | |
2043 | dir->untracked->ss_excludes_file.sha1)) { | |
2044 | invalidate_gitignore(dir->untracked, root); | |
2045 | dir->untracked->ss_excludes_file = dir->ss_excludes_file; | |
2046 | } | |
26cb0182 NTND |
2047 | |
2048 | /* Make sure this directory is not dropped out at saving phase */ | |
2049 | root->recurse = 1; | |
ccad261f NTND |
2050 | return root; |
2051 | } | |
2052 | ||
e1b8c7bd BW |
2053 | int read_directory(struct dir_struct *dir, const char *path, |
2054 | int len, const struct pathspec *pathspec) | |
9fc42d60 | 2055 | { |
ccad261f | 2056 | struct untracked_cache_dir *untracked; |
b4189aa8 | 2057 | |
dba2e203 | 2058 | if (has_symlink_leading_path(path, len)) |
725b0605 JH |
2059 | return dir->nr; |
2060 | ||
ccad261f NTND |
2061 | untracked = validate_untracked_cache(dir, len, pathspec); |
2062 | if (!untracked) | |
2063 | /* | |
2064 | * make sure untracked cache code path is disabled, | |
2065 | * e.g. prep_exclude() | |
2066 | */ | |
2067 | dir->untracked = NULL; | |
e1b8c7bd BW |
2068 | if (!len || treat_leading_path(dir, path, len, pathspec)) |
2069 | read_directory_recursive(dir, path, len, untracked, 0, pathspec); | |
9ed0d8d6 RS |
2070 | QSORT(dir->entries, dir->nr, cmp_name); |
2071 | QSORT(dir->ignored, dir->ignored_nr, cmp_name); | |
c9ccb5d3 NTND |
2072 | if (dir->untracked) { |
2073 | static struct trace_key trace_untracked_stats = TRACE_KEY_INIT(UNTRACKED_STATS); | |
2074 | trace_printf_key(&trace_untracked_stats, | |
2075 | "node creation: %u\n" | |
2076 | "gitignore invalidation: %u\n" | |
2077 | "directory invalidation: %u\n" | |
2078 | "opendir: %u\n", | |
2079 | dir->untracked->dir_created, | |
2080 | dir->untracked->gitignore_invalidated, | |
2081 | dir->untracked->dir_invalidated, | |
2082 | dir->untracked->dir_opened); | |
1bbb3dba NTND |
2083 | if (dir->untracked == the_index.untracked && |
2084 | (dir->untracked->dir_opened || | |
2085 | dir->untracked->gitignore_invalidated || | |
2086 | dir->untracked->dir_invalidated)) | |
2087 | the_index.cache_changed |= UNTRACKED_CHANGED; | |
2088 | if (dir->untracked != the_index.untracked) { | |
2089 | free(dir->untracked); | |
2090 | dir->untracked = NULL; | |
2091 | } | |
c9ccb5d3 | 2092 | } |
453ec4bd LT |
2093 | return dir->nr; |
2094 | } | |
c91f0d92 | 2095 | |
686a4a06 | 2096 | int file_exists(const char *f) |
c91f0d92 | 2097 | { |
686a4a06 | 2098 | struct stat sb; |
a50f9fc5 | 2099 | return lstat(f, &sb) == 0; |
c91f0d92 | 2100 | } |
e6636747 | 2101 | |
63ec5e1f JS |
2102 | static int cmp_icase(char a, char b) |
2103 | { | |
2104 | if (a == b) | |
2105 | return 0; | |
2106 | if (ignore_case) | |
2107 | return toupper(a) - toupper(b); | |
2108 | return a - b; | |
2109 | } | |
2110 | ||
e6636747 | 2111 | /* |
9b125da4 NTND |
2112 | * Given two normalized paths (a trailing slash is ok), if subdir is |
2113 | * outside dir, return -1. Otherwise return the offset in subdir that | |
2114 | * can be used as relative path to dir. | |
e6636747 | 2115 | */ |
9b125da4 | 2116 | int dir_inside_of(const char *subdir, const char *dir) |
e6636747 | 2117 | { |
9b125da4 | 2118 | int offset = 0; |
e6636747 | 2119 | |
9b125da4 | 2120 | assert(dir && subdir && *dir && *subdir); |
e6636747 | 2121 | |
63ec5e1f | 2122 | while (*dir && *subdir && !cmp_icase(*dir, *subdir)) { |
e6636747 | 2123 | dir++; |
9b125da4 NTND |
2124 | subdir++; |
2125 | offset++; | |
490544b1 | 2126 | } |
9b125da4 NTND |
2127 | |
2128 | /* hel[p]/me vs hel[l]/yeah */ | |
2129 | if (*dir && *subdir) | |
2130 | return -1; | |
2131 | ||
2132 | if (!*subdir) | |
2133 | return !*dir ? offset : -1; /* same dir */ | |
2134 | ||
2135 | /* foo/[b]ar vs foo/[] */ | |
2136 | if (is_dir_sep(dir[-1])) | |
2137 | return is_dir_sep(subdir[-1]) ? offset : -1; | |
2138 | ||
2139 | /* foo[/]bar vs foo[] */ | |
2140 | return is_dir_sep(*subdir) ? offset + 1 : -1; | |
e6636747 JS |
2141 | } |
2142 | ||
2143 | int is_inside_dir(const char *dir) | |
2144 | { | |
56b9f6e7 RS |
2145 | char *cwd; |
2146 | int rc; | |
2147 | ||
b892913d NTND |
2148 | if (!dir) |
2149 | return 0; | |
56b9f6e7 RS |
2150 | |
2151 | cwd = xgetcwd(); | |
2152 | rc = (dir_inside_of(cwd, dir) >= 0); | |
2153 | free(cwd); | |
2154 | return rc; | |
e6636747 | 2155 | } |
7155b727 | 2156 | |
55892d23 AP |
2157 | int is_empty_dir(const char *path) |
2158 | { | |
2159 | DIR *dir = opendir(path); | |
2160 | struct dirent *e; | |
2161 | int ret = 1; | |
2162 | ||
2163 | if (!dir) | |
2164 | return 0; | |
2165 | ||
2166 | while ((e = readdir(dir)) != NULL) | |
2167 | if (!is_dot_or_dotdot(e->d_name)) { | |
2168 | ret = 0; | |
2169 | break; | |
2170 | } | |
2171 | ||
2172 | closedir(dir); | |
2173 | return ret; | |
2174 | } | |
2175 | ||
ae2f203e | 2176 | static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up) |
7155b727 | 2177 | { |
a0f4afbe | 2178 | DIR *dir; |
7155b727 | 2179 | struct dirent *e; |
ae2f203e | 2180 | int ret = 0, original_len = path->len, len, kept_down = 0; |
a0f4afbe | 2181 | int only_empty = (flag & REMOVE_DIR_EMPTY_ONLY); |
c844a803 | 2182 | int keep_toplevel = (flag & REMOVE_DIR_KEEP_TOPLEVEL); |
a0f4afbe | 2183 | unsigned char submodule_head[20]; |
7155b727 | 2184 | |
a0f4afbe | 2185 | if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) && |
ae2f203e | 2186 | !resolve_gitlink_ref(path->buf, "HEAD", submodule_head)) { |
a0f4afbe | 2187 | /* Do not descend and nuke a nested git work tree. */ |
ae2f203e JH |
2188 | if (kept_up) |
2189 | *kept_up = 1; | |
a0f4afbe | 2190 | return 0; |
ae2f203e | 2191 | } |
a0f4afbe | 2192 | |
ae2f203e | 2193 | flag &= ~REMOVE_DIR_KEEP_TOPLEVEL; |
a0f4afbe | 2194 | dir = opendir(path->buf); |
c844a803 | 2195 | if (!dir) { |
863808cd MH |
2196 | if (errno == ENOENT) |
2197 | return keep_toplevel ? -1 : 0; | |
2198 | else if (errno == EACCES && !keep_toplevel) | |
ecb2c282 MH |
2199 | /* |
2200 | * An empty dir could be removable even if it | |
2201 | * is unreadable: | |
2202 | */ | |
c844a803 JH |
2203 | return rmdir(path->buf); |
2204 | else | |
2205 | return -1; | |
2206 | } | |
00b6c178 | 2207 | strbuf_complete(path, '/'); |
7155b727 JS |
2208 | |
2209 | len = path->len; | |
2210 | while ((e = readdir(dir)) != NULL) { | |
2211 | struct stat st; | |
8ca12c0d AP |
2212 | if (is_dot_or_dotdot(e->d_name)) |
2213 | continue; | |
7155b727 JS |
2214 | |
2215 | strbuf_setlen(path, len); | |
2216 | strbuf_addstr(path, e->d_name); | |
863808cd MH |
2217 | if (lstat(path->buf, &st)) { |
2218 | if (errno == ENOENT) | |
2219 | /* | |
2220 | * file disappeared, which is what we | |
2221 | * wanted anyway | |
2222 | */ | |
2223 | continue; | |
2224 | /* fall thru */ | |
2225 | } else if (S_ISDIR(st.st_mode)) { | |
ae2f203e | 2226 | if (!remove_dir_recurse(path, flag, &kept_down)) |
7155b727 | 2227 | continue; /* happy */ |
863808cd MH |
2228 | } else if (!only_empty && |
2229 | (!unlink(path->buf) || errno == ENOENT)) { | |
7155b727 | 2230 | continue; /* happy, too */ |
863808cd | 2231 | } |
7155b727 JS |
2232 | |
2233 | /* path too long, stat fails, or non-directory still exists */ | |
2234 | ret = -1; | |
2235 | break; | |
2236 | } | |
2237 | closedir(dir); | |
2238 | ||
2239 | strbuf_setlen(path, original_len); | |
ae2f203e | 2240 | if (!ret && !keep_toplevel && !kept_down) |
863808cd | 2241 | ret = (!rmdir(path->buf) || errno == ENOENT) ? 0 : -1; |
ae2f203e JH |
2242 | else if (kept_up) |
2243 | /* | |
2244 | * report the uplevel that it is not an error that we | |
2245 | * did not rmdir() our directory. | |
2246 | */ | |
2247 | *kept_up = !ret; | |
7155b727 JS |
2248 | return ret; |
2249 | } | |
039bc64e | 2250 | |
ae2f203e JH |
2251 | int remove_dir_recursively(struct strbuf *path, int flag) |
2252 | { | |
2253 | return remove_dir_recurse(path, flag, NULL); | |
2254 | } | |
2255 | ||
f932729c JK |
2256 | static GIT_PATH_FUNC(git_path_info_exclude, "info/exclude") |
2257 | ||
039bc64e JH |
2258 | void setup_standard_excludes(struct dir_struct *dir) |
2259 | { | |
039bc64e | 2260 | dir->exclude_per_dir = ".gitignore"; |
099d2d86 JH |
2261 | |
2262 | /* core.excludefile defaulting to $XDG_HOME/git/ignore */ | |
2845ce7f PT |
2263 | if (!excludes_file) |
2264 | excludes_file = xdg_config_home("ignore"); | |
4698c8fe | 2265 | if (excludes_file && !access_or_warn(excludes_file, R_OK, 0)) |
38ccaf93 JH |
2266 | add_excludes_from_file_1(dir, excludes_file, |
2267 | dir->untracked ? &dir->ss_excludes_file : NULL); | |
099d2d86 JH |
2268 | |
2269 | /* per repository user preference */ | |
f0056f64 JK |
2270 | if (startup_info->have_repository) { |
2271 | const char *path = git_path_info_exclude(); | |
2272 | if (!access_or_warn(path, R_OK, 0)) | |
2273 | add_excludes_from_file_1(dir, path, | |
2274 | dir->untracked ? &dir->ss_info_exclude : NULL); | |
2275 | } | |
039bc64e | 2276 | } |
4a92d1bf AR |
2277 | |
2278 | int remove_path(const char *name) | |
2279 | { | |
2280 | char *slash; | |
2281 | ||
9a6728d4 | 2282 | if (unlink(name) && errno != ENOENT && errno != ENOTDIR) |
4a92d1bf AR |
2283 | return -1; |
2284 | ||
2285 | slash = strrchr(name, '/'); | |
2286 | if (slash) { | |
2287 | char *dirs = xstrdup(name); | |
2288 | slash = dirs + (slash - name); | |
2289 | do { | |
2290 | *slash = '\0'; | |
3fc0d131 | 2291 | } while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/'))); |
4a92d1bf AR |
2292 | free(dirs); |
2293 | } | |
2294 | return 0; | |
2295 | } | |
2296 | ||
270be816 AS |
2297 | /* |
2298 | * Frees memory within dir which was allocated for exclude lists and | |
2299 | * the exclude_stack. Does not free dir itself. | |
2300 | */ | |
2301 | void clear_directory(struct dir_struct *dir) | |
2302 | { | |
2303 | int i, j; | |
2304 | struct exclude_list_group *group; | |
2305 | struct exclude_list *el; | |
2306 | struct exclude_stack *stk; | |
2307 | ||
2308 | for (i = EXC_CMDL; i <= EXC_FILE; i++) { | |
2309 | group = &dir->exclude_list_group[i]; | |
2310 | for (j = 0; j < group->nr; j++) { | |
2311 | el = &group->el[j]; | |
2312 | if (i == EXC_DIRS) | |
2313 | free((char *)el->src); | |
2314 | clear_exclude_list(el); | |
2315 | } | |
2316 | free(group->el); | |
2317 | } | |
2318 | ||
2319 | stk = dir->exclude_stack; | |
2320 | while (stk) { | |
2321 | struct exclude_stack *prev = stk->prev; | |
2322 | free(stk); | |
2323 | stk = prev; | |
2324 | } | |
aceb9429 | 2325 | strbuf_release(&dir->basebuf); |
270be816 | 2326 | } |
83c094ad NTND |
2327 | |
2328 | struct ondisk_untracked_cache { | |
2329 | struct stat_data info_exclude_stat; | |
2330 | struct stat_data excludes_file_stat; | |
2331 | uint32_t dir_flags; | |
2332 | unsigned char info_exclude_sha1[20]; | |
2333 | unsigned char excludes_file_sha1[20]; | |
2334 | char exclude_per_dir[FLEX_ARRAY]; | |
2335 | }; | |
2336 | ||
2337 | #define ouc_size(len) (offsetof(struct ondisk_untracked_cache, exclude_per_dir) + len + 1) | |
2338 | ||
2339 | struct write_data { | |
2340 | int index; /* number of written untracked_cache_dir */ | |
2341 | struct ewah_bitmap *check_only; /* from untracked_cache_dir */ | |
2342 | struct ewah_bitmap *valid; /* from untracked_cache_dir */ | |
2343 | struct ewah_bitmap *sha1_valid; /* set if exclude_sha1 is not null */ | |
2344 | struct strbuf out; | |
2345 | struct strbuf sb_stat; | |
2346 | struct strbuf sb_sha1; | |
2347 | }; | |
2348 | ||
2349 | static void stat_data_to_disk(struct stat_data *to, const struct stat_data *from) | |
2350 | { | |
2351 | to->sd_ctime.sec = htonl(from->sd_ctime.sec); | |
2352 | to->sd_ctime.nsec = htonl(from->sd_ctime.nsec); | |
2353 | to->sd_mtime.sec = htonl(from->sd_mtime.sec); | |
2354 | to->sd_mtime.nsec = htonl(from->sd_mtime.nsec); | |
2355 | to->sd_dev = htonl(from->sd_dev); | |
2356 | to->sd_ino = htonl(from->sd_ino); | |
2357 | to->sd_uid = htonl(from->sd_uid); | |
2358 | to->sd_gid = htonl(from->sd_gid); | |
2359 | to->sd_size = htonl(from->sd_size); | |
2360 | } | |
2361 | ||
2362 | static void write_one_dir(struct untracked_cache_dir *untracked, | |
2363 | struct write_data *wd) | |
2364 | { | |
2365 | struct stat_data stat_data; | |
2366 | struct strbuf *out = &wd->out; | |
2367 | unsigned char intbuf[16]; | |
2368 | unsigned int intlen, value; | |
2369 | int i = wd->index++; | |
2370 | ||
2371 | /* | |
2372 | * untracked_nr should be reset whenever valid is clear, but | |
2373 | * for safety.. | |
2374 | */ | |
2375 | if (!untracked->valid) { | |
2376 | untracked->untracked_nr = 0; | |
2377 | untracked->check_only = 0; | |
2378 | } | |
2379 | ||
2380 | if (untracked->check_only) | |
2381 | ewah_set(wd->check_only, i); | |
2382 | if (untracked->valid) { | |
2383 | ewah_set(wd->valid, i); | |
2384 | stat_data_to_disk(&stat_data, &untracked->stat_data); | |
2385 | strbuf_add(&wd->sb_stat, &stat_data, sizeof(stat_data)); | |
2386 | } | |
2387 | if (!is_null_sha1(untracked->exclude_sha1)) { | |
2388 | ewah_set(wd->sha1_valid, i); | |
2389 | strbuf_add(&wd->sb_sha1, untracked->exclude_sha1, 20); | |
2390 | } | |
2391 | ||
2392 | intlen = encode_varint(untracked->untracked_nr, intbuf); | |
2393 | strbuf_add(out, intbuf, intlen); | |
2394 | ||
2395 | /* skip non-recurse directories */ | |
2396 | for (i = 0, value = 0; i < untracked->dirs_nr; i++) | |
2397 | if (untracked->dirs[i]->recurse) | |
2398 | value++; | |
2399 | intlen = encode_varint(value, intbuf); | |
2400 | strbuf_add(out, intbuf, intlen); | |
2401 | ||
2402 | strbuf_add(out, untracked->name, strlen(untracked->name) + 1); | |
2403 | ||
2404 | for (i = 0; i < untracked->untracked_nr; i++) | |
2405 | strbuf_add(out, untracked->untracked[i], | |
2406 | strlen(untracked->untracked[i]) + 1); | |
2407 | ||
2408 | for (i = 0; i < untracked->dirs_nr; i++) | |
2409 | if (untracked->dirs[i]->recurse) | |
2410 | write_one_dir(untracked->dirs[i], wd); | |
2411 | } | |
2412 | ||
2413 | void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked) | |
2414 | { | |
2415 | struct ondisk_untracked_cache *ouc; | |
2416 | struct write_data wd; | |
2417 | unsigned char varbuf[16]; | |
e0b83735 JK |
2418 | int varint_len; |
2419 | size_t len = strlen(untracked->exclude_per_dir); | |
2420 | ||
2421 | FLEX_ALLOC_MEM(ouc, exclude_per_dir, untracked->exclude_per_dir, len); | |
83c094ad NTND |
2422 | stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclude.stat); |
2423 | stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_file.stat); | |
2424 | hashcpy(ouc->info_exclude_sha1, untracked->ss_info_exclude.sha1); | |
2425 | hashcpy(ouc->excludes_file_sha1, untracked->ss_excludes_file.sha1); | |
2426 | ouc->dir_flags = htonl(untracked->dir_flags); | |
1e8fef60 NTND |
2427 | |
2428 | varint_len = encode_varint(untracked->ident.len, varbuf); | |
2429 | strbuf_add(out, varbuf, varint_len); | |
8109984d | 2430 | strbuf_addbuf(out, &untracked->ident); |
1e8fef60 | 2431 | |
83c094ad NTND |
2432 | strbuf_add(out, ouc, ouc_size(len)); |
2433 | free(ouc); | |
2434 | ouc = NULL; | |
2435 | ||
2436 | if (!untracked->root) { | |
2437 | varint_len = encode_varint(0, varbuf); | |
2438 | strbuf_add(out, varbuf, varint_len); | |
2439 | return; | |
2440 | } | |
2441 | ||
2442 | wd.index = 0; | |
2443 | wd.check_only = ewah_new(); | |
2444 | wd.valid = ewah_new(); | |
2445 | wd.sha1_valid = ewah_new(); | |
2446 | strbuf_init(&wd.out, 1024); | |
2447 | strbuf_init(&wd.sb_stat, 1024); | |
2448 | strbuf_init(&wd.sb_sha1, 1024); | |
2449 | write_one_dir(untracked->root, &wd); | |
2450 | ||
2451 | varint_len = encode_varint(wd.index, varbuf); | |
2452 | strbuf_add(out, varbuf, varint_len); | |
2453 | strbuf_addbuf(out, &wd.out); | |
2454 | ewah_serialize_strbuf(wd.valid, out); | |
2455 | ewah_serialize_strbuf(wd.check_only, out); | |
2456 | ewah_serialize_strbuf(wd.sha1_valid, out); | |
2457 | strbuf_addbuf(out, &wd.sb_stat); | |
2458 | strbuf_addbuf(out, &wd.sb_sha1); | |
2459 | strbuf_addch(out, '\0'); /* safe guard for string lists */ | |
2460 | ||
2461 | ewah_free(wd.valid); | |
2462 | ewah_free(wd.check_only); | |
2463 | ewah_free(wd.sha1_valid); | |
2464 | strbuf_release(&wd.out); | |
2465 | strbuf_release(&wd.sb_stat); | |
2466 | strbuf_release(&wd.sb_sha1); | |
2467 | } | |
f9e6c649 NTND |
2468 | |
2469 | static void free_untracked(struct untracked_cache_dir *ucd) | |
2470 | { | |
2471 | int i; | |
2472 | if (!ucd) | |
2473 | return; | |
2474 | for (i = 0; i < ucd->dirs_nr; i++) | |
2475 | free_untracked(ucd->dirs[i]); | |
2476 | for (i = 0; i < ucd->untracked_nr; i++) | |
2477 | free(ucd->untracked[i]); | |
2478 | free(ucd->untracked); | |
2479 | free(ucd->dirs); | |
2480 | free(ucd); | |
2481 | } | |
2482 | ||
2483 | void free_untracked_cache(struct untracked_cache *uc) | |
2484 | { | |
2485 | if (uc) | |
2486 | free_untracked(uc->root); | |
2487 | free(uc); | |
2488 | } | |
2489 | ||
2490 | struct read_data { | |
2491 | int index; | |
2492 | struct untracked_cache_dir **ucd; | |
2493 | struct ewah_bitmap *check_only; | |
2494 | struct ewah_bitmap *valid; | |
2495 | struct ewah_bitmap *sha1_valid; | |
2496 | const unsigned char *data; | |
2497 | const unsigned char *end; | |
2498 | }; | |
2499 | ||
2500 | static void stat_data_from_disk(struct stat_data *to, const struct stat_data *from) | |
2501 | { | |
2502 | to->sd_ctime.sec = get_be32(&from->sd_ctime.sec); | |
2503 | to->sd_ctime.nsec = get_be32(&from->sd_ctime.nsec); | |
2504 | to->sd_mtime.sec = get_be32(&from->sd_mtime.sec); | |
2505 | to->sd_mtime.nsec = get_be32(&from->sd_mtime.nsec); | |
2506 | to->sd_dev = get_be32(&from->sd_dev); | |
2507 | to->sd_ino = get_be32(&from->sd_ino); | |
2508 | to->sd_uid = get_be32(&from->sd_uid); | |
2509 | to->sd_gid = get_be32(&from->sd_gid); | |
2510 | to->sd_size = get_be32(&from->sd_size); | |
2511 | } | |
2512 | ||
2513 | static int read_one_dir(struct untracked_cache_dir **untracked_, | |
2514 | struct read_data *rd) | |
2515 | { | |
2516 | struct untracked_cache_dir ud, *untracked; | |
2517 | const unsigned char *next, *data = rd->data, *end = rd->end; | |
2518 | unsigned int value; | |
2519 | int i, len; | |
2520 | ||
2521 | memset(&ud, 0, sizeof(ud)); | |
2522 | ||
2523 | next = data; | |
2524 | value = decode_varint(&next); | |
2525 | if (next > end) | |
2526 | return -1; | |
2527 | ud.recurse = 1; | |
2528 | ud.untracked_alloc = value; | |
2529 | ud.untracked_nr = value; | |
2530 | if (ud.untracked_nr) | |
b32fa95f | 2531 | ALLOC_ARRAY(ud.untracked, ud.untracked_nr); |
f9e6c649 NTND |
2532 | data = next; |
2533 | ||
2534 | next = data; | |
2535 | ud.dirs_alloc = ud.dirs_nr = decode_varint(&next); | |
2536 | if (next > end) | |
2537 | return -1; | |
b32fa95f | 2538 | ALLOC_ARRAY(ud.dirs, ud.dirs_nr); |
f9e6c649 NTND |
2539 | data = next; |
2540 | ||
2541 | len = strlen((const char *)data); | |
2542 | next = data + len + 1; | |
2543 | if (next > rd->end) | |
2544 | return -1; | |
50a6c8ef | 2545 | *untracked_ = untracked = xmalloc(st_add(sizeof(*untracked), len)); |
f9e6c649 NTND |
2546 | memcpy(untracked, &ud, sizeof(ud)); |
2547 | memcpy(untracked->name, data, len + 1); | |
2548 | data = next; | |
2549 | ||
2550 | for (i = 0; i < untracked->untracked_nr; i++) { | |
2551 | len = strlen((const char *)data); | |
2552 | next = data + len + 1; | |
2553 | if (next > rd->end) | |
2554 | return -1; | |
2555 | untracked->untracked[i] = xstrdup((const char*)data); | |
2556 | data = next; | |
2557 | } | |
2558 | ||
2559 | rd->ucd[rd->index++] = untracked; | |
2560 | rd->data = data; | |
2561 | ||
2562 | for (i = 0; i < untracked->dirs_nr; i++) { | |
2563 | len = read_one_dir(untracked->dirs + i, rd); | |
2564 | if (len < 0) | |
2565 | return -1; | |
2566 | } | |
2567 | return 0; | |
2568 | } | |
2569 | ||
2570 | static void set_check_only(size_t pos, void *cb) | |
2571 | { | |
2572 | struct read_data *rd = cb; | |
2573 | struct untracked_cache_dir *ud = rd->ucd[pos]; | |
2574 | ud->check_only = 1; | |
2575 | } | |
2576 | ||
2577 | static void read_stat(size_t pos, void *cb) | |
2578 | { | |
2579 | struct read_data *rd = cb; | |
2580 | struct untracked_cache_dir *ud = rd->ucd[pos]; | |
2581 | if (rd->data + sizeof(struct stat_data) > rd->end) { | |
2582 | rd->data = rd->end + 1; | |
2583 | return; | |
2584 | } | |
2585 | stat_data_from_disk(&ud->stat_data, (struct stat_data *)rd->data); | |
2586 | rd->data += sizeof(struct stat_data); | |
2587 | ud->valid = 1; | |
2588 | } | |
2589 | ||
2590 | static void read_sha1(size_t pos, void *cb) | |
2591 | { | |
2592 | struct read_data *rd = cb; | |
2593 | struct untracked_cache_dir *ud = rd->ucd[pos]; | |
2594 | if (rd->data + 20 > rd->end) { | |
2595 | rd->data = rd->end + 1; | |
2596 | return; | |
2597 | } | |
2598 | hashcpy(ud->exclude_sha1, rd->data); | |
2599 | rd->data += 20; | |
2600 | } | |
2601 | ||
2602 | static void load_sha1_stat(struct sha1_stat *sha1_stat, | |
2603 | const struct stat_data *stat, | |
2604 | const unsigned char *sha1) | |
2605 | { | |
2606 | stat_data_from_disk(&sha1_stat->stat, stat); | |
2607 | hashcpy(sha1_stat->sha1, sha1); | |
2608 | sha1_stat->valid = 1; | |
2609 | } | |
2610 | ||
2611 | struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz) | |
2612 | { | |
2613 | const struct ondisk_untracked_cache *ouc; | |
2614 | struct untracked_cache *uc; | |
2615 | struct read_data rd; | |
2616 | const unsigned char *next = data, *end = (const unsigned char *)data + sz; | |
1e8fef60 NTND |
2617 | const char *ident; |
2618 | int ident_len, len; | |
f9e6c649 NTND |
2619 | |
2620 | if (sz <= 1 || end[-1] != '\0') | |
2621 | return NULL; | |
2622 | end--; | |
2623 | ||
1e8fef60 NTND |
2624 | ident_len = decode_varint(&next); |
2625 | if (next + ident_len > end) | |
2626 | return NULL; | |
2627 | ident = (const char *)next; | |
2628 | next += ident_len; | |
2629 | ||
f9e6c649 NTND |
2630 | ouc = (const struct ondisk_untracked_cache *)next; |
2631 | if (next + ouc_size(0) > end) | |
2632 | return NULL; | |
2633 | ||
2634 | uc = xcalloc(1, sizeof(*uc)); | |
1e8fef60 NTND |
2635 | strbuf_init(&uc->ident, ident_len); |
2636 | strbuf_add(&uc->ident, ident, ident_len); | |
f9e6c649 NTND |
2637 | load_sha1_stat(&uc->ss_info_exclude, &ouc->info_exclude_stat, |
2638 | ouc->info_exclude_sha1); | |
2639 | load_sha1_stat(&uc->ss_excludes_file, &ouc->excludes_file_stat, | |
2640 | ouc->excludes_file_sha1); | |
2641 | uc->dir_flags = get_be32(&ouc->dir_flags); | |
2642 | uc->exclude_per_dir = xstrdup(ouc->exclude_per_dir); | |
2643 | /* NUL after exclude_per_dir is covered by sizeof(*ouc) */ | |
2644 | next += ouc_size(strlen(ouc->exclude_per_dir)); | |
2645 | if (next >= end) | |
2646 | goto done2; | |
2647 | ||
2648 | len = decode_varint(&next); | |
2649 | if (next > end || len == 0) | |
2650 | goto done2; | |
2651 | ||
2652 | rd.valid = ewah_new(); | |
2653 | rd.check_only = ewah_new(); | |
2654 | rd.sha1_valid = ewah_new(); | |
2655 | rd.data = next; | |
2656 | rd.end = end; | |
2657 | rd.index = 0; | |
b32fa95f | 2658 | ALLOC_ARRAY(rd.ucd, len); |
f9e6c649 NTND |
2659 | |
2660 | if (read_one_dir(&uc->root, &rd) || rd.index != len) | |
2661 | goto done; | |
2662 | ||
2663 | next = rd.data; | |
2664 | len = ewah_read_mmap(rd.valid, next, end - next); | |
2665 | if (len < 0) | |
2666 | goto done; | |
2667 | ||
2668 | next += len; | |
2669 | len = ewah_read_mmap(rd.check_only, next, end - next); | |
2670 | if (len < 0) | |
2671 | goto done; | |
2672 | ||
2673 | next += len; | |
2674 | len = ewah_read_mmap(rd.sha1_valid, next, end - next); | |
2675 | if (len < 0) | |
2676 | goto done; | |
2677 | ||
2678 | ewah_each_bit(rd.check_only, set_check_only, &rd); | |
2679 | rd.data = next + len; | |
2680 | ewah_each_bit(rd.valid, read_stat, &rd); | |
2681 | ewah_each_bit(rd.sha1_valid, read_sha1, &rd); | |
2682 | next = rd.data; | |
2683 | ||
2684 | done: | |
2685 | free(rd.ucd); | |
2686 | ewah_free(rd.valid); | |
2687 | ewah_free(rd.check_only); | |
2688 | ewah_free(rd.sha1_valid); | |
2689 | done2: | |
2690 | if (next != end) { | |
2691 | free_untracked_cache(uc); | |
2692 | uc = NULL; | |
2693 | } | |
2694 | return uc; | |
2695 | } | |
e931371a | 2696 | |
73f9145f NTND |
2697 | static void invalidate_one_directory(struct untracked_cache *uc, |
2698 | struct untracked_cache_dir *ucd) | |
2699 | { | |
2700 | uc->dir_invalidated++; | |
2701 | ucd->valid = 0; | |
2702 | ucd->untracked_nr = 0; | |
2703 | } | |
2704 | ||
2705 | /* | |
2706 | * Normally when an entry is added or removed from a directory, | |
2707 | * invalidating that directory is enough. No need to touch its | |
2708 | * ancestors. When a directory is shown as "foo/bar/" in git-status | |
2709 | * however, deleting or adding an entry may have cascading effect. | |
2710 | * | |
2711 | * Say the "foo/bar/file" has become untracked, we need to tell the | |
2712 | * untracked_cache_dir of "foo" that "bar/" is not an untracked | |
2713 | * directory any more (because "bar" is managed by foo as an untracked | |
2714 | * "file"). | |
2715 | * | |
2716 | * Similarly, if "foo/bar/file" moves from untracked to tracked and it | |
2717 | * was the last untracked entry in the entire "foo", we should show | |
2718 | * "foo/" instead. Which means we have to invalidate past "bar" up to | |
2719 | * "foo". | |
2720 | * | |
2721 | * This function traverses all directories from root to leaf. If there | |
2722 | * is a chance of one of the above cases happening, we invalidate back | |
2723 | * to root. Otherwise we just invalidate the leaf. There may be a more | |
2724 | * sophisticated way than checking for SHOW_OTHER_DIRECTORIES to | |
2725 | * detect these cases and avoid unnecessary invalidation, for example, | |
2726 | * checking for the untracked entry named "bar/" in "foo", but for now | |
2727 | * stick to something safe and simple. | |
2728 | */ | |
2729 | static int invalidate_one_component(struct untracked_cache *uc, | |
2730 | struct untracked_cache_dir *dir, | |
2731 | const char *path, int len) | |
2732 | { | |
2733 | const char *rest = strchr(path, '/'); | |
2734 | ||
2735 | if (rest) { | |
2736 | int component_len = rest - path; | |
2737 | struct untracked_cache_dir *d = | |
2738 | lookup_untracked(uc, dir, path, component_len); | |
2739 | int ret = | |
2740 | invalidate_one_component(uc, d, rest + 1, | |
2741 | len - (component_len + 1)); | |
2742 | if (ret) | |
2743 | invalidate_one_directory(uc, dir); | |
2744 | return ret; | |
2745 | } | |
2746 | ||
2747 | invalidate_one_directory(uc, dir); | |
2748 | return uc->dir_flags & DIR_SHOW_OTHER_DIRECTORIES; | |
2749 | } | |
2750 | ||
e931371a NTND |
2751 | void untracked_cache_invalidate_path(struct index_state *istate, |
2752 | const char *path) | |
2753 | { | |
e931371a NTND |
2754 | if (!istate->untracked || !istate->untracked->root) |
2755 | return; | |
73f9145f NTND |
2756 | invalidate_one_component(istate->untracked, istate->untracked->root, |
2757 | path, strlen(path)); | |
e931371a NTND |
2758 | } |
2759 | ||
2760 | void untracked_cache_remove_from_index(struct index_state *istate, | |
2761 | const char *path) | |
2762 | { | |
2763 | untracked_cache_invalidate_path(istate, path); | |
2764 | } | |
2765 | ||
2766 | void untracked_cache_add_to_index(struct index_state *istate, | |
2767 | const char *path) | |
2768 | { | |
2769 | untracked_cache_invalidate_path(istate, path); | |
2770 | } | |
47e83eb3 SB |
2771 | |
2772 | /* Update gitfile and core.worktree setting to connect work tree and git dir */ | |
2773 | void connect_work_tree_and_git_dir(const char *work_tree_, const char *git_dir_) | |
2774 | { | |
365444a6 SB |
2775 | struct strbuf gitfile_sb = STRBUF_INIT; |
2776 | struct strbuf cfg_sb = STRBUF_INIT; | |
47e83eb3 | 2777 | struct strbuf rel_path = STRBUF_INIT; |
365444a6 | 2778 | char *git_dir, *work_tree; |
47e83eb3 | 2779 | |
365444a6 SB |
2780 | /* Prepare .git file */ |
2781 | strbuf_addf(&gitfile_sb, "%s/.git", work_tree_); | |
2782 | if (safe_create_leading_directories_const(gitfile_sb.buf)) | |
2783 | die(_("could not create directories for %s"), gitfile_sb.buf); | |
2784 | ||
2785 | /* Prepare config file */ | |
2786 | strbuf_addf(&cfg_sb, "%s/config", git_dir_); | |
2787 | if (safe_create_leading_directories_const(cfg_sb.buf)) | |
2788 | die(_("could not create directories for %s"), cfg_sb.buf); | |
47e83eb3 | 2789 | |
e394fa01 JH |
2790 | git_dir = real_pathdup(git_dir_, 1); |
2791 | work_tree = real_pathdup(work_tree_, 1); | |
365444a6 SB |
2792 | |
2793 | /* Write .git file */ | |
2794 | write_file(gitfile_sb.buf, "gitdir: %s", | |
2795 | relative_path(git_dir, work_tree, &rel_path)); | |
47e83eb3 | 2796 | /* Update core.worktree setting */ |
365444a6 | 2797 | git_config_set_in_file(cfg_sb.buf, "core.worktree", |
47e83eb3 SB |
2798 | relative_path(work_tree, git_dir, &rel_path)); |
2799 | ||
365444a6 SB |
2800 | strbuf_release(&gitfile_sb); |
2801 | strbuf_release(&cfg_sb); | |
47e83eb3 SB |
2802 | strbuf_release(&rel_path); |
2803 | free(work_tree); | |
2804 | free(git_dir); | |
2805 | } | |
f6f85861 SB |
2806 | |
2807 | /* | |
2808 | * Migrate the git directory of the given path from old_git_dir to new_git_dir. | |
2809 | */ | |
2810 | void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_git_dir) | |
2811 | { | |
2812 | if (rename(old_git_dir, new_git_dir) < 0) | |
2813 | die_errno(_("could not migrate git directory from '%s' to '%s'"), | |
2814 | old_git_dir, new_git_dir); | |
2815 | ||
2816 | connect_work_tree_and_git_dir(path, new_git_dir); | |
2817 | } |