path_excluded(): update API to less cache-entry centric

It was stupid of me to make the API too much cache-entry specific;
the caller may want to check arbitrary pathname without having a
corresponding cache-entry to see if a path is ignored.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 90dc3601a8249b222b187455c862f9c723915b01..31b3f2d9006e0f5703ca9fb37bea247012581c0e 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -200,6 +200,12 @@ static void show_ru_info(void)
        }
 }
 
        }
 }
 

+static int ce_excluded(struct path_exclude_check *check, struct cache_entry *ce)
+{
+       int dtype = ce_to_dtype(ce);
+       return path_excluded(check, ce->name, ce_namelen(ce), &dtype);
+}
+

 static void show_files(struct dir_struct *dir)
 {
        int i;
 static void show_files(struct dir_struct *dir)
 {
        int i;


@@ -220,7 +226,7 @@ static void show_files(struct dir_struct *dir)
                for (i = 0; i < active_nr; i++) {
                        struct cache_entry *ce = active_cache[i];
                        if ((dir->flags & DIR_SHOW_IGNORED) &&
                for (i = 0; i < active_nr; i++) {
                        struct cache_entry *ce = active_cache[i];
                        if ((dir->flags & DIR_SHOW_IGNORED) &&

-                           !path_excluded(&check, ce))
+                           !ce_excluded(&check, ce))

                                continue;
                        if (show_unmerged && !ce_stage(ce))
                                continue;
                                continue;
                        if (show_unmerged && !ce_stage(ce))
                                continue;


@@ -236,7 +242,7 @@ static void show_files(struct dir_struct *dir)
                        struct stat st;
                        int err;
                        if ((dir->flags & DIR_SHOW_IGNORED) &&
                        struct stat st;
                        int err;
                        if ((dir->flags & DIR_SHOW_IGNORED) &&

-                           !path_excluded(&check, ce))
+                           !ce_excluded(&check, ce))

                                continue;
                        if (ce->ce_flags & CE_UPDATE)
                                continue;
                                continue;
                        if (ce->ce_flags & CE_UPDATE)
                                continue;

diff --git a/dir.c b/dir.c
index 839bc9f61c421427a87bf6144482dc9851de2cbc..7ab7fc5c22cefba11cb013bdd5ca5cea2f284c2c 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -593,31 +593,40 @@ void path_exclude_check_clear(struct path_exclude_check *check)
 }
 
 /*
 }
 
 /*

- * Is the ce->name excluded?  This is for a caller like show_files() that
+ * Is this name excluded?  This is for a caller like show_files() that

  * do not honor directory hierarchy and iterate through paths that are
  * possibly in an ignored directory.
  *
  * A path to a directory known to be excluded is left in check->path to
  * optimize for repeated checks for files in the same excluded directory.
  */
  * do not honor directory hierarchy and iterate through paths that are
  * possibly in an ignored directory.
  *
  * A path to a directory known to be excluded is left in check->path to
  * optimize for repeated checks for files in the same excluded directory.
  */

-int path_excluded(struct path_exclude_check *check, struct cache_entry *ce)
+int path_excluded(struct path_exclude_check *check,
+                 const char *name, int namelen, int *dtype)

 {
 {

-       int i, dtype;
+       int i;

        struct strbuf *path = &check->path;
 
        struct strbuf *path = &check->path;
 

+       /*
+        * we allow the caller to pass namelen as an optimization; it
+        * must match the length of the name, as we eventually call
+        * excluded() on the whole name string.
+        */
+       if (namelen < 0)
+               namelen = strlen(name);
+

        if (path->len &&
        if (path->len &&

-           path->len <= ce_namelen(ce) &&
-           !memcmp(ce->name, path->buf, path->len) &&
-           (!ce->name[path->len] || ce->name[path->len] == '/'))
+           path->len <= namelen &&
+           !memcmp(name, path->buf, path->len) &&
+           (!name[path->len] || name[path->len] == '/'))

                return 1;
 
        strbuf_setlen(path, 0);
                return 1;
 
        strbuf_setlen(path, 0);

-       for (i = 0; ce->name[i]; i++) {
-               int ch = ce->name[i];
+       for (i = 0; name[i]; i++) {
+               int ch = name[i];

 
                if (ch == '/') {
 
                if (ch == '/') {

-                       dtype = DT_DIR;
-                       if (excluded(check->dir, path->buf, &dtype))
+                       int dt = DT_DIR;
+                       if (excluded(check->dir, path->buf, &dt))

                                return 1;
                }
                strbuf_addch(path, ch);
                                return 1;
                }
                strbuf_addch(path, ch);


@@ -626,8 +635,7 @@ int path_excluded(struct path_exclude_check *check, struct cache_entry *ce)
        /* An entry in the index; cannot be a directory with subentries */
        strbuf_setlen(path, 0);
 
        /* An entry in the index; cannot be a directory with subentries */
        strbuf_setlen(path, 0);
 

-       dtype = ce_to_dtype(ce);
-       return excluded(check->dir, ce->name, &dtype);
+       return excluded(check->dir, name, dtype);

 }
 
 static struct dir_entry *dir_entry_new(const char *pathname, int len)
 }
 
 static struct dir_entry *dir_entry_new(const char *pathname, int len)

diff --git a/dir.h b/dir.h
index 7378e69c179c5aa66ed046d6cd7be360a715cffb..36a82b3bd1d6202b3e006dac39e42ed925d79d54 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -92,7 +92,8 @@ struct path_exclude_check {
 };
 extern void path_exclude_check_init(struct path_exclude_check *, struct dir_struct *);
 extern void path_exclude_check_clear(struct path_exclude_check *);
 };
 extern void path_exclude_check_init(struct path_exclude_check *, struct dir_struct *);
 extern void path_exclude_check_clear(struct path_exclude_check *);

-extern int path_excluded(struct path_exclude_check *, struct cache_entry *);
+extern int path_excluded(struct path_exclude_check *, const char *, int namelen, int *dtype);
+

 
 extern int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen,
                                          char **buf_p, struct exclude_list *which, int check_index);
 
 extern int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen,
                                          char **buf_p, struct exclude_list *which, int check_index);