From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu, pclouds@gmail.com
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v6 09/32] refs: add do_for_each_per_worktree_ref
Date: Wed, 24 Feb 2016 17:58:41 -0500 [thread overview]
Message-ID: <1456354744-8022-10-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1456354744-8022-1-git-send-email-dturner@twopensource.com>
Alternate refs backends might still use files to store per-worktree
refs. So the files backend's ref-loading infrastructure should be
available to those backends, just for use on per-worktree refs. Add
do_for_each_per_worktree_ref, which iterates over per-worktree refs.
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs/files-backend.c | 16 ++++++++++++++++
refs/refs-internal.h | 7 +++++++
2 files changed, 23 insertions(+)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index db9e948..d315f40 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -565,6 +565,10 @@ static int do_one_ref(struct ref_entry *entry, void *cb_data)
struct ref_entry *old_current_ref;
int retval;
+ if (data->flags & DO_FOR_EACH_PER_WORKTREE_ONLY &&
+ ref_type(entry->name) != REF_TYPE_PER_WORKTREE)
+ return 0;
+
if (!starts_with(entry->name, data->base))
return 0;
@@ -1701,6 +1705,18 @@ static int files_do_for_each_ref(const char *submodule, const char *base,
return do_for_each_entry(refs, base, do_one_ref, &data);
}
+int do_for_each_per_worktree_ref(const char *submodule, const char *base,
+ each_ref_fn fn, int trim, int flags,
+ void *cb_data)
+{
+ /*
+ * It's important that this one use the files backend, since
+ * that's what controls the per-worktree refs
+ */
+ return files_do_for_each_ref(submodule, base, fn, trim,
+ flags | DO_FOR_EACH_PER_WORKTREE_ONLY, cb_data);
+}
+
static void unlock_ref(struct ref_lock *lock)
{
/* Do not free lock->lk -- atexit() still looks at them */
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 3702737..bb0d588 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -203,6 +203,13 @@ int rename_ref_available(const char *oldname, const char *newname);
/* Include broken references in a do_for_each_ref*() iteration: */
#define DO_FOR_EACH_INCLUDE_BROKEN 0x01
+/* Only include per-worktree refs in a do_for_each_ref*() iteration */
+#define DO_FOR_EACH_PER_WORKTREE_ONLY 0x02
+
+int do_for_each_per_worktree_ref(const char *submodule, const char *base,
+ each_ref_fn fn, int trim, int flags,
+ void *cb_data);
+
/* refs backends */
typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
struct strbuf *err);
--
2.4.2.767.g62658d5-twtrsrc
next prev parent reply other threads:[~2016-02-24 22:59 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 22:58 [PATCH v6 00/32] refs backend David Turner
2016-02-24 22:58 ` [PATCH v6 01/32] refs: move head_ref{,_submodule} to the common code David Turner
2016-02-24 22:58 ` [PATCH v6 02/32] refs: move for_each_*ref* functions into " David Turner
2016-02-24 22:58 ` [PATCH v6 03/32] files-backend: break out ref reading David Turner
2016-02-25 0:21 ` Junio C Hamano
2016-02-25 0:51 ` Junio C Hamano
2016-02-25 20:11 ` David Turner
2016-02-25 20:27 ` Junio C Hamano
2016-02-24 22:58 ` [PATCH v6 04/32] refs: move resolve_ref_unsafe into common code David Turner
2016-02-25 0:22 ` Junio C Hamano
2016-02-24 22:58 ` [PATCH v6 05/32] refs: add a backend method structure with transaction functions David Turner
2016-02-27 4:06 ` Jeff King
2016-02-29 20:43 ` David Turner
2016-02-24 22:58 ` [PATCH v6 06/32] refs: add methods for misc ref operations David Turner
2016-02-24 22:58 ` [PATCH v6 07/32] refs: add method for do_for_each_ref David Turner
2016-02-24 22:58 ` [PATCH v6 08/32] refs: reduce the visibility of do_for_each_ref() David Turner
2016-02-24 22:58 ` David Turner [this message]
2016-02-24 22:58 ` [PATCH v6 10/32] refs: add methods for reflog David Turner
2016-02-24 22:58 ` [PATCH v6 11/32] refs: add method for initial ref transaction commit David Turner
2016-02-24 22:58 ` [PATCH v6 12/32] refs: add method for delete_refs David Turner
2016-02-24 22:58 ` [PATCH v6 13/32] refs: add methods to init refs db David Turner
2016-02-24 22:58 ` [PATCH v6 14/32] refs: add method to rename refs David Turner
2016-02-24 22:58 ` [PATCH v6 15/32] refs: handle non-normal ref renames David Turner
2016-02-24 22:58 ` [PATCH v6 16/32] refs: make lock generic David Turner
2016-02-24 22:58 ` [PATCH v6 17/32] refs: move duplicate check to common code David Turner
2016-02-24 22:58 ` [PATCH v6 18/32] refs: allow log-only updates David Turner
2016-02-24 22:58 ` [PATCH v6 19/32] refs: don't dereference on rename David Turner
2016-02-24 22:58 ` [PATCH v6 20/32] refs: on symref reflog expire, lock symref not referrent David Turner
2016-02-24 22:58 ` [PATCH v6 21/32] refs: resolve symbolic refs first David Turner
2016-02-24 22:58 ` [PATCH v6 22/32] refs: always handle non-normal refs in files backend David Turner
2016-02-24 22:58 ` [PATCH v6 23/32] init: allow alternate ref strorage to be set for new repos David Turner
2016-02-24 22:58 ` [PATCH v6 24/32] refs: check submodules' ref storage config David Turner
2016-02-24 22:58 ` [PATCH v6 25/32] clone: allow ref storage backend to be set for clone David Turner
2016-02-24 22:58 ` [PATCH v6 26/32] svn: learn ref-storage argument David Turner
2016-02-24 22:58 ` [PATCH v6 27/32] refs: register ref storage backends David Turner
2016-02-24 22:59 ` [PATCH v6 28/32] config: read ref storage config on startup David Turner
2016-02-27 3:56 ` Jeff King
2016-02-27 4:14 ` Jeff King
2016-02-29 21:57 ` David Turner
2016-02-29 22:13 ` Jeff King
2016-02-29 21:57 ` David Turner
2016-02-29 22:10 ` Jeff King
2016-02-29 22:21 ` Jeff King
2016-02-29 22:59 ` David Turner
2016-02-24 22:59 ` [PATCH v6 29/32] refs: break out resolve_ref_unsafe_submodule David Turner
2016-02-24 22:59 ` [PATCH v6 30/32] refs: add LMDB refs storage backend David Turner
2016-02-24 22:59 ` [PATCH v6 31/32] refs: tests for lmdb backend David Turner
2016-02-24 22:59 ` [PATCH v6 32/32] tests: add ref-storage argument David Turner
2016-02-29 22:52 ` SZEDER Gábor
2016-02-29 23:50 ` David Turner
2016-02-25 0:08 ` [PATCH v6 00/32] refs backend Ramsay Jones
2016-02-25 19:32 ` David Turner
2016-02-25 12:57 ` Duy Nguyen
2016-02-25 19:27 ` David Turner
2016-02-25 19:31 ` Stefan Beller
2016-02-25 20:31 ` Duy Nguyen
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=1456354744-8022-10-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@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).