From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org, Michael J Gruber <git@drmicha.warpmail.net>
Subject: [PATCH] pathspec: rename per-item field has_wildcard to use_wildcard
Date: Tue, 05 Apr 2011 15:10:22 -0700 [thread overview]
Message-ID: <7vr59gl581.fsf@alter.siamese.dyndns.org> (raw)
As the point of the last change is to allow use of strings as
literals no matter what characters are in them, "has_wildcard"
does not match what we use this field for anymore.
It is used to decide if the wildcard matching should be used, so
rename it to match the usage better.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* I was looking at the codepaths that would need to be touched in order
to properly support the "magic pathspec" we have been discussing, and
am leaning to conclude that all the users of get_pathspec() need to be
rewritten to throw the remainder of argv[] at a function that fills a
struct pathspec (in other words, a combination of get_pathspec() and
init_pathspec()). Michael's "alternative approach to grep --full-tree"
was operating at the get_pathspec() level, but that function is an
interface to return an array of plain-vanilla strings only, and there
is no place to hook richer per-item information on the elements. We
would need "struct pathspec" in the function where we parse the argv[]
and combine its elements with prefix.
In any case, pathspec.has_wildcard vs pathspec.item[i].has_wildcard was
difficult to grep and find patterns, and this is an obvious fix to that
problem, independent from the above observation.
builtin/ls-files.c | 2 +-
builtin/ls-tree.c | 3 ++-
cache.h | 2 +-
dir.c | 6 +++---
tree-walk.c | 4 ++--
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 199af46..1570123 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -361,7 +361,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
matchbuf[0] = prefix;
matchbuf[1] = NULL;
init_pathspec(&pathspec, matchbuf);
- pathspec.items[0].has_wildcard = 0;
+ pathspec.items[0].use_wildcard = 0;
} else
init_pathspec(&pathspec, NULL);
if (read_tree(tree, 1, &pathspec))
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 4290723..f08c5b0 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -168,7 +168,8 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
init_pathspec(&pathspec, get_pathspec(prefix, argv + 1));
for (i = 0; i < pathspec.nr; i++)
- pathspec.items[i].has_wildcard = 0;
+ pathspec.items[i].use_wildcard = 0;
+ pathspec.has_wildcard = 0;
tree = parse_tree_indirect(sha1);
if (!tree)
die("not a tree object");
diff --git a/cache.h b/cache.h
index edd5b5a..43d719d 100644
--- a/cache.h
+++ b/cache.h
@@ -509,7 +509,7 @@ struct pathspec {
struct pathspec_item {
const char *match;
int len;
- unsigned int has_wildcard:1;
+ unsigned int use_wildcard:1;
} *items;
};
diff --git a/dir.c b/dir.c
index 168dad6..91f1502 100644
--- a/dir.c
+++ b/dir.c
@@ -230,7 +230,7 @@ static int match_pathspec_item(const struct pathspec_item *item, int prefix,
return MATCHED_RECURSIVELY;
}
- if (item->has_wildcard && !fnmatch(match, name, 0))
+ if (item->use_wildcard && !fnmatch(match, name, 0))
return MATCHED_FNMATCH;
return 0;
@@ -1286,8 +1286,8 @@ int init_pathspec(struct pathspec *pathspec, const char **paths)
item->match = path;
item->len = strlen(path);
- item->has_wildcard = !no_wildcard(path);
- if (item->has_wildcard)
+ item->use_wildcard = !no_wildcard(path);
+ if (item->use_wildcard)
pathspec->has_wildcard = 1;
}
diff --git a/tree-walk.c b/tree-walk.c
index 322becc..33f749e 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -598,7 +598,7 @@ int tree_entry_interesting(const struct name_entry *entry,
&never_interesting))
return 1;
- if (ps->items[i].has_wildcard) {
+ if (ps->items[i].use_wildcard) {
if (!fnmatch(match + baselen, entry->path, 0))
return 1;
@@ -614,7 +614,7 @@ int tree_entry_interesting(const struct name_entry *entry,
}
match_wildcards:
- if (!ps->items[i].has_wildcard)
+ if (!ps->items[i].use_wildcard)
continue;
/*
--
1.7.5.rc0.131.gfa38c
next reply other threads:[~2011-04-05 22:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-05 22:10 Junio C Hamano [this message]
2011-04-06 15:54 ` [PATCH] pathspec: rename per-item field has_wildcard to use_wildcard Nguyen Thai Ngoc Duy
2011-04-06 17:13 ` Junio C Hamano
2011-04-06 19:52 ` Junio C Hamano
2011-04-07 11:09 ` Michael J Gruber
2011-04-07 13:00 ` Nguyen Thai Ngoc Duy
2011-04-07 19:44 ` Junio C Hamano
2011-04-07 19:47 ` Junio C Hamano
2011-04-08 8:29 ` Michael J Gruber
2011-04-08 19:40 ` Junio C Hamano
2011-04-07 12:51 ` Nguyen Thai Ngoc Duy
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=7vr59gl581.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.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).