git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v6 06/32] refs: add methods for misc ref operations

From
David Turner <dturner@twopensource.com>
Date
Feb 24, 2016, 22:58 UTC
Message-ID
<1456354744-8022-7-git-send-email-dturner@twopensource.com>
In-Reply-To
<1456354744-8022-1-git-send-email-dturner@twopensource.com>
From: Ronnie Sahlberg <sahlberg@google.com>

Add ref backend methods for: read_raw_ref, verify_refname_available, pack_refs, peel_ref, create_symref, resolve_gitlink_ref.

read_raw_ref becomes static because it's not used outside refs.c
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
 refs.c               | 37 +++++++++++++++++++++++++++++++++++++
 refs/files-backend.c | 33 ++++++++++++++++++++++-----------
 refs/refs-internal.h | 27 +++++++++++++++++++++++----
 3 files changed, 82 insertions(+), 15 deletions(-)
diff --git a/refs.c b/refs.c
index 6d16058..6fd5121 100644
--- a/refs.c
+++ b/refs.c
@@ -1191,6 +1191,14 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)
 			       DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
 }
 
+static int read_raw_ref(const char *refname, unsigned char *sha1,
+			struct strbuf *symref, struct strbuf *sb_path,
+			unsigned int *flags)
+{
+	return the_refs_backend->read_raw_ref(refname, sha1, symref, sb_path,
+					      flags);
+}
+
 /* This function needs to return a meaningful errno on failure */
 static const char *resolve_ref_1(const char *refname,
 				 int resolve_flags,
@@ -1302,3 +1310,32 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 {
 	return the_refs_backend->transaction_commit(transaction, err);
 }
+
+int verify_refname_available(const char *refname, struct string_list *extra,
+			     struct string_list *skip, struct strbuf *err)
+{
+	return the_refs_backend->verify_refname_available(refname, extra, skip, err);
+}
+
+int pack_refs(unsigned int flags)
+{
+	return the_refs_backend->pack_refs(flags);
+}
+
+int peel_ref(const char *refname, unsigned char *sha1)
+{
+	return the_refs_backend->peel_ref(refname, sha1);
+}
+
+int create_symref(const char *ref_target, const char *refs_heads_master,
+		  const char *logmsg)
+{
+	return the_refs_backend->create_symref(ref_target, refs_heads_master,
+					       logmsg);
+}
+
+int resolve_gitlink_ref(const char *path, const char *refname,
+			unsigned char *sha1)
+{
+	return the_refs_backend->resolve_gitlink_ref(path, refname, sha1);
+}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 45b81cd..3a83c0d 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1338,7 +1338,8 @@ static int resolve_gitlink_ref_recursive(struct ref_cache *refs,
 	return resolve_gitlink_ref_recursive(refs, p, sha1, recursion+1);
 }
 
-int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sha1)
+static int files_resolve_gitlink_ref(const char *path, const char *refname,
+				     unsigned char *sha1)
 {
 	int len = strlen(path), retval;
 	struct strbuf submodule = STRBUF_INIT;
@@ -1421,9 +1422,9 @@ static int resolve_missing_loose_ref(const char *refname,
  *
  * sb_path is workspace: the caller should allocate and free it.
  */
-int read_raw_ref(const char *refname, unsigned char *sha1,
-		 struct strbuf *symref, struct strbuf *sb_path,
-		 unsigned int *flags)
+static int files_read_raw_ref(const char *refname, unsigned char *sha1,
+			      struct strbuf *symref, struct strbuf *sb_path,
+			      unsigned int *flags)
 {
 	struct strbuf sb_contents = STRBUF_INIT;
 	int ret = -1;
@@ -1576,7 +1577,7 @@ static enum peel_status peel_entry(struct ref_entry *entry, int repeel)
 	return status;
 }
 
-int peel_ref(const char *refname, unsigned char *sha1)
+static int files_peel_ref(const char *refname, unsigned char *sha1)
 {
 	int flag;
 	unsigned char base[20];
@@ -2136,7 +2137,7 @@ static void prune_refs(struct ref_to_prune *r)
 	}
 }
 
-int pack_refs(unsigned int flags)
+static int files_pack_refs(unsigned int flags)
 {
 	struct pack_refs_cb_data cbdata;
 
@@ -2327,10 +2328,10 @@ out:
 	return ret;
 }
 
-int verify_refname_available(const char *newname,
-			     struct string_list *extras,
-			     struct string_list *skip,
-			     struct strbuf *err)
+static int files_verify_refname_available(const char *newname,
+					  struct string_list *extras,
+					  struct string_list *skip,
+					  struct strbuf *err)
 {
 	struct ref_dir *packed_refs = get_packed_refs(&ref_cache);
 	struct ref_dir *loose_refs = get_loose_refs(&ref_cache);
@@ -2750,7 +2751,9 @@ static int create_symref_locked(struct ref_lock *lock, const char *refname,
 	return 0;
 }
 
-int create_symref(const char *refname, const char *target, const char *logmsg)
+static int files_create_symref(const char *refname,
+			       const char *target,
+			       const char *logmsg)
 {
 	struct strbuf err = STRBUF_INIT;
 	struct ref_lock *lock;
@@ -3404,4 +3407,12 @@ struct ref_storage_be refs_be_files = {
 	NULL,
 	"files",
 	files_transaction_commit,
+
+	files_pack_refs,
+	files_peel_ref,
+	files_create_symref,
+
+	files_read_raw_ref,
+	files_verify_refname_available,
+	files_resolve_gitlink_ref,
 };
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 62ba0c0..c5f5ef7 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -209,18 +209,37 @@ int rename_ref_available(const char *oldname, const char *newname);
 int do_for_each_ref(const char *submodule, const char *base,
 		    each_ref_fn fn, int trim, int flags, void *cb_data);
 
-int read_raw_ref(const char *refname, unsigned char *sha1,
-		 struct strbuf *symref, struct strbuf *sb_path,
-		 unsigned int *flags);
-
 /* refs backends */
 typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
 				      struct strbuf *err);
 
+/* misc methods */
+typedef int pack_refs_fn(unsigned int flags);
+typedef int peel_ref_fn(const char *refname, unsigned char *sha1);
+typedef int create_symref_fn(const char *ref_target,
+			     const char *refs_heads_master,
+			     const char *logmsg);
+
+/* resolution methods */
+typedef int read_raw_ref_fn(const char *refname, unsigned char *sha1,
+			    struct strbuf *symref, struct strbuf *sb_path,
+			    unsigned int *flags);
+typedef int verify_refname_available_fn(const char *refname, struct string_list *extra, struct string_list *skip, struct strbuf *err);
+typedef int resolve_gitlink_ref_fn(const char *path, const char *refname,
+				   unsigned char *sha1);
+
 struct ref_storage_be {
 	struct ref_storage_be *next;
 	const char *name;
 	ref_transaction_commit_fn *transaction_commit;
+
+	pack_refs_fn *pack_refs;
+	peel_ref_fn *peel_ref;
+	create_symref_fn *create_symref;
+
+	read_raw_ref_fn *read_raw_ref;
+	verify_refname_available_fn *verify_refname_available;
+	resolve_gitlink_ref_fn *resolve_gitlink_ref;
 };
 
 extern struct ref_storage_be refs_be_files;

-- 
2.4.2.767.g62658d5-twtrsrc
Previous: David TurnerNext: David Turner
Message 14 of 56 in “refs backend”
  1. 00/32 refs backendDavid Turner, Feb 24, 2016
  2. 01/32 refs: move head_ref{,_submodule} to the common codeDavid Turner, Feb 24, 2016
  3. 02/32 refs: move for_each_*ref* functions into common codeDavid Turner, Feb 24, 2016
  4. 03/32 files-backend: break out ref readingDavid Turner, Feb 24, 2016
  5. Junio C HamanoFeb 25, 2016
  6. Junio C HamanoFeb 25, 2016
  7. David TurnerFeb 25, 2016
  8. Junio C HamanoFeb 25, 2016
  9. 04/32 refs: move resolve_ref_unsafe into common codeDavid Turner, Feb 24, 2016
  10. Junio C HamanoFeb 25, 2016
  11. 05/32 refs: add a backend method structure with transaction functionsDavid Turner, Feb 24, 2016
  12. Jeff KingFeb 27, 2016
  13. David TurnerFeb 29, 2016
  14. 06/32 refs: add methods for misc ref operationsDavid Turner, Feb 24, 2016
  15. 07/32 refs: add method for do_for_each_refDavid Turner, Feb 24, 2016
  16. 08/32 refs: reduce the visibility of do_for_each_ref()David Turner, Feb 24, 2016
  17. 09/32 refs: add do_for_each_per_worktree_refDavid Turner, Feb 24, 2016
  18. 10/32 refs: add methods for reflogDavid Turner, Feb 24, 2016
  19. 11/32 refs: add method for initial ref transaction commitDavid Turner, Feb 24, 2016
  20. 12/32 refs: add method for delete_refsDavid Turner, Feb 24, 2016
  21. 13/32 refs: add methods to init refs dbDavid Turner, Feb 24, 2016
  22. 14/32 refs: add method to rename refsDavid Turner, Feb 24, 2016
  23. 15/32 refs: handle non-normal ref renamesDavid Turner, Feb 24, 2016
  24. 16/32 refs: make lock genericDavid Turner, Feb 24, 2016
  25. 17/32 refs: move duplicate check to common codeDavid Turner, Feb 24, 2016
  26. 18/32 refs: allow log-only updatesDavid Turner, Feb 24, 2016
  27. 19/32 refs: don't dereference on renameDavid Turner, Feb 24, 2016
  28. 20/32 refs: on symref reflog expire, lock symref not referrentDavid Turner, Feb 24, 2016
  29. 21/32 refs: resolve symbolic refs firstDavid Turner, Feb 24, 2016
  30. 22/32 refs: always handle non-normal refs in files backendDavid Turner, Feb 24, 2016
  31. 23/32 init: allow alternate ref strorage to be set for new reposDavid Turner, Feb 24, 2016
  32. 24/32 refs: check submodules' ref storage configDavid Turner, Feb 24, 2016
  33. 25/32 clone: allow ref storage backend to be set for cloneDavid Turner, Feb 24, 2016
  34. 26/32 svn: learn ref-storage argumentDavid Turner, Feb 24, 2016
  35. 27/32 refs: register ref storage backendsDavid Turner, Feb 24, 2016
  36. 28/32 config: read ref storage config on startupDavid Turner, Feb 24, 2016
  37. Jeff KingFeb 27, 2016
  38. Jeff KingFeb 27, 2016
  39. David TurnerFeb 29, 2016
  40. Jeff KingFeb 29, 2016
  41. David TurnerFeb 29, 2016
  42. Jeff KingFeb 29, 2016
  43. Jeff KingFeb 29, 2016
  44. David TurnerFeb 29, 2016
  45. 29/32 refs: break out resolve_ref_unsafe_submoduleDavid Turner, Feb 24, 2016
  46. 30/32 refs: add LMDB refs storage backendDavid Turner, Feb 24, 2016
  47. 31/32 refs: tests for lmdb backendDavid Turner, Feb 24, 2016
  48. 32/32 tests: add ref-storage argumentDavid Turner, Feb 24, 2016
  49. SZEDER GáborFeb 29, 2016
  50. David TurnerFeb 29, 2016
  51. Ramsay JonesFeb 25, 2016
  52. David TurnerFeb 25, 2016
  53. Duy NguyenFeb 25, 2016
  54. David TurnerFeb 25, 2016
  55. Stefan BellerFeb 25, 2016
  56. Duy NguyenFeb 25, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.