From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ronnie Sahlberg Subject: [PATCH v12 38/41] refs.c: pass a skip list to name_conflict_fn Date: Thu, 29 May 2014 09:07:53 -0700 Message-ID: <1401379676-9307-12-git-send-email-sahlberg@google.com> References: <1401379676-9307-1-git-send-email-sahlberg@google.com> Cc: jrnieder@gmail.com, Ronnie Sahlberg To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu May 29 18:08:44 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 1Wq2sh-0006y9-To for gcvg-git-2@plane.gmane.org; Thu, 29 May 2014 18:08:40 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757586AbaE2QIa (ORCPT ); Thu, 29 May 2014 12:08:30 -0400 Received: from mail-oa0-f74.google.com ([209.85.219.74]:32807 "EHLO mail-oa0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757477AbaE2QIA (ORCPT ); Thu, 29 May 2014 12:08:00 -0400 Received: by mail-oa0-f74.google.com with SMTP id m1so105241oag.3 for ; Thu, 29 May 2014 09:07:59 -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=cVxUgq8Rem9Wl8fx9LRE/Lpa/lXnsmKNzqxlCpQ03GQ=; b=RloCAu/TfQAlg8DWAMbmlKrCbgZ6nQUeRtwuHpChf/ppUBFsmgqOExyp7fH9BqKYZv YT1Ar0zU7iuRTfy62b+7m1A4GSrnzvmUGOzssh1Zx/MZH2fV+wOeFR9QZNduvAH3L3QZ s0qdOoKUSAcz34gkDjFJUMC+QZxLjmxOJfphXfw6FOccXFZv4gaJrp2hGiu/zYp72OJ2 beWK70DIknhIGUzx9cOJd0LPPgWPM/oQrm3/W9ft8nljU3cvMox1TudDlGdW8/r21VpX SoMEcRMhqy3kcRUqkY+taidTBXDXWxObKs5h6w4Z32dLbkpgybg9sOT5dQzN7Wjl3tq0 qw8g== 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=cVxUgq8Rem9Wl8fx9LRE/Lpa/lXnsmKNzqxlCpQ03GQ=; b=EaybrIWMJZXjv5mOvwi7NBRj7M3/OVODWc+nrMfQUh8GSBnQmaMvVGFcNbWN6VIxzN z7+I4y3srLTibpGv+HsPxWIN6v8GJn8ZSQEpKbVJnfHsI7rUAkZkD+cq+BD/LFOItbUB VEQtk7dj8197In6VJVbKTz7TUBtk0TKMMz122wrr74HTkoXrM6XTSEYlQcizD1eqskf8 yyFZWPENvdx0STTEpkD0Q1Rg9cCPIFhaHfsFDn7bGMBx2c8bbOryhzrT22d2s6ccvFy3 ifnDXtV0er2hXD+AX54IgLRxQC8T6VtyRZrF89m2HLrJ79SThBY4n12a/h/GycMjF2KQ I8rQ== X-Gm-Message-State: ALoCoQkKFGGbGhOb2JgeDyLQ/TkCtswy5yVL5wXP7PgL631x5iIKS5H/0nSW/1mOb5iZ4RowrlQH X-Received: by 10.182.109.231 with SMTP id hv7mr3484855obb.2.1401379679777; Thu, 29 May 2014 09:07:59 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id c50si80318yhl.7.2014.05.29.09.07.59 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 May 2014 09:07:59 -0700 (PDT) Received: from sahlberg1.mtv.corp.google.com (sahlberg1.mtv.corp.google.com [172.27.69.52]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 8CFB431C3FB; Thu, 29 May 2014 09:07:59 -0700 (PDT) Received: by sahlberg1.mtv.corp.google.com (Postfix, from userid 177442) id 48019E110F; Thu, 29 May 2014 09:07:59 -0700 (PDT) X-Mailer: git-send-email 2.0.0.rc3.474.g3833130 In-Reply-To: <1401379676-9307-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 | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/refs.c b/refs.c index edf73b7..ec8d642 100644 --- a/refs.c +++ b/refs.c @@ -793,11 +793,17 @@ 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; + int i; + for (i = 0; i < data->skipnum; i++) + if (!strcmp(entry->name, data->skip[i])) + return 0; if (data->oldrefname && !strcmp(data->oldrefname, entry->name)) return 0; if (names_conflict(data->refname, entry->name)) { @@ -812,15 +818,19 @@ 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) + 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)) { @@ -2032,7 +2042,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; @@ -2079,7 +2090,9 @@ 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, NULL, + get_packed_refs(&ref_cache), + skip, skipnum)) { last_errno = ENOTDIR; goto error_return; } @@ -2137,7 +2150,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); } /* @@ -2624,10 +2637,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, oldrefname, + get_packed_refs(&ref_cache), NULL, 0)) return 1; - if (!is_refname_available(newrefname, oldrefname, get_loose_refs(&ref_cache))) + if (!is_refname_available(newrefname, oldrefname, + get_loose_refs(&ref_cache), NULL, 0)) return 1; if (log && rename(git_path("logs/%s", oldrefname), git_path(TMP_RENAMED_LOG))) @@ -2660,7 +2675,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; @@ -2675,7 +2690,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; @@ -3520,7 +3535,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.rc3.474.g3833130