From patchwork Tue Feb 4 04:05:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meet Soni X-Patchwork-Id: 13958578 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 2AB801E86E for ; Tue, 4 Feb 2025 04:06:09 +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=1738641972; cv=none; b=dJkx1bWv3kHkzPuAjJDKF+mUJOBwb/EQo2WVkU6gWjl2f7zFEKMrRvNeO7wv0EmziCOdEapC3IB9DmtOAaahre02JT7vodhXbSAPCmse6YKzpqk/WTYknPxk+21r/4iJo/RgVuS4kXXmHow3UlOcRxe1R0qIhtaa4fB0UfKQtgQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738641972; c=relaxed/simple; bh=M+ZyVYSBVPxPQXNw8GRFPvnS9/7hRNvMyX2F+ofKHPU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OPGHBV0UeZwuRrxXdegULqa+tHC93LzY6ZLBJg/dOtbWpC4oyniTHzQrY7lU43YY9aFetIn9Ay29NuE1PWQ7r4MPEm8UVn/1t8kdwmINiKfx+wGvX99McvuUg5Yro32/NWbqyVEFjdcvpb1jcMvCyIvtRr9FfvWjqHSFUNfQJsw= 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=O3WGe7nJ; 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="O3WGe7nJ" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21649a7bcdcso89185995ad.1 for ; Mon, 03 Feb 2025 20:06:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738641969; x=1739246769; 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=O3WGe7nJqNpTJQtGB1GTl00oUtkdZCYHwjIeH/vfYj6LBRRp4+9HA6xwdLaK1HQiyi YDOYIUADhH/awBejvza8RaPaNe0Ubh4zdz2G4cWbgo1a0mMPWnx3MNO5xVBDL7o+TMak l9Gx7wCxyTeo6KbPrTfDmbCidFyeXpMCkCOMDpGlhoG+jYCHZVovkJ70E1doMvTqvM9J u8ttNxKCa4ZBaMairvKVOY+ezkbo2BA6g1cHzprBaKM/z6oMMHd38NOckXa6gaqRmb5l kaD+3NFDivhthl+mOtqWlRQ1lsHEHG6b4daQkxi18kNUn+/frwcnS4G1dQRV7EBbzjMr 4iIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738641969; x=1739246769; 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=mLBugn/BmbbTyRtebLPN/JCqrxTjARGsR0o8Oti6Ux3RPXBEdqigakhWESXJLw7HEQ M+FJjqSNK4EW47U4HyeA6SPDG8SgH1jEVHNeaYD2YQ0Ot0Dz0rTA1UgxZ+31Pp3YgKQq TbuFuefTb+BavyD+dZv1EEZU/zJpMU03CdrA7gY4440ZC8+MgUCEeGcc4Zd2u8Gy05zb 12UJ2XPRyK5cIEpZwInqT2JBMWdxQt1XerxUCCNdhrwrfTH5py8daFESU+G7Lnm1mv95 LLVkdBqxXfhyGMNrUn2i23toNTxkiPASYaeDgNHIYPzD+Wp3uLPTI5zuRAd76q2oYBJa 7Gqw== X-Gm-Message-State: AOJu0YwnC/ppkUiQsdkT9DMQFMPSqCLVzosx4dA4ehplmMU0us7qvOws x86gSXKIlc4BG6U4IuVVsdz9VxwRk4ucG3OyZvzwH9X5OkdgmYp1stcUNA== X-Gm-Gg: ASbGnctJYQQVgXHoEF8fDoNm8xSfzALBJDsr458KacGtALje/rhOVK9EINjxB+KvBQg 1QSliM6VdYgI5cvrzsunYNwHw6uL0lYrP6QscjUnvrpTkF8cdZ3QRAtv4zxCwk9yrOdUk5Bi68w mn931Vmj9jGq04Jyut2nVTQjfUK5MKYXG+TiqGasIniLG0HkdT3YUP1eiShvxgLNzg+41NVB3mK GsUVhPwFPM87fIvWHfXy88Kh0UnFlkJISd64bjarsrTtxGr+8SX7C2UfLOBYzeELXrpiRpXV1T/ ove0PkE9KocPYw== X-Google-Smtp-Source: AGHT+IFxUkKyZRpBlj2zNylJI3VKoGf7F9P5QdM0NGo4goxgs/+dkeGZONFUexSIawyfr8llucg+Ew== X-Received: by 2002:a17:903:41cc:b0:215:bb50:6a05 with SMTP id d9443c01a7336-21dd7c499d2mr340912635ad.9.1738641968839; Mon, 03 Feb 2025 20:06:08 -0800 (PST) Received: from meet.. ([103.240.169.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f83bd09cb1sm12272583a91.21.2025.02.03.20.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 20:06:08 -0800 (PST) From: Meet Soni To: git@vger.kernel.org Cc: shubham.kanodia10@gmail.com, Meet Soni , Jacob Keller , Junio C Hamano , Pavel Rappo , Jacob Keller , Jeff King , Patrick Steinhardt , Matthew Rogers Subject: [GSoC][PATCH v4 1/5] remote: rename function omit_name_by_refspec Date: Tue, 4 Feb 2025 09:35:54 +0530 Message-Id: <20250204040558.34766-2-meetsoni3017@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250204040558.34766-1-meetsoni3017@gmail.com> References: <20250201064202.76116-1-meetsoni3017@gmail.com> <20250204040558.34766-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 Tue Feb 4 04:05:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meet Soni X-Patchwork-Id: 13958579 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 1A7BD1E86E for ; Tue, 4 Feb 2025 04:06:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738641975; cv=none; b=l0ZW0o5I1+DkAWGJHJVSa92PKo62eezi9WsLneWxgnvVhkJtMPc+PDdeRzMTCvfYBwchLLWm5W3tEtJF/fZ8TQzZ9iIsj+g+8LLkKtQIOAbv4vrR+5Jb+6DW4WULOUhUsa7DbSnQ4mM04vjwkR7Ww8FLCzG81axl27oXPRZcUGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738641975; c=relaxed/simple; bh=K8c7zrz3BsEzSXdD0bAIEFml7K9yEkDFRfdtYIl1MW4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=L4vy5znE5Q80x9cdKE7/Wvx6DCv7pcUh+f48nN20lZ4DXMrWXG5v24Yk4Z3kpORQKa+6dDrP04SM1jBNrG6DqMNFAuJ0ws/KA3aOJuxGD6Wzjo5Win/D9vmfNuA5+tPwgdQuW/jOUktsGD9bjGnutm+t9ctQlhut777P9UV/GVY= 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=D/J95DHn; arc=none smtp.client-ip=209.85.214.178 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="D/J95DHn" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2156e078563so75235535ad.2 for ; Mon, 03 Feb 2025 20:06:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738641973; x=1739246773; 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=D/J95DHnwsB11ERUn0qol2UkTXYOe62VtryBc+/9qS0uZw1leyjii/rD6NIqzr0Gj3 4h/KPCGe6eDsDfUnz5y6NUCMwB5mXYs31+aw3zm/nIxmFeCTZWiNLW4cTVxNqGCWWM3U Nkpyqqr5Pd5cuDhazrQeNGUg69ZB4JyyAL1xd/5sPMr+j34P9xqJtNduNtCPlfEOc31A 2V5/maZOplcsb+No3KOh/iOSFTadsq7IGWjLgwdMNZ6ouz9kT2/NabSk9Estn+f+bgKw BANLiSrtNJz2glHkGpZ3hgO44hIbtgYsNoXMurJDOMtUwscwI78xI0+m+2W0jjcvy3iP 5NuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738641973; x=1739246773; 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=M4FUBVG/oRUKLswRycPna/eeG0NvW9JsQzp5A512vRBzCrNEkc6MhDVzr+HlbD/H/a BZ5Ji3xCuNOsOmyGHIdJfMmpbzA8U9lKTySRLeRxlbp/NY4tQ1UsuZTacXmOFxkyOGHq AdwoOvnnHenU1PhTj3PxmSR2PlQRtCcrfx/4E5tM646QvlBwI7m2/zMXFeHXXQ+9g3mD 5awx1bbNo7Qneruq+rJ9pAkg8+vLoVtqlgirDibquCR2xat6FtrO1hQouAWml1/YXJRJ lIWV7hO8rMEswJREDIFpo2vWw0MZ4OZIvmgZ/iTRTPDYf/DoG5E4jP9Q2A01Hy3c1Obd GWXw== X-Gm-Message-State: AOJu0YxJmWKgCjq5GqJhOmWkyimbau5kCVlCGGqqyLLD3+X1NsdbJiaO VUWUB5t/+ggB0Ip2GAmPPuTOkordqtHdrm+aphop1hty8MHJ04aJ7DFKWA== X-Gm-Gg: ASbGncu04GTioZ8XJWDoBuavF0PcD/QciaT+mtZ1yS3u434A/H4swSKr83Nej7bqG45 TEtY5qCKYm8MXDN3fV3BBWUU9Arbo9t42B7McZicJ8gzB97FD5OCK2EPpZMnHxbg/PbGjKqPuIJ qqWhO8udmdRI90xfSbJqv8u6g3NXqOY+lZZcdtbDZB+Oz1okolkLQ79wMynuFNUW5LNPD2tO6kX VvU56AnPyPrM2VkVYN/NcWcYwJxOSPtwnbB3e1thGawXjzfg/nCawJw2UcvMuxMTI/kmcAGc+Bf Ws6xjmp0orI9tQ== X-Google-Smtp-Source: AGHT+IHmBZC6GgL9hoimycqvx+9ntUEQiBlNtTcLT+9JkWCiqNWOeX0RMA88qau8dOO3GFtAmTsCww== X-Received: by 2002:a17:902:ea03:b0:216:4883:fb43 with SMTP id d9443c01a7336-21dd7dde209mr429757125ad.32.1738641972865; Mon, 03 Feb 2025 20:06:12 -0800 (PST) Received: from meet.. ([103.240.169.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f83bd09cb1sm12272583a91.21.2025.02.03.20.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 20:06:12 -0800 (PST) From: Meet Soni To: git@vger.kernel.org Cc: shubham.kanodia10@gmail.com, Meet Soni , Junio C Hamano , Jeff King , Jacob Keller , Matthew Rogers , Patrick Steinhardt Subject: [GSoC][PATCH v4 2/5] refspec: relocate refname_matches_negative_refspec_item Date: Tue, 4 Feb 2025 09:35:55 +0530 Message-Id: <20250204040558.34766-3-meetsoni3017@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250204040558.34766-1-meetsoni3017@gmail.com> References: <20250201064202.76116-1-meetsoni3017@gmail.com> <20250204040558.34766-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 Tue Feb 4 04:05:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meet Soni X-Patchwork-Id: 13958580 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 3548E16FF44 for ; Tue, 4 Feb 2025 04:06:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738641979; cv=none; b=Opvg7Gmvg4JPi+lFlx1nD+z8wtIQphWj6jxbJxc7WoQiwQdnQ8gmxMKxYRvRqJdP9IANzbbrjDu0I3VtNJLFLhqSOgEmdnTH3+ukYTiuOUa/mAypzfuVwrIDyC8bw/bJMV+L6RTtwfwLmIUy/l7h3bu1TRsLjC5ch0Gd4rdzc1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738641979; c=relaxed/simple; bh=OeYLS3WZ2+RTWYOVZivojvdAHmyuufU3UCKZEI3gjXI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YKvdDyamqOUndE6S2NZqtYxH5mMVc/oYP3a6wY/zOyws1TyvFxzE9I7uHI7WJVboj5tMtyU2IAXgR+UrbdNFJGjz55/gE8n7gG64/augW46Qc8MyozdMhh2r5Nx03ny5rJcCxi4/DTw3cZ56Q9oaIUVJB32KoNNlOu00a2rlMhM= 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=Mw1Pdp+D; arc=none smtp.client-ip=209.85.216.44 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="Mw1Pdp+D" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2ee8aa26415so8899746a91.1 for ; Mon, 03 Feb 2025 20:06:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738641977; x=1739246777; 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=QrkFf0+1B586BYPUmx4yFi2Vp+dfGSg1x4gcoqndSeM=; b=Mw1Pdp+D/4DA+sdpfqHWWLKPoPc7tkXJDAhrsNvWoMVVJYgcnUs9SJb1TTJWPjb7Ki AwLqo6L2mqHxCtnaCYq7k3L+L3xEc/XN7Xh815q7bCNgIeW708xVyy3E+d9JTPg276lD JGILBRW1P93orNMcEtIBDUBhL1FbzqfsCBegJm5EPhxaOWnDIyXY0MyF8kATKGV0JOIB slVFv8Wf2jOFobu9t14PimLgTkO2yjJr5OIfgNyGDfETQrm8crPgIJSMr3KDzM4q9pvb TTma+1gi0z00XA+4vEl0mt0MszMLyE7IkGorjrChnffvc9jA8WyfHft689qMdikOFFBH Xobg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738641977; x=1739246777; 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=QrkFf0+1B586BYPUmx4yFi2Vp+dfGSg1x4gcoqndSeM=; b=CzRu5TerrTQgGs1i/cgo3aKLKtwvISy0eChcFZcI8C6g3WfXszQ0DfVN5l8H9b53t7 f5lzBKqWsUejs05Ljy6qAMKLYLvT6KxVgqGnUMEtmlbAUEYiUpk7HA8LMs+QZ+CuaY2Z BoJnzcNj8ymxAlxKM1q65YgSjlVkem53t+td2e+8HLjesCoTMgXef8yQ9/5G40doh0Qz Ge2ZClGlqNKgnVltafAKz+gCHK/M/qTu7gW2epBflDQgLHoSG4XT36uCWHhgwup3tKAE PFKf8UaNX8kb2cGsMsjM6NPk6T3ehik86cX3C+CFRgIHYTyGWe1tmj3vT4hFOWnjsygJ eQNA== X-Gm-Message-State: AOJu0YyZcvfGerzkkPnrfwk/QLndADQyOsk95Ak9ZSxuxGjF6gsp7BTK qMI1flbrZKJIRvSzA5z7Str6e+g6QATiDGzx9FO0v8SQyBwWPq1JtQqg1w== X-Gm-Gg: ASbGnctV34LfIKJYUSWIDCd5PNXCFMB6PQh0be1bxkoDZHdJQhKRZYcIjMdvKWqTfxL NTKNTFHfy7OCVsE/pfVCtm0YDhb4nEH9BmasClzblaH288i1/Bym2dEC1bVj8coyB4AdwZ5eaf3 4J3Bl5jzEb1dbczH+V67sqYozBzhEWDCFnGtiyKyICznsld0Fq9u9abdONeT5ik/GD+DdYI7+2j kWrG0hJg+7chQD0OztgXGieIEJjue9q1Hss1bVDMKsiw/azz0HLvs1842BxXuZo58nOoTZs808V dwNUlTYNktB8Kg== X-Google-Smtp-Source: AGHT+IF5e3AP57DZ/5LtquHXiVZ6sMatiDqif7wAiLgnUMNfK+7AXYCQKSIYoytPcYn5jowOCqIXdg== X-Received: by 2002:a17:90b:288c:b0:2f4:432d:250d with SMTP id 98e67ed59e1d1-2f83ac17f80mr34026129a91.21.1738641977012; Mon, 03 Feb 2025 20:06:17 -0800 (PST) Received: from meet.. ([103.240.169.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f83bd09cb1sm12272583a91.21.2025.02.03.20.06.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 20:06:16 -0800 (PST) From: Meet Soni To: git@vger.kernel.org Cc: shubham.kanodia10@gmail.com, Meet Soni , Patrick Steinhardt , Denton Liu , Junio C Hamano , Jacob Keller , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthew Rogers Subject: [GSoC][PATCH v4 3/5] remote: rename query_refspecs functions Date: Tue, 4 Feb 2025 09:35:56 +0530 Message-Id: <20250204040558.34766-4-meetsoni3017@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250204040558.34766-1-meetsoni3017@gmail.com> References: <20250201064202.76116-1-meetsoni3017@gmail.com> <20250204040558.34766-1-meetsoni3017@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename functions related to handling refspecs in preparation for their move from `remote.c` to `refspec.c`. Update their names to better reflect their intent: - `query_refspecs()` -> `refspec_find_match()` for clarity, as it finds a single matching refspec. - `query_refspecs_multiple()` -> `refspec_find_all_matches()` to better reflect that it collects all matching refspecs instead of returning just the first match. - `query_matches_negative_refspec()` -> `refspec_find_negative_match()` for consistency with the updated naming convention, even though this static function didn't strictly require renaming. 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..92d530e5c4 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 (!refspec_find_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..b510809a56 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 refspec_find_negative_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 refspec_find_all_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("refspec_find_all_matches: need either src or dst"); - if (query_matches_negative_refspec(rs, query)) + if (refspec_find_negative_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 refspec_find_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("refspec_find_match: need either src or dst"); - if (query_matches_negative_refspec(rs, query)) + if (refspec_find_negative_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 (refspec_find_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 refspec_find_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); + refspec_find_all_matches(info->rs, &query, &matches); if (matches.nr == 0) goto clean_exit; /* No matches */ diff --git a/remote.h b/remote.h index 66ee53411d..516ba7f398 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 refspec_find_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 Tue Feb 4 04:05:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meet Soni X-Patchwork-Id: 13958581 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 7B8D716FF44 for ; Tue, 4 Feb 2025 04:06:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738641984; cv=none; b=cxNH3fwrH8F12noo0JfGhW1e+oQzNotln1ZwuLIzMy9Mdcwf/9t0/+0HR0GT3wmq0nF3ggPCQycI/isMAOvpadAahYwLjBL5WoLQC7hOLZ10WtaEOXR3LXs08gf90vrPmQkj25q360ci1P4BqHrULjqdlvKRsPa5TN2WspRpFhY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738641984; c=relaxed/simple; bh=agnH6QuGvkQnX11XBvFQApbm+qS1yxqTvQRjSk7ZwQM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=E9Cw/FJ2MOj1vTtvbBF1WigsiA/Alza5Km7zI9Dsnrvn0DbYzxzY3dFcFuppjgP9YIT0QjxkS5aDzfC8SW9beZB11jC7wgFdJ2M+x8QXyEkk0SV3pJZlWh33Xup94WFbNbDT4MdVqWHqbltNjciDxER6SoMPe7J/1Lx7SoyGoS0= 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=E3hkTp+6; arc=none smtp.client-ip=209.85.216.51 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="E3hkTp+6" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2f441791e40so6570319a91.3 for ; Mon, 03 Feb 2025 20:06:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738641981; x=1739246781; 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=944Czf3HLevK8LFL7a16D1dQvg24llj7qF62WNejlzU=; b=E3hkTp+6xHffXIRgjUbHY/ka2oFiX4g+Pltg317W3x2aySrCQpvkU/be5xPEp2nW9o IJQsXerqkFaDcZVQ7irjy7S4fv1n/Ds2fyBEDSSYuO7SxqQJmNj2bZE2njTlQjvBI32a aImJVESTZGmep7wDbf15ZueBuxBattKwpcrggQvWML2XtiiRbzYn4U1aKxgLi4J0EQQE QGMLb7tGiytcrERDQC7zOGKNBAYn4BAqfmil36CbEUV6WypO+HzoLCKS+y20K3+IHxT4 VEXv0gOi9Xr/MnP7xfPmUsin59dvfIw5G6pcUK0P47q21wmX3WOdcaTD4FQs0FBt1ug1 SRYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738641981; x=1739246781; 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=944Czf3HLevK8LFL7a16D1dQvg24llj7qF62WNejlzU=; b=MjPIK6DsIFyM1HTo/9RImQ8c+V2uLDm4HEJum08KOkPprkTI/siLvQfZ/J+LJVeePN fXJ8OGhXUuaE0lK5HrOTR8ntNPONoNjvKQKmD/o38apxwELDwTbWCESN2Gj2RVGcKdSi QnJHpRN6CXwf/b0SaPMxeofHMozYe7i2y4PPAIchnggk+E7DOfCs3NkshSIYNtNDPvko 7HPdt8a6NuopG1uaz/pOZVny0BG9Q8jWa4IAvZhCVoRJwAPZlVgXRMU/j6mOWM+Tbbh6 oVeeFTbUsEG/8YYYjxmdSKUtoFlBYO+Trqj+XaAAKZC8mrWfFjKMxOSXNKVmrDQOnmO6 VhDg== X-Gm-Message-State: AOJu0YwbfFILsjvuz6qBI3DV/dJ+nJMSSGltg4OXHSuHJ/SLEs2EnaaE LXKK8PQEHmPd9RNHdiQniEPhFwm7/QYWteVBGET0ylDMl9MB3b4JDloioA== X-Gm-Gg: ASbGncv50Rb3gO3G6SmlXHTtCnnSSMos7T0XPsGeC2NzkO4v8Tj5iEZIhQEWZH6LMmL qGwT8I4UGPmdXACrJUkSHKVuHFhz2koIdhk8fiavGHajaCxMV3+3jmEZcInqsnhQwkYZUaXXfM2 nGfIDW3lICUF3fUBOyyakqXksWQNmKN9gKpjqYjOCxMVWKxYoPUKRYBb6bDcHh0mAlClkB6BfVB nmnDTRNoykztXBGQmvYM9+yI8ofgQmFcldkeSCqJ76Mo5Aa0qxkmqsW5PIeAsvqUnhOuRWcqt5M 4QUJruExXpamXA== X-Google-Smtp-Source: AGHT+IE8DojESGMY8Afss8FcDz/6rs3edWeaAVOLYCoTWuFfrgLIc2jmsJFz+TC3BjxtouQmT5Kv6g== X-Received: by 2002:a17:90a:dfc7:b0:2ee:c6c8:d89f with SMTP id 98e67ed59e1d1-2f83abf3750mr40687663a91.14.1738641980797; Mon, 03 Feb 2025 20:06:20 -0800 (PST) Received: from meet.. ([103.240.169.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f83bd09cb1sm12272583a91.21.2025.02.03.20.06.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 20:06:20 -0800 (PST) From: Meet Soni To: git@vger.kernel.org Cc: shubham.kanodia10@gmail.com, Meet Soni , Elijah Newren , Junio C Hamano , Jeff King , Nipunn Koorapati Subject: [GSoC][PATCH v4 4/5] refspec: relocate matching related functions Date: Tue, 4 Feb 2025 09:35:57 +0530 Message-Id: <20250204040558.34766-5-meetsoni3017@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250204040558.34766-1-meetsoni3017@gmail.com> References: <20250201064202.76116-1-meetsoni3017@gmail.com> <20250204040558.34766-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 `refspec_find_match()`, `refspec_find_all_matches()` and `refspec_find_negative_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..cab0b0d127 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 refspec_find_negative_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 refspec_find_all_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("refspec_find_all_matches: need either src or dst"); + + if (refspec_find_negative_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 refspec_find_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("refspec_find_match: need either src or dst"); + + if (refspec_find_negative_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..be20ba53ab 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 refspec_find_match(struct refspec *rs, struct refspec_item *query); + +/* + * Queries a refspec for all matches and appends results to the provided string + * list. + */ +void refspec_find_all_matches(struct refspec *rs, + struct refspec_item *query, + struct string_list *results); + #endif /* REFSPEC_H */ diff --git a/remote.c b/remote.c index b510809a56..4c5940482f 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 refspec_find_negative_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 refspec_find_all_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("refspec_find_all_matches: need either src or dst"); - - if (refspec_find_negative_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 refspec_find_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("refspec_find_match: need either src or dst"); - - if (refspec_find_negative_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 Tue Feb 4 04:05: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: 13958582 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 7B4EC15B0EF for ; Tue, 4 Feb 2025 04:06:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738641990; cv=none; b=sO5hXBqhjl1orHfhDGaHRERYsVcBo3H+HVckjUEI6P4lRz0nPX+wgsOPmuJUfkg0omgqyl3A5bdd9kYZAwYyYdgfjjvqG8LDPHQaHCcnDvS67NEjnF577hf14hQx/aFqnAQNwMD2GfaulBzJ7gl+3TNq2nD4jmISsFn6DVYLXjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738641990; c=relaxed/simple; bh=hp0Y+c1DTxKSnGvyDMZhas88cHvhfU313nlyVpEayic=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Akri91SAki1V3MR4ixqUr4QyvaV/O+aabFlz9yUjAQV6Asg5DDhcZuTkp4GQBN7OwYjRtc70J97u4oI4CYRzi8XfVhf17rBDOeR/LcaE7gBr9gpWSQ3Pw5dPCJG7iAce3CwliNxbr6tZWfQPyF1vh7FXFXvsYkdhqxWVjGlxBww= 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=D32Cid/u; arc=none smtp.client-ip=209.85.216.49 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="D32Cid/u" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2ef70c7efa5so6946458a91.2 for ; Mon, 03 Feb 2025 20:06:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738641987; x=1739246787; 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=uz/Lkw/pPvD6GgKWN7JRL6zgGJcri82lQpkMJTV+Foc=; b=D32Cid/uXHa5RDh9Tzay9SuYpUkjryLSN/Ia+5lyGBBmUD+Is+mpNKWk7bmQ26otSk 3qeGAed1Cfm9iIaR5plP+RdIG+Kh56fJWvunYEt7Vk+DsuAdNE4/utfOPxKf81kXCQcR MoKoLIb+YlakzilzAaojVP+24b+yJoe1ion+kfYqQgup60bt7eu2yRjqCBRiE1uhOGcu 1FUkfdcsYXLO3f6oI5scXSNTopKpMPL6PyjVTVyKfGZtfse3UtBnt5+b75qyBsNmqgen /2Z2XaMyW8na2k43skqfh2uuLGSGeVL935a3Eox9XYc1dgbW1v8BFR397P6ivkYq8wc6 nKqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738641987; x=1739246787; 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=uz/Lkw/pPvD6GgKWN7JRL6zgGJcri82lQpkMJTV+Foc=; b=eQ5IPI8rKuNUVokXTSp7AAmvoU4i9Qh+O8ndY3p6LO0xF6lM75Wkpw8uZsY4AoEqLF uUzi+p4dMCnqq5Dia0pKKIdp7vKMLCgz1Q29xZ6CsJYXqHOYSLBphwv+MtrRgL5gWF06 xJ2VW74YNNhBwmiwJEJbeEBwAAKPZGX6TnBJrZwlS8w7gGgPuknoNWXLCeyP2vsskxQr X5eNIkvCNjT+xDXHlNQH01ZmdYWQshEtsA5cJCSI9dEpIATJugKi6x6vY2G+Mp5lv/ea tOB3W0NWsYxnmdEeyPkpPE84jYqL9P8Sz0KilKR+FzZqV1ywoJaQfdGyUi9OOpRp74wY 5Bnw== X-Gm-Message-State: AOJu0Yw8I2xkXXJUBhlap/YZcby+xXG2kN46yhfqk+ABVPt4jc/EtXWO wTEo+Pe3a4oyifup2dTOuozVHyI8x8SxPjrJ5SxSSzOaEfF71W4noGCTNg== X-Gm-Gg: ASbGncuHSyeThY/SoWCbxp1Reb9FGMlGjmJxuFmHuvdndsXbO+TjmlMQEmYd3UkOPc7 UU8VXSg9feH3v7EUzEoieKqa5Ydjd7LJAArZzgDFtvw0Td2bZOXDPC6nY5R8pn3RFj3io37KqGD PyhMkyQ33K1CLESY5utjlcvEacTVsVivFHOqVUnbot6uvKPK7s7FY0D+EaonhHiTyPU0sXCVbv8 ikMLkSefqTBDkCH6g9ZMiae+U/yKQl5ydbr3DtRv+WxADtbKFO1hPTpf1izGr7aHbXX/kXxZY5E qIqwr0Wkf890Zg== X-Google-Smtp-Source: AGHT+IEUCC6m+mNCkcsfMnsBOWJDj2GuSTN8Tg5b/zDr1bXqFZAzcnG29pZyKQzr7+rElVd2Rko3qw== X-Received: by 2002:a17:90b:548e:b0:2f4:4500:bb4d with SMTP id 98e67ed59e1d1-2f83ac0a3d9mr35238959a91.20.1738641986811; Mon, 03 Feb 2025 20:06:26 -0800 (PST) Received: from meet.. ([103.240.169.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f83bd09cb1sm12272583a91.21.2025.02.03.20.06.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 20:06:25 -0800 (PST) From: Meet Soni To: git@vger.kernel.org Cc: shubham.kanodia10@gmail.com, Meet Soni , Jacob Keller , Junio C Hamano , Jeff King , Pavel Rappo , Jacob Keller , Elijah Newren , Matthew Rogers , Patrick Steinhardt Subject: [GSoC][PATCH v4 5/5] refspec: relocate apply_refspecs and related funtions Date: Tue, 4 Feb 2025 09:35:58 +0530 Message-Id: <20250204040558.34766-6-meetsoni3017@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250204040558.34766-1-meetsoni3017@gmail.com> References: <20250201064202.76116-1-meetsoni3017@gmail.com> <20250204040558.34766-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 cab0b0d127..0dbbd1e799 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 refspec_find_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 (refspec_find_match(rs, &query)) + return NULL; + + return query.dst; +} diff --git a/refspec.h b/refspec.h index be20ba53ab..2a28d043be 100644 --- a/refspec.h +++ b/refspec.h @@ -96,4 +96,16 @@ void refspec_find_all_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 4c5940482f..7f27c59a5b 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 (refspec_find_match(rs, &query)) - return NULL; - - return query.dst; -} - int remote_find_tracking(struct remote *remote, struct refspec_item *refspec) { return refspec_find_match(&remote->fetch, refspec); diff --git a/remote.h b/remote.h index 516ba7f398..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 refspec_find_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);