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>

diff --git a/dir.c b/dir.c
index 5ba6030e9a89102a8fcf0e7311d80082841de67b..6ed9eda954a85ab1052b9499b4b72a78457a6cbb 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -291,6 +291,15 @@ struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int
        return dir->entries[dir->nr++] = dir_entry_new(pathname, len);
 }
 
        return dir->entries[dir->nr++] = dir_entry_new(pathname, len);
 }
 

+struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len)
+{
+       if (cache_name_pos(pathname, len) >= 0)
+               return NULL;
+
+       ALLOC_GROW(dir->ignored, dir->ignored_nr, dir->ignored_alloc);
+       return dir->ignored[dir->ignored_nr++] = dir_entry_new(pathname, len);
+}
+

 enum exist_status {
        index_nonexistent = 0,
        index_directory,
 enum exist_status {
        index_nonexistent = 0,
        index_directory,


@@ -463,6 +472,8 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
                                continue;
 
                        exclude = excluded(dir, fullname);
                                continue;
 
                        exclude = excluded(dir, fullname);

+                       if (exclude && dir->collect_ignored)
+                               dir_add_ignored(dir, fullname, baselen + len);

                        if (exclude != dir->show_ignored) {
                                if (!dir->show_ignored || DTYPE(de) != DT_DIR) {
                                        continue;
                        if (exclude != dir->show_ignored) {
                                if (!dir->show_ignored || DTYPE(de) != DT_DIR) {
                                        continue;


@@ -609,6 +620,7 @@ int read_directory(struct dir_struct *dir, const char *path, const char *base, i
        read_directory_recursive(dir, path, base, baselen, 0, simplify);
        free_simplify(simplify);
        qsort(dir->entries, dir->nr, sizeof(struct dir_entry *), cmp_name);
        read_directory_recursive(dir, path, base, baselen, 0, simplify);
        free_simplify(simplify);
        qsort(dir->entries, dir->nr, sizeof(struct dir_entry *), cmp_name);

+       qsort(dir->ignored, dir->ignored_nr, sizeof(struct dir_entry *), cmp_name);

        return dir->nr;
 }
 
        return dir->nr;
 }
 

diff --git a/dir.h b/dir.h
index 172147fd3d4711c9ea95cd76048b7188bf9a1e2c..c94f3cb066d86a557e1e819b0996f67ceb13132b 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -31,11 +31,14 @@ struct exclude_list {
 
 struct dir_struct {
        int nr, alloc;
 
 struct dir_struct {
        int nr, alloc;

+       int ignored_nr, ignored_alloc;

        unsigned int show_ignored:1,
                     show_other_directories:1,
                     hide_empty_directories:1,
        unsigned int show_ignored:1,
                     show_other_directories:1,
                     hide_empty_directories:1,

-                    no_gitlinks:1;
+                    no_gitlinks:1,
+                    collect_ignored:1;

        struct dir_entry **entries;
        struct dir_entry **entries;

+       struct dir_entry **ignored;

 
        /* Exclude info */
        const char *exclude_per_dir;
 
        /* Exclude info */
        const char *exclude_per_dir;