From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v21 01/19] refs.c: remove ref_transaction_rollback
Date: Mon, 14 Jul 2014 13:58:43 -0700 [thread overview]
Message-ID: <1405371541-32121-2-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1405371541-32121-1-git-send-email-sahlberg@google.com>
We do not yet need both a rollback and a free function for transactions.
Remove ref_transaction_rollback and use ref_transaction_free instead.
At a later stage we may reintroduce a rollback function if we want to start
adding reusable transactions and similar.
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
refs.c | 7 +------
refs.h | 16 +++++++---------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/refs.c b/refs.c
index dc45774..6d841a0 100644
--- a/refs.c
+++ b/refs.c
@@ -3334,7 +3334,7 @@ struct ref_transaction *ref_transaction_begin(void)
return xcalloc(1, sizeof(struct ref_transaction));
}
-static void ref_transaction_free(struct ref_transaction *transaction)
+void ref_transaction_free(struct ref_transaction *transaction)
{
int i;
@@ -3345,11 +3345,6 @@ static void ref_transaction_free(struct ref_transaction *transaction)
free(transaction);
}
-void ref_transaction_rollback(struct ref_transaction *transaction)
-{
- ref_transaction_free(transaction);
-}
-
static struct ref_update *add_update(struct ref_transaction *transaction,
const char *refname)
{
diff --git a/refs.h b/refs.h
index 4e3050d..cfd1832 100644
--- a/refs.h
+++ b/refs.h
@@ -219,18 +219,12 @@ enum action_on_err {
/*
* Begin a reference transaction. The reference transaction must
- * eventually be commited using ref_transaction_commit() or rolled
- * back using ref_transaction_rollback().
+ * eventually be commited using ref_transaction_commit() or freed by
+ * calling ref_transaction_free().
*/
struct ref_transaction *ref_transaction_begin(void);
/*
- * Roll back a ref_transaction and free all associated data.
- */
-void ref_transaction_rollback(struct ref_transaction *transaction);
-
-
-/*
* The following functions add a reference check or update to a
* ref_transaction. In all of them, refname is the name of the
* reference to be affected. The functions make internal copies of
@@ -238,7 +232,6 @@ void ref_transaction_rollback(struct ref_transaction *transaction);
* can be REF_NODEREF; it is passed to update_ref_lock().
*/
-
/*
* Add a reference update to transaction. new_sha1 is the value that
* the reference should have after the update, or zeros if it should
@@ -280,6 +273,11 @@ void ref_transaction_delete(struct ref_transaction *transaction,
int ref_transaction_commit(struct ref_transaction *transaction,
const char *msg, enum action_on_err onerr);
+/*
+ * Free an existing transaction and all associated data.
+ */
+void ref_transaction_free(struct ref_transaction *transaction);
+
/** Lock a ref and then write its file */
int update_ref(const char *action, const char *refname,
const unsigned char *sha1, const unsigned char *oldval,
--
2.0.1.546.gf603308
next prev parent reply other threads:[~2014-07-14 20:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-14 20:58 [PATCH v21 00/19] Use ref transactions Ronnie Sahlberg
2014-07-14 20:58 ` Ronnie Sahlberg [this message]
2014-07-14 20:58 ` [PATCH v21 02/19] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 03/19] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 04/19] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 05/19] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 06/19] lockfile.c: add a new public function unable_to_lock_message Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 07/19] lockfile.c: make lock_file return a meaningful errno on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 08/19] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 09/19] refs.c: make sure log_ref_setup returns a meaningful errno Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 10/19] refs.c: verify_lock should set errno to something meaningful Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 11/19] refs.c: make remove_empty_directories always set errno to something sane Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 12/19] refs.c: commit_packed_refs to return a meaningful errno on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 13/19] refs.c: make resolve_ref_unsafe set errno to something meaningful on error Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 14/19] refs.c: log_ref_write should try to return meaningful errno Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 15/19] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 16/19] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 17/19] update-ref: use err argument to get error from ref_transaction_commit Ronnie Sahlberg
2014-07-14 20:59 ` [PATCH v21 18/19] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-07-14 20:59 ` [PATCH v21 19/19] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405371541-32121-2-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).