From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: git <git@vger.kernel.org>, gitster <gitster@pobox.com>
Subject: Re: [PATCH 2/7] Fix ignoring of pathspecs with rev-list --objects
Date: Thu, 26 Aug 2010 08:11:07 +1000 [thread overview]
Message-ID: <AANLkTimguNHXSFyO1EvS+dHbHiXU-dXTNwkWfEsVUbVC@mail.gmail.com> (raw)
In-Reply-To: <1282704795-29661-3-git-send-email-newren@gmail.com>
On Wed, Aug 25, 2010 at 12:53 PM, Elijah Newren <newren@gmail.com> wrote:
> @@ -84,7 +85,24 @@ static void process_tree(struct rev_info *revs,
>
> 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) {
> + char *full_path = path_name(path, name);
> + int full_path_len = strlen(full_path);
> + int showit = tree_entry_interesting(&desc,
> full_path, full_path_len,
> + &revs->diffopt);
> + free(full_path);
I wonder if we can avoid xmalloc/free so many times here. If full_path
is unchanged, how about moving it outside the loop?
> 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;
While at it, can you please also fix its comments? The comments say
pathspec while what it uses is actually path prefix. Maybe something
like this
diff --git a/tree-diff.c b/tree-diff.c
index 3c34c77..514dbca 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -83,7 +83,7 @@ static int compare_tree_entry(struct tree_desc *t1,
struct tree_desc *t2, const
}
/*
- * Is a tree entry interesting given the pathspec we have?
+ * Is a tree entry interesting given the path prefix we have?
*
* Return:
* - 2 for "yes, and all subsequent entries will be"
This patch is good stuff. Please be informed I will steal this patch
for my narrow use.
--
Duy
next prev parent reply other threads:[~2010-08-25 22:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-25 2:53 [PATCH 0/7] Minor bug fix and optimizations for revision/tree walking Elijah Newren
2010-08-25 2:53 ` [PATCH 1/7] Add testcase showing how pathspecs are ignored with rev-list --objects Elijah Newren
2010-08-25 2:53 ` [PATCH 2/7] Fix ignoring of pathspecs " Elijah Newren
2010-08-25 22:11 ` Nguyen Thai Ngoc Duy [this message]
2010-08-25 23:50 ` Elijah Newren
2010-08-26 2:49 ` Elijah Newren
2010-08-26 23:15 ` Nguyen Thai Ngoc Duy
2010-08-26 23:41 ` Junio C Hamano
2010-08-25 2:53 ` [PATCH 3/7] tree-walk: Correct bitrotted comment about tree_entry() Elijah Newren
2010-08-25 2:53 ` [PATCH 4/7] tree_entry_interesting(): Make return value more specific Elijah Newren
2010-08-25 2:53 ` [PATCH 5/7] diff_tree(): Skip skip_uninteresting() when all remaining paths interesting Elijah Newren
2010-08-25 23:25 ` Junio C Hamano
2010-08-25 23:57 ` Elijah Newren
2010-08-26 3:49 ` Junio C Hamano
2010-08-25 2:53 ` [PATCH 6/7] list-objects.c: Avoid recomputing interesting-ness for subtrees when possible Elijah Newren
2010-08-25 2:53 ` [PATCH 7/7] tree-diff.c: " Elijah Newren
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTimguNHXSFyO1EvS+dHbHiXU-dXTNwkWfEsVUbVC@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@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.
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 NNTP newsgroup(s).