From patchwork Wed Oct 23 15:36:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bence Ferdinandy X-Patchwork-Id: 13847316 Received: from aib29agh123.zrh1.oracleemaildelivery.com (aib29agh123.zrh1.oracleemaildelivery.com [192.29.178.123]) (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 F068D1C7601 for ; Wed, 23 Oct 2024 15:39:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.29.178.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729697947; cv=none; b=u2qasZtT4SFaGc7pIhCq90DlIgIjI8CeQVwDOoBJbVG/IEXV/1fjYP3cMw19wajj6kzeCF0Y0hzLPXc5mqbqWR2nWVx1NpEnLnys/10d/dupvvrGsHa93GVh5yvNe9xaUQ0g3je5750qwWB5Fb20+zAeFK98RLxUaBlRCmuaYuE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729697947; c=relaxed/simple; bh=P49taN4+Ju9ibf8ZfmmhZZhU+0dX25ge3R41Xv7Lbfo=; h=From:To:Cc:Subject:Date:Message-id:In-reply-to:References: MIME-version; b=naLwzzyo+j0WYsIqscyZsvUjsehcoZ3sb6j1TnNIeeN+uMepNNb/d+BmKXtcpDC8Elb2PofnfPiMdRCmDvNtMWeS5J5ht0ZAO63oMs4aWckIAQGH8XZVAMnRHKdhP0Va+u1TTbIWeZVKWxXWVhNopRE3gJyLw131xOvDDCV90bI= 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=Wld/PsEq; arc=none smtp.client-ip=192.29.178.123 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="Wld/PsEq" 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=29O6tSBf8BEBVILHhwIioDqpRSa6JmaJnl3Qh0KSO8Y=; b=Wld/PsEquEdofYxSUjczWDgh6IRoUDMqfkbs7Wvgq29Y32CCSpjRXvLaqbQyZP2F6taCSxXWCq/8 T6RuPGVdgLNsZQGeCqHJIRndkigXAK1bRPWf/d2oD/LfzD1MFV0E5XFZ+FqTc3eCGMv3WNCP6Yok a6SRBBHt62fO6St/P8q8n7v4rlMx54T57M5B88Yg6Vn1nbhkZUuGA/VhelIu4IowqzfkTuV9UOnv dFcVLKBjL2eAN3HSUIVo6x6NwA6coXaQgiYdS11N/SZBj9Z9bqMNV7E46SgF7512QBCITCbdkMj6 jDb5LYRxFpz2n5d9fKdnmk9YNo4fAWDDJrrZbg== Received: by omta-ad1-fd1-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 <0SLT00DSSFH4YL40@omta-ad1-fd1-402-eu-zurich-1.omtaad1.vcndpzrh.oraclevcn.com> for git@vger.kernel.org; Wed, 23 Oct 2024 15:39:04 +0000 (GMT) List-Unsubscribe-Post: List-Unsubscribe=One-Click From: Bence Ferdinandy To: git@vger.kernel.org Cc: phillip.wood@dunelm.org.uk, =?utf-8?q?Ren=C3=A9_Scharfe?= , Johannes Schindelin , Junio C Hamano , karthik.188@gmail.com, Taylor Blau , Bence Ferdinandy , ferdinandy.bence@ttk.elte.hu Subject: [PATCH v12 5/8] refs: add TRANSACTION_CREATE_EXISTS error Date: Wed, 23 Oct 2024 17:36:39 +0200 Message-id: <20241023153736.257733-6-bence@ferdinandy.com> In-reply-to: <20241023153736.257733-1-bence@ferdinandy.com> References: <20241022194710.3743691-1-bence@ferdinandy.com> <20241023153736.257733-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: AAENjx+kQ8INcyjxai/I64o8V1KX/5STYv/8mM/petn9DN10RWPokP8dgqKLQ6oL xwqcRcjZZYC6OPSAQMhH6kY+/bLOIE1tzkp7Gbuf2U1iFF6SwbHgIEoX9AZjV+y+ nZ4z1fxS+uhPoAptYGq/FqpEo3c+lCf9tkoA8CGYkT1JcD6AVxosZQthiYMqDrBh C4SalZ9xPOnc5nob34ZqPI3zizq+beF7W5HYolneptYrh7z0AeLRrtKQdUALhzrU YGPF/RV6H1N/Is1z+4rqqF/uGRIcAlk7B9RkXN4chrBLwU9OwGyBu6AaF6Yhbp1+ /giDcsKxSG2k7QFezHT2XiLU3jN1RF9Q+3q/JzL3tefESRUZZZvNvkd4HzmD+cdj fIbI2hpaw3LCfX7Ed6EkYilK0ULZGpJTuSEJETgjvJKsmoKuJz5sYyaCpE/lueYa TJzOkxSV3qhAiCnv/44htfMsk83KswmTjc+UIIFv+sRRW7dF0Ji8NZjE 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 v8: no change v9: - no change v10: no change v11: no change v12: no change 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 259191a485..a5bc25442b 100644 --- a/refs.h +++ b/refs.h @@ -762,8 +762,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 3c6107c7ce..b3b5ce77dd 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; }