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

[PATCH v3 05/20] refs: add methods for reflog

From
David Turner <dturner@twopensource.com>
Date
Jan 14, 2016, 16:26 UTC
Message-ID
<1452788777-24954-6-git-send-email-dturner@twopensource.com>
In-Reply-To
<1452788777-24954-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 9c2caa7..36b4666 100644
--- a/refs.c
+++ b/refs.c
@@ -1201,3 +1201,49 @@ int for_each_replace_ref(each_ref_fn fn, void *cb_data)
 {
 	return the_refs_backend->for_each_replace_ref(fn, cb_data);
 }
+
+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 68f310e..f13b111 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2649,7 +2649,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;
@@ -2905,7 +2906,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;
 
@@ -2913,7 +2914,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));
 }
@@ -2957,7 +2958,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;
@@ -3059,7 +3062,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;
@@ -3121,7 +3125,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;
@@ -3431,12 +3435,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;
@@ -3541,6 +3545,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 d3cc8d0..87f2274 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -211,6 +211,25 @@ int rename_ref_available(const char *oldname, const char *newname);
 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);
@@ -249,6 +268,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.749.g730654d-twtrsrc
Previous: David TurnerNext: David Turner
Message 6 of 49 in “refs backend rebase on pu”
  1. 00/20 refs backend rebase on puDavid Turner, Jan 14, 2016
  2. 01/20 refs: add a backend method structure with transaction functionsDavid Turner, Jan 14, 2016
  3. 02/20 refs: add methods for misc ref operationsDavid Turner, Jan 14, 2016
  4. 03/20 refs: add methods for the ref iteratorsDavid Turner, Jan 14, 2016
  5. 04/20 refs: add do_for_each_per_worktree_refDavid Turner, Jan 14, 2016
  6. 05/20 refs: add methods for reflogDavid Turner, Jan 14, 2016
  7. 06/20 refs: add method for initial ref transaction commitDavid Turner, Jan 14, 2016
  8. 07/20 refs: add method for delete_refsDavid Turner, Jan 14, 2016
  9. 08/20 refs: add methods to init refs dbDavid Turner, Jan 14, 2016
  10. 09/20 refs: add method to rename refsDavid Turner, Jan 14, 2016
  11. 10/20 refs: make lock genericDavid Turner, Jan 14, 2016
  12. 11/20 refs: move duplicate check to common codeDavid Turner, Jan 14, 2016
  13. 12/20 refs: allow log-only updatesDavid Turner, Jan 14, 2016
  14. 13/20 refs: resolve symbolic refs firstDavid Turner, Jan 14, 2016
  15. Jeff KingFeb 4, 2016
  16. David TurnerFeb 4, 2016
  17. 14/20 refs: always handle non-normal refs in files backendDavid Turner, Jan 14, 2016
  18. 15/20 init: allow alternate backends to be set for new reposDavid Turner, Jan 14, 2016
  19. SZEDER GáborJan 15, 2016
  20. Thomas GummererJan 15, 2016
  21. David TurnerJan 19, 2016
  22. Duy NguyenFeb 4, 2016
  23. David TurnerFeb 4, 2016
  24. 16/20 refs: check submodules ref storage configDavid Turner, Jan 14, 2016
  25. 17/20 refs: allow ref backend to be set for cloneDavid Turner, Jan 14, 2016
  26. SZEDER GáborJan 15, 2016
  27. David TurnerJan 19, 2016
  28. SZEDER GáborJan 21, 2016
  29. 18/20 svn: learn ref-storage argumentDavid Turner, Jan 14, 2016
  30. SZEDER GáborJan 15, 2016
  31. 19/20 refs: add LMDB refs backendDavid Turner, Jan 14, 2016
  32. Thomas GummererJan 15, 2016
  33. David TurnerJan 19, 2016
  34. Duy NguyenFeb 4, 2016
  35. David TurnerFeb 4, 2016
  36. 20/20 refs: tests for lmdb backendDavid Turner, Jan 14, 2016
  37. David TurnerFeb 2, 2016
  38. Junio C HamanoFeb 2, 2016
  39. Junio C HamanoFeb 4, 2016
  40. David TurnerFeb 4, 2016
  41. Ramsay JonesFeb 4, 2016
  42. Jeff KingFeb 4, 2016
  43. David TurnerFeb 4, 2016
  44. Duy NguyenFeb 4, 2016
  45. David TurnerFeb 4, 2016
  46. Duy NguyenFeb 4, 2016
  47. David TurnerFeb 4, 2016
  48. Ramsay JonesFeb 4, 2016
  49. David TurnerFeb 4, 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.