From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2 32/46] Convert {read,fill}_directory to take struct pathspec
Date: Sun, 14 Jul 2013 15:35:55 +0700 [thread overview]
Message-ID: <1373790969-13000-33-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1373790969-13000-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/add.c | 4 +++-
builtin/clean.c | 2 +-
builtin/grep.c | 2 +-
builtin/ls-files.c | 2 +-
dir.c | 16 +++++++++++-----
dir.h | 4 ++--
wt-status.c | 2 +-
7 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index f5d6a33..34c9358 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -507,6 +507,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (add_new_files) {
int baselen;
+ struct pathspec empty_pathspec;
/* Set up the default git porcelain excludes */
memset(&dir, 0, sizeof(dir));
@@ -515,8 +516,9 @@ int cmd_add(int argc, const char **argv, const char *prefix)
setup_standard_excludes(&dir);
}
+ memset(&empty_pathspec, 0, sizeof(empty_pathspec));
/* 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)
seen = prune_directory(&dir, pathspec.raw, baselen,
implicit_dot ? WARN_IMPLICIT_DOT : 0);
diff --git a/builtin/clean.c b/builtin/clean.c
index fdd4980..d540ca4 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -214,7 +214,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
PATHSPEC_PREFER_CWD,
prefix, argv);
- fill_directory(&dir, pathspec.raw);
+ fill_directory(&dir, &pathspec);
for (i = 0; i < dir.nr; i++) {
struct dir_entry *ent = dir.entries[i];
diff --git a/builtin/grep.c b/builtin/grep.c
index 4bc0754..76a6a60 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -523,7 +523,7 @@ static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec,
if (exc_std)
setup_standard_excludes(&dir);
- fill_directory(&dir, pathspec->raw);
+ fill_directory(&dir, pathspec);
for (i = 0; i < dir.nr; i++) {
const char *name = dir.entries[i]->name;
int namelen = strlen(name);
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 50e6edf..fa1a6be 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -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 */
if (show_others || show_killed) {
- fill_directory(dir, pathspec.raw);
+ fill_directory(dir, &pathspec);
if (show_others)
show_other_files(dir);
if (show_killed)
diff --git a/dir.c b/dir.c
index 19978d3..290c7a3 100644
--- a/dir.c
+++ b/dir.c
@@ -142,7 +142,7 @@ char *common_prefix(const char **pathspec)
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;
@@ -150,10 +150,10 @@ int fill_directory(struct dir_struct *dir, const char **pathspec)
* Calculate common prefix for the pathspec, and
* 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_directory(dir, pathspec ? *pathspec : "", len, pathspec);
+ read_directory(dir, pathspec->nr ? pathspec->raw[0] : "", len, pathspec);
return len;
}
@@ -1388,14 +1388,20 @@ static int treat_leading_path(struct dir_struct *dir,
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;
+ /*
+ * Check out create_simplify()
+ */
+ if (pathspec)
+ GUARD_PATHSPEC(pathspec, PATHSPEC_FROMTOP | PATHSPEC_MAXDEPTH);
+
if (has_symlink_leading_path(path, len))
return dir->nr;
- simplify = create_simplify(pathspec);
+ simplify = create_simplify(pathspec ? pathspec->raw : NULL);
if (!len || treat_leading_path(dir, path, len, simplify))
read_directory_recursive(dir, path, len, 0, simplify);
free_simplify(simplify);
diff --git a/dir.h b/dir.h
index 229ccc8..076dd96 100644
--- a/dir.h
+++ b/dir.h
@@ -137,8 +137,8 @@ extern int match_pathspec_depth(const struct pathspec *pathspec,
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 fill_directory(struct dir_struct *dir, const struct pathspec *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,
int *dtype, struct exclude_list *el);
diff --git a/wt-status.c b/wt-status.c
index fae0c27..33baf0a 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -514,7 +514,7 @@ static void wt_status_collect_untracked(struct wt_status *s)
dir.flags |= DIR_SHOW_IGNORED_TOO;
setup_standard_excludes(&dir);
- fill_directory(&dir, s->pathspec.raw);
+ fill_directory(&dir, &s->pathspec);
for (i = 0; i < dir.nr; i++) {
struct dir_entry *ent = dir.entries[i];
--
1.8.2.83.gc99314b
next prev parent reply other threads:[~2013-07-14 8:39 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-14 8:35 [PATCH v2 00/46] "struct pathspec" conversion and :(glob) and :(icase) Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 01/46] clean: remove unused variable "seen" Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 02/46] Move struct pathspec and related functions to pathspec.[ch] Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 03/46] pathspec: i18n-ize error strings in pathspec parsing code Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 04/46] pathspec: add copy_pathspec Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 05/46] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 06/46] parse_pathspec: save original pathspec for reporting Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 07/46] parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL} Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 08/46] Convert some get_pathspec() calls to parse_pathspec() Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 09/46] parse_pathspec: add special flag for max_depth feature Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 10/46] parse_pathspec: support stripping submodule trailing slashes Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 11/46] parse_pathspec: support stripping/checking submodule paths Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 12/46] parse_pathspec: support prefixing original patterns Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 13/46] Guard against new pathspec magic in pathspec matching code Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 14/46] clean: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 15/46] commit: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 16/46] status: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 17/46] rerere: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 18/46] checkout: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 19/46] rm: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 20/46] ls-files: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 21/46] archive: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 22/46] check-ignore: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 23/46] add: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 24/46] reset: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 25/46] line-log: " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 26/46] Convert read_cache_preload() to take struct pathspec Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 27/46] Convert run_add_interactive to use " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 28/46] Convert unmerge_cache to take " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 29/46] checkout: convert read_tree_some " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 30/46] Convert report_path_error " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 31/46] Convert refresh_index " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` Nguyễn Thái Ngọc Duy [this message]
2013-07-14 8:35 ` [PATCH v2 33/46] Convert add_files_to_cache " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 34/46] Convert common_prefix() to use " Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 35/46] Remove diff_tree_{setup,release}_paths Nguyễn Thái Ngọc Duy
2013-07-14 8:35 ` [PATCH v2 36/46] Remove init_pathspec() in favor of parse_pathspec() Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 37/46] Remove match_pathspec() in favor of match_pathspec_depth() Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 38/46] tree-diff: remove the use of pathspec's raw[] in follow-rename codepath Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 39/46] Rename field "raw" to "_raw" in struct pathspec Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 40/46] parse_pathspec: make sure the prefix part is wildcard-free Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 41/46] parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 42/46] Kill limit_pathspec_to_literal() as it's only used by parse_pathspec() Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 43/46] pathspec: support :(literal) syntax for noglob pathspec Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 44/46] pathspec: make --literal-pathspecs disable pathspec magic Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 45/46] pathspec: support :(glob) syntax Nguyễn Thái Ngọc Duy
2013-07-14 8:36 ` [PATCH v2 46/46] parse_pathspec: accept :(icase)path syntax Nguyễn Thái Ngọc Duy
2013-07-14 8:48 ` Eric Sunshine
2013-07-15 19:08 ` [PATCH v2 00/46] "struct pathspec" conversion and :(glob) and :(icase) Junio C Hamano
2013-07-15 21:43 ` Junio C Hamano
2013-08-16 14:07 ` "git fmt-merge-msg" usage (was [PATCH v2 00/46] "struct pathspec" conversion and :(glob) and :(icase)) Michael Haggerty
2013-08-18 19:40 ` "git fmt-merge-msg" usage Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1373790969-13000-33-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).