From patchwork Sat Feb 1 06:41:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meet Soni X-Patchwork-Id: 13956092 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 89805BA34 for ; Sat, 1 Feb 2025 06:42:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738392170; cv=none; b=WggWt9iMOaBAqLQDo443Hn//c6wXJ5iBZavfPIUCwQLtDnYu5rbrAUe0zBBOjnrhMSZJ30c2c9b6mg7qCijRZVM5BJRaoM8Hm44mWqN6cgMkBcKpDuZHnAJmjsQ/oF7s/mWDeFfb8QSGbYG7xpyUXpUyD4jHozU9BP4GfVgHcR4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738392170; c=relaxed/simple; bh=M+ZyVYSBVPxPQXNw8GRFPvnS9/7hRNvMyX2F+ofKHPU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PEbtXpJsu1udlam5E3cwp+hgp1PFj3n/2tjPQoE4RM32mFJ9BgVRayB8FF8UAfGorfKYBme6XrOehfwFGRZejnncacvYzerSqzKSPZJa9GKVy4Qro+zCRMnhOJLpQ8K4D3Exh198cpVtp5vqHLdBBR58ND6MsJrhWacGGm459T8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ar9YBO/V; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ar9YBO/V" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2165cb60719so50597995ad.0 for ; Fri, 31 Jan 2025 22:42:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738392167; x=1738996967; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QPs+pVBrIP21zpkuhISs9jJHORFBB6K5p8XwuYzdVgw=; b=ar9YBO/VHJR7moFIPmUCP/aFIaeoptPTPY2vmbROtYGsw/cnYG7ND0L7KWhHProlLS 6GZxFzYhxxPPccjaO41yjE7agQaQ3huweC/xQPnU5uR4v9P/iHZrXpyCxcF1d7S48zxY 0fqkvs7EGZ+nhwxiBuuYlJUbFU0YV2Ny5bb6qJoTG0tqzUu7bTCnqqER0UgtjlSufTQA 7MY/tNtBC4MHbFUKFMMpRoqG8FWEHpo7KWjpiTfHdQP1dZiZ+wRufUW//GD2rKukle2H yo/V2zvb6PQownMjB/GyitJXQFkcliD/RTY0m0UnJt4fvJUD0jLI4zsfmhWRZ75Fzyp6 m0Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738392167; x=1738996967; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QPs+pVBrIP21zpkuhISs9jJHORFBB6K5p8XwuYzdVgw=; b=r8soY4sYxRhxFkcm889vBPA/dAbNZHpsdVNS2QOO7dDhUt+Hj/v207txF98LydvwVE 9L5drvcGyx9/ADy+BuEemxR5uYvFmebRXmRoz5j7wXTiOC0JNUxdLn/2Kpvmo0y9psyO 8QdOwV5kMXQj3kQsZDvTFg8rRuQrG2pz5eMcxYwqsPzA8oB/t8NfNEnm5aZJVo6b2E0R AJAQyyiFwuwbay7Rlahl7iP4GiRNdJ2IPG71CABxmsGlqTTcTeZagxmRVjqF5KgC1iJP mPhms4Py6H4mEA6KmOsGaBcjVmKPkUfvBmnOk1pgxzY6Y/ktnm4QYwMpMFSGhl3ycwSL kVGQ== X-Gm-Message-State: AOJu0YxRPO8FHspYWDEacsrOlEDg1SKzENcCU4NfgeBAOdmOh5OlfNHq QteJCw/4mXr/OaJcjqxQKBxLcaxkjhuo+iifkM8sucLqcA/W8ckDdTVi/tgT X-Gm-Gg: ASbGncvwUD+KThnx4L9ttpcdILNIDWoKVfw+HAF+TQCYhTnUb07QaaNDwdNFC9q2OcL HvhweNkm4wQdgu65nKGrajJ92cRlGYm/An5xoEgtjCU+JTzwlt60sL4jg/1DD0UoCFNF90uuM7J y8rK4SioXUdGho7IMCF5EQV5gJkx8VETYubgz9q2biYYz5LbK0kzwT0Hc59mNwXcXC4ZCnEvEAV 5dVMy2vM9aQSuNUq2ubk0Wt8xaKj7hdBDNSFa8c6PhLmEzdcFBwpJWe+69YHHk8PCTkOHxU04rA kJbmkQU7KKNhRA== X-Google-Smtp-Source: AGHT+IG3N729kM+Hxm8jE5uJPtPDfvP32gpGbfpLcnjAsfm1FOxMdWDhXa0LZ+GJf60DMyQzxvOZGA== X-Received: by 2002:a05:6a21:7101:b0:1e2:88b:4f1b with SMTP id adf61e73a8af0-1ed7a62497cmr21607089637.39.1738392167262; Fri, 31 Jan 2025 22:42:47 -0800 (PST) Received: from meet.. ([103.240.169.233]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec0e8ef61sm4058592a12.78.2025.01.31.22.42.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jan 2025 22:42:46 -0800 (PST) From: Meet Soni To: git@vger.kernel.org Cc: shubham.kanodia10@gmail.com, Meet Soni , Jeff King , Jacob Keller , Junio C Hamano , Jacob Keller , Matthew Rogers , Patrick Steinhardt , Pavel Rappo Subject: [PATCH v3 1/5] refactor(remote): rename function omit_name_by_refspec Date: Sat, 1 Feb 2025 12:11:58 +0530 Message-Id: <20250201064202.76116-2-meetsoni3017@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250201064202.76116-1-meetsoni3017@gmail.com> References: <20250127103644.36627-1-meetsoni3017@gmail.com> <20250201064202.76116-1-meetsoni3017@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename the function `omit_name_by_refspec()` to `refname_matches_negative_refspec_item()` to provide clearer intent. The previous function name was vague and did not accurately describe its purpose. By using `refname_matches_negative_refspec_item`, make the function's purpose more intuitive, clarifying that it checks if a reference name matches any negative refspec. Rename function parameters for consistency with existing naming conventions. Use `refname` instead of `name` to align with terminology in `refs.h`. Remove the redundant doc comment since the function name is now self-explanatory. Signed-off-by: Meet Soni --- builtin/remote.c | 2 +- remote.c | 8 ++++---- remote.h | 6 +----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 0435963286..258b8895cd 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -383,7 +383,7 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat states->remote->fetch.items[i].raw); for (ref = fetch_map; ref; ref = ref->next) { - if (omit_name_by_refspec(ref->name, &states->remote->fetch)) + if (refname_matches_negative_refspec_item(ref->name, &states->remote->fetch)) string_list_append(&states->skipped, abbrev_branch(ref->name)); else if (!ref->peer_ref || !refs_ref_exists(get_main_ref_store(the_repository), ref->peer_ref->name)) string_list_append(&states->new_refs, abbrev_branch(ref->name)); diff --git a/remote.c b/remote.c index 0f6fba8562..cb70ce6f3b 100644 --- a/remote.c +++ b/remote.c @@ -944,12 +944,12 @@ static int refspec_match(const struct refspec_item *refspec, return !strcmp(refspec->src, name); } -int omit_name_by_refspec(const char *name, struct refspec *rs) +int refname_matches_negative_refspec_item(const char *refname, struct refspec *rs) { int i; for (i = 0; i < rs->nr; i++) { - if (rs->items[i].negative && refspec_match(&rs->items[i], name)) + if (rs->items[i].negative && refspec_match(&rs->items[i], refname)) return 1; } return 0; @@ -962,7 +962,7 @@ struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs) for (tail = &ref_map; *tail; ) { struct ref *ref = *tail; - if (omit_name_by_refspec(ref->name, rs)) { + if (refname_matches_negative_refspec_item(ref->name, rs)) { *tail = ref->next; free(ref->peer_ref); free(ref); @@ -1021,7 +1021,7 @@ static int query_matches_negative_refspec(struct refspec *rs, struct refspec_ite } for (i = 0; !matched_negative && i < reversed.nr; i++) { - if (omit_name_by_refspec(reversed.items[i].string, rs)) + if (refname_matches_negative_refspec_item(reversed.items[i].string, rs)) matched_negative = 1; } diff --git a/remote.h b/remote.h index bda10dd5c8..66ee53411d 100644 --- a/remote.h +++ b/remote.h @@ -261,11 +261,7 @@ int resolve_remote_symref(struct ref *ref, struct ref *list); */ struct ref *ref_remove_duplicates(struct ref *ref_map); -/* - * Check whether a name matches any negative refspec in rs. Returns 1 if the - * name matches at least one negative refspec, and 0 otherwise. - */ -int omit_name_by_refspec(const char *name, struct refspec *rs); +int refname_matches_negative_refspec_item(const char *refname, struct refspec *rs); /* * Remove all entries in the input list which match any negative refspec in From patchwork Sat Feb 1 06:41:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meet Soni X-Patchwork-Id: 13956093 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BA16BA34 for ; Sat, 1 Feb 2025 06:43:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738392183; cv=none; b=mQnpVYYnSg66S2RIv/jfqiXBkH4uzhj7pTYvJg7ycOKhL57Oo8zmaSdwhFnN+9sPbANtL2KQP4pood8YWHxJ7WC/ng3c4xuumCcqgFXudQJWPd6CBESbjiEopu+Oo7CARbKhxKPmK1U5H9WYNoogC0l8yzFP08qUY5uzbGnMHJo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738392183; c=relaxed/simple; bh=K8c7zrz3BsEzSXdD0bAIEFml7K9yEkDFRfdtYIl1MW4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BOIuAje4Ik5TQb0rkwo70nE79Lo0ZnVOH70ybsArW4Wj1TbByxFeE/jQbJwKHrM6QQ/k2/ooKh5J9QyLe+EwUq9RP2NtWf3p8t04sfdQlTes07CeczLraP/OoZ9QuqvuSfGXTGtRKzQUpsxk6VHrwXYPlJbX2e8Uf04gUTJ1vUE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HM1k+Yca; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HM1k+Yca" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2163dc5155fso49594615ad.0 for ; Fri, 31 Jan 2025 22:43:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738392180; x=1738996980; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+XrzHN4wuZPJQC7cj5lxtiODkgcNKnVudGps5nhWM6o=; b=HM1k+YcawlLTgAa2DcjKtcZg25mbTSN4W9GeD8D9UF4aYKoHPBjZ8FqPp87nBHpRmq 2gCCm1B9LJIvgg+Y08zJv6iNT8phxRKXTepDDMXp80g+qhZxrWDGqPXJL270IidRq6pr xvTrocwLrURkaKSxobBSLG7RuXtY8M4AIrJveTNqMWEUNUh7CmJJ1YoqjZG2G1/FWf4D eBZZiIUuG3dZnJsbl+x45Ms2MgkiBI3IR3EwCNS9kpe8ISm9ZlEU6bCZUDeW1yz5Dgh0 pbqBEfQ3jhcQTH1qCYAuJtItd9g8zoQqILKtmCQmKsG2BV83IlCDjpCERMd6/2x40aLG PQsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738392180; x=1738996980; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+XrzHN4wuZPJQC7cj5lxtiODkgcNKnVudGps5nhWM6o=; b=k/2ZNY5RxbBVtjJSc+klwS/i5+wsmWAByj3qiFDj4K4y779Ir6ntvQKGtC2HpTxw4x jP7738+hzODO/eeC/f5826Nlu9gm++FHN22ycoavy3+nu1R2rHHkWmcvqeKfZkL3dr7A csiAOrVDLTpDSiHSX5SaGFovfTacCzNhYuVrFfF7DoDW2zeRiqtsgl5jFN80dDZmk/BK Ax9sjgxmpjGP/Zdsf6kJGhTawJrtrN3ataVG8bbYM4YNUaTX0RVTLs6wGVtlzXls5RXs c/cz+8qH1s8H0zUM+z6cYBCF841XgmDNPp+aZYKeKsEJSyu0SDzsM63RK+Jk1B/029gU ccVw== X-Gm-Message-State: AOJu0YxEHfmuoXniFJghf8FyznAoJC+6pENJfPEHN6m5pJXZra7j2a3S k2MryPTcVPCxMde+F5X8NOVkLYD8M5eqDm4BrEuGj3f5zF0iNVtUi+x5VsXn X-Gm-Gg: ASbGncsgI3Bfu30Tq2dYQRBajo/vjiHCPPagofRYjPK2oDNRx5LsNne+E/zdUgqb2Qx F9P300+b7bq28rteZBvZVPzuV9QgEyDFqw5cwmUFED3WgE3OO/l5AiH6HKu7yKcNWfTO0ReH+Z2 usK+BFF5dv3vK+8uKs/6CTVFbS8jUZYNwJ2oilcn+U67g1T8kr1kIp7pIIh7xPYM4ndEEq2xk2o 7LDyNu3mXIVi6BrYETwVMAIcx8pxneWO8Hyij63wLq/RNrIuRpx9RIDgbiJXonF+LBzgx6k/9s4 G5hhd73TRlG+lA== X-Google-Smtp-Source: AGHT+IEbd1o4HRqRCy4hZlZ+za6BhYHIeCcZvAjBpUAizcH3C5bN+Ax9/bAKwKh/eoQGi4OyJgYp0g== X-Received: by 2002:a05:6a20:9c8b:b0:1e1:b28e:a148 with SMTP id adf61e73a8af0-1ed7a5a56d7mr20628078637.5.1738392180594; Fri, 31 Jan 2025 22:43:00 -0800 (PST) Received: from meet.. ([103.240.169.233]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec0e8ef61sm4058592a12.78.2025.01.31.22.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jan 2025 22:43:00 -0800 (PST) From: Meet Soni To: git@vger.kernel.org Cc: shubham.kanodia10@gmail.com, Meet Soni , Junio C Hamano , Patrick Steinhardt , Matthew Rogers , Jacob Keller , Jeff King Subject: [PATCH v3 2/5] refspec: relocate refname_matches_negative_refspec_item Date: Sat, 1 Feb 2025 12:11:59 +0530 Message-Id: <20250201064202.76116-3-meetsoni3017@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250201064202.76116-1-meetsoni3017@gmail.com> References: <20250127103644.36627-1-meetsoni3017@gmail.com> <20250201064202.76116-1-meetsoni3017@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Move the functions `refname_matches_negative_refspec_item()`, `refspec_match()`, and `match_name_with_pattern()` from `remote.c` to `refspec.c`. These functions focus on refspec matching, so placing them in `refspec.c` aligns with the separation of concerns. Keep refspec-related logic in `refspec.c` and remote-specific logic in `remote.c` for better code organization. Signed-off-by: Meet Soni --- refspec.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ refspec.h | 9 +++++++++ remote.c | 48 ------------------------------------------------ 3 files changed, 57 insertions(+), 48 deletions(-) diff --git a/refspec.c b/refspec.c index 6d86e04442..b447768304 100644 --- a/refspec.c +++ b/refspec.c @@ -276,3 +276,51 @@ void refspec_ref_prefixes(const struct refspec *rs, } } } + +int match_name_with_pattern(const char *key, const char *name, + const char *value, char **result) +{ + const char *kstar = strchr(key, '*'); + size_t klen; + size_t ksuffixlen; + size_t namelen; + int ret; + if (!kstar) + die(_("key '%s' of pattern had no '*'"), key); + klen = kstar - key; + ksuffixlen = strlen(kstar + 1); + namelen = strlen(name); + ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen && + !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen); + if (ret && value) { + struct strbuf sb = STRBUF_INIT; + const char *vstar = strchr(value, '*'); + if (!vstar) + die(_("value '%s' of pattern has no '*'"), value); + strbuf_add(&sb, value, vstar - value); + strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen); + strbuf_addstr(&sb, vstar + 1); + *result = strbuf_detach(&sb, NULL); + } + return ret; +} + +static int refspec_match(const struct refspec_item *refspec, + const char *name) +{ + if (refspec->pattern) + return match_name_with_pattern(refspec->src, name, NULL, NULL); + + return !strcmp(refspec->src, name); +} + +int refname_matches_negative_refspec_item(const char *refname, struct refspec *rs) +{ + int i; + + for (i = 0; i < rs->nr; i++) { + if (rs->items[i].negative && refspec_match(&rs->items[i], refname)) + return 1; + } + return 0; +} diff --git a/refspec.h b/refspec.h index 69d693c87d..584d9c9eb5 100644 --- a/refspec.h +++ b/refspec.h @@ -71,4 +71,13 @@ struct strvec; void refspec_ref_prefixes(const struct refspec *rs, struct strvec *ref_prefixes); +int refname_matches_negative_refspec_item(const char *refname, struct refspec *rs); + +/* + * Checks whether a name matches a pattern and optionally generates a result. + * Returns 1 if the name matches the pattern, 0 otherwise. + */ +int match_name_with_pattern(const char *key, const char *name, + const char *value, char **result); + #endif /* REFSPEC_H */ diff --git a/remote.c b/remote.c index cb70ce6f3b..1da8ec7037 100644 --- a/remote.c +++ b/remote.c @@ -907,54 +907,6 @@ void ref_push_report_free(struct ref_push_report *report) } } -static int match_name_with_pattern(const char *key, const char *name, - const char *value, char **result) -{ - const char *kstar = strchr(key, '*'); - size_t klen; - size_t ksuffixlen; - size_t namelen; - int ret; - if (!kstar) - die(_("key '%s' of pattern had no '*'"), key); - klen = kstar - key; - ksuffixlen = strlen(kstar + 1); - namelen = strlen(name); - ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen && - !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen); - if (ret && value) { - struct strbuf sb = STRBUF_INIT; - const char *vstar = strchr(value, '*'); - if (!vstar) - die(_("value '%s' of pattern has no '*'"), value); - strbuf_add(&sb, value, vstar - value); - strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen); - strbuf_addstr(&sb, vstar + 1); - *result = strbuf_detach(&sb, NULL); - } - return ret; -} - -static int refspec_match(const struct refspec_item *refspec, - const char *name) -{ - if (refspec->pattern) - return match_name_with_pattern(refspec->src, name, NULL, NULL); - - return !strcmp(refspec->src, name); -} - -int refname_matches_negative_refspec_item(const char *refname, struct refspec *rs) -{ - int i; - - for (i = 0; i < rs->nr; i++) { - if (rs->items[i].negative && refspec_match(&rs->items[i], refname)) - return 1; - } - return 0; -} - struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs) { struct ref **tail; From patchwork Sat Feb 1 06:42:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meet Soni X-Patchwork-Id: 13956094 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 951DB126F1E for ; Sat, 1 Feb 2025 06:43:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738392190; cv=none; b=WMppOdg6Grw2N1mxor50i4v2e3O/1RB03P1i53qSAXTTcKsJrBdgHjNKp7C2TUKy4psbtH/mTmS5340ypB7v00q8b42LomrX7IJpuZdGI45Zf28prKgpeUFuE1cHAH/xdpMUlCFURbN+qdnA++SNNZzAES+lTtOFDhs1Bdq6XPU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738392190; c=relaxed/simple; bh=o0RSl/GTWUbwoOVBaZeyzZsfazQZv4I9jj3N0c/i/7E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TQ9hMIkd/kQ13z+21sgBXBWunoyzLkkN4e8sPO64EwqR7qkN2GpZFLhEu0MjWL8RIapGl1AQsd8uhJnWlyca0ptI7qIT7apWigNqN9SzGjhE8H9YZIuf/Rkz9zIs4mpBJWtJP3gROpC8gxusAXrHYg573QaSInh+zbOcTRxKmJA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SyPz0qw2; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SyPz0qw2" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2166f1e589cso69067625ad.3 for ; Fri, 31 Jan 2025 22:43:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738392187; x=1738996987; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=csK2Ph5s9/p6teNNvidx4xGEocrCytCWN/BhSGHMWuM=; b=SyPz0qw2ltwapLTl9iUWE4i9H4NCN1mVruSnFpFXA9rSaQ6QuxOnaSitAdetmOvY9K oWAb9QKpKPCHBaKKLSWIrw3CY20EO70ExV9lfMAFWBdj6Tl1LmH0sxtxxZoU4HIVPh82 /TwDaWE7/Hh4pzojygyi1ll5s/72PnGu316KN2Q9jr4vjhiQsa46v6pf8RvNdWdzO0Km PleLfYaoeLFXcmCUt1NigAiPZdG8aRY52E58KOFT6ysNZzm98oF0iV2dJjpqTkKgsdTe Zq98kSHkbRPYc+dpIb3cI2TDg3b8YDKsVwDGAVXCaYa0EwPgRsNQ/QUAl8OWmSsgLGm5 DdXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738392187; x=1738996987; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=csK2Ph5s9/p6teNNvidx4xGEocrCytCWN/BhSGHMWuM=; b=R+aTRF+WI/L26Sq9FHaDG6xMJVNjS3UYQbsalPKcQayfa/6xxTIdfxcIJS2SgthhPj ZOBwtgtkS/uDj8v0Ae1bEpR1b+E0ge5VHLs7RsY+A3FcH2a8sMxwX139SSgGXDK6VaBd iTYPe0mkSGPq+5Dr/Xz5dzecDAthfKJUchRGhPV81hcr0BhoBpSuL1yrm/pGSiJZ4oqs vqWFSM9xSz88XzGjNKzZEX1RccvUyEsLbs332T2U0AVlnNX4glfdb5C0OOa9r0sIeSCk yv6Wkn8ZRxr5QbMizisKK521PeTSMNMsA5OezzmkZ+0apPvH0kQvqbrwj+BkXWYnadPM nmzA== X-Gm-Message-State: AOJu0YwIaUfOXhF71Y5yQC7N+5r3oSMpvL/EHNcGFgIYv2L7tkdUU9gM 8OEEE1n2P525kVc3XXGohBcR8YMCXNBFuTS7t3AFuC20jTDQlowCyzA29BWL X-Gm-Gg: ASbGnctaV+GDSLubpJcEImxBA9FRmxAFJkJOqwhdEE1nBVl3Hjvj7od6e3uZUimhTKv M0k9xDDTatXQEhGyN/JL+/7vgxVZSMGNYmOBQEudirjEMY/B/V7yseyNpK+AijgEBscZzxMCHed 51x21UQUJ4aW61I/2zDZ5waWoLwUMDxRs0QL53C6PUkpd88qaWpGMMkm1DnjFDlg2oFz0wx4pno KkFvELu2rw4F+5zso1f04nEc+likfxIv0+/6IOccQxMgdOJ8ttP61fvlkO6d1y7Mo/3syvYx+W0 pkt9OHmZQf1TsA== X-Google-Smtp-Source: AGHT+IE/rBlifCEywCCP5vxUHUtTkFYEWZS7Fwnu4F8GiueJ7DHMeOD5fqPBKmjuH9ajoOOwjRYRYw== X-Received: by 2002:a05:6a21:78c:b0:1e1:9f77:da92 with SMTP id adf61e73a8af0-1ed7a5ee31emr20667335637.33.1738392186905; Fri, 31 Jan 2025 22:43:06 -0800 (PST) Received: from meet.. ([103.240.169.233]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec0e8ef61sm4058592a12.78.2025.01.31.22.43.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jan 2025 22:43:06 -0800 (PST) From: Meet Soni To: git@vger.kernel.org Cc: shubham.kanodia10@gmail.com, Meet Soni , Patrick Steinhardt , Junio C Hamano , Matthew Rogers , =?utf-8?q?Ren=C3=A9_Scharfe?= , Jacob Keller , Denton Liu Subject: [PATCH v3 3/5] refactor(remote): rename query_refspecs functions Date: Sat, 1 Feb 2025 12:12:00 +0530 Message-Id: <20250201064202.76116-4-meetsoni3017@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250201064202.76116-1-meetsoni3017@gmail.com> References: <20250127103644.36627-1-meetsoni3017@gmail.com> <20250201064202.76116-1-meetsoni3017@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename `query_refspecs()` to `find_refspec_match` for clarity, as it finds a single matching refspec. Rename `query_refspecs_multiple()` to `find_all_refspec_matches` to better reflect that it collects all matching refspecs instead of returning just the first match. Rename `query_matches_negative_refspec()` to `find_negative_refspec_match` for consistency with the updated naming convention. Signed-off-by: Meet Soni --- builtin/push.c | 2 +- remote.c | 20 ++++++++++---------- remote.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 90de3746b5..e6527b0b04 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -78,7 +78,7 @@ static void refspec_append_mapped(struct refspec *refspec, const char *ref, .src = matched->name, }; - if (!query_refspecs(&remote->push, &query) && query.dst) { + if (!find_refspec_match(&remote->push, &query) && query.dst) { refspec_appendf(refspec, "%s%s:%s", query.force ? "+" : "", query.src, query.dst); diff --git a/remote.c b/remote.c index 1da8ec7037..4654bce5d4 100644 --- a/remote.c +++ b/remote.c @@ -925,7 +925,7 @@ struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs) return ref_map; } -static int query_matches_negative_refspec(struct refspec *rs, struct refspec_item *query) +static int find_negative_refspec_match(struct refspec *rs, struct refspec_item *query) { int i, matched_negative = 0; int find_src = !query->src; @@ -982,7 +982,7 @@ static int query_matches_negative_refspec(struct refspec *rs, struct refspec_ite return matched_negative; } -static void query_refspecs_multiple(struct refspec *rs, +static void find_all_refspec_matches(struct refspec *rs, struct refspec_item *query, struct string_list *results) { @@ -990,9 +990,9 @@ static void query_refspecs_multiple(struct refspec *rs, int find_src = !query->src; if (find_src && !query->dst) - BUG("query_refspecs_multiple: need either src or dst"); + BUG("find_all_refspec_matches: need either src or dst"); - if (query_matches_negative_refspec(rs, query)) + if (find_negative_refspec_match(rs, query)) return; for (i = 0; i < rs->nr; i++) { @@ -1013,7 +1013,7 @@ static void query_refspecs_multiple(struct refspec *rs, } } -int query_refspecs(struct refspec *rs, struct refspec_item *query) +int find_refspec_match(struct refspec *rs, struct refspec_item *query) { int i; int find_src = !query->src; @@ -1021,9 +1021,9 @@ int query_refspecs(struct refspec *rs, struct refspec_item *query) char **result = find_src ? &query->src : &query->dst; if (find_src && !query->dst) - BUG("query_refspecs: need either src or dst"); + BUG("find_refspec_match: need either src or dst"); - if (query_matches_negative_refspec(rs, query)) + if (find_negative_refspec_match(rs, query)) return -1; for (i = 0; i < rs->nr; i++) { @@ -1054,7 +1054,7 @@ char *apply_refspecs(struct refspec *rs, const char *name) memset(&query, 0, sizeof(struct refspec_item)); query.src = (char *)name; - if (query_refspecs(rs, &query)) + if (find_refspec_match(rs, &query)) return NULL; return query.dst; @@ -1062,7 +1062,7 @@ char *apply_refspecs(struct refspec *rs, const char *name) int remote_find_tracking(struct remote *remote, struct refspec_item *refspec) { - return query_refspecs(&remote->fetch, refspec); + return find_refspec_match(&remote->fetch, refspec); } static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen, @@ -2487,7 +2487,7 @@ static int get_stale_heads_cb(const char *refname, const char *referent UNUSED, memset(&query, 0, sizeof(struct refspec_item)); query.dst = (char *)refname; - query_refspecs_multiple(info->rs, &query, &matches); + find_all_refspec_matches(info->rs, &query, &matches); if (matches.nr == 0) goto clean_exit; /* No matches */ diff --git a/remote.h b/remote.h index 66ee53411d..f109310eda 100644 --- a/remote.h +++ b/remote.h @@ -269,7 +269,7 @@ int refname_matches_negative_refspec_item(const char *refname, struct refspec *r */ struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs); -int query_refspecs(struct refspec *rs, struct refspec_item *query); +int find_refspec_match(struct refspec *rs, struct refspec_item *query); char *apply_refspecs(struct refspec *rs, const char *name); int check_push_refs(struct ref *src, struct refspec *rs); From patchwork Sat Feb 1 06:42:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meet Soni X-Patchwork-Id: 13956095 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49ADF12A177 for ; Sat, 1 Feb 2025 06:43:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738392195; cv=none; b=Sq42UXK0qfOqVodLBKbG/U6vCSTKlyL62Uqlix/MAiYQ/wrYw0f9D+Keb6jTGT70VSv3Ux4qLoJpYfCYqbnFwUXXFf2iMEe2fEi3KufYAtVJoTIPJBoFoi329bgBfkIKFEMkxNJXDPNjSJ5siVVdiK1G1j9a4tUM4Rz/3MlFLKA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738392195; c=relaxed/simple; bh=9oe7U1bnGRovoJa1j0cg+CxSP1kElBQkGxLGSNsWGJA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RQ6M1uzYs6NG92lpJYYRwjPTfoPwNeOrVfZ2GT/QXqBPIx1mZ4LVMkOYo3ehhwnrUY/kM7JLnQ4i+aJrq+3wK+ud7jWJUcc6PiMbEiLsOGuPCwU6zV9MzxUK4zo+wnqhpeTaIu/ZYFCDC7/mGndxnClnarTb+FHwn3ooPavfcNk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GpU6hqqp; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GpU6hqqp" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-216728b1836so47088755ad.0 for ; Fri, 31 Jan 2025 22:43:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738392191; x=1738996991; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/csq2zKAIsVOcBaweCao3H8BZrt1Q8jMq2sWK2Q9axw=; b=GpU6hqqpH5zKFNXmq7hITbevbXj9Lu9oBRNznAVqbvOGYOjcuSo8wtOyRqRuCsaHST soRCbaNWiMzgOkX1Tbee9hExXnnoZiBkGN/DaStZeKDENYQZD+cB8GossShcsW1bTbJp pW0CsdbeWmF8IumY32lCFyBq1dN45bwDd26bhhuRsaeITfJrboJGjrYkLgJcG5WM3F1d uaOjuVpMQ1T8dOUhYd0hD4r+R4fuuKZ8pwwZikVaXaXisZcJ8RCQ8N01910RPz0QiLfd HNUB/n45eKNo7hCQSXf0MK+1YgPilQ9nCWcmcKcdOlRjaiAqMY60pz+R8YV2MM1XwjvH JDtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738392191; x=1738996991; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/csq2zKAIsVOcBaweCao3H8BZrt1Q8jMq2sWK2Q9axw=; b=hy0maT4pU6cQ74e7ZUMDHe6V3DHIulnD3VfrpPrAQwZolPQePTYL+obpZldrDiNocC XT/UZumtvloSiGqHSNhBU4JkJA381RFtWcnCBCP4GLUHJwX4bbxNvhlX8aw6KD7lt00+ uRZGR6CFG6/bU/LBu2lID6K43jowOX5A6EmevxJZc9Ybs9spkMfLgjZu9kDNjWigD5nr 0mDI/wLAVFansRqD9inhRpc431qF+5+8f3bZrVS37giN2wKu2B42eBePr+QuUYAdWRhy WIXzzSIYZNR0blGJmu+7KuuiUiDJPWbQOBt6M1H2sxPtcmfLf2hcgkQkvmu3q44yFKRJ iP+A== X-Gm-Message-State: AOJu0YyJVmHD8X1NEBus4yMUEALabMW7IeKV6Cb9UB4VEgp1aPerY5wT XbRr2Hc+G0n3yU9VpTUDL8Vvj/PSL62i5myzHgemXk6rLlO6hd3bMcuTRA0P X-Gm-Gg: ASbGncu0PX34dmbBpyUCPvUPjQQrHvSI0l9wtgohmHc/a45RSjMd0h+aSzgeXQ5oKbL 41n6Ao9MWs++67hiQ+EfIKPcVwjWiOXN99LRvPXJuGA7q9lomQPHDYqjxhjSH+Va3fQhGMv13mt iBiY5P7XywA6p05VeTLXX9kQxNJat15zvex0S52+mVKzE+Lbbtl5gNbKaHou6Wo1q4rl0UFb3X4 sb8qbiLUg0QQDjcb77juo5BqQDYvs59OqKRScTG0QsTpf7stVQHAj8WpxxFrjn61nuxokirx4up IZSpIKLQlRmc6A== X-Google-Smtp-Source: AGHT+IGKAo5g0h6jEE0zBzn7SZnrEUQb3JLtakhxmOVwQ3zykkuv2VAO0jdSL38bfMNGR4u5a7hDaw== X-Received: by 2002:a17:903:247:b0:216:3dc5:1240 with SMTP id d9443c01a7336-21dd7dd5339mr210936965ad.45.1738392190853; Fri, 31 Jan 2025 22:43:10 -0800 (PST) Received: from meet.. ([103.240.169.233]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec0e8ef61sm4058592a12.78.2025.01.31.22.43.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jan 2025 22:43:10 -0800 (PST) From: Meet Soni To: git@vger.kernel.org Cc: shubham.kanodia10@gmail.com, Meet Soni , Jeff King , Elijah Newren , Nipunn Koorapati , Junio C Hamano Subject: [PATCH v3 4/5] refspec: relocate matching related functions Date: Sat, 1 Feb 2025 12:12:01 +0530 Message-Id: <20250201064202.76116-5-meetsoni3017@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250201064202.76116-1-meetsoni3017@gmail.com> References: <20250127103644.36627-1-meetsoni3017@gmail.com> <20250201064202.76116-1-meetsoni3017@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Move the functions `find_refspec_match()`, `find_all_refspec_matches()` and `find_negative_refspec_match()` from `remote.c` to `refspec.c`. These functions focus on matching refspecs, so centralizing them in `refspec.c` improves code organization by keeping refspec-related logic in one place. Signed-off-by: Meet Soni --- refspec.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ refspec.h | 16 +++++++ remote.c | 122 ----------------------------------------------------- 3 files changed, 139 insertions(+), 122 deletions(-) diff --git a/refspec.c b/refspec.c index b447768304..6634e7765d 100644 --- a/refspec.c +++ b/refspec.c @@ -5,6 +5,7 @@ #include "gettext.h" #include "hash.h" #include "hex.h" +#include "string-list.h" #include "strvec.h" #include "refs.h" #include "refspec.h" @@ -324,3 +325,125 @@ int refname_matches_negative_refspec_item(const char *refname, struct refspec *r } return 0; } + +static int find_negative_refspec_match(struct refspec *rs, struct refspec_item *query) +{ + int i, matched_negative = 0; + int find_src = !query->src; + struct string_list reversed = STRING_LIST_INIT_DUP; + const char *needle = find_src ? query->dst : query->src; + + /* + * Check whether the queried ref matches any negative refpsec. If so, + * then we should ultimately treat this as not matching the query at + * all. + * + * Note that negative refspecs always match the source, but the query + * item uses the destination. To handle this, we apply pattern + * refspecs in reverse to figure out if the query source matches any + * of the negative refspecs. + * + * The first loop finds and expands all positive refspecs + * matched by the queried ref. + * + * The second loop checks if any of the results of the first loop + * match any negative refspec. + */ + for (i = 0; i < rs->nr; i++) { + struct refspec_item *refspec = &rs->items[i]; + char *expn_name; + + if (refspec->negative) + continue; + + /* Note the reversal of src and dst */ + if (refspec->pattern) { + const char *key = refspec->dst ? refspec->dst : refspec->src; + const char *value = refspec->src; + + if (match_name_with_pattern(key, needle, value, &expn_name)) + string_list_append_nodup(&reversed, expn_name); + } else if (refspec->matching) { + /* For the special matching refspec, any query should match */ + string_list_append(&reversed, needle); + } else if (!refspec->src) { + BUG("refspec->src should not be null here"); + } else if (!strcmp(needle, refspec->src)) { + string_list_append(&reversed, refspec->src); + } + } + + for (i = 0; !matched_negative && i < reversed.nr; i++) { + if (refname_matches_negative_refspec_item(reversed.items[i].string, rs)) + matched_negative = 1; + } + + string_list_clear(&reversed, 0); + + return matched_negative; +} + +void find_all_refspec_matches(struct refspec *rs, + struct refspec_item *query, + struct string_list *results) +{ + int i; + int find_src = !query->src; + + if (find_src && !query->dst) + BUG("find_all_refspec_matches: need either src or dst"); + + if (find_negative_refspec_match(rs, query)) + return; + + for (i = 0; i < rs->nr; i++) { + struct refspec_item *refspec = &rs->items[i]; + const char *key = find_src ? refspec->dst : refspec->src; + const char *value = find_src ? refspec->src : refspec->dst; + const char *needle = find_src ? query->dst : query->src; + char **result = find_src ? &query->src : &query->dst; + + if (!refspec->dst || refspec->negative) + continue; + if (refspec->pattern) { + if (match_name_with_pattern(key, needle, value, result)) + string_list_append_nodup(results, *result); + } else if (!strcmp(needle, key)) { + string_list_append(results, value); + } + } +} + +int find_refspec_match(struct refspec *rs, struct refspec_item *query) +{ + int i; + int find_src = !query->src; + const char *needle = find_src ? query->dst : query->src; + char **result = find_src ? &query->src : &query->dst; + + if (find_src && !query->dst) + BUG("find_refspec_match: need either src or dst"); + + if (find_negative_refspec_match(rs, query)) + return -1; + + for (i = 0; i < rs->nr; i++) { + struct refspec_item *refspec = &rs->items[i]; + const char *key = find_src ? refspec->dst : refspec->src; + const char *value = find_src ? refspec->src : refspec->dst; + + if (!refspec->dst || refspec->negative) + continue; + if (refspec->pattern) { + if (match_name_with_pattern(key, needle, value, result)) { + query->force = refspec->force; + return 0; + } + } else if (!strcmp(needle, key)) { + *result = xstrdup(value); + query->force = refspec->force; + return 0; + } + } + return -1; +} diff --git a/refspec.h b/refspec.h index 584d9c9eb5..0393643bc8 100644 --- a/refspec.h +++ b/refspec.h @@ -30,6 +30,8 @@ struct refspec_item { char *raw; }; +struct string_list; + #define REFSPEC_FETCH 1 #define REFSPEC_PUSH 0 @@ -80,4 +82,18 @@ int refname_matches_negative_refspec_item(const char *refname, struct refspec *r int match_name_with_pattern(const char *key, const char *name, const char *value, char **result); +/* + * Queries a refspec for a match and updates the query item. + * Returns 0 on success, -1 if no match is found or negative refspec matches. + */ +int find_refspec_match(struct refspec *rs, struct refspec_item *query); + +/* + * Queries a refspec for all matches and appends results to the provided string + * list. + */ +void find_all_refspec_matches(struct refspec *rs, + struct refspec_item *query, + struct string_list *results); + #endif /* REFSPEC_H */ diff --git a/remote.c b/remote.c index 4654bce5d4..858ab39471 100644 --- a/remote.c +++ b/remote.c @@ -925,128 +925,6 @@ struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs) return ref_map; } -static int find_negative_refspec_match(struct refspec *rs, struct refspec_item *query) -{ - int i, matched_negative = 0; - int find_src = !query->src; - struct string_list reversed = STRING_LIST_INIT_DUP; - const char *needle = find_src ? query->dst : query->src; - - /* - * Check whether the queried ref matches any negative refpsec. If so, - * then we should ultimately treat this as not matching the query at - * all. - * - * Note that negative refspecs always match the source, but the query - * item uses the destination. To handle this, we apply pattern - * refspecs in reverse to figure out if the query source matches any - * of the negative refspecs. - * - * The first loop finds and expands all positive refspecs - * matched by the queried ref. - * - * The second loop checks if any of the results of the first loop - * match any negative refspec. - */ - for (i = 0; i < rs->nr; i++) { - struct refspec_item *refspec = &rs->items[i]; - char *expn_name; - - if (refspec->negative) - continue; - - /* Note the reversal of src and dst */ - if (refspec->pattern) { - const char *key = refspec->dst ? refspec->dst : refspec->src; - const char *value = refspec->src; - - if (match_name_with_pattern(key, needle, value, &expn_name)) - string_list_append_nodup(&reversed, expn_name); - } else if (refspec->matching) { - /* For the special matching refspec, any query should match */ - string_list_append(&reversed, needle); - } else if (!refspec->src) { - BUG("refspec->src should not be null here"); - } else if (!strcmp(needle, refspec->src)) { - string_list_append(&reversed, refspec->src); - } - } - - for (i = 0; !matched_negative && i < reversed.nr; i++) { - if (refname_matches_negative_refspec_item(reversed.items[i].string, rs)) - matched_negative = 1; - } - - string_list_clear(&reversed, 0); - - return matched_negative; -} - -static void find_all_refspec_matches(struct refspec *rs, - struct refspec_item *query, - struct string_list *results) -{ - int i; - int find_src = !query->src; - - if (find_src && !query->dst) - BUG("find_all_refspec_matches: need either src or dst"); - - if (find_negative_refspec_match(rs, query)) - return; - - for (i = 0; i < rs->nr; i++) { - struct refspec_item *refspec = &rs->items[i]; - const char *key = find_src ? refspec->dst : refspec->src; - const char *value = find_src ? refspec->src : refspec->dst; - const char *needle = find_src ? query->dst : query->src; - char **result = find_src ? &query->src : &query->dst; - - if (!refspec->dst || refspec->negative) - continue; - if (refspec->pattern) { - if (match_name_with_pattern(key, needle, value, result)) - string_list_append_nodup(results, *result); - } else if (!strcmp(needle, key)) { - string_list_append(results, value); - } - } -} - -int find_refspec_match(struct refspec *rs, struct refspec_item *query) -{ - int i; - int find_src = !query->src; - const char *needle = find_src ? query->dst : query->src; - char **result = find_src ? &query->src : &query->dst; - - if (find_src && !query->dst) - BUG("find_refspec_match: need either src or dst"); - - if (find_negative_refspec_match(rs, query)) - return -1; - - for (i = 0; i < rs->nr; i++) { - struct refspec_item *refspec = &rs->items[i]; - const char *key = find_src ? refspec->dst : refspec->src; - const char *value = find_src ? refspec->src : refspec->dst; - - if (!refspec->dst || refspec->negative) - continue; - if (refspec->pattern) { - if (match_name_with_pattern(key, needle, value, result)) { - query->force = refspec->force; - return 0; - } - } else if (!strcmp(needle, key)) { - *result = xstrdup(value); - query->force = refspec->force; - return 0; - } - } - return -1; -} - char *apply_refspecs(struct refspec *rs, const char *name) { struct refspec_item query; From patchwork Sat Feb 1 06:42:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meet Soni X-Patchwork-Id: 13956096 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 66A6A136353 for ; Sat, 1 Feb 2025 06:43:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738392200; cv=none; b=E8riQ9YycGVJA1NGbcH+N7cLPe7IGYv1LC/e9BK6oeLL/yGtm9GNxNCdb/66qw6AD0s4QKviwdH5smvOz7PxXbruwMwCbLrOImUQ1YedRNtaCZMz9sIal/USqJtU94Zj1WtDYww5NuWChA5MHAiJOfFkTtQaKrY59mh9YIp7K0I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738392200; c=relaxed/simple; bh=4mCqh4v2rAK/MCHKGPkxoJWMb5pUUE4ddEthQN3orUg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=b5RgeK3Zba3UZe7pX+htfiFNAOwXUtA23MxuWJ7GCRzzfWtR8NAEZYnV6cO1OnaLlJXKzv7sYxnVzADF+gwFbnS6Etj5IoeKptbnypdVFWrkuEZBi37HN7QhqVd5WZz+yO4TnkaLFpcCUcpVSqbTZhb+qIQABMx+xcV2Jfd1EnU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=D63sriu4; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D63sriu4" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2165448243fso45552855ad.1 for ; Fri, 31 Jan 2025 22:43:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738392196; x=1738996996; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X8YKgcgmOUMbJxDoRpIidv/VEbqNHTX/3NXuyu7CVpI=; b=D63sriu4cK+Hfa84AZLPQf4YWYhguiGQnMs8qs4CbKIFVx51SqgVSalQNVdCbzMsGF PP5dAAvm7Xuppj10FZCz5mPGz6eopaWUJWzV87Y6E0P90G2BEKFVVuo3kuTsj7NCEcC4 LVIbdRdMGZmMaqmSfrjOfAh06y62P1P8Ih/skP+cDdn4JG+1RsBgJYYRape/g3ZKQc8i zuhszEya9ncVnngNl8ygQJzbmHKIeE865dZHqwortGvkaRYA0cvF3vfi1LT6euWE3LWu RMVudfT62SktNQvNQ5li5LGOa6HkyBJN/U4Y+06nhNQ/xWFvPnwOQzgfHk80Ez6Wx0JB KAXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738392196; x=1738996996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X8YKgcgmOUMbJxDoRpIidv/VEbqNHTX/3NXuyu7CVpI=; b=Y0HDrFPTtuyoOWN3rcs9Mgs4rFVHIOicSqb7wuvAoog7wbRSnsYJMc0q6DFy52HYd5 ZTXZmDFSSQ/Lp1i2jVMP0sDPtGStPNIsh/OHvlOk9c6eItlK2gXSB6lMHamUsLEGKGAj s1j1eBmYXb1CQC/OkUOmlt6I4i+XIc0GKaK79a4sH0fLlfO/81nv9tZXIJxQlbdrcWqo V/B+GAufeCMelFeUkAOMVnvVsarH7DuEfTUFL7vaZbSFMWSTAiImWPLXIjBvxCyHJUpB r0JrXhKeKg2oRltLZchtC3onIwv0nX/lRuOn9uSSRcHRIbNaaNozanc7pFwPm5Hr1klc DgSQ== X-Gm-Message-State: AOJu0YxcwEDuep28PPoIkfiIq/aKgKV7c7k7oNWeSewlz8mL/mjjy5Nx a3Atyjfy2o9p9l/79Zw6rlD/1A2W+Rb/CP5bifToectPb3Or0ppRPHT46fO+IWY= X-Gm-Gg: ASbGncsylLhLmezlzp8xPTeWI1osUKPPlbiRyacmNhheQwNnpKA1X+uPklhrmpKwO2c myRCbPuUVPV/t+KkoBrElxs+kTHmuNgPO939HhIHCvXcyR0RQAFNW3uMzvhVgkLrrRZ5YzOBnXm v4gg9fmm4JaHd0TJFa8yfCAt45Wq5VZnhbjo6DA5R8laV0101XmPlUr6xgexi44htve7uN58A9i j+jiCq0tug9GcsGgJiv9nnzmSxMw1Kej2P9nGdSiwnfT2/qUUiw2QZ82ySvSNyfFjhdK3Spf1RR oeXDUxbVZ0gNUg== X-Google-Smtp-Source: AGHT+IHtJPn1ER+DJeo1vT4wAWif6Atyw/ZcJkqtwfg2r4nru02vq3sCg+uJ6XL/Lgfe7nJhjV0huQ== X-Received: by 2002:a05:6a20:4394:b0:1e0:d575:8d4f with SMTP id adf61e73a8af0-1ed7a61ca8fmr24364392637.37.1738392196076; Fri, 31 Jan 2025 22:43:16 -0800 (PST) Received: from meet.. ([103.240.169.233]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acec0e8ef61sm4058592a12.78.2025.01.31.22.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jan 2025 22:43:15 -0800 (PST) From: Meet Soni To: git@vger.kernel.org Cc: shubham.kanodia10@gmail.com, Meet Soni , Pavel Rappo , Patrick Steinhardt , Jeff King , Matthew Rogers , Junio C Hamano , Jacob Keller , Elijah Newren , Jacob Keller Subject: [PATCH v3 5/5] refspec: relocate apply_refspecs and related funtions Date: Sat, 1 Feb 2025 12:12:02 +0530 Message-Id: <20250201064202.76116-6-meetsoni3017@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250201064202.76116-1-meetsoni3017@gmail.com> References: <20250127103644.36627-1-meetsoni3017@gmail.com> <20250201064202.76116-1-meetsoni3017@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Move the functions `apply_refspecs()` and `apply_negative_refspecs()` from `remote.c` to `refspec.c`. These functions focus on applying refspecs, so centralizing them in `refspec.c` improves code organization by keeping refspec-related logic in one place. Signed-off-by: Meet Soni --- refspec.c | 32 ++++++++++++++++++++++++++++++++ refspec.h | 12 ++++++++++++ remote.c | 31 ------------------------------- remote.h | 11 ----------- 4 files changed, 44 insertions(+), 42 deletions(-) diff --git a/refspec.c b/refspec.c index 6634e7765d..47974e86f0 100644 --- a/refspec.c +++ b/refspec.c @@ -9,6 +9,7 @@ #include "strvec.h" #include "refs.h" #include "refspec.h" +#include "remote.h" #include "strbuf.h" /* @@ -447,3 +448,34 @@ int find_refspec_match(struct refspec *rs, struct refspec_item *query) } return -1; } + +struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs) +{ + struct ref **tail; + + for (tail = &ref_map; *tail; ) { + struct ref *ref = *tail; + + if (refname_matches_negative_refspec_item(ref->name, rs)) { + *tail = ref->next; + free(ref->peer_ref); + free(ref); + } else + tail = &ref->next; + } + + return ref_map; +} + +char *apply_refspecs(struct refspec *rs, const char *name) +{ + struct refspec_item query; + + memset(&query, 0, sizeof(struct refspec_item)); + query.src = (char *)name; + + if (find_refspec_match(rs, &query)) + return NULL; + + return query.dst; +} diff --git a/refspec.h b/refspec.h index 0393643bc8..5cbdc5f622 100644 --- a/refspec.h +++ b/refspec.h @@ -96,4 +96,16 @@ void find_all_refspec_matches(struct refspec *rs, struct refspec_item *query, struct string_list *results); +/* + * Remove all entries in the input list which match any negative refspec in + * the refspec list. + */ +struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs); + +/* + * Search for a refspec that matches the given name and return the + * corresponding destination (dst) if a match is found, NULL otherwise. + */ +char *apply_refspecs(struct refspec *rs, const char *name); + #endif /* REFSPEC_H */ diff --git a/remote.c b/remote.c index 858ab39471..ad16d2493d 100644 --- a/remote.c +++ b/remote.c @@ -907,37 +907,6 @@ void ref_push_report_free(struct ref_push_report *report) } } -struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs) -{ - struct ref **tail; - - for (tail = &ref_map; *tail; ) { - struct ref *ref = *tail; - - if (refname_matches_negative_refspec_item(ref->name, rs)) { - *tail = ref->next; - free(ref->peer_ref); - free(ref); - } else - tail = &ref->next; - } - - return ref_map; -} - -char *apply_refspecs(struct refspec *rs, const char *name) -{ - struct refspec_item query; - - memset(&query, 0, sizeof(struct refspec_item)); - query.src = (char *)name; - - if (find_refspec_match(rs, &query)) - return NULL; - - return query.dst; -} - int remote_find_tracking(struct remote *remote, struct refspec_item *refspec) { return find_refspec_match(&remote->fetch, refspec); diff --git a/remote.h b/remote.h index f109310eda..b4bb16af0e 100644 --- a/remote.h +++ b/remote.h @@ -261,17 +261,6 @@ int resolve_remote_symref(struct ref *ref, struct ref *list); */ struct ref *ref_remove_duplicates(struct ref *ref_map); -int refname_matches_negative_refspec_item(const char *refname, struct refspec *rs); - -/* - * Remove all entries in the input list which match any negative refspec in - * the refspec list. - */ -struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs); - -int find_refspec_match(struct refspec *rs, struct refspec_item *query); -char *apply_refspecs(struct refspec *rs, const char *name); - int check_push_refs(struct ref *src, struct refspec *rs); int match_push_refs(struct ref *src, struct ref **dst, struct refspec *rs, int flags);