From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 03/10] unpack-trees: add function to update ce_flags based on sparse patterns
Date: Mon, 15 Nov 2010 17:36:43 +0700 [thread overview]
Message-ID: <1289817410-32470-4-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1289817410-32470-1-git-send-email-pclouds@gmail.com>
The function will reconstruct directory structure from index and feed
excluded_from_list() with proper dtype.
Another advantage over the old will_have_skip_worktree() is that when
a directory is matched or not matched, we can go ahead and set
ce_flags for all of its children without calling excluded_from_list()
again. The old solution requires one excluded_from_list() call per
index entry.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
unpack-trees.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 88 insertions(+), 0 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 9acd9be..6c266ef 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -834,6 +834,94 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
return mask;
}
+/*
+ * traverse the index, find every entry that matches according to
+ * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
+ * number of traversed entries.
+ *
+ * If select_mask is non-zero, only entries whose ce_flags has on of
+ * those bits enabled are traversed.
+ */
+static int clear_ce_flags_1(struct cache_entry **cache, int nr,
+ int prefix_len, int match_all,
+ int select_mask, int clear_mask,
+ struct unpack_trees_options *o)
+{
+ const char *name, *slash;
+ struct cache_entry *ce = cache[0];
+ const char *prefix = ce->name;
+ int processed, original_nr = nr;
+
+ if (prefix_len && !match_all) {
+ int dtype = DT_DIR;
+ static char path[PATH_MAX];
+ int pathlen = prefix_len - 1;
+ const char *basename;
+
+ memcpy(path, prefix, pathlen);
+ path[pathlen] = '\0';
+ basename = strrchr(path, '/');
+ basename = basename ? basename+1 : path;
+ switch (excluded_from_list(path, pathlen, basename, &dtype, o->el)) {
+ case 0:
+ while (nr && !strncmp(ce->name, prefix, prefix_len)) {
+ cache++;
+ ce = *cache;
+ nr--;
+ }
+ return original_nr - nr;
+ case 1:
+ match_all = 1;
+ break;
+ default: /* case -1, undecided */
+ break;
+ }
+ }
+
+ while (nr) {
+ if (select_mask && !(ce->ce_flags & select_mask)) {
+ cache++;
+ ce = *cache;
+ nr--;
+ continue;
+ }
+
+ if (prefix_len && strncmp(ce->name, prefix, prefix_len))
+ break;
+
+ name = ce->name + prefix_len;
+ slash = strchr(name, '/');
+
+ /* no slash, this is a file */
+ if (!slash) {
+ int dtype = ce_to_dtype(ce);
+ if (match_all ||
+ excluded_from_list(ce->name, ce_namelen(ce), name, &dtype, o->el) > 0)
+ ce->ce_flags &= ~clear_mask;
+ cache++;
+ ce = *cache;
+ nr--;
+ continue;
+ }
+
+ /* has slash, this is a directory */
+ processed = clear_ce_flags_1(cache, nr,
+ slash + 1 - ce->name, match_all,
+ select_mask, clear_mask, o);
+ cache += processed;
+ ce = *cache;
+ nr -= processed;
+ }
+ return original_nr - nr;
+}
+
+static int clear_ce_flags(struct cache_entry **cache, int nr,
+ int select_mask, int clear_mask,
+ struct unpack_trees_options *o)
+{
+ return clear_ce_flags_1(cache, nr, 0, 0, select_mask, clear_mask, o);
+}
+
static void set_new_skip_worktree_1(struct unpack_trees_options *o)
{
int i;
--
1.7.3.2.210.g045198
next prev parent reply other threads:[~2010-11-15 10:39 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-15 10:36 [PATCH 00/10] Sparse checkout fixes and improvements Nguyễn Thái Ngọc Duy
2010-11-15 10:36 ` [PATCH 01/10] add: do not rely on dtype being NULL behavior Nguyễn Thái Ngọc Duy
2010-11-15 12:14 ` Jonathan Nieder
2010-11-16 2:18 ` Nguyen Thai Ngoc Duy
2010-11-16 2:42 ` Jonathan Nieder
2010-11-16 18:58 ` Junio C Hamano
2010-11-17 6:38 ` Nguyen Thai Ngoc Duy
2010-11-15 10:36 ` [PATCH 02/10] unpack-trees: move all skip-worktree check back to unpack_trees() Nguyễn Thái Ngọc Duy
2010-11-15 12:34 ` Thiago Farina
2010-11-16 2:19 ` Nguyen Thai Ngoc Duy
2010-11-15 16:01 ` Jonathan Nieder
2010-11-16 2:39 ` Nguyen Thai Ngoc Duy
2010-11-15 10:36 ` Nguyễn Thái Ngọc Duy [this message]
2010-11-15 18:30 ` [PATCH 03/10] unpack-trees: add function to update ce_flags based on sparse patterns Jonathan Nieder
2010-11-15 20:19 ` Jonathan Nieder
2010-11-15 10:36 ` [PATCH 04/10] unpack-trees: fix sparse checkout's "unable to match directories" fault Nguyễn Thái Ngọc Duy
2010-11-15 19:10 ` Jonathan Nieder
2010-11-16 2:43 ` Nguyen Thai Ngoc Duy
2010-11-15 10:36 ` [PATCH 05/10] unpack-trees: optimize full checkout case Nguyễn Thái Ngọc Duy
2010-11-15 20:41 ` Jonathan Nieder
2010-11-15 10:36 ` [PATCH 06/10] templates: add info/sparse-checkout Nguyễn Thái Ngọc Duy
2010-11-15 10:36 ` [PATCH 07/10] checkout: add -S to update sparse checkout Nguyễn Thái Ngọc Duy
2010-11-15 21:16 ` Jonathan Nieder
2010-11-15 21:52 ` Miles Bader
2010-11-17 15:02 ` Nguyen Thai Ngoc Duy
2010-11-16 3:08 ` Nguyen Thai Ngoc Duy
2010-11-15 10:36 ` [PATCH 08/10] checkout: add --full to fully populate working directory Nguyễn Thái Ngọc Duy
2010-11-15 21:23 ` Jonathan Nieder
2010-11-16 2:50 ` Nguyen Thai Ngoc Duy
2010-11-15 10:36 ` [PATCH 09/10] git-checkout.txt: mention of sparse checkout Nguyễn Thái Ngọc Duy
2010-11-15 10:36 ` [PATCH 10/10] clean: support cleaning sparse checkout with -S Nguyễn Thái Ngọc Duy
2010-11-15 21:30 ` Jonathan Nieder
2010-11-16 2:53 ` Nguyen Thai Ngoc Duy
2010-11-16 3:07 ` Jonathan Nieder
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=1289817410-32470-4-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/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).