kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

convert {read,fill}_directory to take struct pathspec 

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2013-07-14 15:35:55 +07:00 committed by Junio C Hamano
parent 9b2d61499b
commit 7327d3d1b7
7 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/add.c
View File

@ -507,6 +507,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)


if (add_new_files) { if (add_new_files) {
int baselen; int baselen;
struct pathspec empty_pathspec;


/* Set up the default git porcelain excludes */ /* Set up the default git porcelain excludes */
memset(&dir, 0, sizeof(dir)); memset(&dir, 0, sizeof(dir));
@ -515,8 +516,9 @@ int cmd_add(int argc, const char **argv, const char *prefix)
setup_standard_excludes(&dir); setup_standard_excludes(&dir);
} }


memset(&empty_pathspec, 0, sizeof(empty_pathspec));
/* This picks up the paths that are not tracked */ /* This picks up the paths that are not tracked */
baselen = fill_directory(&dir, implicit_dot ? NULL : pathspec.raw); baselen = fill_directory(&dir, implicit_dot ? &empty_pathspec : &pathspec);
if (pathspec.nr) if (pathspec.nr)
seen = prune_directory(&dir, pathspec.raw, baselen, seen = prune_directory(&dir, pathspec.raw, baselen,
implicit_dot ? WARN_IMPLICIT_DOT : 0); implicit_dot ? WARN_IMPLICIT_DOT : 0);

2
builtin/clean.c
View File

@ -214,7 +214,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
PATHSPEC_PREFER_CWD, PATHSPEC_PREFER_CWD,
prefix, argv); prefix, argv);


fill_directory(&dir, pathspec.raw); fill_directory(&dir, &pathspec);


for (i = 0; i < dir.nr; i++) { for (i = 0; i < dir.nr; i++) {
struct dir_entry *ent = dir.entries[i]; struct dir_entry *ent = dir.entries[i];

2
builtin/grep.c
View File

@ -523,7 +523,7 @@ static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec,
if (exc_std) if (exc_std)
setup_standard_excludes(&dir); setup_standard_excludes(&dir);


fill_directory(&dir, pathspec->raw); fill_directory(&dir, pathspec);
for (i = 0; i < dir.nr; i++) { for (i = 0; i < dir.nr; i++) {
const char *name = dir.entries[i]->name; const char *name = dir.entries[i]->name;
int namelen = strlen(name); int namelen = strlen(name);

2
builtin/ls-files.c
View File

@ -216,7 +216,7 @@ static void show_files(struct dir_struct *dir)


/* For cached/deleted files we don't need to even do the readdir */ /* For cached/deleted files we don't need to even do the readdir */
if (show_others || show_killed) { if (show_others || show_killed) {
fill_directory(dir, pathspec.raw); fill_directory(dir, &pathspec);
if (show_others) if (show_others)
show_other_files(dir); show_other_files(dir);
if (show_killed) if (show_killed)

16
dir.c
View File

@ -142,7 +142,7 @@ char *common_prefix(const char **pathspec)
return len ? xmemdupz(*pathspec, len) : NULL; return len ? xmemdupz(*pathspec, len) : NULL;
} }


int fill_directory(struct dir_struct *dir, const char **pathspec) int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec)
{ {
size_t len; size_t len;


@ -150,10 +150,10 @@ int fill_directory(struct dir_struct *dir, const char **pathspec)
* Calculate common prefix for the pathspec, and * Calculate common prefix for the pathspec, and
* use that to optimize the directory walk * use that to optimize the directory walk
*/ */
len = common_prefix_len(pathspec); len = common_prefix_len(pathspec->raw);


/* Read the directory and prune it */ /* Read the directory and prune it */
read_directory(dir, pathspec ? *pathspec : "", len, pathspec); read_directory(dir, pathspec->nr ? pathspec->raw[0] : "", len, pathspec);
return len; return len;
} }


@ -1388,14 +1388,20 @@ static int treat_leading_path(struct dir_struct *dir,
return rc; return rc;
} }


int read_directory(struct dir_struct *dir, const char *path, int len, const char **pathspec) int read_directory(struct dir_struct *dir, const char *path, int len, const struct pathspec *pathspec)
{ {
struct path_simplify *simplify; struct path_simplify *simplify;


/*
* Check out create_simplify()
*/
if (pathspec)
GUARD_PATHSPEC(pathspec, PATHSPEC_FROMTOP | PATHSPEC_MAXDEPTH);

if (has_symlink_leading_path(path, len)) if (has_symlink_leading_path(path, len))
return dir->nr; return dir->nr;


simplify = create_simplify(pathspec); simplify = create_simplify(pathspec ? pathspec->raw : NULL);
if (!len || treat_leading_path(dir, path, len, simplify)) if (!len || treat_leading_path(dir, path, len, simplify))
read_directory_recursive(dir, path, len, 0, simplify); read_directory_recursive(dir, path, len, 0, simplify);
free_simplify(simplify); free_simplify(simplify);

4
dir.h
View File

@ -137,8 +137,8 @@ extern int match_pathspec_depth(const struct pathspec *pathspec,
int prefix, char *seen); int prefix, char *seen);
extern int within_depth(const char *name, int namelen, int depth, int max_depth); 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 fill_directory(struct dir_struct *dir, const struct pathspec *pathspec);
extern int read_directory(struct dir_struct *, const char *path, int len, const char **pathspec); extern int read_directory(struct dir_struct *, const char *path, int len, const struct pathspec *pathspec);


extern int is_excluded_from_list(const char *pathname, int pathlen, const char *basename, extern int is_excluded_from_list(const char *pathname, int pathlen, const char *basename,
int *dtype, struct exclude_list *el); int *dtype, struct exclude_list *el);

2
wt-status.c
View File

@ -514,7 +514,7 @@ static void wt_status_collect_untracked(struct wt_status *s)
dir.flags |= DIR_SHOW_IGNORED_TOO; dir.flags |= DIR_SHOW_IGNORED_TOO;
setup_standard_excludes(&dir); setup_standard_excludes(&dir);


fill_directory(&dir, s->pathspec.raw); fill_directory(&dir, &s->pathspec);


for (i = 0; i < dir.nr; i++) { for (i = 0; i < dir.nr; i++) {
struct dir_entry *ent = dir.entries[i]; struct dir_entry *ent = dir.entries[i];