admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

traverse_trees(): allow pruning with pathspec

Browse Source 
The traverse_trees() machinery is primarily meant for merging two (or
more) trees, and because a merge is a full tree operation, it doesn't
support any pruning with pathspec.

Since d1f2d7e (Make run_diff_index() use unpack_trees(), not read_tree(),
2008-01-19), however, we use unpack_trees() to traverse_trees() callchain
to perform "diff-index", which could waste a lot of work traversing trees
outside the user-supplied pathspec, only to discard at the blob comparison
level in diff-lib.c::oneway_diff() which is way too late.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-08-29 12:26:05 -07:00
parent f696543dad
commit 2842c0f914
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tree-walk.c
View File

@@ -309,6 +309,18 @@ static void free_extended_entry(struct tree_desc_x *t)
} }
} }
static inline int prune_traversal(struct name_entry *e,
struct traverse_info *info,
struct strbuf *base,
int still_interesting)
{
if (!info->pathspec || still_interesting == 2)
return 2;
if (still_interesting < 0)
return still_interesting;
return tree_entry_interesting(e, base, 0, info->pathspec);
}
int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info) int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
{ {
int ret = 0; int ret = 0;
@@ -316,10 +328,18 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
struct name_entry *entry = xmalloc(n*sizeof(*entry)); struct name_entry *entry = xmalloc(n*sizeof(*entry));
int i; int i;
struct tree_desc_x *tx = xcalloc(n, sizeof(*tx)); struct tree_desc_x *tx = xcalloc(n, sizeof(*tx));
struct strbuf base = STRBUF_INIT;
int interesting = 1;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
tx[i].d = t[i]; tx[i].d = t[i];
if (info->prev) {
strbuf_grow(&base, info->pathlen);
make_traverse_path(base.buf, info->prev, &info->name);
base.buf[info->pathlen-1] = '/';
strbuf_setlen(&base, info->pathlen);
}
for (;;) { for (;;) {
unsigned long mask, dirmask; unsigned long mask, dirmask;
const char *first = NULL; const char *first = NULL;
@@ -376,16 +396,22 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
mask |= 1ul << i; mask |= 1ul << i;
if (S_ISDIR(entry[i].mode)) if (S_ISDIR(entry[i].mode))
dirmask |= 1ul << i; dirmask |= 1ul << i;
e = &entry[i];
} }
if (!mask) if (!mask)
break; break;
ret = info->fn(n, mask, dirmask, entry, info); interesting = prune_traversal(e, info, &base, interesting);
if (ret < 0) { if (interesting < 0)
error = ret; break;
if (!info->show_all_errors) if (interesting) {
break; ret = info->fn(n, mask, dirmask, entry, info);
if (ret < 0) {
error = ret;
if (!info->show_all_errors)
break;
}
mask &= ret;
} }
mask &= ret;
ret = 0; ret = 0;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
if (mask & (1ul << i)) if (mask & (1ul << i))
@@ -395,6 +421,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
free_extended_entry(tx + i); free_extended_entry(tx + i);
free(tx); free(tx);
strbuf_release(&base);
return error; return error;
} }

1
tree-walk.h
View File

@@ -44,6 +44,7 @@ struct traverse_info {
struct traverse_info *prev; struct traverse_info *prev;
struct name_entry name; struct name_entry name;
int pathlen; int pathlen;
struct pathspec *pathspec;
unsigned long conflicts; unsigned long conflicts;
traverse_callback_t fn; traverse_callback_t fn;