From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Patrick Steinhardt <ps@pks.im>, Taylor Blau <me@ttaylorr.com>,
Karthik Nayak <karthik.188@gmail.com>,
Justin Tobler <jltobler@gmail.com>,
Jean-Noel Avila <jn.avila@free.fr>,
Christian Couder <christian.couder@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH v6 5/5] promisor-remote: use string constants for 'name' and 'url' too
Date: Mon, 21 Jul 2025 16:10:23 +0200 [thread overview]
Message-ID: <20250721141056.2283349-6-christian.couder@gmail.com> (raw)
In-Reply-To: <20250721141056.2283349-1-christian.couder@gmail.com>
A previous commit started to define `promisor_field_filter` and
`promisor_field_token`, and used them instead of the
"partialCloneFilter" and "token" string literals.
Let's do the same for "name" and "url" to avoid repeating them
several times and for consistency with the other fields.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
promisor-remote.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/promisor-remote.c b/promisor-remote.c
index 501cb92391..2f86c68397 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -314,6 +314,12 @@ static int allow_unsanitized(char ch)
return ch > 32 && ch < 127;
}
+/*
+ * All the fields used in "promisor-remote" protocol capability,
+ * including the mandatory "name" and "url" ones.
+ */
+static const char promisor_field_name[] = "name";
+static const char promisor_field_url[] = "url";
static const char promisor_field_filter[] = "partialCloneFilter";
static const char promisor_field_token[] = "token";
@@ -520,9 +526,9 @@ char *promisor_remote_info(struct repository *repo)
if (item != config_info.items)
strbuf_addch(&sb, ';');
- strbuf_addstr(&sb, "name=");
+ strbuf_addf(&sb, "%s=", promisor_field_name);
strbuf_addstr_urlencode(&sb, p->name, allow_unsanitized);
- strbuf_addstr(&sb, ",url=");
+ strbuf_addf(&sb, ",%s=", promisor_field_url);
strbuf_addstr_urlencode(&sb, p->url, allow_unsanitized);
if (p->filter) {
@@ -663,9 +669,9 @@ static struct promisor_info *parse_one_advertised_remote(struct strbuf *remote_i
*p = '\0';
value = url_percent_decode(p + 1);
- if (!strcmp(elem, "name"))
+ if (!strcmp(elem, promisor_field_name))
info->name = value;
- else if (!strcmp(elem, "url"))
+ else if (!strcmp(elem, promisor_field_url))
info->url = value;
else if (!strcasecmp(elem, promisor_field_filter))
info->filter = value;
--
2.50.1.324.gc7d7c83534
next prev parent reply other threads:[~2025-07-21 14:11 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-14 16:03 [PATCH 0/4] Make the "promisor-remote" capability support extra fields Christian Couder
2025-04-14 16:03 ` [PATCH 1/4] config: move is_config_key_char() to "config.h" Christian Couder
2025-04-14 16:03 ` [PATCH 2/4] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-04-22 10:13 ` Patrick Steinhardt
2025-04-29 15:12 ` Christian Couder
2025-04-14 16:03 ` [PATCH 3/4] promisor-remote: allow a server to advertise extra fields Christian Couder
2025-04-14 22:04 ` Junio C Hamano
2025-04-22 10:13 ` Patrick Steinhardt
2025-04-29 15:12 ` Christian Couder
2025-04-29 15:12 ` Christian Couder
2025-04-14 16:03 ` [PATCH 4/4] promisor-remote: allow a client to check " Christian Couder
2025-04-29 14:52 ` [PATCH v2 0/3] Make the "promisor-remote" capability support more fields Christian Couder
2025-04-29 14:52 ` [PATCH v2 1/3] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-05-07 8:25 ` Patrick Steinhardt
2025-05-19 14:10 ` Christian Couder
2025-05-07 12:27 ` Karthik Nayak
2025-05-19 14:10 ` Christian Couder
2025-04-29 14:52 ` [PATCH v2 2/3] promisor-remote: allow a server to advertise more fields Christian Couder
2025-05-07 8:25 ` Patrick Steinhardt
2025-05-19 14:11 ` Christian Couder
2025-05-27 7:50 ` Patrick Steinhardt
2025-05-27 15:30 ` Junio C Hamano
2025-06-11 13:46 ` Christian Couder
2025-05-07 12:44 ` Karthik Nayak
2025-05-19 14:11 ` Christian Couder
2025-04-29 14:52 ` [PATCH v2 3/3] promisor-remote: allow a client to check fields Christian Couder
2025-05-07 8:25 ` Patrick Steinhardt
2025-05-19 14:11 ` Christian Couder
2025-05-02 9:34 ` [PATCH v2 0/3] Make the "promisor-remote" capability support more fields Christian Couder
2025-05-19 14:12 ` [PATCH v3 0/5] " Christian Couder
2025-05-19 14:12 ` [PATCH v3 1/5] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-05-20 9:37 ` Karthik Nayak
2025-05-20 13:32 ` Christian Couder
2025-05-20 16:45 ` Junio C Hamano
2025-05-21 6:33 ` Christian Couder
2025-05-21 15:00 ` Junio C Hamano
2025-06-11 13:47 ` Christian Couder
2025-05-19 14:12 ` [PATCH v3 2/5] promisor-remote: allow a server to advertise more fields Christian Couder
2025-05-21 20:31 ` Justin Tobler
2025-06-11 13:46 ` Christian Couder
2025-05-27 7:51 ` Patrick Steinhardt
2025-06-11 13:46 ` Christian Couder
2025-05-19 14:12 ` [PATCH v3 3/5] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-05-19 14:12 ` [PATCH v3 4/5] promisor-remote: allow a client to check fields Christian Couder
2025-05-19 14:12 ` [PATCH v3 5/5] promisor-remote: use string constants for 'name' and 'url' too Christian Couder
2025-06-11 13:45 ` [PATCH v4 0/5] Make the "promisor-remote" capability support more fields Christian Couder
2025-06-11 13:45 ` [PATCH v4 1/5] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-06-19 11:53 ` Karthik Nayak
2025-06-25 12:53 ` Christian Couder
2025-06-23 19:38 ` Justin Tobler
2025-06-25 12:52 ` Christian Couder
2025-06-11 13:45 ` [PATCH v4 2/5] promisor-remote: allow a server to advertise more fields Christian Couder
2025-06-19 12:15 ` Karthik Nayak
2025-06-25 12:51 ` Christian Couder
2025-06-23 19:59 ` Justin Tobler
2025-06-25 12:51 ` Christian Couder
2025-06-11 13:45 ` [PATCH v4 3/5] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-06-11 13:45 ` [PATCH v4 4/5] promisor-remote: allow a client to check fields Christian Couder
2025-06-11 13:45 ` [PATCH v4 5/5] promisor-remote: use string constants for 'name' and 'url' too Christian Couder
2025-06-19 12:18 ` [PATCH v4 0/5] Make the "promisor-remote" capability support more fields Karthik Nayak
2025-06-25 12:50 ` [PATCH v5 " Christian Couder
2025-06-25 12:50 ` [PATCH v5 1/5] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-06-25 17:05 ` Junio C Hamano
2025-07-21 14:08 ` Christian Couder
2025-06-25 12:50 ` [PATCH v5 2/5] promisor-remote: allow a server to advertise more fields Christian Couder
2025-06-25 22:29 ` Junio C Hamano
2025-07-21 14:09 ` Christian Couder
2025-07-21 18:53 ` Junio C Hamano
2025-07-31 7:20 ` Christian Couder
2025-06-27 18:47 ` Jean-Noël Avila
2025-07-21 14:09 ` Christian Couder
2025-06-25 12:50 ` [PATCH v5 3/5] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-06-25 12:50 ` [PATCH v5 4/5] promisor-remote: allow a client to check fields Christian Couder
2025-06-25 12:50 ` [PATCH v5 5/5] promisor-remote: use string constants for 'name' and 'url' too Christian Couder
2025-07-07 22:35 ` [PATCH v5 0/5] Make the "promisor-remote" capability support more fields Junio C Hamano
2025-07-08 3:34 ` Christian Couder
2025-07-21 14:10 ` [PATCH v6 " Christian Couder
2025-07-21 14:10 ` [PATCH v6 1/5] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-07-21 14:10 ` [PATCH v6 2/5] promisor-remote: allow a server to advertise more fields Christian Couder
2025-07-21 14:10 ` [PATCH v6 3/5] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-07-21 20:39 ` Junio C Hamano
2025-07-31 7:22 ` Christian Couder
2025-07-21 14:10 ` [PATCH v6 4/5] promisor-remote: allow a client to check fields Christian Couder
2025-07-21 20:59 ` Junio C Hamano
2025-07-31 7:21 ` Christian Couder
2025-07-21 14:10 ` Christian Couder [this message]
2025-07-21 20:18 ` [PATCH v6 5/5] promisor-remote: use string constants for 'name' and 'url' too Junio C Hamano
2025-07-31 7:23 ` [PATCH v7 0/5] Make the "promisor-remote" capability support more fields Christian Couder
2025-07-31 7:23 ` [PATCH v7 1/5] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-07-31 7:23 ` [PATCH v7 2/5] promisor-remote: allow a server to advertise more fields Christian Couder
2025-07-31 7:23 ` [PATCH v7 3/5] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-07-31 16:03 ` Junio C Hamano
2025-09-08 5:31 ` Christian Couder
2025-07-31 7:23 ` [PATCH v7 4/5] promisor-remote: allow a client to check fields Christian Couder
2025-07-31 7:23 ` [PATCH v7 5/5] promisor-remote: use string constants for 'name' and 'url' too Christian Couder
2025-07-31 15:48 ` [PATCH v7 0/5] Make the "promisor-remote" capability support more fields Junio C Hamano
2025-08-28 23:32 ` Junio C Hamano
2025-09-08 5:36 ` Christian Couder
2025-09-08 5:30 ` [PATCH v8 0/7] " Christian Couder
2025-09-08 5:30 ` [PATCH v8 1/7] promisor-remote: refactor to get rid of 'struct strvec' Christian Couder
2025-09-08 5:30 ` [PATCH v8 2/7] promisor-remote: allow a server to advertise more fields Christian Couder
2025-09-08 5:30 ` [PATCH v8 3/7] promisor-remote: use string constants for 'name' and 'url' too Christian Couder
2025-09-08 5:30 ` [PATCH v8 4/7] promisor-remote: refactor how we parse advertised fields Christian Couder
2025-09-08 5:30 ` [PATCH v8 5/7] promisor-remote: use string_list_split() in filter_promisor_remote() Christian Couder
2025-09-08 5:30 ` [PATCH v8 6/7] promisor-remote: allow a client to check fields Christian Couder
2025-09-08 5:30 ` [PATCH v8 7/7] promisor-remote: use string_list_split() in mark_remotes_as_accepted() Christian Couder
2025-09-08 17:34 ` [PATCH v8 0/7] Make the "promisor-remote" capability support more fields Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250721141056.2283349-6-christian.couder@gmail.com \
--to=christian.couder@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jltobler@gmail.com \
--cc=jn.avila@free.fr \
--cc=karthik.188@gmail.com \
--cc=me@ttaylorr.com \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).