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

[PATCH v2 05/43] refs.c: move update_ref to refs.c

From
David Turner <dturner@twopensource.com>
Date
Sep 28, 2015, 22:01 UTC
Message-ID
<1443477738-32023-6-git-send-email-dturner@twopensource.com>
In-Reply-To
<1443477738-32023-1-git-send-email-dturner@twopensource.com>
From: Ronnie Sahlberg <sahlberg@google.com>

Move update_ref() to the refs.c file since this function does not contain any backend specific code. Move the ref classifier functions as well, since update_ref depends on them.

Based on Ronnie Sahlberg's patch
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
 refs-be-files.c | 117 +-------------------------------------------------------
 refs.c          | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 2741cc5..2e8079e 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -2687,8 +2687,6 @@ struct pack_refs_cb_data {
 	struct ref_to_prune *ref_to_prune;
 };
 
-static int is_per_worktree_ref(const char *refname);
-
 /*
  * An each_ref_entry_fn that is run over loose references only.  If
  * the loose reference can be packed, add an entry in the packed ref
@@ -2703,7 +2701,7 @@ static int pack_if_possible_fn(struct ref_entry *entry, void *cb_data)
 	int is_tag_ref = starts_with(entry->name, "refs/tags/");
 
 	/* Do not pack per-worktree refs: */
-	if (is_per_worktree_ref(entry->name))
+	if (ref_type(entry->name) == REF_TYPE_PER_WORKTREE)
 		return 0;
 
 	/* ALWAYS pack tags */
@@ -2891,77 +2889,6 @@ static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)
 	return 0;
 }
 
-static int is_per_worktree_ref(const char *refname)
-{
-	return !strcmp(refname, "HEAD") ||
-		starts_with(refname, "refs/bisect/");
-}
-
-static int is_pseudoref_syntax(const char *refname)
-{
-	const char *c;
-
-	for (c = refname; *c; c++) {
-		if (!isupper(*c) && *c != '-' && *c != '_')
-			return 0;
-	}
-
-	return 1;
-}
-
-enum ref_type ref_type(const char *refname)
-{
-	if (is_per_worktree_ref(refname))
-		return REF_TYPE_PER_WORKTREE;
-	if (is_pseudoref_syntax(refname))
-		return REF_TYPE_PSEUDOREF;
-       return REF_TYPE_NORMAL;
-}
-
-static int write_pseudoref(const char *pseudoref, const unsigned char *sha1,
-			   const unsigned char *old_sha1, struct strbuf *err)
-{
-	const char *filename;
-	int fd;
-	static struct lock_file lock;
-	struct strbuf buf = STRBUF_INIT;
-	int ret = -1;
-
-	strbuf_addf(&buf, "%s\n", sha1_to_hex(sha1));
-
-	filename = git_path("%s", pseudoref);
-	fd = hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);
-	if (fd < 0) {
-		strbuf_addf(err, "Could not open '%s' for writing: %s",
-			    filename, strerror(errno));
-		return -1;
-	}
-
-	if (old_sha1) {
-		unsigned char actual_old_sha1[20];
-
-		if (read_ref(pseudoref, actual_old_sha1))
-			die("could not read ref '%s'", pseudoref);
-		if (hashcmp(actual_old_sha1, old_sha1)) {
-			strbuf_addf(err, "Unexpected sha1 when writing %s", pseudoref);
-			rollback_lock_file(&lock);
-			goto done;
-		}
-	}
-
-	if (write_in_full(fd, buf.buf, buf.len) != buf.len) {
-		strbuf_addf(err, "Could not write to '%s'", filename);
-		rollback_lock_file(&lock);
-		goto done;
-	}
-
-	commit_lock_file(&lock);
-	ret = 0;
-done:
-	strbuf_release(&buf);
-	return ret;
-}
-
 static int delete_pseudoref(const char *pseudoref, const unsigned char *old_sha1)
 {
 	static struct lock_file lock;
@@ -4110,48 +4037,6 @@ int ref_transaction_verify(struct ref_transaction *transaction,
 				      flags, NULL, err);
 }
 
