kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

remote: convert get_stale_heads to take a struct refspec 

Convert 'get_stale_heads()' to take a 'struct refspec' as a parameter instead
of a list of 'struct refspec_item'.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brandon Williams 2018-05-16 15:58:10 -07:00 committed by Junio C Hamano
parent def11e7193
commit a2ac50cbfd
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/fetch.c
View File

@ -963,7 +963,7 @@ static int prune_refs(struct refspec *rs, struct ref *ref_map,
const char *raw_url) const char *raw_url)
{ {
int url_len, i, result = 0; int url_len, i, result = 0;
struct ref *ref, *stale_refs = get_stale_heads(rs->items, rs->nr, ref_map); struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
char *url; char *url;
int summary_width = transport_summary_width(stale_refs); int summary_width = transport_summary_width(stale_refs);
const char *dangling_msg = dry_run const char *dangling_msg = dry_run

3
builtin/remote.c
View File

@ -347,8 +347,7 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
else else
string_list_append(&states->tracked, abbrev_branch(ref->name)); string_list_append(&states->tracked, abbrev_branch(ref->name));
} }
stale_refs = get_stale_heads(states->remote->fetch.items, stale_refs = get_stale_heads(&states->remote->fetch, fetch_map);
states->remote->fetch.nr, fetch_map);
for (ref = stale_refs; ref; ref = ref->next) { for (ref = stale_refs; ref; ref = ref->next) {
struct string_list_item *item = struct string_list_item *item =
string_list_append(&states->stale, abbrev_branch(ref->name)); string_list_append(&states->stale, abbrev_branch(ref->name));

18
remote.c
View File

@ -698,7 +698,9 @@ static int match_name_with_pattern(const char *key, const char *name,
return ret; return ret;
} }


static void query_refspecs_multiple(struct refspec_item *refs, int ref_count, struct refspec_item *query, struct string_list *results) static void query_refspecs_multiple(struct refspec *rs,
struct refspec_item *query,
struct string_list *results)
{ {
int i; int i;
int find_src = !query->src; int find_src = !query->src;
@ -706,8 +708,8 @@ static void query_refspecs_multiple(struct refspec_item *refs, int ref_count, st
if (find_src && !query->dst) if (find_src && !query->dst)
error("query_refspecs_multiple: need either src or dst"); error("query_refspecs_multiple: need either src or dst");


for (i = 0; i < ref_count; i++) { for (i = 0; i < rs->nr; i++) {
struct refspec_item *refspec = &refs[i]; struct refspec_item *refspec = &rs->items[i];
const char *key = find_src ? refspec->dst : refspec->src; const char *key = find_src ? refspec->dst : refspec->src;
const char *value = find_src ? refspec->src : refspec->dst; const char *value = find_src ? refspec->src : refspec->dst;
const char *needle = find_src ? query->dst : query->src; const char *needle = find_src ? query->dst : query->src;
@ -2068,8 +2070,7 @@ struct ref *guess_remote_head(const struct ref *head,
struct stale_heads_info { struct stale_heads_info {
struct string_list *ref_names; struct string_list *ref_names;
struct ref **stale_refs_tail; struct ref **stale_refs_tail;
struct refspec_item *refs; struct refspec *rs;
int ref_count;
}; };


static int get_stale_heads_cb(const char *refname, const struct object_id *oid, static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
@ -2082,7 +2083,7 @@ static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
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->refs, info->ref_count, &query, &matches); query_refspecs_multiple(info->rs, &query, &matches);
if (matches.nr == 0) if (matches.nr == 0)
goto clean_exit; /* No matches */ goto clean_exit; /* No matches */


@ -2110,7 +2111,7 @@ clean_exit:
return 0; return 0;
} }


struct ref *get_stale_heads(struct refspec_item *refs, int ref_count, struct ref *fetch_map) struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
{ {
struct ref *ref, *stale_refs = NULL; struct ref *ref, *stale_refs = NULL;
struct string_list ref_names = STRING_LIST_INIT_NODUP; struct string_list ref_names = STRING_LIST_INIT_NODUP;
@ -2118,8 +2119,7 @@ struct ref *get_stale_heads(struct refspec_item *refs, int ref_count, struct ref


info.ref_names = &ref_names; info.ref_names = &ref_names;
info.stale_refs_tail = &stale_refs; info.stale_refs_tail = &stale_refs;
info.refs = refs; info.rs = rs;
info.ref_count = ref_count;
for (ref = fetch_map; ref; ref = ref->next) for (ref = fetch_map; ref; ref = ref->next)
string_list_append(&ref_names, ref->name); string_list_append(&ref_names, ref->name);
string_list_sort(&ref_names); string_list_sort(&ref_names);

2
remote.h
View File

@ -267,7 +267,7 @@ struct ref *guess_remote_head(const struct ref *head,
int all); int all);


/* Return refs which no longer exist on remote */ /* Return refs which no longer exist on remote */
struct ref *get_stale_heads(struct refspec_item *refs, int ref_count, struct ref *fetch_map); struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map);


/* /*
* Compare-and-swap * Compare-and-swap