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

[PATCH 31/31] refs.c: use the transaction to manage the reflog in rename_refs

From
Ronnie Sahlberg <sahlberg@google.com>
Date
May 14, 2014, 22:13 UTC
Message-ID
<1400105610-21194-32-git-send-email-sahlberg@google.com>
In-Reply-To
<1400105610-21194-1-git-send-email-sahlberg@google.com>

We have a transaction in rename_ref to managing the ref during the rename. Use this transaction to manage the changes to the reflog too. This now means that rename_ref is almost completely agnostic about how refs storage is implemented and should be easier to migrate if/when we allow a different store for refs, such as a database.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 62 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 20 deletions(-)
diff --git a/refs.c b/refs.c
index bcce8fe..829c89a 100644
--- a/refs.c
+++ b/refs.c
@@ -2633,6 +2633,24 @@ struct ref_update {
 	const char refname[FLEX_ARRAY];
 };
 
+struct rename_reflog_cb {
+       struct ref_transaction *t;
+       const char *refname;
+};
+
+static int rename_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
+			     const char *email, unsigned long timestamp, int tz,
+			     const char *message, void *cb_data)
+{
+       struct rename_reflog_cb *cb = cb_data;
+
+       transaction_update_reflog(cb->t, cb->refname, nsha1, osha1,
+				 email, timestamp, tz, message, 0,
+				 NULL);
+
+       return 0;
+}
+
 int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg)
 {
 	unsigned char sha1[20];
@@ -2664,40 +2682,44 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
 				  get_loose_refs(&ref_cache), NULL, 0))
 		return 1;
 
-	if (log && rename(git_path("logs/%s", oldrefname), git_path(TMP_RENAMED_LOG)))
-		return error("unable to move logfile logs/%s to "TMP_RENAMED_LOG": %s",
-			oldrefname, strerror(errno));
-
 	if (pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE))
 		return error("unable to pack refs");
 
 	transaction = transaction_begin();
-	if (!transaction ||
-	    transaction_delete_sha1(transaction, oldrefname, sha1,
+	if (log) {
+		struct rename_reflog_cb cb;
+
+		transaction_update_reflog(transaction, newrefname,
+					  null_sha1, null_sha1, NULL,
+					  0, 0, NULL,
+					  REFLOG_TRUNCATE,
+					  NULL);
+
+		cb.t = transaction;
+		cb.refname = newrefname;
+		for_each_reflog_ent(oldrefname, rename_reflog_ent, &cb);
+
+		transaction_update_reflog(transaction, newrefname,
+					  sha1, sha1,
+					  git_committer_info(0),
+					  0, 0, logmsg,
+					  REFLOG_EMAIL_IS_COMMITTER,
+					  &err);
+	}
+
+	if (transaction_delete_sha1(transaction, oldrefname, sha1,
 				    REF_NODEREF | REF_ISPACKONLY,
 				    1, NULL, &err) ||
 	    transaction_update_sha1(transaction, newrefname, sha1,
-				    NULL, 0, 0, logmsg, &err) ||
+				    NULL, 0, 0, NULL, &err) ||
 	    transaction_commit(transaction, &err)) {
 		transaction_rollback(transaction);
 		error("rename_ref failed: %s", err.buf);
 		strbuf_release(&err);
-		goto rollbacklog;
+		return 1;
 	}
 	transaction_free(transaction);
-
-	if (log && rename_tmp_log(newrefname))
-		goto rollbacklog;
-
 	return 0;
-
- rollbacklog:
-	if (log &&
-	    rename(git_path(TMP_RENAMED_LOG), git_path("logs/%s", oldrefname)))
-		error("unable to restore logfile %s from "TMP_RENAMED_LOG": %s",
-			oldrefname, strerror(errno));
-
-	return 1;
 }
 
 static int close_ref(struct ref_lock *lock)