-int update_ref(const char *msg, const char *refname,
-	       const unsigned char *new_sha1, const unsigned char *old_sha1,
-	       unsigned int flags, enum action_on_err onerr)
-{
-	struct ref_transaction *t = NULL;
-	struct strbuf err = STRBUF_INIT;
-	int ret = 0;
-
-	if (ref_type(refname) == REF_TYPE_PSEUDOREF) {
-		ret = write_pseudoref(refname, new_sha1, old_sha1, &err);
-	} else {
-		t = ref_transaction_begin(&err);
-		if (!t ||
-		    ref_transaction_update(t, refname, new_sha1, old_sha1,
-					   flags, msg, &err) ||
-		    ref_transaction_commit(t, &err)) {
-			ret = 1;
-			ref_transaction_free(t);
-		}
-	}
-	if (ret) {
-		const char *str = "update_ref failed for ref '%s': %s";
-
-		switch (onerr) {
-		case UPDATE_REFS_MSG_ON_ERR:
-			error(str, refname, err.buf);
-			break;
-		case UPDATE_REFS_DIE_ON_ERR:
-			die(str, refname, err.buf);
-			break;
-		case UPDATE_REFS_QUIET_ON_ERR:
-			break;
-		}
-		strbuf_release(&err);
-		return 1;
-	}
-	strbuf_release(&err);
-	if (t)
-		ref_transaction_free(t);
-	return 0;
-}
-
 static int ref_update_reject_duplicates(struct string_list *refnames,
 					struct strbuf *err)
 {
diff --git a/refs.c b/refs.c
index 77492ff..2d10708 100644
--- a/refs.c
+++ b/refs.c
@@ -1,3 +1,118 @@
 /*
  * Common refs code for all backends.
  */
+#include "cache.h"
+#include "refs.h"
+#include "lockfile.h"
+
+static int is_per_worktree_ref(const char *refname)
+{
+	return !strcmp(refname, "HEAD") ||
+		starts_with(refname, "refs/bisect/");
+}
+
+static int is_pseudoref_syntax(const char *refname)
+{
+	const char *c;
+
+	for (c = refname; *c; c++) {
+		if (!isupper(*c) && *c != '-' && *c != '_')
+			return 0;
+	}
+
+	return 1;
+}
+
+enum ref_type ref_type(const char *refname)
+{
+	if (is_per_worktree_ref(refname))
+		return REF_TYPE_PER_WORKTREE;
+	if (is_pseudoref_syntax(refname))
+		return REF_TYPE_PSEUDOREF;
+       return REF_TYPE_NORMAL;
+}
+
+static int write_pseudoref(const char *pseudoref, const unsigned char *sha1,
+			   const unsigned char *old_sha1, struct strbuf *err)
+{
+	const char *filename;
+	int fd;
+	static struct lock_file lock;
+	struct strbuf buf = STRBUF_INIT;
+	int ret = -1;
+
+	strbuf_addf(&buf, "%s\n", sha1_to_hex(sha1));
+
+	filename = git_path("%s", pseudoref);
+	fd = hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);
+	if (fd < 0) {
+		strbuf_addf(err, "Could not open '%s' for writing: %s",
+			    filename, strerror(errno));
+		return -1;
+	}
+
+	if (old_sha1) {
+		unsigned char actual_old_sha1[20];
+		read_ref(pseudoref, actual_old_sha1);
+		if (hashcmp(actual_old_sha1, old_sha1)) {
+			strbuf_addf(err, "Unexpected sha1 when writing %s", pseudoref);
+			rollback_lock_file(&lock);
+			goto done;
+		}
+	}
+
+	if (write_in_full(fd, buf.buf, buf.len) != buf.len) {
+		strbuf_addf(err, "Could not write to '%s'", filename);
+		rollback_lock_file(&lock);
+		goto done;
+	}
+
+	commit_lock_file(&lock);
+	ret = 0;
+done:
+	strbuf_release(&buf);
+	return ret;
+}
+
+int update_ref(const char *msg, const char *refname,
+	       const unsigned char *new_sha1, const unsigned char *old_sha1,
+	       unsigned int flags, enum action_on_err onerr)
+{
+	struct ref_transaction *t = NULL;
+	struct strbuf err = STRBUF_INIT;
+	int ret = 0;
+
+	if (ref_type(refname) == REF_TYPE_PSEUDOREF) {
+		ret = write_pseudoref(refname, new_sha1, old_sha1, &err);
+	} else {
+		t = ref_transaction_begin(&err);
+		if (!t ||
+		    ref_transaction_update(t, refname, new_sha1, old_sha1,
+					   flags, msg, &err) ||
+		    ref_transaction_commit(t, &err)) {
+			ret = 1;
+			ref_transaction_free(t);
+		}
+	}
+
+	if (ret) {
+		const char *str = "update_ref failed for ref '%s': %s";
+
+		switch (onerr) {
+		case UPDATE_REFS_MSG_ON_ERR:
+			error(str, refname, err.buf);
+			break;
+		case UPDATE_REFS_DIE_ON_ERR:
+			die(str, refname, err.buf);
+			break;
+		case UPDATE_REFS_QUIET_ON_ERR:
+			break;
+		}
+		strbuf_release(&err);
+		return 1;
+	}
+	strbuf_release(&err);
+	if (t)
+		ref_transaction_free(t);
+	return 0;
+}

