From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 222E01F4CBF for ; Thu, 31 Jul 2025 07:24:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753946664; cv=none; b=OiTyFshZBRwWsPUcCjbrNT7bjFhCt4bVJ/GWVEmWlcCflmfc5LEzlbz5bfruF1JeYxyjpQHfgryhG8fKB/QQApkzPBQU+wOKzYjZAYsqE/a9Nm14ZNVSTK2lSDv1689IbBl32S2HU4j86iPrGvlSZxFu3kF0p76UYookmhH36Ns= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753946664; c=relaxed/simple; bh=50QgJfcMxpYPV4jMw9osShX57EQvlPKqw4+RKJi5sCY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W5m3Cj5fxV6sSw7YrNBqjKquVg8lgoAJviXXBeGyiFzOKX0AEAZ2L2sC6dWYGvJtt4I1DVh/TYMMToNvbZmmL3tCvGp4LxjRkL/vyDabu80yF1YXywbAKUSmNcL4MxiDTIp12xekET/kcnP0A92jvhUYP7SY1Ix/uAiidGPoY5c= 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=RPIA04Un; arc=none smtp.client-ip=209.85.128.53 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="RPIA04Un" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-45600581226so6169655e9.1 for ; Thu, 31 Jul 2025 00:24:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753946660; x=1754551460; 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=U9O9ESDSbUHFs1dSkRfyYZMMbRhZ4n99tGU5NbM5zX0=; b=RPIA04UnixrA9leXdewWqdny5iUu9Wv7xduK14e8HFf71nUaxg5X73PBfkbAnTVdwd RH8tmHfJo1paEbiGA62MuxAp1S0e30SehxMBfrw9Eff/KkbyQhNisyT3iBYaBmM7I7+9 lGPMArhZBElnWWnhpUX5aZZ081xN1Kk2cB1Zq7f1sx5XZX55iiHI3L6IXyCv6xJwg9Ia axda326tgjygy8D04PIflty97mjTnOA8DcgXZiIhRWj10SHYWUEgTHXI/mbXi3avYY95 N8NIfgaB1VFzfMShNzXODfQUya9W+Y+6omYwalfEjkL/7ligw0kbXSFIIf95h2FRhxXK 7XDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753946660; x=1754551460; 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=U9O9ESDSbUHFs1dSkRfyYZMMbRhZ4n99tGU5NbM5zX0=; b=ho2J8aAmBAMDzM5OuAak5jLj0c1OJp1N/XxP83vptogTwGFZCLzq6Rau+5U2CPgKZ0 h5QnkaXXkgDkLoIlFmScwQE9U+CKeZd5Z0fmcwAMbVA1k3Ij718xFuXbVIUOPwDwiB/K LXfVwvgAUrQFfFUcsQe344UB6AeIy1I914hAit03ohjCAa1dfFPXEMmEB3Q1AhvCrxOn L1bq5hoWbiVomqwJgQfyV2WepppfT3Jpf6mWWxrn23WpGQVmC3vV700HBTjjL2LcenTL +xowWc2NbyJoxf8GeLHdDBL06xJ82LdV29PEM6tsHsMdU4Qx1sfnZB2sjSYvtlWDqrMu HVqA== X-Gm-Message-State: AOJu0YxUhw7uqM/LePCdxMNdMgSiGU/4yOqkXOIghqEa1SltgZNcoxq4 P/tKBzBNowQDdgcvaIpD20tN+wXD+JR3i5lrTbaUgkeCnXX05t0ZeBCfK2W6zA== X-Gm-Gg: ASbGnctGdA8D4zwf+nQdFJYEQgsFun4kCOk+e+M3DB37wpScyLtroza4O3cG/3emTJM KTqa74ruyvaOqzDkKijc8vCvbS1Z5dkISD/lLEhkwN6/Ink0KAyGQLhfHjW5nMsE6JUDOZrgfzI etNQuQmlxYsm3FqZyyBkUJUS4ckEH6ZRam7GsJ2TIse+xpF9IkIlCOm6DihpmXzVYyhvzPbbP0y qopDTBeOQUqKTobpc7gr3+FSJc5cVrmFH8+GeYOgGPWNNKL9yETC+GrSTimyp5k9aqR6m6qQgOC LY73GeRhzStw4dhJWY4Q233smzlerXTH926wzXe3ugRi8fWbL7cSt/PShpIspSbSlFjJMPGbp4z oodqj5f47MSS/7jkfBzbkFZQb45S8I+YrW/FfdwspaWRKL9/+ORGv/mEY6tIlwWvoyLrk4oETf0 3DJmJB X-Google-Smtp-Source: AGHT+IGT5zVW/kX0jbvSf0E/1zdYISpMHdDxymJ8H56oHoyTiwQgudXEezlUNpZ0OTxl1FN/vB2myw== X-Received: by 2002:a05:600c:518d:b0:456:eab:633e with SMTP id 5b1f17b1804b1-45892bc6ef0mr55307355e9.17.1753946659790; Thu, 31 Jul 2025 00:24:19 -0700 (PDT) Received: from christian--20230123--2G7D3 (176-138-135-207.abo.bbox.fr. [176.138.135.207]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458953f8e02sm52495175e9.32.2025.07.31.00.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Jul 2025 00:24:18 -0700 (PDT) From: Christian Couder To: git@vger.kernel.org Cc: Junio C Hamano , Patrick Steinhardt , Taylor Blau , Karthik Nayak , Justin Tobler , Jean-Noel Avila , Christian Couder , Christian Couder Subject: [PATCH v7 1/5] promisor-remote: refactor to get rid of 'struct strvec' Date: Thu, 31 Jul 2025 09:23:53 +0200 Message-ID: <20250731072401.3817074-2-christian.couder@gmail.com> X-Mailer: git-send-email 2.50.1.323.g4e0625aa69.dirty In-Reply-To: <20250731072401.3817074-1-christian.couder@gmail.com> References: <20250721141056.2283349-1-christian.couder@gmail.com> <20250731072401.3817074-1-christian.couder@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In a following commit, we will use the new 'promisor-remote' protocol capability introduced by d460267613 (Add 'promisor-remote' capability to protocol v2, 2025-02-18) to pass and process more information about promisor remotes than just their name and url. For that purpose, we will need to store information about other fields, especially information that might or might not be available for different promisor remotes. Unfortunately using 'struct strvec', as we currently do, to store information about the promisor remotes with one 'struct strvec' for each field like "name" or "url" does not scale easily in that case. We would need one 'struct strvec' for each new field, and then we would have to pass all these 'struct strvec' around. Let's refactor this and introduce a new 'struct promisor_info'. It will only store promisor remote information in its members. For now it has only a 'name' member for the promisor remote name and an 'url' member for its URL. We will use a 'struct string_list' to store the instances of 'struct promisor_info'. For each 'item' in the string_list, 'item->string' will point to the promisor remote name and 'item->util' will point to the corresponding 'struct promisor_info' instance. Explicit members are used within 'struct promisor_info' for type safety and clarity regarding the specific information being handled, rather than a generic key-value store. We want to specify and document each field and its content, so adding new members to the struct as more fields are supported is fine. Signed-off-by: Christian Couder --- promisor-remote.c | 107 ++++++++++++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 41 deletions(-) diff --git a/promisor-remote.c b/promisor-remote.c index be6f82d12f..0213b8768f 100644 --- a/promisor-remote.c +++ b/promisor-remote.c @@ -314,9 +314,35 @@ static int allow_unsanitized(char ch) return ch > 32 && ch < 127; } -static void promisor_info_vecs(struct repository *repo, - struct strvec *names, - struct strvec *urls) +/* + * Struct for promisor remotes involved in the "promisor-remote" + * protocol capability. + * + * Except for "name", each in this struct and its + * should correspond (either on the client side or on the server side) + * to a "remote.." config variable set to where + * "" is a promisor remote name. + */ +struct promisor_info { + const char *name; + const char *url; +}; + +static void promisor_info_list_clear(struct string_list *list) +{ + for (size_t i = 0; i < list->nr; i++) { + struct promisor_info *p = list->items[i].util; + free((char *)p->name); + free((char *)p->url); + } + string_list_clear(list, 1); +} + +/* + * Populate 'list' with promisor remote information from the config. + * The 'util' pointer of each list item will hold a 'struct promisor_info'. + */ +static void promisor_config_info_list(struct repository *repo, struct string_list *list) { struct promisor_remote *r; @@ -328,8 +354,14 @@ static void promisor_info_vecs(struct repository *repo, /* Only add remotes with a non empty URL */ if (!git_config_get_string_tmp(url_key, &url) && *url) { - strvec_push(names, r->name); - strvec_push(urls, url); + struct promisor_info *new_info = xcalloc(1, sizeof(*new_info)); + struct string_list_item *item; + + new_info->name = xstrdup(r->name); + new_info->url = xstrdup(url); + + item = string_list_append(list, new_info->name); + item->util = new_info; } free(url_key); @@ -340,47 +372,36 @@ char *promisor_remote_info(struct repository *repo) { struct strbuf sb = STRBUF_INIT; int advertise_promisors = 0; - struct strvec names = STRVEC_INIT; - struct strvec urls = STRVEC_INIT; + struct string_list config_info = STRING_LIST_INIT_NODUP; + struct string_list_item *item; git_config_get_bool("promisor.advertise", &advertise_promisors); if (!advertise_promisors) return NULL; - promisor_info_vecs(repo, &names, &urls); + promisor_config_info_list(repo, &config_info); - if (!names.nr) + if (!config_info.nr) return NULL; - for (size_t i = 0; i < names.nr; i++) { - if (i) + for_each_string_list_item(item, &config_info) { + struct promisor_info *p = item->util; + + if (item != config_info.items) strbuf_addch(&sb, ';'); + strbuf_addstr(&sb, "name="); - strbuf_addstr_urlencode(&sb, names.v[i], allow_unsanitized); + strbuf_addstr_urlencode(&sb, p->name, allow_unsanitized); strbuf_addstr(&sb, ",url="); - strbuf_addstr_urlencode(&sb, urls.v[i], allow_unsanitized); + strbuf_addstr_urlencode(&sb, p->url, allow_unsanitized); } - strvec_clear(&names); - strvec_clear(&urls); + promisor_info_list_clear(&config_info); return strbuf_detach(&sb, NULL); } -/* - * Find first index of 'nicks' where there is 'nick'. 'nick' is - * compared case sensitively to the strings in 'nicks'. If not found - * 'nicks->nr' is returned. - */ -static size_t remote_nick_find(struct strvec *nicks, const char *nick) -{ - for (size_t i = 0; i < nicks->nr; i++) - if (!strcmp(nicks->v[i], nick)) - return i; - return nicks->nr; -} - enum accept_promisor { ACCEPT_NONE = 0, ACCEPT_KNOWN_URL, @@ -390,19 +411,23 @@ enum accept_promisor { static int should_accept_remote(enum accept_promisor accept, const char *remote_name, const char *remote_url, - struct strvec *names, struct strvec *urls) + struct string_list *config_info) { - size_t i; + struct promisor_info *p; + struct string_list_item *item; if (accept == ACCEPT_ALL) return 1; - i = remote_nick_find(names, remote_name); + /* Get config info for that promisor remote */ + item = string_list_lookup(config_info, remote_name); - if (i >= names->nr) + if (!item) /* We don't know about that remote */ return 0; + p = item->util; + if (accept == ACCEPT_KNOWN_NAME) return 1; @@ -414,11 +439,11 @@ static int should_accept_remote(enum accept_promisor accept, return 0; } - if (!strcmp(urls->v[i], remote_url)) + if (!strcmp(p->url, remote_url)) return 1; warning(_("known remote named '%s' but with URL '%s' instead of '%s'"), - remote_name, urls->v[i], remote_url); + remote_name, p->url, remote_url); return 0; } @@ -430,8 +455,7 @@ static void filter_promisor_remote(struct repository *repo, struct strbuf **remotes; const char *accept_str; enum accept_promisor accept = ACCEPT_NONE; - struct strvec names = STRVEC_INIT; - struct strvec urls = STRVEC_INIT; + struct string_list config_info = STRING_LIST_INIT_NODUP; if (!git_config_get_string_tmp("promisor.acceptfromserver", &accept_str)) { if (!*accept_str || !strcasecmp("None", accept_str)) @@ -450,8 +474,10 @@ static void filter_promisor_remote(struct repository *repo, if (accept == ACCEPT_NONE) return; - if (accept != ACCEPT_ALL) - promisor_info_vecs(repo, &names, &urls); + if (accept != ACCEPT_ALL) { + promisor_config_info_list(repo, &config_info); + string_list_sort(&config_info); + } /* Parse remote info received */ @@ -482,7 +508,7 @@ static void filter_promisor_remote(struct repository *repo, if (remote_url) decoded_url = url_percent_decode(remote_url); - if (decoded_name && should_accept_remote(accept, decoded_name, decoded_url, &names, &urls)) + if (decoded_name && should_accept_remote(accept, decoded_name, decoded_url, &config_info)) strvec_push(accepted, decoded_name); strbuf_list_free(elems); @@ -490,8 +516,7 @@ static void filter_promisor_remote(struct repository *repo, free(decoded_url); } - strvec_clear(&names); - strvec_clear(&urls); + promisor_info_list_clear(&config_info); strbuf_list_free(remotes); } -- 2.50.1.323.g4e0625aa69.dirty