-- 
2.0.0.rc3.506.g3739a35
Previous: Ronnie Sahlberg
Message 43 of 43 in “Finish implementing ref and reflog transactions”
  1. 00/31 Finish implementing ref and reflog transactionsRonnie Sahlberg, May 14, 2014
  2. 01/31 refs.c make ref_transaction_create a wrapper to ref_transaction_updateRonnie Sahlberg, May 14, 2014
  3. 02/31 refs.c: make ref_transaction_delete a wrapper for ref_transaction_updateRonnie Sahlberg, May 14, 2014
  4. 03/31 refs.c: rename the transaction functionsRonnie Sahlberg, May 14, 2014
  5. Junio C HamanoMay 16, 2014
  6. Ronnie SahlbergMay 19, 2014
  7. Junio C HamanoMay 19, 2014
  8. 04/31 refs.c: add a new update_type field to ref_updateRonnie Sahlberg, May 14, 2014
  9. 05/31 refs.c: add a function to append a reflog entry to a fdRonnie Sahlberg, May 14, 2014
  10. 06/31 refs.c: add a transaction function to append a reflog entryRonnie Sahlberg, May 14, 2014
  11. 07/31 refs.c: add a flag to allow reflog updates to truncate the logRonnie Sahlberg, May 14, 2014
  12. Junio C HamanoMay 16, 2014
  13. Ronnie SahlbergMay 19, 2014
  14. 08/31 refs.c: only write reflog update if msg is non-NULLRonnie Sahlberg, May 14, 2014
  15. Junio C HamanoMay 16, 2014
  16. Ronnie SahlbergMay 19, 2014
  17. 09/31 refs.c: allow multiple reflog updates during a single transactionRonnie Sahlberg, May 14, 2014
  18. Junio C HamanoMay 16, 2014
  19. Eric SunshineMay 16, 2014
  20. Ronnie SahlbergMay 19, 2014
  21. Ronnie SahlbergMay 19, 2014
  22. 10/31 reflog.c: use a reflog transaction when writing during expireRonnie Sahlberg, May 14, 2014
  23. 11/31 refs.c: null terminate the string in copy_msgRonnie Sahlberg, May 14, 2014
  24. 12/31 refs.c: track the refnames we are deleting in the transaction structureRonnie Sahlberg, May 14, 2014
  25. 13/31 refs.c: update the list of deleted refs during _update instead of _commitRonnie Sahlberg, May 14, 2014
  26. 14/31 refs.c: return error instead of dying when locking fails during transactionRonnie Sahlberg, May 14, 2014
  27. 15/31 refs.c: lock the ref during _update instead of during _commitRonnie Sahlberg, May 14, 2014
  28. 16/31 refs.c: add an error argument to create/delete/update just like commitRonnie Sahlberg, May 14, 2014
  29. 17/31 refs.c: make _update_reflog take an error argumentRonnie Sahlberg, May 14, 2014
  30. 18/31 refs.c: return immediately from _commit if the transaction has an errorRonnie Sahlberg, May 14, 2014
  31. 19/31 tests: move tests for -z update/delete/verify to after the ref is createdRonnie Sahlberg, May 14, 2014
  32. 20/31 refs.c: check for lock conflicts already in _updateRonnie Sahlberg, May 14, 2014
  33. 21/31 refs.c allow multiple updates of the same ref in a transactionRonnie Sahlberg, May 14, 2014
  34. 22/31 refs.c: release all remaining locks during transaction_freeRonnie Sahlberg, May 14, 2014
  35. 23/31 reflog.c: use the existing transaction to also lock and update the refRonnie Sahlberg, May 14, 2014
  36. 24/31 refs.c: make unlock_ref staticRonnie Sahlberg, May 14, 2014
  37. 25/31 refs.c: make close_ref staticRonnie Sahlberg, May 14, 2014
  38. 26/31 refs.c: make commit_ref staticRonnie Sahlberg, May 14, 2014
  39. 27/31 refs.c: remove the function lock_any_ref_for_updateRonnie Sahlberg, May 14, 2014
  40. 28/31 refs.c: make struct ref_lock private to refs.cRonnie Sahlberg, May 14, 2014
  41. 29/31 refs.c: allow passing raw git_committer_info as email to _update_reflogRonnie Sahlberg, May 14, 2014
  42. 30/31 refs.c: move ref_update and other definitions to earlier in the fileRonnie Sahlberg, May 14, 2014
  43. 31/31 refs.c: use the transaction to manage the reflog in rename_refsRonnie Sahlberg, May 14, 2014

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.