[PATCH 07/13] Add a config option for remotes to specify a foreign vcs
From: Daniel Barkalow <hidden>
Date: 2016-06-15 22:47:09
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
If this is set, the url is not required, and the transport always uses a helper named "git-remote-<value>". It is a separate configuration option in order to allow a sensible configuration for foreign systems which either have no meaningful urls for repositories or which require urls that do not specify the system used by the repository at that location. However, this only affects how the name of the helper is determined, not anything about the interaction with the helper, and the contruction is such that, if the foreign scm does happen to use a co-named url method, a url with that method may be used directly. Signed-off-by: Daniel Barkalow <redacted> --- Documentation/config.txt | 4 ++++ remote.c | 4 +++- remote.h | 2 ++ transport-helper.c | 14 ++++++++++---- transport.c | 5 +++++ 5 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c6f09f8..6763c4b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt@@ -1364,6 +1364,10 @@ remote.<name>.tagopt:: Setting this value to \--no-tags disables automatic tag following when fetching from remote <name> +remote.<name>.vcs:: + Setting this to a value <vcs> will cause git to interact with + the remote with the git-vcs-<vcs> helper. + remotes.<group>:: The list of remotes which are fetched by "git remote update <group>". See linkgit:git-remote[1].
diff --git a/remote.c b/remote.c
index e6f5cd2..057ac02 100644
--- a/remote.c
+++ b/remote.c@@ -50,7 +50,7 @@ static char buffer[BUF_SIZE]; static int valid_remote(const struct remote *remote) { - return !!remote->url; + return remote->url || remote->foreign_vcs; } static const char *alias_url(const char *url)
@@ -427,6 +427,8 @@ static int handle_config(const char *key, const char *value, void *cb) } else if (!strcmp(subkey, ".proxy")) { return git_config_string((const char **)&remote->http_proxy, key, value); + } else if (!strcmp(subkey, ".vcs")) { + return git_config_string(&remote->foreign_vcs, key, value); } return 0; }
diff --git a/remote.h b/remote.h
index 5db8420..ac0ce2f 100644
--- a/remote.h
+++ b/remote.h@@ -11,6 +11,8 @@ struct remote { const char *name; int origin; + const char *foreign_vcs; + const char **url; int url_nr; int url_alloc;
diff --git a/transport-helper.c b/transport-helper.c
index 203a056..dccf400 100644
--- a/transport-helper.c
+++ b/transport-helper.c@@ -155,10 +155,16 @@ static struct ref *get_refs_list(struct transport *transport, int for_push) int transport_helper_init(struct transport *transport) { struct helper_data *data = xcalloc(sizeof(*data), 1); - char *eom = strchr(transport->url, ':'); - if (!eom) - return -1; - data->name = xstrndup(transport->url, eom - transport->url); + + if (transport->remote->foreign_vcs) { + data->name = xstrdup(transport->remote->foreign_vcs); + transport->url = transport->remote->foreign_vcs; + } else { + char *eom = strchr(transport->url, ':'); + if (!eom) + return -1; + data->name = xstrndup(transport->url, eom - transport->url); + } transport->data = data; transport->get_refs_list = get_refs_list;
diff --git a/transport.c b/transport.c
index 983d183..b5dcdc7 100644
--- a/transport.c
+++ b/transport.c@@ -813,6 +813,11 @@ struct transport *transport_get(struct remote *remote, const char *url) url = remote->url[0]; ret->url = url; + if (remote && remote->foreign_vcs) { + transport_helper_init(ret); + return ret; + } + if (!prefixcmp(url, "rsync:")) { ret->get_refs_list = get_refs_via_rsync; ret->fetch = fetch_objs_via_rsync;
--
1.6.4.rc3.27.g95032.dirty