mirror of
https://github.com/git/git.git
synced 2024-11-06 17:23:00 +01:00
cd733f4f71
"git ls-files --exclude=t -i" did not consider anything under t/ as excluded, as it did not pay attention to exclusion of leading paths while walking the index. Other two users of excluded() are also updated. * jc/ls-files-i-dir: dir.c: make excluded() file scope static unpack-trees.c: use path_excluded() in check_ok_to_remove() builtin/add.c: use path_excluded() path_excluded(): update API to less cache-entry centric ls-files -i: micro-optimize path_excluded() ls-files -i: pay attention to exclusion of leading paths
131 lines
3.9 KiB
C
131 lines
3.9 KiB
C
#ifndef DIR_H
|
|
#define DIR_H
|
|
|
|
#include "strbuf.h"
|
|
|
|
struct dir_entry {
|
|
unsigned int len;
|
|
char name[FLEX_ARRAY]; /* more */
|
|
};
|
|
|
|
#define EXC_FLAG_NODIR 1
|
|
#define EXC_FLAG_ENDSWITH 4
|
|
#define EXC_FLAG_MUSTBEDIR 8
|
|
|
|
struct exclude_list {
|
|
int nr;
|
|
int alloc;
|
|
struct exclude {
|
|
const char *pattern;
|
|
int patternlen;
|
|
int nowildcardlen;
|
|
const char *base;
|
|
int baselen;
|
|
int to_exclude;
|
|
int flags;
|
|
} **excludes;
|
|
};
|
|
|
|
struct exclude_stack {
|
|
struct exclude_stack *prev;
|
|
char *filebuf;
|
|
int baselen;
|
|
int exclude_ix;
|
|
};
|
|
|
|
struct dir_struct {
|
|
int nr, alloc;
|
|
int ignored_nr, ignored_alloc;
|
|
enum {
|
|
DIR_SHOW_IGNORED = 1<<0,
|
|
DIR_SHOW_OTHER_DIRECTORIES = 1<<1,
|
|
DIR_HIDE_EMPTY_DIRECTORIES = 1<<2,
|
|
DIR_NO_GITLINKS = 1<<3,
|
|
DIR_COLLECT_IGNORED = 1<<4
|
|
} flags;
|
|
struct dir_entry **entries;
|
|
struct dir_entry **ignored;
|
|
|
|
/* Exclude info */
|
|
const char *exclude_per_dir;
|
|
struct exclude_list exclude_list[3];
|
|
/*
|
|
* We maintain three exclude pattern lists:
|
|
* EXC_CMDL lists patterns explicitly given on the command line.
|
|
* EXC_DIRS lists patterns obtained from per-directory ignore files.
|
|
* EXC_FILE lists patterns from fallback ignore files.
|
|
*/
|
|
#define EXC_CMDL 0
|
|
#define EXC_DIRS 1
|
|
#define EXC_FILE 2
|
|
|
|
struct exclude_stack *exclude_stack;
|
|
char basebuf[PATH_MAX];
|
|
};
|
|
|
|
#define MATCHED_RECURSIVELY 1
|
|
#define MATCHED_FNMATCH 2
|
|
#define MATCHED_EXACTLY 3
|
|
extern char *common_prefix(const char **pathspec);
|
|
extern int match_pathspec(const char **pathspec, const char *name, int namelen, int prefix, char *seen);
|
|
extern int match_pathspec_depth(const struct pathspec *pathspec,
|
|
const char *name, int namelen,
|
|
int prefix, char *seen);
|
|
extern int within_depth(const char *name, int namelen, int depth, int max_depth);
|
|
|
|
extern int fill_directory(struct dir_struct *dir, const char **pathspec);
|
|
extern int read_directory(struct dir_struct *, const char *path, int len, const char **pathspec);
|
|
|
|
extern int excluded_from_list(const char *pathname, int pathlen, const char *basename,
|
|
int *dtype, struct exclude_list *el);
|
|
struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len);
|
|
|
|
/*
|
|
* The excluded() API is meant for callers that check each level of leading
|
|
* directory hierarchies with excluded() to avoid recursing into excluded
|
|
* directories. Callers that do not do so should use this API instead.
|
|
*/
|
|
struct path_exclude_check {
|
|
struct dir_struct *dir;
|
|
struct strbuf path;
|
|
};
|
|
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 *, 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 void add_excludes_from_file(struct dir_struct *, const char *fname);
|
|
extern void add_exclude(const char *string, const char *base,
|
|
int baselen, struct exclude_list *which);
|
|
extern void free_excludes(struct exclude_list *el);
|
|
extern int file_exists(const char *);
|
|
|
|
extern int is_inside_dir(const char *dir);
|
|
extern int dir_inside_of(const char *subdir, const char *dir);
|
|
|
|
static inline int is_dot_or_dotdot(const char *name)
|
|
{
|
|
return (name[0] == '.' &&
|
|
(name[1] == '\0' ||
|
|
(name[1] == '.' && name[2] == '\0')));
|
|
}
|
|
|
|
extern int is_empty_dir(const char *dir);
|
|
|
|
extern void setup_standard_excludes(struct dir_struct *dir);
|
|
|
|
#define REMOVE_DIR_EMPTY_ONLY 01
|
|
#define REMOVE_DIR_KEEP_NESTED_GIT 02
|
|
#define REMOVE_DIR_KEEP_TOPLEVEL 04
|
|
extern int remove_dir_recursively(struct strbuf *path, int flag);
|
|
|
|
/* tries to remove the path with empty directories along it, ignores ENOENT */
|
|
extern int remove_path(const char *path);
|
|
|
|
extern int strcmp_icase(const char *a, const char *b);
|
|
extern int strncmp_icase(const char *a, const char *b, size_t count);
|
|
extern int fnmatch_icase(const char *pattern, const char *string, int flags);
|
|
|
|
#endif
|