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

[PATCH v3 20/44] refs-be-files.c: add methods for misc ref operations

From
David Turner <dturner@twopensource.com>
Date
Oct 12, 2015, 21:51 UTC
Message-ID
<1444686725-27660-22-git-send-email-dturner@twopensource.com>
In-Reply-To
<1444686725-27660-1-git-send-email-dturner@twopensource.com>
From: Ronnie Sahlberg <sahlberg@google.com>

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

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: David Turner <dturner@twitter.com>
---
 builtin/init-db.c |  1 +
 cache.h           |  7 +++++++
 refs-be-files.c   | 36 +++++++++++++++++++++++++++---------
 refs.c            | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 refs.h            | 18 ++++++++++++++++++
 5 files changed, 100 insertions(+), 9 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index cf6a3c8..313d13f 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -8,6 +8,7 @@
 #include "builtin.h"
 #include "exec_cmd.h"
 #include "parse-options.h"
+#include "refs.h"
 
 #ifndef DEFAULT_GIT_TEMPLATE_DIR
 #define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates"
diff --git a/cache.h b/cache.h
index 497d296..1c45b62 100644
--- a/cache.h
+++ b/cache.h
@@ -1104,6 +1104,13 @@ extern char *oid_to_hex(const struct object_id *oid);	/* same static buffer as s
 extern int interpret_branch_name(const char *str, int len, struct strbuf *);
 extern int get_sha1_mb(const char *str, unsigned char *sha1);
 
+/*
+ * Return true iff abbrev_name is a possible abbreviation for
+ * full_name according to the rules defined by ref_rev_parse_rules in
+ * refs.c.
+ */
+extern int refname_match(const char *abbrev_name, const char *full_name);
+
 extern int validate_headref(const char *ref);
 
 extern int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
diff --git a/refs-be-files.c b/refs-be-files.c
index 3050f1d..116d72d 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -1386,7 +1386,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;
 	char *submodule;
@@ -1618,8 +1619,10 @@ static const char *resolve_ref_1(const char *refname,
 	}
 }
 
-const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
-			       unsigned char *sha1, int *flags)
+static const char *files_resolve_ref_unsafe(const char *refname,
+					    int resolve_flags,
+					    unsigned char *sha1,
+					    int *flags)
 {
 	static struct strbuf sb_refname = STRBUF_INIT;
 	struct strbuf sb_contents = STRBUF_INIT;
@@ -1721,7 +1724,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];
@@ -2355,7 +2358,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;
 
@@ -2677,8 +2680,16 @@ static int should_autocreate_reflog(const char *refname)
 		!strcmp(refname, "HEAD");
 }
 
-int verify_refname_available(const char *newname, struct string_list *extra,
-			     struct string_list *skip, struct strbuf *err)
+/*
+ * Create a reflog for a ref.  If force_create = 0, the reflog will
+ * only be created for certain refs (those for which
+ * should_autocreate_reflog returns non-zero.  Otherwise, create it
+ * regardless of the ref name.  Fill in *err and return -1 on failure.
+ */
+static int files_verify_refname_available(const char *newname,
+					  struct string_list *extra,
+					  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);
@@ -2913,8 +2924,9 @@ static int commit_ref_update(struct ref_lock *lock,
 	return 0;
 }
 
