Re: [PATCH v3 11/19] tag.c: use ref transactions when doing updates

Done.

Thanks.

On Fri, Apr 25, 2014 at 3:58 PM, Michael Haggerty [off-list ref] wrote:

On 04/25/2014 06:14 PM, Ronnie Sahlberg wrote:

quoted

Change tag.c to use ref transactions for all ref updates.

Signed-off-by: Ronnie Sahlberg <redacted>
---
 builtin/tag.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/builtin/tag.c b/builtin/tag.c
index 40356e3..dd53fb4 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c

@@ -488,7 +488,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;

@@ -496,6 +495,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;
+     char *err = NULL;
      struct option options[] = {
              OPT_CMDMODE('l', "list", &cmdmode, N_("list tag names"), 'l'),
              { OPTION_INTEGER, 'n', NULL, &lines, N_("n"),

@@ -641,11 +642,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)) ||
+         ref_transaction_commit(transaction, NULL, &err))
+       die(_("%s: cannot update the ref: %s"), ref.buf, err);

Formatting nit: die() should be indented by two TABs.

quoted

      if (force && !is_null_sha1(prev) && hashcmp(prev, object))
              printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev, DEFAULT_ABBREV));

Michael

--
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/