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

[PATCH v6 10/32] refs: add methods for reflog

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

In the file-based backend, the reflog piggybacks on the ref lock. Since other backends won't have the same sort of ref lock, ref backends must also handle reflogs.

Signed-off-by: Ronnie Sahlberg <rsahlberg@google.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
 refs.c               | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 refs/files-backend.c | 36 ++++++++++++++++++++++++------------
 refs/refs-internal.h | 27 +++++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 12 deletions(-)
diff --git a/refs.c b/refs.c
index abc5b0d..9f06686 100644
--- a/refs.c
+++ b/refs.c
@@ -1350,3 +1350,49 @@ int resolve_gitlink_ref(const char *path, const char *refname,
 {
 	return the_refs_backend->resolve_gitlink_ref(path, refname, sha1);
 }
+
+int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn,
+				void *cb_data)
+{
+	return the_refs_backend->for_each_reflog_ent_reverse(refname, fn,
+							     cb_data);
+}
+
+int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn,
+			void *cb_data)
+{
+	return the_refs_backend->for_each_reflog_ent(refname, fn, cb_data);
+}
+
+int for_each_reflog(each_ref_fn fn, void *cb_data)
+{
+	return the_refs_backend->for_each_reflog(fn, cb_data);
+}
+
+int reflog_exists(const char *refname)
+{
+	return the_refs_backend->reflog_exists(refname);
+}
+
+int safe_create_reflog(const char *refname, int force_create,
+		       struct strbuf *err)
+{
+	return the_refs_backend->create_reflog(refname, force_create, err);
+}
+
+int delete_reflog(const char *refname)
+{
+	return the_refs_backend->delete_reflog(refname);
+}
+
+int reflog_expire(const char *refname, const unsigned char *sha1,
+		  unsigned int flags,
+		  reflog_expiry_prepare_fn prepare_fn,
+		  reflog_expiry_should_prune_fn should_prune_fn,
+		  reflog_expiry_cleanup_fn cleanup_fn,
+		  void *policy_cb_data)
+{
+	return the_refs_backend->reflog_expire(refname, sha1, flags,
+					       prepare_fn, should_prune_fn,
+					       cleanup_fn, policy_cb_data);
+}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index d315f40..5e44b10 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2533,7 +2533,8 @@ static int log_ref_setup(const char *refname, struct strbuf *logfile, struct str
 }
 
 
-int safe_create_reflog(const char *refname, int force_create, struct strbuf *err)
+static int files_create_reflog(const char *refname, int force_create,
+			       struct strbuf *err)
 {
 	int ret;
 	struct strbuf sb = STRBUF_INIT;
@@ -2789,7 +2790,7 @@ static int files_create_symref(const char *refname,
 	return ret;
 }
 
-int reflog_exists(const char *refname)
+static int files_reflog_exists(const char *refname)
 {
 	struct stat st;
 
@@ -2797,7 +2798,7 @@ int reflog_exists(const char *refname)
 		S_ISREG(st.st_mode);
 }
 
-int delete_reflog(const char *refname)
+static int files_delete_reflog(const char *refname)
 {
 	return remove_path(git_path("logs/%s", refname));
 }
@@ -2841,7 +2842,9 @@ static char *find_beginning_of_line(char *bob, char *scan)
 	return scan;
 }
 
-int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void *cb_data)
+static int files_for_each_reflog_ent_reverse(const char *refname,
+					     each_reflog_ent_fn fn,
+					     void *cb_data)
 {
 	struct strbuf sb = STRBUF_INIT;
 	FILE *logfp;
@@ -2943,7 +2946,8 @@ int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void
 	return ret;
 }
 
-int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_data)
+static int files_for_each_reflog_ent(const char *refname,
+				     each_reflog_ent_fn fn, void *cb_data)
 {
 	FILE *logfp;
 	struct strbuf sb = STRBUF_INIT;
@@ -3005,7 +3009,7 @@ static int do_for_each_reflog(struct strbuf *name, each_ref_fn fn, void *cb_data
 	return retval;
 }
 
-int for_each_reflog(each_ref_fn fn, void *cb_data)
+static int files_for_each_reflog(each_ref_fn fn, void *cb_data)
 {
 	int retval;
 	struct strbuf name;
@@ -3315,12 +3319,12 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
 	return 0;
 }
 
-int reflog_expire(const char *refname, const unsigned char *sha1,
-		 unsigned int flags,
-		 reflog_expiry_prepare_fn prepare_fn,
-		 reflog_expiry_should_prune_fn should_prune_fn,
-		 reflog_expiry_cleanup_fn cleanup_fn,
-		 void *policy_cb_data)
+static int files_reflog_expire(const char *refname, const unsigned char *sha1,
+			       unsigned int flags,
+			       reflog_expiry_prepare_fn prepare_fn,
+			       reflog_expiry_should_prune_fn should_prune_fn,
+			       reflog_expiry_cleanup_fn cleanup_fn,
+			       void *policy_cb_data)
 {
 	static struct lock_file reflog_lock;
 	struct expire_reflog_cb cb;
@@ -3425,6 +3429,14 @@ struct ref_storage_be refs_be_files = {
 	"files",
 	files_transaction_commit,
 
+	files_for_each_reflog_ent,
+	files_for_each_reflog_ent_reverse,
+	files_for_each_reflog,
+	files_reflog_exists,
+	files_create_reflog,
+	files_delete_reflog,
+	files_reflog_expire,
+
 	files_pack_refs,
 	files_peel_ref,
 	files_create_symref,
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index bb0d588..c92e0c3 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -214,6 +214,25 @@ int do_for_each_per_worktree_ref(const char *submodule, const char *base,
 typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
 				      struct strbuf *err);
 
+/* reflog functions */
+typedef int for_each_reflog_ent_fn(const char *refname,
+				   each_reflog_ent_fn fn,
+				   void *cb_data);
+typedef int for_each_reflog_ent_reverse_fn(const char *refname,
+					   each_reflog_ent_fn fn,
+					   void *cb_data);
+typedef int for_each_reflog_fn(each_ref_fn fn, void *cb_data);
+typedef int reflog_exists_fn(const char *refname);
+typedef int create_reflog_fn(const char *refname, int force_create,
+			     struct strbuf *err);
+typedef int delete_reflog_fn(const char *refname);
+typedef int reflog_expire_fn(const char *refname, const unsigned char *sha1,
+			     unsigned int flags,
+			     reflog_expiry_prepare_fn prepare_fn,
+			     reflog_expiry_should_prune_fn should_prune_fn,
+			     reflog_expiry_cleanup_fn cleanup_fn,
+			     void *policy_cb_data);
+
 /* misc methods */
 typedef int pack_refs_fn(unsigned int flags);
 typedef int peel_ref_fn(const char *refname, unsigned char *sha1);
@@ -237,6 +256,14 @@ struct ref_storage_be {
 	const char *name;
 	ref_transaction_commit_fn *transaction_commit;
 
+	for_each_reflog_ent_fn *for_each_reflog_ent;
+	for_each_reflog_ent_reverse_fn *for_each_reflog_ent_reverse;
+	for_each_reflog_fn *for_each_reflog;
+	reflog_exists_fn *reflog_exists;
+	create_reflog_fn *create_reflog;
+	delete_reflog_fn *delete_reflog;
+	reflog_expire_fn *reflog_expire;
+
 	pack_refs_fn *pack_refs;
 	peel_ref_fn *peel_ref;
 	create_symref_fn *create_symref;

-- 
2.4.2.767.g62658d5-twtrsrc
Previous: David TurnerNext: David Turner
Message 18 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.