@matheusbsbs / matheus-bagliano / commits / 2abd31b078
Fork 0

dir_struct: add collect_ignored option

When set, this option will cause read_directory to keep track of which entries were ignored. While this shouldn't effect functionality in most cases, it can make warning messages to the user much more useful. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jun 11, 2007 at 09:39 UTC 2abd31b07864049f0352d86c0c90413123f40945
2 files changed +16 -1
dir.c
+12
@@ -291,6 +291,15 @@ struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int
291 return dir->entries[dir->nr++] = dir_entry_new(pathname, len);
292 }
293
294 +struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len)
295 +{
296 + if (cache_name_pos(pathname, len) >= 0)
297 + return NULL;
298 +
299 + ALLOC_GROW(dir->ignored, dir->ignored_nr, dir->ignored_alloc);
300 + return dir->ignored[dir->ignored_nr++] = dir_entry_new(pathname, len);
301 +}
302 +
303 enum exist_status {
304 index_nonexistent = 0,
305 index_directory,
@@ -463,6 +472,8 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
472 continue;
473
474 exclude = excluded(dir, fullname);
475 + if (exclude && dir->collect_ignored)
476 + dir_add_ignored(dir, fullname, baselen + len);
477 if (exclude != dir->show_ignored) {
478 if (!dir->show_ignored || DTYPE(de) != DT_DIR) {
479 continue;
@@ -609,6 +620,7 @@ int read_directory(struct dir_struct *dir, const char *path, const char *base, i
620 read_directory_recursive(dir, path, base, baselen, 0, simplify);
621 free_simplify(simplify);
622 qsort(dir->entries, dir->nr, sizeof(struct dir_entry *), cmp_name);
623 + qsort(dir->ignored, dir->ignored_nr, sizeof(struct dir_entry *), cmp_name);
624 return dir->nr;
625 }
626
dir.h
+4 -1
@@ -31,11 +31,14 @@ struct exclude_list {
31
32 struct dir_struct {
33 int nr, alloc;
34 + int ignored_nr, ignored_alloc;
35 unsigned int show_ignored:1,
36 show_other_directories:1,
37 hide_empty_directories:1,
37 - no_gitlinks:1;
38 + no_gitlinks:1,
39 + collect_ignored:1;
40 struct dir_entry **entries;
41 + struct dir_entry **ignored;
42
43 /* Exclude info */
44 const char *exclude_per_dir;