From: mhagger@alum.mit.edu
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Jakub Narebski <jnareb@gmail.com>,
Heiko Voigt <hvoigt@hvoigt.net>,
Johan Herland <johan@herland.net>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 15/15] do_for_each_ref(): only iterate over the subtree that was requested
Date: Tue, 10 Apr 2012 07:30:27 +0200 [thread overview]
Message-ID: <1334035827-20331-16-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1334035827-20331-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>
If the base argument has a "/" chararacter, then only iterate over the
reference subdir whose name is the part up to the last "/".
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs.c | 35 ++++++++++++++++++++++++++++-------
1 file changed, 28 insertions(+), 7 deletions(-)
diff --git a/refs.c b/refs.c
index cdfb53d..f97a256 100644
--- a/refs.c
+++ b/refs.c
@@ -1144,13 +1144,34 @@ static int do_for_each_ref(const char *submodule, const char *base, each_ref_fn
int trim, int flags, void *cb_data)
{
struct ref_cache *refs = get_ref_cache(submodule);
- struct ref_dir *packed_refs = get_packed_refs(refs);
- struct ref_dir *loose_refs = get_loose_refs(refs);
- sort_ref_dir(packed_refs);
- sort_ref_dir(loose_refs);
- return do_for_each_ref_in_dirs(packed_refs,
- loose_refs,
- base, fn, trim, flags, cb_data);
+ struct ref_dir *packed_dir = get_packed_refs(refs);
+ struct ref_dir *loose_dir = get_loose_refs(refs);
+ int retval = 0;
+
+ if (base && *base) {
+ packed_dir = find_containing_dir(packed_dir, base, 0);
+ loose_dir = find_containing_dir(loose_dir, base, 0);
+ }
+
+ if (packed_dir && loose_dir) {
+ sort_ref_dir(packed_dir);
+ sort_ref_dir(loose_dir);
+ retval = do_for_each_ref_in_dirs(
+ packed_dir, loose_dir,
+ base, fn, trim, flags, cb_data);
+ } else if (packed_dir) {
+ sort_ref_dir(packed_dir);
+ retval = do_for_each_ref_in_dir(
+ packed_dir, 0,
+ base, fn, trim, flags, cb_data);
+ } else if (loose_dir) {
+ sort_ref_dir(loose_dir);
+ retval = do_for_each_ref_in_dir(
+ loose_dir, 0,
+ base, fn, trim, flags, cb_data);
+ }
+
+ return retval;
}
static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data)
--
1.7.10
next prev parent reply other threads:[~2012-04-10 5:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 5:30 [PATCH 00/15] Hierarchical reference cache (once again) mhagger
2012-04-10 5:30 ` [PATCH 01/15] refs.c: reorder definitions more logically mhagger
2012-04-10 5:30 ` [PATCH 02/15] refs: manage current_ref within do_one_ref() mhagger
2012-04-10 5:30 ` [PATCH 03/15] do_for_each_ref_in_array(): new function mhagger
2012-04-10 5:30 ` [PATCH 04/15] do_for_each_ref_in_arrays(): " mhagger
2012-04-10 5:30 ` [PATCH 05/15] repack_without_ref(): reimplement using do_for_each_ref_in_array() mhagger
2012-04-10 5:30 ` [PATCH 06/15] names_conflict(): new function, extracted from is_refname_available() mhagger
2012-04-10 5:30 ` [PATCH 07/15] names_conflict(): simplify implementation mhagger
2012-04-10 5:30 ` [PATCH 08/15] is_refname_available(): reimplement using do_for_each_ref_in_array() mhagger
2012-04-10 5:30 ` [PATCH 09/15] free_ref_entry(): new function mhagger
2012-04-10 5:30 ` [PATCH 10/15] check_refname_component(): return 0 for zero-length components mhagger
2012-04-10 5:30 ` [PATCH 11/15] struct ref_entry: nest the value part in a union mhagger
2012-04-10 5:30 ` [PATCH 12/15] refs.c: rename ref_array -> ref_dir mhagger
2012-04-10 5:30 ` [PATCH 13/15] sort_ref_dir(): simplify logic mhagger
2012-04-10 5:30 ` [PATCH 14/15] refs: store references hierarchically mhagger
2012-04-10 5:30 ` mhagger [this message]
2012-04-12 6:44 ` [PATCH 00/15] Hierarchical reference cache (once again) Jeff King
2012-04-12 15:36 ` Junio C Hamano
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=1334035827-20331-16-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=jnareb@gmail.com \
--cc=johan@herland.net \
--cc=peff@peff.net \
/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).