From: "Glen Choo via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Glen Choo <chooglen@google.com>, Glen Choo <chooglen@google.com>
Subject: [PATCH 1/2] remote: move static variables into struct
Date: Thu, 07 Oct 2021 19:07:14 +0000 [thread overview]
Message-ID: <f7639a20fcd437d5f50665b5c6f5318c1245b9b5.1633633635.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1103.git.git.1633633635.gitgitgadget@gmail.com>
From: Glen Choo <chooglen@google.com>
remote.c only works with the_repository because it stores its state as
static variables. To support non-the_repository, we can use a
per-repository struct for the remotes subsystem.
Prepare for this change by moving the static variables of remote.c into
a static struct remote_state.
This introduces no behavioral or API changes.
Signed-off-by: Glen Choo <chooglen@google.com>
---
remote.c | 109 ++++++++++++++++++++++++++++++++-----------------------
1 file changed, 63 insertions(+), 46 deletions(-)
diff --git a/remote.c b/remote.c
index 31e141b01fa..55997210060 100644
--- a/remote.c
+++ b/remote.c
@@ -34,20 +34,24 @@ struct rewrites {
int rewrite_nr;
};
-static struct remote **remotes;
-static int remotes_alloc;
-static int remotes_nr;
-static struct hashmap remotes_hash;
+static struct remote_state {
+ struct remote **remotes;
+ int remotes_alloc;
+ int remotes_nr;
+ struct hashmap remotes_hash;
-static struct branch **branches;
-static int branches_alloc;
-static int branches_nr;
+ struct branch **branches;
+ int branches_alloc;
+ int branches_nr;
-static struct branch *current_branch;
-static const char *pushremote_name;
+ struct branch *current_branch;
+ const char *pushremote_name;
-static struct rewrites rewrites;
-static struct rewrites rewrites_push;
+ struct rewrites rewrites;
+ struct rewrites rewrites_push;
+} remotes;
+
+struct remote_state *remote_state = &remotes;
static int valid_remote(const struct remote *remote)
{
@@ -94,14 +98,14 @@ static void add_pushurl(struct remote *remote, const char *pushurl)
static void add_pushurl_alias(struct remote *remote, const char *url)
{
- const char *pushurl = alias_url(url, &rewrites_push);
+ const char *pushurl = alias_url(url, &remote_state->rewrites_push);
if (pushurl != url)
add_pushurl(remote, pushurl);
}
static void add_url_alias(struct remote *remote, const char *url)
{
- add_url(remote, alias_url(url, &rewrites));
+ add_url(remote, alias_url(url, &remote_state->rewrites));
add_pushurl_alias(remote, url);
}
@@ -129,8 +133,9 @@ static int remotes_hash_cmp(const void *unused_cmp_data,
static inline void init_remotes_hash(void)
{
- if (!remotes_hash.cmpfn)
- hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
+ if (!remote_state->remotes_hash.cmpfn)
+ hashmap_init(&remote_state->remotes_hash, remotes_hash_cmp,
+ NULL, 0);
}
static struct remote *make_remote(const char *name, int len)
@@ -147,7 +152,7 @@ static struct remote *make_remote(const char *name, int len)
lookup.len = len;
hashmap_entry_init(&lookup_entry, memhash(name, len));
- e = hashmap_get(&remotes_hash, &lookup_entry, &lookup);
+ e = hashmap_get(&remote_state->remotes_hash, &lookup_entry, &lookup);
if (e)
return container_of(e, struct remote, ent);
@@ -158,11 +163,12 @@ static struct remote *make_remote(const char *name, int len)
refspec_init(&ret->push, REFSPEC_PUSH);
refspec_init(&ret->fetch, REFSPEC_FETCH);
- ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
- remotes[remotes_nr++] = ret;
+ ALLOC_GROW(remote_state->remotes, remote_state->remotes_nr + 1,
+ remote_state->remotes_alloc);
+ remote_state->remotes[remote_state->remotes_nr++] = ret;
hashmap_entry_init(&ret->ent, lookup_entry.hash);
- if (hashmap_put_entry(&remotes_hash, ret, ent))
+ if (hashmap_put_entry(&remote_state->remotes_hash, ret, ent))
BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
return ret;
}
@@ -179,15 +185,16 @@ static struct branch *make_branch(const char *name, size_t len)
struct branch *ret;
int i;
- for (i = 0; i < branches_nr; i++) {
- if (!strncmp(name, branches[i]->name, len) &&
- !branches[i]->name[len])
- return branches[i];
+ for (i = 0; i < remote_state->branches_nr; i++) {
+ if (!strncmp(name, remote_state->branches[i]->name, len) &&
+ !remote_state->branches[i]->name[len])
+ return remote_state->branches[i];
}
- ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
+ ALLOC_GROW(remote_state->branches, remote_state->branches_nr + 1,
+ remote_state->branches_alloc);
CALLOC_ARRAY(ret, 1);
- branches[branches_nr++] = ret;
+ remote_state->branches[remote_state->branches_nr++] = ret;
ret->name = xstrndup(name, len);
ret->refname = xstrfmt("refs/heads/%s", ret->name);
@@ -327,12 +334,14 @@ static int handle_config(const char *key, const char *value, void *cb)
if (!strcmp(subkey, "insteadof")) {
if (!value)
return config_error_nonbool(key);
- rewrite = make_rewrite(&rewrites, name, namelen);
+ rewrite = make_rewrite(&remote_state->rewrites, name,
+ namelen);
add_instead_of(rewrite, xstrdup(value));
} else if (!strcmp(subkey, "pushinsteadof")) {
if (!value)
return config_error_nonbool(key);
- rewrite = make_rewrite(&rewrites_push, name, namelen);
+ rewrite = make_rewrite(&remote_state->rewrites_push,
+ name, namelen);
add_instead_of(rewrite, xstrdup(value));
}
}
@@ -342,7 +351,8 @@ static int handle_config(const char *key, const char *value, void *cb)
/* Handle remote.* variables */
if (!name && !strcmp(subkey, "pushdefault"))
- return git_config_string(&pushremote_name, key, value);
+ return git_config_string(&remote_state->pushremote_name, key,
+ value);
if (!name)
return 0;
@@ -425,18 +435,24 @@ static int handle_config(const char *key, const char *value, void *cb)
static void alias_all_urls(void)
{
int i, j;
- for (i = 0; i < remotes_nr; i++) {
+ for (i = 0; i < remote_state->remotes_nr; i++) {
int add_pushurl_aliases;
- if (!remotes[i])
+ if (!remote_state->remotes[i])
continue;
- for (j = 0; j < remotes[i]->pushurl_nr; j++) {
- remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
+ for (j = 0; j < remote_state->remotes[i]->pushurl_nr; j++) {
+ remote_state->remotes[i]->pushurl[j] =
+ alias_url(remote_state->remotes[i]->pushurl[j],
+ &remote_state->rewrites);
}
- add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
- for (j = 0; j < remotes[i]->url_nr; j++) {
+ add_pushurl_aliases = remote_state->remotes[i]->pushurl_nr == 0;
+ for (j = 0; j < remote_state->remotes[i]->url_nr; j++) {
if (add_pushurl_aliases)
- add_pushurl_alias(remotes[i], remotes[i]->url[j]);
- remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
+ add_pushurl_alias(
+ remote_state->remotes[i],
+ remote_state->remotes[i]->url[j]);
+ remote_state->remotes[i]->url[j] =
+ alias_url(remote_state->remotes[i]->url[j],
+ &remote_state->rewrites);
}
}
}
@@ -450,12 +466,13 @@ static void read_config(void)
return;
loaded = 1;
- current_branch = NULL;
+ remote_state->current_branch = NULL;
if (startup_info->have_repository) {
const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
if (head_ref && (flag & REF_ISSYMREF) &&
skip_prefix(head_ref, "refs/heads/", &head_ref)) {
- current_branch = make_branch(head_ref, strlen(head_ref));
+ remote_state->current_branch =
+ make_branch(head_ref, strlen(head_ref));
}
}
git_config(handle_config, NULL);
@@ -493,10 +510,10 @@ const char *pushremote_for_branch(struct branch *branch, int *explicit)
*explicit = 1;
return branch->pushremote_name;
}
- if (pushremote_name) {
+ if (remote_state->pushremote_name) {
if (explicit)
*explicit = 1;
- return pushremote_name;
+ return remote_state->pushremote_name;
}
return remote_for_branch(branch, explicit);
}
@@ -534,7 +551,7 @@ static struct remote *remote_get_1(const char *name,
if (name)
name_given = 1;
else
- name = get_default(current_branch, &name_given);
+ name = get_default(remote_state->current_branch, &name_given);
ret = make_remote(name, 0);
if (valid_remote_nick(name) && have_git_dir()) {
@@ -573,11 +590,11 @@ int for_each_remote(each_remote_fn fn, void *priv)
{
int i, result = 0;
read_config();
- for (i = 0; i < remotes_nr && !result; i++) {
- struct remote *r = remotes[i];
- if (!r)
+ for (i = 0; i < remote_state->remotes_nr && !result; i++) {
+ struct remote *remote = remote_state->remotes[i];
+ if (!remote)
continue;
- result = fn(r, priv);
+ result = fn(remote, priv);
}
return result;
}
@@ -1685,7 +1702,7 @@ struct branch *branch_get(const char *name)
read_config();
if (!name || !*name || !strcmp(name, "HEAD"))
- ret = current_branch;
+ ret = remote_state->current_branch;
else
ret = make_branch(name, strlen(name));
set_merge(ret);
--
gitgitgadget
next prev parent reply other threads:[~2021-10-07 19:07 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 19:07 [PATCH 0/2] remote: replace static variables with struct remote_state Glen Choo via GitGitGadget
2021-10-07 19:07 ` Glen Choo via GitGitGadget [this message]
2021-10-07 23:36 ` [PATCH 1/2] remote: move static variables into struct Junio C Hamano
2021-10-07 19:07 ` [PATCH 2/2] remote: add remote_state to struct repository Glen Choo via GitGitGadget
2021-10-07 23:39 ` Junio C Hamano
2021-10-08 17:30 ` Glen Choo
2021-10-13 19:31 ` [PATCH v2 0/3] remote: replace static variables with struct remote_state Glen Choo
2021-10-13 19:31 ` [PATCH v2 1/3] remote: move static variables into per-repository struct Glen Choo
2021-10-13 20:21 ` Junio C Hamano
2021-10-14 17:25 ` Glen Choo
2021-10-14 18:33 ` Junio C Hamano
2021-10-13 19:31 ` [PATCH v2 2/3] remote: use remote_state parameter internally Glen Choo
2021-10-13 20:23 ` Junio C Hamano
2021-10-13 19:31 ` [PATCH v2 3/3] remote: add struct repository parameter to external functions Glen Choo
2021-10-13 20:24 ` Junio C Hamano
2021-10-13 20:11 ` [PATCH v2 0/3] remote: replace static variables with struct remote_state Junio C Hamano
2021-10-13 20:27 ` Junio C Hamano
2021-10-13 22:00 ` Glen Choo
2021-10-13 21:56 ` Glen Choo
2021-10-13 23:37 ` Junio C Hamano
2021-10-14 1:25 ` Glen Choo
2021-10-19 22:43 ` [PATCH v3 0/4] " Glen Choo
2021-10-19 22:43 ` [PATCH v3 1/4] remote: move static variables into per-repository struct Glen Choo
2021-10-19 22:43 ` [PATCH v3 2/4] remote: use remote_state parameter internally Glen Choo
2021-10-20 19:45 ` Junio C Hamano
2021-10-20 20:31 ` Junio C Hamano
2021-10-20 22:08 ` Junio C Hamano
2021-10-25 18:09 ` Glen Choo
2021-10-25 19:36 ` Glen Choo
2021-10-25 20:33 ` Junio C Hamano
2021-10-25 23:00 ` Glen Choo
2021-10-26 0:45 ` Junio C Hamano
2021-10-26 1:22 ` Junio C Hamano
2021-10-26 17:04 ` Glen Choo
2021-10-27 2:28 ` Junio C Hamano
2021-10-27 17:59 ` Glen Choo
2021-10-27 20:03 ` Junio C Hamano
2021-10-19 22:43 ` [PATCH v3 3/4] remote: remove the_repository->remote_state from static methods Glen Choo
2021-10-19 22:43 ` [PATCH v3 4/4] remote: add struct repository parameter to external functions Glen Choo
2021-10-28 18:30 ` [PATCH v4 0/6] remote: replace static variables with struct remote_state Glen Choo
2021-10-28 18:30 ` [PATCH v4 1/6] t5516: add test case for pushing remote refspecs Glen Choo
2021-10-28 20:17 ` Junio C Hamano
2021-11-15 18:42 ` Jonathan Tan
2021-11-15 20:09 ` Glen Choo
2021-10-28 18:30 ` [PATCH v4 2/6] remote: move static variables into per-repository struct Glen Choo
2021-10-28 18:30 ` [PATCH v4 3/6] remote: use remote_state parameter internally Glen Choo
2021-10-28 18:30 ` [PATCH v4 4/6] remote: remove the_repository->remote_state from static methods Glen Choo
2021-11-15 18:48 ` Jonathan Tan
2021-10-28 18:31 ` [PATCH v4 5/6] remote: die if branch is not found in repository Glen Choo
2021-11-15 18:50 ` Jonathan Tan
2021-11-15 20:06 ` Glen Choo
2021-11-16 17:45 ` Jonathan Tan
2021-10-28 18:31 ` [PATCH v4 6/6] remote: add struct repository parameter to external functions Glen Choo
2021-11-15 18:55 ` Jonathan Tan
2021-11-15 21:44 ` Glen Choo
2021-11-12 0:01 ` [PATCH v4 0/6] remote: replace static variables with struct remote_state Glen Choo
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=f7639a20fcd437d5f50665b5c6f5318c1245b9b5.1633633635.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.