-- 
2.4.2.644.g97b850b-twtrsrc
Previous: David TurnerNext: David Turner
Message 14 of 90 in “lmdb ref backend”
  1. 00/43 lmdb ref backendDavid Turner, Sep 28, 2015
  2. 01/43 refs.c: create a public version of verify_refname_availableDavid Turner, Sep 28, 2015
  3. Torsten BögershausenOct 3, 2015
  4. David TurnerOct 3, 2015
  5. Torsten BögershausenOct 3, 2015
  6. Torsten BögershausenOct 4, 2015
  7. Michael HaggertyOct 5, 2015
  8. David TurnerOct 5, 2015
  9. 02/43 refs: make repack_without_refs and is_branch publicDavid Turner, Sep 28, 2015
  10. Michael HaggertyOct 5, 2015
  11. David TurnerOct 5, 2015
  12. 03/43 refs-be-files.c: rename refs to refs-be-filesDavid Turner, Sep 28, 2015
  13. 04/43 refs.c: add a new refs.c file to hold all common refs codeDavid Turner, Sep 28, 2015
  14. 05/43 refs.c: move update_ref to refs.cDavid Turner, Sep 28, 2015
  15. 06/43 refs.c: move delete_ref and delete_refs to the common codeDavid Turner, Sep 28, 2015
  16. 07/43 refs.c: move read_ref_at to the common refs fileDavid Turner, Sep 28, 2015
  17. 08/43 refs.c: move the hidden refs functions to the common codeDavid Turner, Sep 28, 2015
  18. 09/43 refs.c: move dwim and friend functions to the common refs codeDavid Turner, Sep 28, 2015
  19. 10/43 refs.c: move warn_if_dangling_symref* to the common codeDavid Turner, Sep 28, 2015
  20. 11/43 refs.c: move read_ref, read_ref_full and ref_exists to the common codeDavid Turner, Sep 28, 2015
  21. 12/43 refs.c: move resolve_refdup to commonDavid Turner, Sep 28, 2015
  22. 13/43 refs.c: move check_refname_format to the common codeDavid Turner, Sep 28, 2015
  23. 14/43 refs.c: move is_branch to the common codeDavid Turner, Sep 28, 2015
  24. 15/43 refs.c: move prettify_refname to the common codeDavid Turner, Sep 28, 2015
  25. 16/43 refs.c: move ref iterators to the common codeDavid Turner, Sep 28, 2015
  26. 17/43 refs.c: move head_ref_namespaced to the common codeDavid Turner, Sep 28, 2015
  27. 18/43 refs-be-files.c: add a backend method structure with transaction functionsDavid Turner, Sep 28, 2015
  28. Michael HaggertyOct 5, 2015
  29. Junio C HamanoOct 5, 2015
  30. David TurnerOct 6, 2015
  31. 19/43 refs-be-files.c: add methods for misc ref operationsDavid Turner, Sep 28, 2015
  32. 20/43 refs-be-files.c: add methods for the ref iteratorsDavid Turner, Sep 28, 2015
  33. 21/43 refs-be-files.c: add method for for_each_reftype_...David Turner, Sep 28, 2015
  34. 22/43 refs-be-files.c: add do_for_each_per_worktree_refDavid Turner, Sep 28, 2015
  35. Michael HaggertyOct 5, 2015
  36. David TurnerOct 5, 2015
  37. 23/43 refs.c: move refname_is_safe to the common codeDavid Turner, Sep 28, 2015
  38. 24/43 refs.h: document make refname_is_safe and add it to headerDavid Turner, Sep 28, 2015
  39. 25/43 refs.c: move copy_msg to the common codeDavid Turner, Sep 28, 2015
  40. 26/43 refs.c: move peel_object to the common codeDavid Turner, Sep 28, 2015
  41. 27/43 refs.c: move should_autocreate_reflog to common codeDavid Turner, Sep 28, 2015
  42. Junio C HamanoOct 2, 2015
  43. 28/43 refs.c: add ref backend init functionDavid Turner, Sep 28, 2015
  44. Michael HaggertyOct 5, 2015
  45. David TurnerOct 5, 2015
  46. 29/43 refs.c: add methods for reflogDavid Turner, Sep 28, 2015
  47. 30/43 refs-be-files.c: add method to expire reflogsDavid Turner, Sep 28, 2015
  48. Michael HaggertyOct 5, 2015
  49. 31/43 refs.c: add method for initial ref transaction commitDavid Turner, Sep 28, 2015
  50. 32/43 initdb: move safe_create_dir into common codeDavid Turner, Sep 28, 2015
  51. 33/43 refs.c: add method for initializing refs dbDavid Turner, Sep 28, 2015
  52. 34/43 refs.c: make struct ref_transaction genericDavid Turner, Sep 28, 2015
  53. Michael BlumeOct 6, 2015
  54. David TurnerOct 6, 2015
  55. 35/43 refs-be-files.c: add method to rename refsDavid Turner, Sep 28, 2015
  56. 36/43 run-command: track total number of commands runDavid Turner, Sep 28, 2015
  57. 37/43 refs: move some defines from refs-be-files.c to refs.hDavid Turner, Sep 28, 2015
  58. Michael HaggertyOct 5, 2015
  59. 38/43 refs: make some files backend functions publicDavid Turner, Sep 28, 2015
  60. Michael HaggertyOct 5, 2015
  61. David TurnerOct 6, 2015
  62. David TurnerOct 7, 2015
  63. Michael HaggertyOct 7, 2015
  64. Junio C HamanoOct 7, 2015
  65. David TurnerOct 7, 2015
  66. Michael HaggertyOct 7, 2015
  67. 39/43 refs: break out a ref conflict checkDavid Turner, Sep 28, 2015
  68. Michael HaggertyOct 5, 2015
  69. David TurnerOct 6, 2015
  70. 40/43 refs: allow ref backend to be set for cloneDavid Turner, Sep 28, 2015
  71. Michael HaggertyOct 5, 2015
  72. David TurnerOct 6, 2015
  73. Jeff KingOct 6, 2015
  74. David TurnerOct 6, 2015
  75. Carlos Martín NietoOct 12, 2015
  76. Michael HaggertyOct 5, 2015
  77. David TurnerOct 6, 2015
  78. 41/43 refs: add register_refs_backendDavid Turner, Sep 28, 2015
  79. 42/43 refs: add LMDB refs backendDavid Turner, Sep 28, 2015
  80. Junio C HamanoOct 2, 2015
  81. Michael HaggertyOct 5, 2015
  82. David TurnerOct 7, 2015
  83. Michael HaggertyOct 7, 2015
  84. Junio C HamanoOct 7, 2015
  85. David TurnerOct 7, 2015
  86. Michael HaggertyOct 7, 2015
  87. 43/43 refs: tests for db backendDavid Turner, Sep 28, 2015
  88. Dennis KaarsemakerOct 3, 2015
  89. Junio C HamanoOct 5, 2015
  90. David TurnerOct 6, 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.