From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v18 39/48] refs.c: make prune_ref use a transaction to delete the ref
Date: Tue, 17 Jun 2014 08:53:53 -0700 [thread overview]
Message-ID: <1403020442-31049-40-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1403020442-31049-1-git-send-email-sahlberg@google.com>
Change prune_ref to delete the ref using a ref transaction. To do this we also
need to add a new flag REF_ISPRUNING that will tell the transaction that we
do not want to delete this ref from the packed refs. This flag is private to
refs.c and not exposed to external callers.
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
refs.c | 29 +++++++++++++++++++++--------
refs.h | 14 ++++++++++++--
2 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/refs.c b/refs.c
index e8118de..e753711 100644
--- a/refs.c
+++ b/refs.c
@@ -25,6 +25,11 @@ static unsigned char refname_disposition[256] = {
};
/*
+ * Used as a flag to ref_transaction_delete when a loose ref is being
+ * pruned.
+ */
+#define REF_ISPRUNING 0x0100
+/*
* Try to read one refname component from the front of refname.
* Return the length of the component found, or -1 if the component is
* not legal. It is legal if it is something reasonable to have under
@@ -2380,17 +2385,24 @@ static void try_remove_empty_parents(char *name)
/* make sure nobody touched the ref, and unlink */
static void prune_ref(struct ref_to_prune *r)
{
- struct ref_lock *lock;
+ struct ref_transaction *transaction;
+ struct strbuf err = STRBUF_INIT;
if (check_refname_format(r->name + 5, 0))
return;
- lock = lock_ref_sha1_basic(r->name, r->sha1, 0, NULL);
- if (lock) {
- unlink_or_warn(git_path("%s", r->name));
- unlock_ref(lock);
- try_remove_empty_parents(r->name);
- }
+ transaction = ref_transaction_begin(&err);
+ if (!transaction ||
+ ref_transaction_delete(transaction, r->name, r->sha1,
+ REF_ISPRUNING, 1, &err) ||
+ ref_transaction_commit(transaction, NULL, &err)) {
+ ref_transaction_free(transaction);
+ error("%s", err.buf);
+ strbuf_release(&err);
+ return;
+ }
+ ref_transaction_free(transaction);
+ try_remove_empty_parents(r->name);
}
static void prune_refs(struct ref_to_prune *r)
@@ -3619,9 +3631,10 @@ int ref_transaction_commit(struct ref_transaction *transaction,
struct ref_update *update = updates[i];
if (update->lock) {
- delnames[delnum++] = update->lock->ref_name;
ret |= delete_ref_loose(update->lock, update->type,
err);
+ if (!(update->flags & REF_ISPRUNING))
+ delnames[delnum++] = update->lock->ref_name;
}
}
diff --git a/refs.h b/refs.h
index 4ac4a7d..3b321c2 100644
--- a/refs.h
+++ b/refs.h
@@ -177,9 +177,19 @@ extern int ref_exists(const char *);
*/
extern int peel_ref(const char *refname, unsigned char *sha1);
-/** Locks any ref (for 'HEAD' type refs). */
+/*
+ * Flags controlling lock_any_ref_for_update(), ref_transaction_update(),
+ * ref_transaction_create(), etc.
+ * REF_NODEREF: act on the ref directly, instead of dereferencing
+ * symbolic references.
+ *
+ * Flags >= 0x100 are reserved for internal use.
+ */
#define REF_NODEREF 0x01
-/* errno is set to something meaningful on failure */
+/*
+ * Locks any ref (for 'HEAD' type refs) and sets errno to something
+ * meaningful on failure.
+ */
extern struct ref_lock *lock_any_ref_for_update(const char *refname,
const unsigned char *old_sha1,
int flags, int *type_p);
--
2.0.0.438.gec92e5c
next prev parent reply other threads:[~2014-06-17 15:55 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 15:53 [PATCH v18 00/48] Use ref transactions Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 01/48] refs.c: remove ref_transaction_rollback Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 02/48] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 03/48] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 04/48] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 05/48] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 06/48] lockfile.c: add a new public function unable_to_lock_message Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 07/48] lockfile.c: make lock_file return a meaningful errno on failurei Ronnie Sahlberg
2014-06-18 20:30 ` Michael Haggerty
2014-06-18 20:36 ` Michael Haggerty
2014-06-17 15:53 ` [PATCH v18 08/48] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 09/48] refs.c: make sure log_ref_setup returns a meaningful errno Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 10/48] refs.c: verify_lock should set errno to something meaningful Ronnie Sahlberg
2014-06-18 20:38 ` Michael Haggerty
2014-06-18 21:40 ` Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 11/48] refs.c: make remove_empty_directories alwasy set errno to something sane Ronnie Sahlberg
2014-06-18 21:00 ` Michael Haggerty
2014-06-18 21:41 ` Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 12/48] refs.c: commit_packed_refs to return a meaningful errno on failure Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 13/48] refs.c: make resolve_ref_unsafe set errno to something meaningful on error Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 14/48] refs.c: log_ref_write should try to return meaningful errno Ronnie Sahlberg
2014-06-18 21:08 ` Michael Haggerty
2014-06-18 21:38 ` Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 15/48] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 16/48] refs.c: add an err argument to delete_ref_loose Ronnie Sahlberg
2014-06-18 20:47 ` Michael Haggerty
2014-06-18 22:27 ` Ronnie Sahlberg
2014-06-18 22:38 ` Michael Haggerty
2014-06-19 15:56 ` Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 17/48] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 18/48] update-ref: use err argument to get error from ref_transaction_commit Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 19/48] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 20/48] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 21/48] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 22/48] refs.c: update ref_transaction_delete to check for error " Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 23/48] refs.c: make ref_transaction_begin take an err argument Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 24/48] refs.c: add transaction.status and track OPEN/CLOSED/ERROR Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 25/48] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 26/48] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 27/48] commit.c: use ref transactions " Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 28/48] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 29/48] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 30/48] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 31/48] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 32/48] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 33/48] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 34/48] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 35/48] refs.c: make lock_ref_sha1 static Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 36/48] refs.c: remove the update_ref_lock function Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 37/48] refs.c: remove the update_ref_write function Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 38/48] refs.c: remove lock_ref_sha1 Ronnie Sahlberg
2014-06-17 15:53 ` Ronnie Sahlberg [this message]
2014-06-17 15:53 ` [PATCH v18 40/48] refs.c: make delete_ref use a transaction Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 41/48] refs.c: pass the ref log message to _create/delete/update instead of _commit Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 42/48] refs.c: pass NULL as *flags to read_ref_full Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 43/48] refs.c: move the check for valid refname to lock_ref_sha1_basic Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 44/48] refs.c: call lock_ref_sha1_basic directly from commit Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 45/48] refs.c: pass a skip list to name_conflict_fn Ronnie Sahlberg
2014-06-17 15:54 ` [PATCH v18 46/48] refs.c: propagate any errno==ENOTDIR from _commit back to the callers Ronnie Sahlberg
2014-06-17 15:54 ` [PATCH v18 47/48] fetch.c: change s_update_ref to use a ref transaction Ronnie Sahlberg
2014-06-17 15:54 ` [PATCH v18 48/48] refs.c: make write_ref_sha1 static 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=1403020442-31049-40-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).