Re: [PATCH 09/16] promisor-remote: add 'local_name' to 'struct promisor_info'

[Patrick Steinhardt <ps@pks.im>]

On Mon, Mar 23, 2026 at 09:05:12AM +0100, Christian Couder wrote:
> In a following commit, we will store promisor remote information under
> a remote name different than the one the server advertised.
> 
> To prepare for this change, let's add a new 'char* local_name' member

Micronit: s/char* local_name/char *local_name/

> diff --git a/promisor-remote.c b/promisor-remote.c
> index bdfc5e7608..da347fa2dc 100644
> --- a/promisor-remote.c
> +++ b/promisor-remote.c
> @@ -434,15 +434,19 @@ static struct string_list *fields_stored(void)
>  
>  /*
>   * Struct for promisor remotes involved in the "promisor-remote"
> - * protocol capability.
> + * protocol capability:
>   *
> - * Except for "name", each <member> in this struct and its <value>
> - * should correspond (either on the client side or on the server side)
> - * to a "remote.<name>.<member>" config variable set to <value> where
> - * "<name>" is a promisor remote name.
> + * - "name" is the name the server advertised.
> + * - "local_name" is the name we use locally (may be auto-generated).
> + *
> + * Except for "name" and "local_name", each <member> in this struct
> + * and its <value> should correspond (either on the client side or on
> + * the server side) to a "remote.<name>.<member>" config variable set
> + * to <value> where "<name>" is a promisor remote name.
>   */
>  struct promisor_info {
>  	const char *name;
> +	const char *local_name;
>  	const char *url;
>  	const char *filter;
>  	const char *token;

I think it would be easier to follow if the struct-level comment applied
to the general description of the struct, and individual members would
then have their own comments describing their intent.

> @@ -464,6 +469,11 @@ static void promisor_info_list_clear(struct string_list *list)
>  	string_list_clear(list, 0);
>  }
>  
> +static const char *promisor_info_internal_name(struct promisor_info *p)
> +{
> +	return p->local_name ? p->local_name : p->name;
> +}
> +
>  static void set_one_field(struct promisor_info *p,
>  			  const char *field, const char *value)
>  {
> @@ -819,7 +829,7 @@ static bool promisor_store_advertised_fields(struct promisor_info *advertised,
>  {
>  	struct promisor_info *p;
>  	struct string_list_item *item;
> -	const char *remote_name = advertised->name;
> +	const char *remote_name = promisor_info_internal_name(advertised);
>  	bool reload_config = false;
>  
>  	if (!(store_info->store_filter || store_info->store_token))
> @@ -927,7 +937,8 @@ static void filter_promisor_remote(struct repository *repo,
>  	/* Apply accepted remotes to the stable repo state */
>  	for_each_string_list_item(item, accepted_remotes) {
>  		struct promisor_info *info = item->util;
> -		struct promisor_remote *r = repo_promisor_remote_find(repo, info->name);
> +		const char *local = promisor_info_internal_name(info);
> +		struct promisor_remote *r = repo_promisor_remote_find(repo, local);
>  
>  		if (r) {
>  			r->accepted = 1;

Okay. These hunks are essentially a no-op for now given that we don't
yet store a local name.

Patrick