-int create_symref(const char *ref_target, const char *refs_heads_master,
-		  const char *logmsg)
+static int files_create_symref(const char *ref_target,
+			       const char *refs_heads_master,
+			       const char *logmsg)
 {
 	char *lockpath = NULL;
 	char ref[1000];
@@ -3617,4 +3629,10 @@ struct ref_be refs_be_files = {
 	NULL,
 	"files",
 	files_transaction_commit,
+	files_resolve_ref_unsafe,
+	files_verify_refname_available,
+	files_pack_refs,
+	files_peel_ref,
+	files_create_symref,
+	files_resolve_gitlink_ref,
 };
diff --git a/refs.c b/refs.c
index f930fe0..61d90f5 100644
--- a/refs.c
+++ b/refs.c
@@ -1015,3 +1015,50 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 {
 	return the_refs_backend->transaction_commit(transaction, err);
 }
+
+const char *resolve_ref_unsafe(const char *ref, int resolve_flags,
+			       unsigned char *sha1, int *flags)
+{
+	return the_refs_backend->resolve_ref_unsafe(ref, resolve_flags, sha1,
+						    flags);
+}
+
+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)
+{
+	struct strbuf err = STRBUF_INIT;
+	struct ref_transaction *transaction = ref_transaction_begin(&err);
+	if (!transaction)
+		return -1;
+
+	if (the_refs_backend->create_symref(transaction, ref_target,
+					    refs_heads_master, logmsg))
+		return -1;
+
+	if (ref_transaction_commit(transaction, &err))
+		return -1;
+
+	return 0;
+}
+
+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.h b/refs.h
index 419abf4..ee06a20 100644
--- a/refs.h
+++ b/refs.h
@@ -623,11 +623,29 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,
 typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
 				      struct strbuf *err);
 typedef void ref_transaction_free_fn(struct ref_transaction *transaction);
+typedef const char *resolve_ref_unsafe_fn(const char *ref,
+					  int resolve_flags,
+					  unsigned char *sha1, int *flags);
+typedef int verify_refname_available_fn(const char *refname, struct string_list *extra, struct string_list *skip, struct strbuf *err);
+typedef int pack_refs_fn(unsigned int flags);
+typedef int peel_ref_fn(const char *refname, unsigned char *sha1);
+typedef int create_symref_fn(struct ref_transaction *transaction,
+			     const char *ref_target,
+			     const char *refs_heads_master,
+			     const char *logmsg);
+typedef int resolve_gitlink_ref_fn(const char *path, const char *refname,
+				   unsigned char *sha1);
 
 struct ref_be {
 	struct ref_be *next;
 	const char *name;
 	ref_transaction_commit_fn *transaction_commit;
+	resolve_ref_unsafe_fn *resolve_ref_unsafe;
+	verify_refname_available_fn *verify_refname_available;
+	pack_refs_fn *pack_refs;
+	peel_ref_fn *peel_ref;
+	create_symref_fn *create_symref;
+	resolve_gitlink_ref_fn *resolve_gitlink_ref;
 };
 
 

