mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote: rename query_refspecs functions

Browse Source 
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 <meetsoni3017@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Meet Soni
2025-02-04 09:35:56 +05:30
committed by Junio C Hamano
parent 230d022fe3
commit be0905fed1
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/push.c
View File

@ -78,7 +78,7 @@ static void refspec_append_mapped(struct refspec *refspec, const char *ref,
.src = matched->name, .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", refspec_appendf(refspec, "%s%s:%s",
query.force ? "+" : "", query.force ? "+" : "",
query.src, query.dst); query.src, query.dst);

20
remote.c
View File

@ -925,7 +925,7 @@ struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs)
return ref_map; 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 i, matched_negative = 0;
int find_src = !query->src; int find_src = !query->src;
@ -982,7 +982,7 @@ static int query_matches_negative_refspec(struct refspec *rs, struct refspec_ite
return matched_negative; 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 refspec_item *query,
struct string_list *results) struct string_list *results)
{ {
@ -990,9 +990,9 @@ static void query_refspecs_multiple(struct refspec *rs,
int find_src = !query->src; int find_src = !query->src;
if (find_src && !query->dst) 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; return;
for (i = 0; i < rs->nr; i++) { 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 i;
int find_src = !query->src; 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; char **result = find_src ? &query->src : &query->dst;
if (find_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; return -1;
for (i = 0; i < rs->nr; i++) { 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)); memset(&query, 0, sizeof(struct refspec_item));
query.src = (char *)name; query.src = (char *)name;
if (query_refspecs(rs, &query)) if (refspec_find_match(rs, &query))
return NULL; return NULL;
return query.dst; 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) 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, 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)); memset(&query, 0, sizeof(struct refspec_item));
query.dst = (char *)refname; query.dst = (char *)refname;
query_refspecs_multiple(info->rs, &query, &matches); refspec_find_all_matches(info->rs, &query, &matches);
if (matches.nr == 0) if (matches.nr == 0)
goto clean_exit; /* No matches */ goto clean_exit; /* No matches */

2
remote.h
View File

@ -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); 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); char *apply_refspecs(struct refspec *rs, const char *name);
int check_push_refs(struct ref *src, struct refspec *rs); int check_push_refs(struct ref *src, struct refspec *rs);