refs: add method iterator_begin

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index 3d007ba02288e96a83cf974dc7962f6f988bef99..91174e60f7c89037eeb7ba8d71e263e680e5d5fe 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1157,7 +1157,7 @@ static int do_for_each_ref(const char *submodule, const char *prefix,
        if (!refs)
                return 0;
 
-       iter = files_ref_iterator_begin(refs, prefix, flags);
+       iter = refs->be->iterator_begin(refs, prefix, flags);
        iter = prefix_ref_iterator_begin(iter, prefix, trim);
 
        return do_for_each_ref_iterator(iter, fn, cb_data);

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 4918469f343324afc50d16aef5b7f713de52db84..2cda511352f8b68658a29f3e48aad8fd4077975c 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1862,7 +1862,7 @@ static struct ref_iterator_vtable files_ref_iterator_vtable = {
        files_ref_iterator_abort
 };
 
-struct ref_iterator *files_ref_iterator_begin(
+static struct ref_iterator *files_ref_iterator_begin(
                struct ref_store *ref_store,
                const char *prefix, unsigned int flags)
 {
@@ -4044,6 +4044,7 @@ struct ref_storage_be refs_be_files = {
        files_peel_ref,
        files_create_symref,
 
+       files_ref_iterator_begin,
        files_read_raw_ref,
        files_verify_refname_available
 };

diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 0af10797131d6e1c282a4148b1908445aca18068..5be62a296ab658cf938f07759b2be7605ebe01d0 100644 (file)
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -404,18 +404,6 @@ struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
                                               const char *prefix,
                                               int trim);
 
-struct ref_store;
-
-/*
- * Iterate over the packed and loose references in the specified
- * ref_store that are within find_containing_dir(prefix). If prefix is
- * NULL or the empty string, iterate over all references in the
- * submodule.
- */
-struct ref_iterator *files_ref_iterator_begin(struct ref_store *ref_store,
-                                             const char *prefix,
-                                             unsigned int flags);
-
 /*
  * Iterate over the references in the main ref_store that have a
  * reflog. The paths within a directory are iterated over in arbitrary
@@ -488,6 +476,8 @@ int do_for_each_ref_iterator(struct ref_iterator *iter,
 
 /* refs backends */
 
+struct ref_store;
+
 /*
  * Initialize the ref_store for the specified submodule, or for the
  * main repository if submodule == NULL. These functions should call
@@ -508,6 +498,15 @@ typedef int create_symref_fn(struct ref_store *ref_store,
                             const char *refs_heads_master,
                             const char *logmsg);
 
+/*
+ * Iterate over the references in the specified ref_store that are
+ * within find_containing_dir(prefix). If prefix is NULL or the empty
+ * string, iterate over all references in the submodule.
+ */
+typedef struct ref_iterator *ref_iterator_begin_fn(
+               struct ref_store *ref_store,
+               const char *prefix, unsigned int flags);
+
 /*
  * Read a reference from the specified reference store, non-recursively.
  * Set type to describe the reference, and:
@@ -566,6 +565,7 @@ struct ref_storage_be {
        peel_ref_fn *peel_ref;
        create_symref_fn *create_symref;
 
+       ref_iterator_begin_fn *iterator_begin;
        read_raw_ref_fn *read_raw_ref;
        verify_refname_available_fn *verify_refname_available;
 };