From: Ronnie Sahlberg <sahlb...@google.com>

Signed-off-by: Ronnie Sahlberg <sahlb...@google.com>
Signed-off-by: David Turner <dtur...@twopensource.com>
---
 refs.c               | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 refs/files-backend.c | 41 +++++++++++++++++++++++++++------------
 refs/refs-internal.h | 29 ++++++++++++++++++++++++++++
 3 files changed, 112 insertions(+), 12 deletions(-)

diff --git a/refs.c b/refs.c
index 9562325..b9b0244 100644
--- a/refs.c
+++ b/refs.c
@@ -1150,3 +1150,57 @@ int resolve_gitlink_ref(const char *path, const char 
*refname,
 {
        return the_refs_backend->resolve_gitlink_ref(path, refname, sha1);
 }
+
+int head_ref(each_ref_fn fn, void *cb_data)
+{
+       return the_refs_backend->head_ref(fn, cb_data);
+}
+
+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+       return the_refs_backend->head_ref_submodule(submodule, fn, cb_data);
+}
+
+int for_each_ref(each_ref_fn fn, void *cb_data)
+{
+       return the_refs_backend->for_each_ref(fn, cb_data);
+}
+
+int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void 
*cb_data)
+{
+       return the_refs_backend->for_each_ref_submodule(submodule, fn, cb_data);
+}
+
+int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
+{
+       return the_refs_backend->for_each_ref_in(prefix, fn, cb_data);
+}
+
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
+                       unsigned int broken)
+{
+       return the_refs_backend->for_each_fullref_in(prefix, fn, cb_data,
+                                                    broken);
+}
+
+int for_each_ref_in_submodule(const char *submodule, const char *prefix,
+                             each_ref_fn fn, void *cb_data)
+{
+       return the_refs_backend->for_each_ref_in_submodule(submodule, prefix,
+                                                          fn, cb_data);
+}
+
+int for_each_rawref(each_ref_fn fn, void *cb_data)
+{
+       return the_refs_backend->for_each_rawref(fn, cb_data);
+}
+
+int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
+{
+       return the_refs_backend->for_each_namespaced_ref(fn, cb_data);
+}
+
+int for_each_replace_ref(each_ref_fn fn, void *cb_data)
+{
+       return the_refs_backend->for_each_replace_ref(fn, cb_data);
+}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 25fba43..d4bd6cf 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1756,32 +1756,36 @@ static int do_head_ref(const char *submodule, 
each_ref_fn fn, void *cb_data)
        return 0;
 }
 
-int head_ref(each_ref_fn fn, void *cb_data)
+static int files_head_ref(each_ref_fn fn, void *cb_data)
 {
        return do_head_ref(NULL, fn, cb_data);
 }
 
-int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+static int files_head_ref_submodule(const char *submodule, each_ref_fn fn,
+                                   void *cb_data)
 {
        return do_head_ref(submodule, fn, cb_data);
 }
 
-int for_each_ref(each_ref_fn fn, void *cb_data)
+static int files_for_each_ref(each_ref_fn fn, void *cb_data)
 {
        return do_for_each_ref(&ref_cache, "", fn, 0, 0, cb_data);
 }
 
-int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void 
*cb_data)
+static int files_for_each_ref_submodule(const char *submodule, each_ref_fn fn,
+                                       void *cb_data)
 {
        return do_for_each_ref(get_ref_cache(submodule), "", fn, 0, 0, cb_data);
 }
 
-int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
+static int files_for_each_ref_in(const char *prefix, each_ref_fn fn,
+                                void *cb_data)
 {
        return do_for_each_ref(&ref_cache, prefix, fn, strlen(prefix), 0, 
cb_data);
 }
 
