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

promisor-remote: remove the 'accepted' strvec 

In a previous commit, filter_promisor_remote() was refactored to keep
accepted 'struct promisor_info' instances alive instead of dismantling
them into separate parallel data structures.

Let's go one step further and replace the 'struct strvec *accepted'
argument passed to filter_promisor_remote() with a
'struct string_list *accepted_remotes' argument.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Christian Couder 2026-04-07 13:52:42 +02:00 committed by Junio C Hamano
parent e0f80d8876
commit d56e483b03
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
promisor-remote.c
View File

@ -885,12 +885,11 @@ static enum accept_promisor accept_from_server(struct repository *repo)
} }


static void filter_promisor_remote(struct repository *repo, static void filter_promisor_remote(struct repository *repo,
struct strvec *accepted, struct string_list *accepted_remotes,
const char *info) const char *info)
{ {
struct string_list config_info = STRING_LIST_INIT_NODUP; struct string_list config_info = STRING_LIST_INIT_NODUP;
struct string_list remote_info = STRING_LIST_INIT_DUP; struct string_list remote_info = STRING_LIST_INIT_DUP;
struct string_list accepted_remotes = STRING_LIST_INIT_NODUP;
struct store_info *store_info = NULL; struct store_info *store_info = NULL;
struct string_list_item *item; struct string_list_item *item;
bool reload_config = false; bool reload_config = false;
@ -922,7 +921,7 @@ static void filter_promisor_remote(struct repository *repo,
if (promisor_store_advertised_fields(advertised, store_info)) if (promisor_store_advertised_fields(advertised, store_info))
reload_config = true; reload_config = true;


string_list_append(&accepted_remotes, advertised->name)->util = advertised; string_list_append(accepted_remotes, advertised->name)->util = advertised;
} else { } else {
promisor_info_free(advertised); promisor_info_free(advertised);
} }
@ -936,12 +935,10 @@ static void filter_promisor_remote(struct repository *repo,
repo_promisor_remote_reinit(repo); repo_promisor_remote_reinit(repo);


/* Apply accepted remotes to the stable repo state */ /* Apply accepted remotes to the stable repo state */
for_each_string_list_item(item, &accepted_remotes) { for_each_string_list_item(item, accepted_remotes) {
struct promisor_info *info = item->util; struct promisor_info *info = item->util;
struct promisor_remote *r = repo_promisor_remote_find(repo, info->name); struct promisor_remote *r = repo_promisor_remote_find(repo, info->name);


strvec_push(accepted, info->name);

if (r) { if (r) {
r->accepted = 1; r->accepted = 1;
if (info->filter) { if (info->filter) {
@ -950,23 +947,23 @@ static void filter_promisor_remote(struct repository *repo,
} }
} }
} }

promisor_info_list_clear(&accepted_remotes);
} }


void promisor_remote_reply(const char *info, char **accepted_out) void promisor_remote_reply(const char *info, char **accepted_out)
{ {
struct strvec accepted = STRVEC_INIT; struct string_list accepted_remotes = STRING_LIST_INIT_NODUP;


filter_promisor_remote(the_repository, &accepted, info); filter_promisor_remote(the_repository, &accepted_remotes, info);


if (accepted_out) { if (accepted_out) {
if (accepted.nr) { if (accepted_remotes.nr) {
struct strbuf reply = STRBUF_INIT; struct strbuf reply = STRBUF_INIT;
for (size_t i = 0; i < accepted.nr; i++) { struct string_list_item *item;
if (i)
for_each_string_list_item(item, &accepted_remotes) {
if (reply.len)
strbuf_addch(&reply, ';'); strbuf_addch(&reply, ';');
strbuf_addstr_urlencode(&reply, accepted.v[i], allow_unsanitized); strbuf_addstr_urlencode(&reply, item->string, allow_unsanitized);
} }
*accepted_out = strbuf_detach(&reply, NULL); *accepted_out = strbuf_detach(&reply, NULL);
} else { } else {
@ -974,7 +971,7 @@ void promisor_remote_reply(const char *info, char **accepted_out)
} }
} }


strvec_clear(&accepted); promisor_info_list_clear(&accepted_remotes);
} }


void mark_promisor_remotes_as_accepted(struct repository *r, const char *remotes) void mark_promisor_remotes_as_accepted(struct repository *r, const char *remotes)