[PATCHv2 2/8] Make rev-list --objects work together with pathspecs
- From
Elijah Newren <newren@gmail.com>
- Date
- Aug 26, 2010, 06:21 UTC
- Message-ID
- <1282803711-10253-3-git-send-email-newren@gmail.com>
- In-Reply-To
- <1282803711-10253-1-git-send-email-newren@gmail.com>
When traversing commits, the selection of commits would heed the list of pathspecs passed, but subsequent walking of the trees of those commits would not. This resulted in 'rev-list --objects HEAD -- <paths>' displaying objects at unwanted paths.
Have process_tree() call tree_entry_interesting() to determine which paths are interesting and should be walked.
Naturally, this change can provide a large speedup when paths are specified together with --objects, since many tree entries are now correctly ignored. Interestingly, though, this change also gives me a small (~1%) but repeatable speedup even when no paths are specified with --objects.
Signed-off-by: Elijah Newren <newren@gmail.com> --- diff.h | 1 + list-objects.c | 27 ++++++++++++++++++++++++++- revision.c | 8 ++++++-- revision.h | 3 ++- t/t6000-rev-list-misc.sh | 6 +++--- tree-diff.c | 2 +- 6 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/diff.h b/diff.h index 6fff024..35130b8 100644 --- a/diff.h +++ b/diff.h @@ -169,6 +169,7 @@ extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base, struct diff_options *opt); extern int diff_root_tree_sha1(const unsigned char *new, const char *base, struct diff_options *opt); +extern int tree_entry_interesting(struct tree_desc *desc, const char *base, int baselen, struct diff_options *opt); struct combine_diff_path { struct combine_diff_path *next; diff --git a/list-objects.c b/list-objects.c index 8953548..bb95962 100644 --- a/list-objects.c +++ b/list-objects.c @@ -67,6 +67,9 @@ static void process_tree(struct rev_info *revs, struct tree_desc desc; struct name_entry entry; struct name_path me; + int all_interesting = (revs->diffopt.nr_paths == 0); + char *full_prefix = NULL; + int full_prefix_len = 0; if (!revs->tree_objects) return; @@ -82,9 +85,30 @@ static void process_tree(struct rev_info *revs, me.elem = name; me.elem_len = strlen(name); + if (!all_interesting) { + full_prefix = path_name_impl(path, name, 1); + full_prefix_len = strlen(full_prefix); + } + init_tree_desc(&desc, tree->buffer, tree->size); - while (tree_entry(&desc, &entry)) { + for (; desc.size; update_tree_entry(&desc)) { + entry = desc.entry; + + if (!all_interesting) { + int showit = tree_entry_interesting(&desc, + full_prefix, + full_prefix_len, + &revs->diffopt); + + if (showit < 0) + break; + else if (!showit) + continue; + else if (showit == 2) + all_interesting = 1; + } + if (S_ISDIR(entry.mode)) process_tree(revs, lookup_tree(entry.sha1), @@ -97,6 +121,7 @@ static void process_tree(struct rev_info *revs, lookup_blob(entry.sha1), show, &me, entry.path); } + free(full_prefix); free(tree->buffer); tree->buffer = NULL; } diff --git a/revision.c b/revision.c index 7e82efd..64d8316 100644 --- a/revision.c +++ b/revision.c @@ -16,7 +16,7 @@ volatile show_early_output_fn_t show_early_output; -char *path_name(const struct name_path *path, const char *name) +char *path_name_impl(const struct name_path *path, const char *name, int isdir) { const struct name_path *p; char *n, *m; @@ -27,7 +27,7 @@ char *path_name(const struct name_path *path, const char *name) if (p->elem_len) len += p->elem_len + 1; } - n = xmalloc(len); + n = xmalloc(len + !!isdir); m = n + len - (nlen + 1); strcpy(m, name); for (p = path; p; p = p->up) { @@ -37,6 +37,10 @@ char *path_name(const struct name_path *path, const char *name) m[p->elem_len] = '/'; } } + if (isdir && len > 1) { + n[len-1] = '/'; + n[len] = '\0'; + } return n; } diff --git a/revision.h b/revision.h index 36fdf22..5ecbeb0 100644 --- a/revision.h +++ b/revision.h @@ -172,7 +172,8 @@ struct name_path { const char *elem; }; -char *path_name(const struct name_path *path, const char *name); +char *path_name_impl(const struct name_path *path, const char *name, int isdir); +#define path_name(path, name) path_name_impl(path, name, 0) extern void add_object(struct object *obj, struct object_array *p, diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh index a298f0d..b6a7c9c 100755 --- a/t/t6000-rev-list-misc.sh +++ b/t/t6000-rev-list-misc.sh @@ -11,13 +11,13 @@ test_expect_success setup ' git commit -mone ' -test_expect_failure 'rev-list --objects heeds pathspecs' ' +test_expect_success 'rev-list --objects heeds pathspecs' ' git rev-list --objects HEAD -- wanted_file >output && grep wanted_file output && ! grep unwanted_file output ' -test_expect_failure 'rev-list --objects with pathspecs and deeper paths' ' +test_expect_success 'rev-list --objects with pathspecs and deeper paths' ' mkdir foo && > foo/file && git add foo/file && @@ -31,7 +31,7 @@ test_expect_failure 'rev-list --objects with pathspecs and deeper paths' ' ! grep unwanted_file output ' -test_expect_failure 'rev-list --objects with pathspecs and copied files' ' +test_expect_success 'rev-list --objects with pathspecs and copied files' ' git checkout --orphan junio-testcase && git rm -rf . && diff --git a/tree-diff.c b/tree-diff.c index cd659c6..2fb670b 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -91,7 +91,7 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const * - zero for no * - negative for "no, and no subsequent entries will be either" */ -static int tree_entry_interesting(struct tree_desc *desc, const char *base, int baselen, struct diff_options *opt) +int tree_entry_interesting(struct tree_desc *desc, const char *base, int baselen, struct diff_options *opt) { const char *path; const unsigned char *sha1;
-- 1.7.2.2.45.ga60f