2006-05-17 02:02:14 +00:00
|
|
|
#ifndef DIR_H
|
|
|
|
#define DIR_H
|
|
|
|
|
|
|
|
struct dir_entry {
|
builtin-add: simplify (and increase accuracy of) exclude handling
Previously, the code would always set up the excludes, and then manually
pick through the pathspec we were given, assuming that non-added but
existing paths were just ignored. This was mostly correct, but would
erroneously mark a totally empty directory as 'ignored'.
Instead, we now use the collect_ignored option of dir_struct, which
unambiguously tells us whether a path was ignored. This simplifies the
code, and means empty directories are now just not mentioned at all.
Furthermore, we now conditionally ask dir_struct to respect excludes,
depending on whether the '-f' flag has been set. This means we don't have
to pick through the result, checking for an 'ignored' flag; ignored entries
were either added or not in the first place.
We can safely get rid of the special 'ignored' flags to dir_entry, which
were not used anywhere else.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-12 21:42:14 +00:00
|
|
|
unsigned int len;
|
2006-05-17 02:02:14 +00:00
|
|
|
char name[FLEX_ARRAY]; /* more */
|
|
|
|
};
|
|
|
|
|
2007-10-28 20:27:13 +00:00
|
|
|
#define EXC_FLAG_NODIR 1
|
|
|
|
#define EXC_FLAG_NOWILDCARD 2
|
|
|
|
#define EXC_FLAG_ENDSWITH 4
|
2008-01-31 09:17:48 +00:00
|
|
|
#define EXC_FLAG_MUSTBEDIR 8
|
2007-10-28 20:27:13 +00:00
|
|
|
|
2006-05-17 02:02:14 +00:00
|
|
|
struct exclude_list {
|
|
|
|
int nr;
|
|
|
|
int alloc;
|
|
|
|
struct exclude {
|
|
|
|
const char *pattern;
|
2007-10-28 20:27:13 +00:00
|
|
|
int patternlen;
|
2006-05-17 02:02:14 +00:00
|
|
|
const char *base;
|
|
|
|
int baselen;
|
2007-10-28 20:27:13 +00:00
|
|
|
int to_exclude;
|
|
|
|
int flags;
|
2006-05-17 02:02:14 +00:00
|
|
|
} **excludes;
|
|
|
|
};
|
|
|
|
|
2007-11-29 10:17:44 +00:00
|
|
|
struct exclude_stack {
|
|
|
|
struct exclude_stack *prev;
|
|
|
|
char *filebuf;
|
|
|
|
int baselen;
|
|
|
|
int exclude_ix;
|
|
|
|
};
|
|
|
|
|
2006-05-17 02:02:14 +00:00
|
|
|
struct dir_struct {
|
|
|
|
int nr, alloc;
|
2007-06-11 13:39:50 +00:00
|
|
|
int ignored_nr, ignored_alloc;
|
2009-02-16 12:20:25 +00:00
|
|
|
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;
|
2006-05-17 02:02:14 +00:00
|
|
|
struct dir_entry **entries;
|
2007-06-11 13:39:50 +00:00
|
|
|
struct dir_entry **ignored;
|
2006-05-17 02:02:14 +00:00
|
|
|
|
|
|
|
/* Exclude info */
|
|
|
|
const char *exclude_per_dir;
|
|
|
|
struct exclude_list exclude_list[3];
|
2007-11-29 10:17:44 +00:00
|
|
|
/*
|
|
|
|
* 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];
|
2006-05-17 02:02:14 +00:00
|
|
|
};
|
|
|
|
|
2006-12-25 11:09:52 +00:00
|
|
|
#define MATCHED_RECURSIVELY 1
|
|
|
|
#define MATCHED_FNMATCH 2
|
|
|
|
#define MATCHED_EXACTLY 3
|
2006-05-19 23:07:51 +00:00
|
|
|
extern int match_pathspec(const char **pathspec, const char *name, int namelen, int prefix, char *seen);
|
|
|
|
|
2009-05-14 20:22:36 +00:00
|
|
|
extern int fill_directory(struct dir_struct *dir, const char **pathspec);
|
2009-07-09 02:24:39 +00:00
|
|
|
extern int read_directory(struct dir_struct *, const char *path, int len, const char **pathspec);
|
2006-12-05 00:00:46 +00:00
|
|
|
|
2009-08-20 13:47:04 +00:00
|
|
|
extern int excluded_from_list(const char *pathname, int pathlen, const char *basename,
|
|
|
|
int *dtype, struct exclude_list *el);
|
2008-02-01 04:23:25 +00:00
|
|
|
extern int excluded(struct dir_struct *, const char *, int *);
|
2010-07-09 22:18:38 +00:00
|
|
|
struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len);
|
2009-08-20 13:47:04 +00:00
|
|
|
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);
|
2006-05-17 02:02:14 +00:00
|
|
|
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);
|
2010-11-26 18:17:44 +00:00
|
|
|
extern void free_excludes(struct exclude_list *el);
|
2006-09-08 08:05:34 +00:00
|
|
|
extern int file_exists(const char *);
|
2006-05-17 02:02:14 +00:00
|
|
|
|
2007-08-01 00:29:17 +00:00
|
|
|
extern int is_inside_dir(const char *dir);
|
2011-03-26 09:04:24 +00:00
|
|
|
extern int dir_inside_of(const char *subdir, const char *dir);
|
2007-08-01 00:29:17 +00:00
|
|
|
|
2009-01-10 12:07:50 +00:00
|
|
|
static inline int is_dot_or_dotdot(const char *name)
|
|
|
|
{
|
|
|
|
return (name[0] == '.' &&
|
|
|
|
(name[1] == '\0' ||
|
|
|
|
(name[1] == '.' && name[2] == '\0')));
|
|
|
|
}
|
|
|
|
|
2009-01-11 12:19:12 +00:00
|
|
|
extern int is_empty_dir(const char *dir);
|
|
|
|
|
core.excludesfile clean-up
There are inconsistencies in the way commands currently handle
the core.excludesfile configuration variable. The problem is
the variable is too new to be noticed by anything other than
git-add and git-status.
* git-ls-files does not notice any of the "ignore" files by
default, as it predates the standardized set of ignore files.
The calling scripts established the convention to use
.git/info/exclude, .gitignore, and later core.excludesfile.
* git-add and git-status know about it because they call
add_excludes_from_file() directly with their own notion of
which standard set of ignore files to use. This is just a
stupid duplication of code that need to be updated every time
the definition of the standard set of ignore files is
changed.
* git-read-tree takes --exclude-per-directory=<gitignore>,
not because the flexibility was needed. Again, this was
because the option predates the standardization of the ignore
files.
* git-merge-recursive uses hardcoded per-directory .gitignore
and nothing else. git-clean (scripted version) does not
honor core.* because its call to underlying ls-files does not
know about it. git-clean in C (parked in 'pu') doesn't either.
We probably could change git-ls-files to use the standard set
when no excludes are specified on the command line and ignore
processing was asked, or something like that, but that will be a
change in semantics and might break people's scripts in a subtle
way. I am somewhat reluctant to make such a change.
On the other hand, I think it makes perfect sense to fix
git-read-tree, git-merge-recursive and git-clean to follow the
same rule as other commands. I do not think of a valid use case
to give an exclude-per-directory that is nonstandard to
read-tree command, outside a "negative" test in the t1004 test
script.
This patch is the first step to untangle this mess.
The next step would be to teach read-tree, merge-recursive and
clean (in C) to use setup_standard_excludes().
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-14 08:05:00 +00:00
|
|
|
extern void setup_standard_excludes(struct dir_struct *dir);
|
2009-06-30 22:33:45 +00:00
|
|
|
|
|
|
|
#define REMOVE_DIR_EMPTY_ONLY 01
|
|
|
|
#define REMOVE_DIR_KEEP_NESTED_GIT 02
|
|
|
|
extern int remove_dir_recursively(struct strbuf *path, int flag);
|
2007-09-28 15:28:54 +00:00
|
|
|
|
2008-09-26 22:56:46 +00:00
|
|
|
/* tries to remove the path with empty directories along it, ignores ENOENT */
|
|
|
|
extern int remove_path(const char *path);
|
|
|
|
|
2010-10-03 09:56:41 +00:00
|
|
|
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);
|
|
|
|
|
2006-05-17 02:02:14 +00:00
|
|
|
#endif
|