undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pathspec: save the non-wildcard length part

Browse Source 
We mark pathspec with wildcards with the field use_wildcard. We
could do better by saving the length of the non-wildcard part, which
can be used for optimizations such as f9f6e2c (exclude: do strcmp as
much as possible before fnmatch - 2012-06-07).

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2012-11-18 16:13:06 +07:00 committed by Junio C Hamano
parent f3828dc066
commit 170260ae90
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/ls-files.c
View File

@ -337,7 +337,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
matchbuf[0] = prefix; matchbuf[0] = prefix;
matchbuf[1] = NULL; matchbuf[1] = NULL;
init_pathspec(&pathspec, matchbuf); init_pathspec(&pathspec, matchbuf);
pathspec.items[0].use_wildcard = 0; pathspec.items[0].nowildcard_len = pathspec.items[0].len;
} else } else
init_pathspec(&pathspec, NULL); init_pathspec(&pathspec, NULL);
if (read_tree(tree, 1, &pathspec)) if (read_tree(tree, 1, &pathspec))

2
builtin/ls-tree.c
View File

@ -168,7 +168,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
init_pathspec(&pathspec, get_pathspec(prefix, argv + 1)); init_pathspec(&pathspec, get_pathspec(prefix, argv + 1));
for (i = 0; i < pathspec.nr; i++) for (i = 0; i < pathspec.nr; i++)
pathspec.items[i].use_wildcard = 0; pathspec.items[i].nowildcard_len = pathspec.items[i].len;
pathspec.has_wildcard = 0; pathspec.has_wildcard = 0;
tree = parse_tree_indirect(sha1); tree = parse_tree_indirect(sha1);
if (!tree) if (!tree)

2
cache.h
View File

@ -482,7 +482,7 @@ struct pathspec {
struct pathspec_item { struct pathspec_item {
const char *match; const char *match;
int len; int len;
unsigned int use_wildcard:1; int nowildcard_len;
} *items; } *items;
}; };

6
dir.c
View File

@ -230,7 +230,7 @@ static int match_pathspec_item(const struct pathspec_item *item, int prefix,
return MATCHED_RECURSIVELY; return MATCHED_RECURSIVELY;
} }
if (item->use_wildcard && !fnmatch(match, name, 0)) if (item->nowildcard_len < item->len && !fnmatch(match, name, 0))
return MATCHED_FNMATCH; return MATCHED_FNMATCH;
return 0; return 0;
@ -1429,8 +1429,8 @@ int init_pathspec(struct pathspec *pathspec, const char **paths)
item->match = path; item->match = path;
item->len = strlen(path); item->len = strlen(path);
item->use_wildcard = !no_wildcard(path); item->nowildcard_len = simple_length(path);
if (item->use_wildcard) if (item->nowildcard_len < item->len)
pathspec->has_wildcard = 1; pathspec->has_wildcard = 1;
} }

4
tree-walk.c
View File

@ -626,7 +626,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
&never_interesting)) &never_interesting))
return entry_interesting; return entry_interesting;
if (item->use_wildcard) { if (item->nowildcard_len < item->len) {
if (!fnmatch(match + baselen, entry->path, 0)) if (!fnmatch(match + baselen, entry->path, 0))
return entry_interesting; return entry_interesting;
@ -642,7 +642,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
} }
match_wildcards: match_wildcards:
if (!item->use_wildcard) if (item->nowildcard_len == item->len)
continue; continue;
/* /*