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

Re: [PATCH v10 13/44] tag.c: use ref transactions when doing updates

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
May 17, 2014, 13:09 UTC
Message-ID
<53775F77.2070004@alum.mit.edu>
In-Reply-To
<1400261852-31303-14-git-send-email-sahlberg@google.com>
On 05/16/2014 07:37 PM, Ronnie Sahlberg wrote:
Show 43 quoted lines
> Change tag.c to use ref transactions for all ref updates.
> 
> Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
> ---
>  builtin/tag.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/builtin/tag.c b/builtin/tag.c
> index c6e8a71..b05f9a5 100644
> --- a/builtin/tag.c
> +++ b/builtin/tag.c
> @@ -548,7 +548,6 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
>  	struct strbuf ref = STRBUF_INIT;
>  	unsigned char object[20], prev[20];
>  	const char *object_ref, *tag;
> -	struct ref_lock *lock;
>  	struct create_tag_options opt;
>  	char *cleanup_arg = NULL;
>  	int annotate = 0, force = 0, lines = -1;
> @@ -556,6 +555,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
>  	const char *msgfile = NULL, *keyid = NULL;
>  	struct msg_arg msg = { 0, STRBUF_INIT };
>  	struct commit_list *with_commit = NULL;
> +	struct ref_transaction *transaction;
> +	struct strbuf err = STRBUF_INIT;
>  	struct option options[] = {
>  		OPT_CMDMODE('l', "list", &cmdmode, N_("list tag names"), 'l'),
>  		{ OPTION_INTEGER, 'n', NULL, &lines, N_("n"),
> @@ -701,11 +702,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
>  	if (annotate)
>  		create_tag(object, tag, &buf, &opt, prev, object);
>  
> -	lock = lock_any_ref_for_update(ref.buf, prev, 0, NULL);
> -	if (!lock)
> -		die(_("%s: cannot lock the ref"), ref.buf);
> -	if (write_ref_sha1(lock, object, NULL) < 0)
> -		die(_("%s: cannot update the ref"), ref.buf);
> +	transaction = ref_transaction_begin();
> +	if (!transaction ||
> +	    ref_transaction_update(transaction, ref.buf, object, prev,
> +				   0, !is_null_sha1(prev), &err) ||
> +	    ref_transaction_commit(transaction, NULL, &err))
> +		die("%s", err.buf);

If ref_transaction_begin() fails, then won't err still be empty? (I know it can't happen, and you know it can't happen, but should the caller have to know that?) It almost seems like ref_transaction_begin() should have an err parameter, too.

It's kindof late for this question to pop into my head, but: have you thought about embedding the err strbuf in the transaction object? I admit it would make the problem with ref_transaction_begin() even worse, but maybe it would be a net win in terms of boilerplate?

>  	if (force && !is_null_sha1(prev) && hashcmp(prev, object))
>  		printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev, DEFAULT_ABBREV));
>  
> 
-- 
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 17 of 65 in “Use ref transactions for all ref updates”
  1. 00/44 Use ref transactions for all ref updatesRonnie Sahlberg, May 16, 2014
  2. 01/44 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, May 16, 2014
  3. 02/44 refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg, May 16, 2014
  4. 03/44 refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg, May 16, 2014
  5. 04/44 refs.c: add an err argument to repack_without_refsRonnie Sahlberg, May 16, 2014
  6. Michael HaggertyMay 17, 2014
  7. Ronnie SahlbergMay 27, 2014
  8. 05/44 refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg, May 16, 2014
  9. 06/44 refs.c: add an err argument to delete_ref_looseRonnie Sahlberg, May 16, 2014
  10. 07/44 refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg, May 16, 2014
  11. 08/44 update-ref.c: log transaction error from the update_refRonnie Sahlberg, May 16, 2014
  12. 09/44 refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg, May 16, 2014
  13. 10/44 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, May 16, 2014
  14. 11/44 refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg, May 16, 2014
  15. 12/44 refs.c: ref_transaction_delete to check for error and return statusRonnie Sahlberg, May 16, 2014
  16. 13/44 tag.c: use ref transactions when doing updatesRonnie Sahlberg, May 16, 2014
  17. Michael HaggertyMay 17, 2014
  18. Ronnie SahlbergMay 19, 2014
  19. Ronnie SahlbergMay 19, 2014
  20. 14/44 replace.c: use the ref transaction functions for updatesRonnie Sahlberg, May 16, 2014
  21. Michael HaggertyMay 17, 2014
  22. Ronnie SahlbergMay 19, 2014
  23. 15/44 commit.c: use ref transactions for updatesRonnie Sahlberg, May 16, 2014
  24. 16/44 sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg, May 16, 2014
  25. 17/44 fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg, May 16, 2014
  26. 18/44 branch.c: use ref transaction for all ref updatesRonnie Sahlberg, May 16, 2014
  27. Michael HaggertyMay 17, 2014
  28. Ronnie SahlbergMay 19, 2014
  29. 19/44 refs.c: change update_ref to use a transactionRonnie Sahlberg, May 16, 2014
  30. 20/44 refs.c: free the transaction before returning when number of updates is 0Ronnie Sahlberg, May 16, 2014
  31. 21/44 refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg, May 16, 2014
  32. 22/44 fetch.c: clear errno before calling functions that might set itRonnie Sahlberg, May 16, 2014
  33. Michael HaggertyMay 17, 2014
  34. Ronnie SahlbergMay 27, 2014
  35. 23/44 fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg, May 16, 2014
  36. 24/44 fetch.c: use a single ref transaction for all ref updatesRonnie Sahlberg, May 16, 2014
  37. Michael HaggertyMay 17, 2014
  38. Michael HaggertyMay 17, 2014
  39. 25/44 receive-pack.c: use a reference transaction for updating the refsRonnie Sahlberg, May 16, 2014
  40. Michael HaggertyMay 17, 2014
  41. Ronnie SahlbergMay 19, 2014
  42. Michael HaggertyMay 23, 2014
  43. Ronnie SahlbergMay 23, 2014
  44. Michael HaggertyMay 23, 2014
  45. Ronnie SahlbergMay 27, 2014
  46. 26/44 fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg, May 16, 2014
  47. 27/44 walker.c: use ref transaction for ref updatesRonnie Sahlberg, May 16, 2014
  48. 28/44 refs.c: make write_ref_sha1 staticRonnie Sahlberg, May 16, 2014
  49. 29/44 refs.c: make lock_ref_sha1 staticRonnie Sahlberg, May 16, 2014
  50. 30/44 refs.c: add transaction.status and track OPEN/CLOSED/ERRORRonnie Sahlberg, May 16, 2014
  51. 31/44 refs.c: remove the update_ref_lock functionRonnie Sahlberg, May 16, 2014
  52. 32/44 refs.c: remove the update_ref_write functionRonnie Sahlberg, May 16, 2014
  53. 33/44 refs.c: remove lock_ref_sha1Ronnie Sahlberg, May 16, 2014
  54. 34/44 refs.c: make prune_ref use a transaction to delete the refRonnie Sahlberg, May 16, 2014
  55. 35/44 refs.c: make delete_ref use a transactionRonnie Sahlberg, May 16, 2014
  56. 36/44 refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg, May 16, 2014
  57. 37/44 refs.c: pass NULL as *flags to read_ref_fullRonnie Sahlberg, May 16, 2014
  58. 38/44 refs.c: pack all refs before we start to rename a refRonnie Sahlberg, May 16, 2014
  59. 39/44 refs.c: move the check for valid refname to lock_ref_sha1_basicRonnie Sahlberg, May 16, 2014
  60. 40/44 refs.c: call lock_ref_sha1_basic directly from commitRonnie Sahlberg, May 16, 2014
  61. 41/44 refs.c: add a new flag for transaction delete for refs we know are packed onlyRonnie Sahlberg, May 16, 2014
  62. 42/44 refs.c: pass a skip list to name_conflict_fnRonnie Sahlberg, May 16, 2014
  63. 43/44 refs.c: make rename_ref use a transactionRonnie Sahlberg, May 16, 2014
  64. 44/44 refs.c: remove forward declaration of write_ref_sha1Ronnie Sahlberg, May 16, 2014
  65. Jonathan NiederMay 16, 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.