-int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, 
unsigned int broken)
+static int files_for_each_fullref_in(const char *prefix, each_ref_fn fn,
+                                    void *cb_data, unsigned int broken)
 {
        unsigned int flag = 0;
 
@@ -1790,19 +1794,21 @@ int for_each_fullref_in(const char *prefix, each_ref_fn 
fn, void *cb_data, unsig
        return do_for_each_ref(&ref_cache, prefix, fn, 0, flag, cb_data);
 }
 
-int for_each_ref_in_submodule(const char *submodule, const char *prefix,
-               each_ref_fn fn, void *cb_data)
+static int files_for_each_ref_in_submodule(const char *submodule,
+                                          const char *prefix,
+                                          each_ref_fn fn, void *cb_data)
 {
-       return do_for_each_ref(get_ref_cache(submodule), prefix, fn, 
strlen(prefix), 0, cb_data);
+       return do_for_each_ref(get_ref_cache(submodule), prefix, fn,
+                              strlen(prefix), 0, cb_data);
 }
 
-int for_each_replace_ref(each_ref_fn fn, void *cb_data)
+static int files_for_each_replace_ref(each_ref_fn fn, void *cb_data)
 {
        return do_for_each_ref(&ref_cache, git_replace_ref_base, fn,
                               strlen(git_replace_ref_base), 0, cb_data);
 }
 
-int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
+static int files_for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
 {
        struct strbuf buf = STRBUF_INIT;
        int ret;
@@ -1812,7 +1818,7 @@ int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
        return ret;
 }
 
-int for_each_rawref(each_ref_fn fn, void *cb_data)
+static int files_for_each_rawref(each_ref_fn fn, void *cb_data)
 {
        return do_for_each_ref(&ref_cache, "", fn, 0,
                               DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
@@ -3527,4 +3533,15 @@ struct ref_be refs_be_files = {
        files_resolve_ref_unsafe,
        files_verify_refname_available,
        files_resolve_gitlink_ref,
+
+       files_head_ref,
+       files_head_ref_submodule,
+       files_for_each_ref,
+       files_for_each_ref_submodule,
+       files_for_each_ref_in,
+       files_for_each_fullref_in,
+       files_for_each_ref_in_submodule,
+       files_for_each_rawref,
+       files_for_each_namespaced_ref,
+       files_for_each_replace_ref,
 };
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 236bce9..ad683df 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -216,6 +216,24 @@ typedef int verify_refname_available_fn(const char 
*refname, struct string_list
 typedef int resolve_gitlink_ref_fn(const char *path, const char *refname,
                                   unsigned char *sha1);
 
+/* iteration methods */
+typedef int head_ref_fn(each_ref_fn fn, void *cb_data);
+typedef int head_ref_submodule_fn(const char *submodule, each_ref_fn fn,
+                                 void *cb_data);
+typedef int for_each_ref_fn(each_ref_fn fn, void *cb_data);
+typedef int for_each_ref_submodule_fn(const char *submodule, each_ref_fn fn,
+                                     void *cb_data);
+typedef int for_each_ref_in_fn(const char *prefix, each_ref_fn fn,
+                              void *cb_data);
+typedef int for_each_fullref_in_fn(const char *prefix, each_ref_fn fn,
+                                  void *cb_data, unsigned int broken);
+typedef int for_each_ref_in_submodule_fn(const char *submodule,
+                                        const char *prefix,
+                                        each_ref_fn fn, void *cb_data);
+typedef int for_each_rawref_fn(each_ref_fn fn, void *cb_data);
+typedef int for_each_namespaced_ref_fn(each_ref_fn fn, void *cb_data);
+typedef int for_each_replace_ref_fn(each_ref_fn fn, void *cb_data);
+
 struct ref_be {
        struct ref_be *next;
        const char *name;
@@ -228,6 +246,17 @@ struct ref_be {
        resolve_ref_unsafe_fn *resolve_ref_unsafe;
        verify_refname_available_fn *verify_refname_available;
        resolve_gitlink_ref_fn *resolve_gitlink_ref;
+
+       head_ref_fn *head_ref;
+       head_ref_submodule_fn *head_ref_submodule;
+       for_each_ref_fn *for_each_ref;
+       for_each_ref_submodule_fn *for_each_ref_submodule;
+       for_each_ref_in_fn *for_each_ref_in;
+       for_each_fullref_in_fn *for_each_fullref_in;
+       for_each_ref_in_submodule_fn *for_each_ref_in_submodule;
+       for_each_rawref_fn *for_each_rawref;
+       for_each_namespaced_ref_fn *for_each_namespaced_ref;
+       for_each_replace_ref_fn *for_each_replace_ref;
 };
 
 #endif /* REFS_REFS_INTERNAL_H */
-- 
2.4.2.749.g0ed01d8-twtrsrc

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to