From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ronnie Sahlberg Subject: [PATCH v14 37/40] refs.c: pass a skip list to name_conflict_fn Date: Fri, 6 Jun 2014 15:29:15 -0700 Message-ID: <1402093758-3162-38-git-send-email-sahlberg@google.com> References: <1402093758-3162-1-git-send-email-sahlberg@google.com> Cc: Ronnie Sahlberg To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Jun 07 00:30:34 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Wt2ef-0002lC-Dt for gcvg-git-2@plane.gmane.org; Sat, 07 Jun 2014 00:30:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752617AbaFFW35 (ORCPT ); Fri, 6 Jun 2014 18:29:57 -0400 Received: from mail-ob0-f201.google.com ([209.85.214.201]:50884 "EHLO mail-ob0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752564AbaFFW3Y (ORCPT ); Fri, 6 Jun 2014 18:29:24 -0400 Received: by mail-ob0-f201.google.com with SMTP id wn1so741060obc.4 for ; Fri, 06 Jun 2014 15:29:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=D6KhfyCvNJX4ZuAcrpndsxaBIGJO/JbV2co7GE7LSu0=; b=St2kap7dJ4VTUu/VGUGl+ofDuc7B8oVBNlli9yJg60TjZYWmE1w0K0Upu6opwIV/TC hKRMnzoAAfHHkhhAexx5jLgNFxmdGqON17s8nYyXnzenGolDxxViSrM0dFluY1PoLNur BOZFBZQqfnBahG6uEJLf37eDpmYi9nkgXletsb+ctU0+xBONKyjS2frglsjXZ4T70B1l VlWH5hGHSIMFglF5UAtjGQlhLDrUfOciO1kQc3nrCMs1V1xX1yJrRGccDSGI9v1PjRD4 86vc74iSEAkFHvr3v6XosUp6m7dEww3X27T7jIs3I38iTeiQNK7w3PoskZFc1nC+8ZGT sA5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=D6KhfyCvNJX4ZuAcrpndsxaBIGJO/JbV2co7GE7LSu0=; b=GwMrIOsrm5qqIqvjwMWH14wAKvdM4s0vL2u//q0WpR6LXwAqlc81EQGtA85Q8CiIzu ETaktEhXX+FnBdvJVe2TZYgsGvdz8aTiFZNjbh/QciRrGks+3Yic4NyhSuo7sNpYYRTM EfRpea/HQdd37RpHxQLDCh7vKAnmjiCDoQU+E1xK56cbv7f8nSuHSAdMy/x4JDsRT3Ya x9PShljIjyin4qkjFP3ymN8guWsnWQSnD0p/C9bQV1eIOrhmgQy3+T7vjhMn5l6qO19Y G8t1sAY6/3RG3/4XQJ/WaMuyrSOyTQSKz3R/vXCziFw86YUjEC9mlLUf9TtbLS9zaKKm etCQ== X-Gm-Message-State: ALoCoQnCuw23Bm6Xk+tOOuaYeGAIjGMPcjrW2EOJb+u+HS5YMiefqIGequzxUWCNObDdWd3o9lDI X-Received: by 10.183.11.102 with SMTP id eh6mr4415938obd.37.1402093763596; Fri, 06 Jun 2014 15:29:23 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id l7si751227vda.3.2014.06.06.15.29.23 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Jun 2014 15:29:23 -0700 (PDT) Received: from sahlberg1.mtv.corp.google.com (sahlberg1.mtv.corp.google.com [172.27.69.52]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 48B085A4515; Fri, 6 Jun 2014 15:29:23 -0700 (PDT) Received: by sahlberg1.mtv.corp.google.com (Postfix, from userid 177442) id 2B29AE081F; Fri, 6 Jun 2014 15:29:22 -0700 (PDT) X-Mailer: git-send-email 2.0.0.582.ge25c160 In-Reply-To: <1402093758-3162-1-git-send-email-sahlberg@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Allow passing a list of refs to skip checking to name_conflict_fn. There are some conditions where we want to allow a temporary conflict and skip checking those refs. For example if we have a transaction that 1, guarantees that m is a packed refs and there is no loose ref for m 2, the transaction will delete m from the packed ref 3, the transaction will create conflicting m/m For this case we want to be able to lock and create m/m since we know that the conflict is only transient. I.e. the conflict will be automatically resolved by the transaction when it deletes m. Signed-off-by: Ronnie Sahlberg --- refs.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/refs.c b/refs.c index 66427f0..a5fd943 100644 --- a/refs.c +++ b/refs.c @@ -791,15 +791,18 @@ static int names_conflict(const char *refname1, const char *refname2) struct name_conflict_cb { const char *refname; - const char *oldrefname; const char *conflicting_refname; + const char **skip; + int skipnum; }; static int name_conflict_fn(struct ref_entry *entry, void *cb_data) { struct name_conflict_cb *data = (struct name_conflict_cb *)cb_data; - if (data->oldrefname && !strcmp(data->oldrefname, entry->name)) - return 0; + int i; + for (i = 0; i < data->skipnum; i++) + if (!strcmp(entry->name, data->skip[i])) + return 0; if (names_conflict(data->refname, entry->name)) { data->conflicting_refname = entry->name; return 1; @@ -812,15 +815,18 @@ static int name_conflict_fn(struct ref_entry *entry, void *cb_data) * conflicting with the name of an existing reference in dir. If * oldrefname is non-NULL, ignore potential conflicts with oldrefname * (e.g., because oldrefname is scheduled for deletion in the same - * operation). + * operation). skip contains a list of refs we want to skip checking for + * conflicts with. */ -static int is_refname_available(const char *refname, const char *oldrefname, - struct ref_dir *dir) +static int is_refname_available(const char *refname, + struct ref_dir *dir, + const char **skip, int skipnum) { struct name_conflict_cb data; data.refname = refname; - data.oldrefname = oldrefname; data.conflicting_refname = NULL; + data.skip = skip; + data.skipnum = skipnum; sort_ref_dir(dir); if (do_for_each_entry_in_dir(dir, 0, name_conflict_fn, &data)) { @@ -2047,7 +2053,8 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log) static struct ref_lock *lock_ref_sha1_basic(const char *refname, const unsigned char *old_sha1, - int flags, int *type_p) + int flags, int *type_p, + const char **skip, int skipnum) { char *ref_file; const char *orig_refname = refname; @@ -2096,7 +2103,8 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, * name is a proper prefix of our refname. */ if (missing && - !is_refname_available(refname, NULL, get_packed_refs(&ref_cache))) { + !is_refname_available(refname, get_packed_refs(&ref_cache), + skip, skipnum)) { last_errno = ENOTDIR; goto error_return; } @@ -2154,7 +2162,7 @@ struct ref_lock *lock_any_ref_for_update(const char *refname, const unsigned char *old_sha1, int flags, int *type_p) { - return lock_ref_sha1_basic(refname, old_sha1, flags, type_p); + return lock_ref_sha1_basic(refname, old_sha1, flags, type_p, NULL, 0); } /* @@ -2645,10 +2653,12 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms if (!symref) return error("refname %s not found", oldrefname); - if (!is_refname_available(newrefname, oldrefname, get_packed_refs(&ref_cache))) + if (!is_refname_available(newrefname, get_packed_refs(&ref_cache), + &oldrefname, 1)) return 1; - if (!is_refname_available(newrefname, oldrefname, get_loose_refs(&ref_cache))) + if (!is_refname_available(newrefname, get_loose_refs(&ref_cache), + &oldrefname, 1)) return 1; if (log && rename(git_path("logs/%s", oldrefname), git_path(TMP_RENAMED_LOG))) @@ -2678,7 +2688,7 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms logmoved = log; - lock = lock_ref_sha1_basic(newrefname, NULL, 0, NULL); + lock = lock_ref_sha1_basic(newrefname, NULL, 0, NULL, NULL, 0); if (!lock) { error("unable to lock %s for update", newrefname); goto rollback; @@ -2693,7 +2703,7 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms return 0; rollback: - lock = lock_ref_sha1_basic(oldrefname, NULL, 0, NULL); + lock = lock_ref_sha1_basic(oldrefname, NULL, 0, NULL, NULL, 0); if (!lock) { error("unable to lock %s for rollback", oldrefname); goto rollbacklog; @@ -3569,7 +3579,8 @@ int ref_transaction_commit(struct ref_transaction *transaction, update->old_sha1 : NULL), update->flags, - &update->type); + &update->type, + delnames, delnum); if (!update->lock) { if (err) strbuf_addf(err, "Cannot lock the ref '%s'.", -- 2.0.0.582.ge25c160