From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 11/21] ls-files: convert to use parse_pathspec
Date: Sun, 6 Jan 2013 13:20:58 +0700 [thread overview]
Message-ID: <1357453268-12543-12-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1357453268-12543-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/ls-files.c | 42 +++++++++++-------------------------------
cache.h | 1 +
dir.c | 20 ++++++++++++++++++++
3 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 4a9ee69..9336abd 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -30,7 +30,7 @@ static int debug_mode;
static const char *prefix;
static int max_prefix_len;
static int prefix_len;
-static const char **pathspec;
+static struct pathspec pathspec;
static int error_unmatch;
static char *ps_matched;
static const char *with_tree;
@@ -58,7 +58,7 @@ static void show_dir_entry(const char *tag, struct dir_entry *ent)
if (len >= ent->len)
die("git ls-files: internal error - directory entry not superset of prefix");
- if (!match_pathspec(pathspec, ent->name, ent->len, len, ps_matched))
+ if (!match_pathspec_depth(&pathspec, ent->name, ent->len, len, ps_matched))
return;
fputs(tag, stdout);
@@ -133,7 +133,7 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce)
if (len >= ce_namelen(ce))
die("git ls-files: internal error - cache entry not superset of prefix");
- if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), len, ps_matched))
+ if (!match_pathspec_depth(&pathspec, ce->name, ce_namelen(ce), len, ps_matched))
return;
if (tag && *tag && show_valid_bit &&
@@ -187,7 +187,7 @@ static void show_ru_info(void)
len = strlen(path);
if (len < max_prefix_len)
continue; /* outside of the prefix */
- if (!match_pathspec(pathspec, path, len, max_prefix_len, ps_matched))
+ if (!match_pathspec_depth(&pathspec, path, len, max_prefix_len, ps_matched))
continue; /* uninterested */
for (i = 0; i < 3; i++) {
if (!ui->mode[i])
@@ -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);
+ fill_directory(dir, pathspec.raw);
if (show_others)
show_other_files(dir);
if (show_killed)
@@ -287,21 +287,6 @@ static void prune_cache(const char *prefix)
active_nr = last;
}
-static void strip_trailing_slash_from_submodules(void)
-{
- const char **p;
-
- for (p = pathspec; *p != NULL; p++) {
- int len = strlen(*p), pos;
-
- if (len < 1 || (*p)[len - 1] != '/')
- continue;
- pos = cache_name_pos(*p, len - 1);
- if (pos >= 0 && S_ISGITLINK(active_cache[pos]->ce_mode))
- *p = xstrndup(*p, len - 1);
- }
-}
-
/*
* Read the tree specified with --with-tree option
* (typically, HEAD) into stage #1 and then
@@ -549,23 +534,18 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
if (require_work_tree && !is_inside_work_tree())
setup_work_tree();
- pathspec = get_pathspec(prefix, argv);
+ parse_pathspec(&pathspec, PATHSPEC_FROMTOP, 0, prefix, argv);
/* be nice with submodule paths ending in a slash */
- if (pathspec)
- strip_trailing_slash_from_submodules();
+ strip_trailing_slash_from_submodules(&pathspec);
/* Find common prefix for all pathspec's */
- max_prefix = common_prefix(pathspec);
+ max_prefix = common_prefix(pathspec.raw);
max_prefix_len = max_prefix ? strlen(max_prefix) : 0;
/* Treat unmatching pathspec elements as errors */
- if (pathspec && error_unmatch) {
- int num;
- for (num = 0; pathspec[num]; num++)
- ;
- ps_matched = xcalloc(1, num);
- }
+ if (pathspec.nr && error_unmatch)
+ ps_matched = xcalloc(1, pathspec.nr);
if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
die("ls-files --ignored needs some exclude pattern");
@@ -592,7 +572,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
if (ps_matched) {
int bad;
- bad = report_path_error(ps_matched, pathspec, prefix);
+ bad = report_path_error(ps_matched, pathspec.raw, prefix);
if (bad)
fprintf(stderr, "Did you forget to 'git add'?\n");
diff --git a/cache.h b/cache.h
index e52365d..890d89b 100644
--- a/cache.h
+++ b/cache.h
@@ -493,6 +493,7 @@ extern int init_pathspec(struct pathspec *, const char **);
extern void parse_pathspec(struct pathspec *pathspec, unsigned magic,
unsigned flags, const char *prefix,
const char **args);
+void strip_trailing_slash_from_submodules(struct pathspec *pathspec);
extern void free_pathspec(struct pathspec *);
extern int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec);
diff --git a/dir.c b/dir.c
index 31f0995..11e8c1d 100644
--- a/dir.c
+++ b/dir.c
@@ -1440,6 +1440,26 @@ int init_pathspec(struct pathspec *pathspec, const char **paths)
return 0;
}
+void strip_trailing_slash_from_submodules(struct pathspec *pathspec)
+{
+ int i;
+ for (i = 0; i < pathspec->nr; i++) {
+ const char *p = pathspec->raw[i];
+ int len = strlen(p), pos;
+
+ if (len < 1 || p[len - 1] != '/')
+ continue;
+ pos = cache_name_pos(p, len - 1);
+ if (pos >= 0 && S_ISGITLINK(active_cache[pos]->ce_mode)) {
+ pathspec->raw[i] = xstrndup(p, len - 1);
+ pathspec->items[i].len--;
+ pathspec->items[i].match =
+ xstrndup(pathspec->items[i].match,
+ pathspec->items[i].len);
+ }
+ }
+}
+
void free_pathspec(struct pathspec *pathspec)
{
free(pathspec->items);
--
1.8.0.rc2.23.g1fb49df
next prev parent reply other threads:[~2013-01-06 6:22 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-06 6:20 [PATCH 00/21] "struct pathspec" conversion Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 01/21] pathspec: save the non-wildcard length part Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 02/21] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-01-10 23:26 ` Martin von Zweigbergk
2013-01-11 2:33 ` Duy Nguyen
2013-01-06 6:20 ` [PATCH 03/21] pathspec: make sure the prefix part is wildcard-clean Nguyễn Thái Ngọc Duy
2013-01-07 1:10 ` Duy Nguyen
2013-01-06 6:20 ` [PATCH 04/21] Export parse_pathspec() and convert some get_pathspec() calls Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 05/21] clean: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 06/21] commit: " Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 07/21] status: " Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 08/21] rerere: " Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 09/21] checkout: " Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 10/21] rm: " Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` Nguyễn Thái Ngọc Duy [this message]
2013-01-06 6:20 ` [PATCH 12/21] archive: " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 13/21] add: " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 14/21] Convert read_cache_preload() to take struct pathspec Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 15/21] Convert unmerge_cache " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 16/21] checkout: convert read_tree_some " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 17/21] Convert report_path_error " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 18/21] Convert refresh_index " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 19/21] Convert {read,fill}_directory " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 20/21] Convert add_files_to_cache " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 21/21] Convert more init_pathspec() to parse_pathspec() Nguyễn Thái Ngọc Duy
2013-01-06 21:45 ` [PATCH 00/21] "struct pathspec" conversion 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=1357453268-12543-12-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/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).