From patchwork Sat Oct 12 23:03:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bence Ferdinandy X-Patchwork-Id: 13833499 Received: from aib29agh127.zrh1.oracleemaildelivery.com (aib29agh127.zrh1.oracleemaildelivery.com [192.29.178.127]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0AB9B19B5B5 for ; Sat, 12 Oct 2024 23:15:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.29.178.127 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728774947; cv=none; b=J4drgZC57W/Gak3Itqa6WPzfTP1u8UqxmIsheTSzSNNA1NjcPLR2m3VuBLrSrSAOosarj8RtrYPBcTZcH6RQ2tighWRJXKaHA5GsvnWcorxYvEqwwPt6L0Y+PgWDDFzMG9QF+rdooXd4j/3CmN+fasbN2soIf7YEWcRaQdRMu0w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728774947; c=relaxed/simple; bh=odkChGjQG2ZHCGNwnDAcSEM3hB+O5MVQuHOUR0TDGuQ=; h=From:To:Cc:Subject:Date:Message-id:In-reply-to:References: MIME-version; b=mNEDk/rRQt/EqdoNc6OgeYGarxnZgJSiojzbqpUOPfz3Rox+WuS0P39gL5+x92ZlMJl+HzIqWVk9ClD8iHPwPS+A7SvzN1Ush4VV6hitWSkyRQdHI/AjmFDx9ShNxsl/QF2+EdVuo8v020BWRhvpIt/D/ldhevUaTeHL2DXu/yc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=ferdinandy.com; spf=pass smtp.mailfrom=zrh1.rp.oracleemaildelivery.com; dkim=pass (2048-bit key) header.d=zrh1.rp.oracleemaildelivery.com header.i=@zrh1.rp.oracleemaildelivery.com header.b=ZclCEcXq; arc=none smtp.client-ip=192.29.178.127 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=ferdinandy.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zrh1.rp.oracleemaildelivery.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=zrh1.rp.oracleemaildelivery.com header.i=@zrh1.rp.oracleemaildelivery.com header.b="ZclCEcXq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=prod-zrh-20200406; d=zrh1.rp.oracleemaildelivery.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender:List-Unsubscribe:List-Unsubscribe-Post; bh=xv/V/03Ge7vGD5PUlB2ajgFFVhV+BrOOx5RuFcLdbEs=; b=ZclCEcXqfGaBEqKekHakuz2RBiyZf2+TQV1aTr14RL9ETc3ZHlaqv0JPhBdPvYCbghIIGc2Ts5Bi Gw8kkVRx23RayVWbqeMD+F9WAzXOeRYrzZIVt4Q3llnEFg1H+LRx2q7fBFt/fgxFI95/Qv5t1x7s XJ8mVu/XX1IdmL+8Tz4VEcMkb/OuXh2lLtpD+eWpkpK+1SavXlufwdGF/sNC/mysWODasKM3hJEB wQx0G5cuG16tTmYptEHmwQKEAYxHVkv6+Lfov8+h3fg40erAUNOmlhisqvmLG+8AB7YFyVSdJTeG Y4Lddfg8PJwbm4z5jnX/rJNwNBRIjxdW/8k/fw== Received: by omta-ad1-fd3-402-eu-zurich-1.omtaad1.vcndpzrh.oraclevcn.com (Oracle Communications Messaging Server 8.1.0.1.20240911 64bit (built Sep 11 2024)) with ESMTPS id <0SL9008VZNA8XY60@omta-ad1-fd3-402-eu-zurich-1.omtaad1.vcndpzrh.oraclevcn.com> for git@vger.kernel.org; Sat, 12 Oct 2024 23:15:44 +0000 (GMT) List-Unsubscribe-Post: List-Unsubscribe=One-Click From: Bence Ferdinandy To: git@vger.kernel.org Cc: phillip.wood@dunelm.org.uk, Taylor Blau , =?utf-8?q?Ren?= =?utf-8?q?=C3=A9_Scharfe?= , Johannes Schindelin , Junio C Hamano , Bence Ferdinandy Subject: [PATCH v7 4/6] refs: add TRANSACTION_CREATE_EXISTS error Date: Sun, 13 Oct 2024 01:03:24 +0200 Message-id: <20241012230428.3259229-4-bence@ferdinandy.com> In-reply-to: <20241012230428.3259229-1-bence@ferdinandy.com> References: <20241010133022.1733542-1-bence@ferdinandy.com> <20241012230428.3259229-1-bence@ferdinandy.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-version: 1.0 Content-transfer-encoding: 8bit Reporting-Meta: AAH5WjwJA9YJE1eMNxG4kucu7BjGwMzMiiZCwtQcLQfhQVT3cNAlp8pJlIUdzg4y sh3cOykRyQotKGSzVWDOhpHd3upg32zoUimOy/NcSkqjKgrg7OqADJG/1OHFgF+c Ie7T5+XG3e4rRD1+L/P4TP3gb3XNWg8W+pMTBUYF1iasHNUtiYVVEwVBWRotdrBu U/ZEMfTupuKi0JzgCNJejoEB/z2gmKzWVZrba2znAOgAhyqTM/JtOIqHOCjn6d46 NqVpVcstz3kywfzc/5IC7amiKxg+QLfPB9cvTK/oopO0t5aW++y+YirSgyGgxET4 GCNuhnNanHno88e7K6+n8Mj88YSsgyWhp1tfX/BT7DTLkuVU+JNuVeI282fbb/qu UI7ASNwgY6TpQWqvblSi3nGbK9qLBRTu4OlEZT4mNsO6s54fhl2ztaCYVufYNa1i upYuR1S0eXx/53mG7+fBFyqMIIRKfM1Jl3OjC9n4ZVB+lua20Eazk+4g Currently there is only one special error for transaction, for when there is a naming conflict, all other errors are dumped under a generic error. Add a new special error case for when the caller requests the reference to be updated only when it does not yet exist and the reference actually does exist. Signed-off-by: Bence Ferdinandy --- Notes: v4: new patch v5: no change v6: no change v7: - change commit prefix to be more in line with project standards - changed error checking to Karthik's suggestion refs.h | 4 +++- refs/files-backend.c | 24 ++++++++++++++++-------- refs/reftable-backend.c | 6 ++++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/refs.h b/refs.h index b09a3a4384..c83b1ec76e 100644 --- a/refs.h +++ b/refs.h @@ -759,8 +759,10 @@ int ref_transaction_verify(struct ref_transaction *transaction, /* Naming conflict (for example, the ref names A and A/B conflict). */ #define TRANSACTION_NAME_CONFLICT -1 +/* When only creation was requested, but the ref already exists. */ +#define TRANSACTION_CREATE_EXISTS -2 /* All other errors. */ -#define TRANSACTION_GENERIC_ERROR -2 +#define TRANSACTION_GENERIC_ERROR -3 /* * Perform the preparatory stages of committing `transaction`. Acquire diff --git a/refs/files-backend.c b/refs/files-backend.c index 0824c0b8a9..e743ec44b5 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -2502,14 +2502,18 @@ static int split_symref_update(struct ref_update *update, static int check_old_oid(struct ref_update *update, struct object_id *oid, struct strbuf *err) { + int ret = TRANSACTION_GENERIC_ERROR; + if (!(update->flags & REF_HAVE_OLD) || oideq(oid, &update->old_oid)) return 0; - if (is_null_oid(&update->old_oid)) + if (is_null_oid(&update->old_oid)) { strbuf_addf(err, "cannot lock ref '%s': " "reference already exists", ref_update_original_update_refname(update)); + ret = TRANSACTION_CREATE_EXISTS; + } else if (is_null_oid(oid)) strbuf_addf(err, "cannot lock ref '%s': " "reference is missing but expected %s", @@ -2522,7 +2526,7 @@ static int check_old_oid(struct ref_update *update, struct object_id *oid, oid_to_hex(oid), oid_to_hex(&update->old_oid)); - return -1; + return ret; } /* @@ -2602,9 +2606,11 @@ static int lock_ref_for_update(struct files_ref_store *refs, ret = TRANSACTION_GENERIC_ERROR; goto out; } - } else if (check_old_oid(update, &lock->old_oid, err)) { - ret = TRANSACTION_GENERIC_ERROR; - goto out; + } else { + ret = check_old_oid(update, &lock->old_oid, err); + if (ret) { + goto out; + } } } else { /* @@ -2635,9 +2641,11 @@ static int lock_ref_for_update(struct files_ref_store *refs, update->old_target); ret = TRANSACTION_GENERIC_ERROR; goto out; - } else if (check_old_oid(update, &lock->old_oid, err)) { - ret = TRANSACTION_GENERIC_ERROR; - goto out; + } else { + ret = check_old_oid(update, &lock->old_oid, err); + if (ret) { + goto out; + } } /* diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c index 3c96fbf66f..ebf8e57fbc 100644 --- a/refs/reftable-backend.c +++ b/refs/reftable-backend.c @@ -1206,10 +1206,13 @@ static int reftable_be_transaction_prepare(struct ref_store *ref_store, goto done; } } else if ((u->flags & REF_HAVE_OLD) && !oideq(¤t_oid, &u->old_oid)) { - if (is_null_oid(&u->old_oid)) + ret = TRANSACTION_NAME_CONFLICT; + if (is_null_oid(&u->old_oid)) { strbuf_addf(err, _("cannot lock ref '%s': " "reference already exists"), ref_update_original_update_refname(u)); + ret = TRANSACTION_CREATE_EXISTS; + } else if (is_null_oid(¤t_oid)) strbuf_addf(err, _("cannot lock ref '%s': " "reference is missing but expected %s"), @@ -1221,7 +1224,6 @@ static int reftable_be_transaction_prepare(struct ref_store *ref_store, ref_update_original_update_refname(u), oid_to_hex(¤t_oid), oid_to_hex(&u->old_oid)); - ret = -1; goto done; }