-- 
2.4.2.644.g97b850b-twtrsrc
Previous: Michael HaggertyNext: Michael Haggerty
Message 39 of 71 in “alternate refs backends”
  1. 00/44 alternate refs backendsDavid Turner, Oct 12, 2015
  2. 01/44 refs.c: create a public version of verify_refname_availableDavid Turner, Oct 12, 2015
  3. Michael HaggertyOct 13, 2015
  4. 02/44 refs: make repack_without_refs and is_branch publicDavid Turner, Oct 12, 2015
  5. Michael HaggertyOct 13, 2015
  6. Michael HaggertyOct 13, 2015
  7. David TurnerOct 13, 2015
  8. 03/44 refs-be-files.c: rename refs to refs-be-filesDavid Turner, Oct 12, 2015
  9. 04/44 refs.c: add a new refs.c file to hold all common refs codeDavid Turner, Oct 12, 2015
  10. 05/44 refs.c: move update_ref to refs.cDavid Turner, Oct 12, 2015
  11. Michael HaggertyOct 13, 2015
  12. David TurnerOct 13, 2015
  13. David TurnerOct 14, 2015
  14. 06/44 refs.c: move delete_ref and delete_refs to the common codeDavid Turner, Oct 12, 2015
  15. Michael HaggertyOct 13, 2015
  16. 07/44 refs.c: move read_ref_at to the common refs fileDavid Turner, Oct 12, 2015
  17. 08/44 refs.c: move the hidden refs functions to the common codeDavid Turner, Oct 12, 2015
  18. 09/44 refs.c: move dwim and friend functions to the common refs codeDavid Turner, Oct 12, 2015
  19. 10/44 refs.c: move warn_if_dangling_symref* to the common codeDavid Turner, Oct 12, 2015
  20. 11/44 refs.c: move read_ref, read_ref_full and ref_exists to the common codeDavid Turner, Oct 12, 2015
  21. 12/44 refs.c: move resolve_refdup to commonDavid Turner, Oct 12, 2015
  22. 13/44 refs.c: move check_refname_format to the common codeDavid Turner, Oct 12, 2015
  23. 14/44 refs.c: move is_branch to the common codeDavid Turner, Oct 12, 2015
  24. 15/44 refs.c: move prettify_refname to the common codeDavid Turner, Oct 12, 2015
  25. 16/44 refs.c: move ref iterators to the common codeDavid Turner, Oct 12, 2015
  26. Michael HaggertyOct 13, 2015
  27. 17/44 refs.c: move head_ref_namespaced to the common codeDavid Turner, Oct 12, 2015
  28. 18/44 refs: move transaction functions into common codeDavid Turner, Oct 12, 2015
  29. Michael HaggertyOct 13, 2015
  30. Michael HaggertyOct 13, 2015
  31. David TurnerOct 13, 2015
  32. David TurnerOct 13, 2015
  33. 19/44 refs: add a backend method structure with transaction functionsDavid Turner, Oct 12, 2015
  34. 19/44 refs-be-files.c: add a backend method structure with transaction functionsDavid Turner, Oct 12, 2015
  35. David TurnerOct 12, 2015
  36. Michael HaggertyOct 13, 2015
  37. David TurnerOct 13, 2015
  38. Michael HaggertyOct 13, 2015
  39. 20/44 refs-be-files.c: add methods for misc ref operationsDavid Turner, Oct 12, 2015
  40. Michael HaggertyOct 13, 2015
  41. 21/44 refs-be-files.c: add methods for the ref iteratorsDavid Turner, Oct 12, 2015
  42. 22/44 refs-be-files.c: add method for for_each_reftype_...David Turner, Oct 12, 2015
  43. 23/44 refs-be-files.c: add do_for_each_per_worktree_refDavid Turner, Oct 12, 2015
  44. 24/44 refs.c: move refname_is_safe to the common codeDavid Turner, Oct 12, 2015
  45. 25/44 refs.h: document make refname_is_safe and add it to headerDavid Turner, Oct 12, 2015
  46. Michael HaggertyOct 13, 2015
  47. Michael HaggertyOct 13, 2015
  48. David TurnerOct 13, 2015
  49. 26/44 refs.c: move copy_msg to the common codeDavid Turner, Oct 12, 2015
  50. Michael HaggertyOct 13, 2015
  51. 27/44 refs.c: move peel_object to the common codeDavid Turner, Oct 12, 2015
  52. Michael HaggertyOct 13, 2015
  53. 28/44 refs.c: move should_autocreate_reflog to common codeDavid Turner, Oct 12, 2015
  54. 29/44 refs.c: add ref backend init functionDavid Turner, Oct 12, 2015
  55. 30/44 refs.c: add methods for reflogDavid Turner, Oct 12, 2015
  56. 31/44 refs.c: add method for initial ref transaction commitDavid Turner, Oct 12, 2015
  57. 32/44 initdb: move safe_create_dir into common codeDavid Turner, Oct 12, 2015
  58. 33/44 refs.c: add method for initializing refs dbDavid Turner, Oct 12, 2015
  59. 34/44 refs-be-files.c: add method to rename refsDavid Turner, Oct 12, 2015
  60. 35/44 refs: make lock genericDavid Turner, Oct 12, 2015
  61. 36/44 refs: make files_log_ref_write functions publicDavid Turner, Oct 12, 2015
  62. 37/44 refs: break out a ref conflict checkDavid Turner, Oct 12, 2015
  63. Michael HaggertyOct 13, 2015
  64. David TurnerOct 13, 2015
  65. 38/44 refs: move duplicate check to common codeDavid Turner, Oct 12, 2015
  66. 39/44 refs: always handle non-normal refs in files backendDavid Turner, Oct 12, 2015
  67. 40/44 refs: allow ref backend to be set for cloneDavid Turner, Oct 12, 2015
  68. 41/44 refs: add register_refs_backendDavid Turner, Oct 12, 2015
  69. 42/44 introduce "extensions" form of core.repositoryformatversionDavid Turner, Oct 12, 2015
  70. 43/44 refs: add LMDB refs backendDavid Turner, Oct 12, 2015
  71. 44/44 refs: tests for db backendDavid Turner, Oct 12, 2015

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.