git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 02/13] Allow programs to not depend on remotes having urls

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
Nov 4, 2009, 19:48 UTC
Message-ID
<1257364098-1685-3-git-send-email-srabbelier@gmail.com>
In-Reply-To
<1257364098-1685-1-git-send-email-srabbelier@gmail.com>
From: Daniel Barkalow <barkalow@iabervon.org>

For fetch and ls-remote, which use the first url of a remote, have transport_get() determine this by passing a remote and passing NULL for the url. For push, which uses every url of a remote, use each url in turn if there are any, and use NULL if there are none.

This will allow the transport code to do something different if the location is not specified with a url.

Also, have the message for a fetch say "foreign" if there is no url.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
	Unchanged.
 builtin-fetch.c     |    7 +++-
 builtin-ls-remote.c |    4 +-
 builtin-push.c      |   68 +++++++++++++++++++++++++++++++-------------------
 transport.c         |    3 ++
 4 files changed, 52 insertions(+), 30 deletions(-)
diff --git a/builtin-fetch.c b/builtin-fetch.c
index a35a6f8..013a6ba 100644
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -309,7 +309,10 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 	if (!fp)
 		return error("cannot open %s: %s\n", filename, strerror(errno));
 
-	url = transport_anonymize_url(raw_url);
+	if (raw_url)
+		url = transport_anonymize_url(raw_url);
+	else
+		url = xstrdup("foreign");
 	for (rm = ref_map; rm; rm = rm->next) {
 		struct ref *ref = NULL;
 
@@ -704,7 +707,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	if (!remote)
 		die("Where do you want to fetch from today?");
 
-	transport = transport_get(remote, remote->url[0]);
+	transport = transport_get(remote, NULL);
 	if (verbosity >= 2)
 		transport->verbose = 1;
 	if (verbosity < 0)
diff --git a/builtin-ls-remote.c b/builtin-ls-remote.c
index 78a88f7..4c6fc58 100644
--- a/builtin-ls-remote.c
+++ b/builtin-ls-remote.c
@@ -87,9 +87,9 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 		}
 	}
 	remote = nongit ? NULL : remote_get(dest);
-	if (remote && !remote->url_nr)
+	if (!nongit && !remote)
 		die("remote %s has no configured URL", dest);
-	transport = transport_get(remote, remote ? remote->url[0] : dest);
+	transport = transport_get(remote, remote ? NULL : dest);
 	if (uploadpack != NULL)
 		transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
 
diff --git a/builtin-push.c b/builtin-push.c
index 8631c06..88dd9f5 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -88,6 +88,36 @@ static void setup_default_push_refspecs(void)
 	}
 }
 
+static int push_with_options(struct transport *transport, int flags)
+{
+	int err;
+	int nonfastforward;
+	if (receivepack)
+		transport_set_option(transport,
+				     TRANS_OPT_RECEIVEPACK, receivepack);
+	if (thin)
+		transport_set_option(transport, TRANS_OPT_THIN, "yes");
+
+	if (flags & TRANSPORT_PUSH_VERBOSE)
+		fprintf(stderr, "Pushing to %s\n", transport->url);
+	err = transport_push(transport, refspec_nr, refspec, flags,
+			     &nonfastforward);
+	err |= transport_disconnect(transport);
+
+	if (!err)
+		return 0;
+
+	error("failed to push some refs to '%s'", transport->url);
+
+	if (nonfastforward && advice_push_nonfastforward) {
+		printf("To prevent you from losing history, non-fast-forward updates were rejected\n"
+		       "Merge the remote changes before pushing again.  See the 'non-fast forward'\n"
+		       "section of 'git push --help' for details.\n");
+	}
+
+	return 1;
+}
+
 static int do_push(const char *repo, int flags)
 {
 	int i, errs;
@@ -136,33 +166,19 @@ static int do_push(const char *repo, int flags)
 		url = remote->url;
 		url_nr = remote->url_nr;
 	}
-	for (i = 0; i < url_nr; i++) {
-		struct transport *transport =
-			transport_get(remote, url[i]);
-		int err;
-		int nonfastforward;
-		if (receivepack)
-			transport_set_option(transport,
-					     TRANS_OPT_RECEIVEPACK, receivepack);
-		if (thin)
-			transport_set_option(transport, TRANS_OPT_THIN, "yes");
-
-		if (flags & TRANSPORT_PUSH_VERBOSE)
-			fprintf(stderr, "Pushing to %s\n", url[i]);
-		err = transport_push(transport, refspec_nr, refspec, flags,
-				     &nonfastforward);
-		err |= transport_disconnect(transport);
-
-		if (!err)
-			continue;
-
-		error("failed to push some refs to '%s'", url[i]);
-		if (nonfastforward && advice_push_nonfastforward) {
-			printf("To prevent you from losing history, non-fast-forward updates were rejected\n"
-			       "Merge the remote changes before pushing again.  See the 'non-fast forward'\n"
-			       "section of 'git push --help' for details.\n");
+	if (url_nr) {
+		for (i = 0; i < url_nr; i++) {
+			struct transport *transport =
+				transport_get(remote, url[i]);
+			if (push_with_options(transport, flags))
+				errs++;
 		}
-		errs++;
+	} else {
+		struct transport *transport =
+			transport_get(remote, NULL);
+
+		if (push_with_options(transport, flags))
+			errs++;
 	}
 	return !!errs;
 }
diff --git a/transport.c b/transport.c
index 644a30a..9daa686 100644
--- a/transport.c
+++ b/transport.c
@@ -813,6 +813,9 @@ struct transport *transport_get(struct remote *remote, const char *url)
 	struct transport *ret = xcalloc(1, sizeof(*ret));
 
 	ret->remote = remote;
+
+	if (!url && remote && remote->url)
+		url = remote->url[0];
 	ret->url = url;
 
 	if (!prefixcmp(url, "rsync:")) {

-- 
1.6.5.2.295.g0d105
Previous: Sverre RabbelierNext: Sverre Rabbelier
Message 3 of 36 in “Reroll of the remote-vcs-helper series”
  1. 00/13 Reroll of the remote-vcs-helper seriesSverre Rabbelier, Nov 4, 2009
  2. 01/13 Fix memory leak in helper method for disconnectSverre Rabbelier, Nov 4, 2009
  3. 02/13 Allow programs to not depend on remotes having urlsSverre Rabbelier, Nov 4, 2009
  4. 03/13 Use a function to determine whether a remote is validSverre Rabbelier, Nov 4, 2009
  5. 04/13 Allow fetch to modify refsSverre Rabbelier, Nov 4, 2009
  6. 05/13 Add a config option for remotes to specify a foreign vcsSverre Rabbelier, Nov 4, 2009
  7. 06/13 Allow specifying the remote helper in the urlSverre Rabbelier, Nov 4, 2009
  8. 07/13 Add support for "import" helper commandSverre Rabbelier, Nov 4, 2009
  9. 08/13 Write local refs written by the "import" helper command only onceSverre Rabbelier, Nov 4, 2009
  10. 09/13 Honour the refspec when updating refs after importSverre Rabbelier, Nov 4, 2009
  11. Daniel BarkalowNov 4, 2009
  12. Sverre RabbelierNov 4, 2009
  13. Daniel BarkalowNov 4, 2009
  14. Sverre RabbelierNov 5, 2009
  15. Daniel BarkalowNov 5, 2009
  16. Daniel BarkalowNov 5, 2009
  17. Sverre RabbelierNov 5, 2009
  18. Daniel BarkalowNov 6, 2009
  19. Sverre RabbelierNov 6, 2009
  20. Daniel BarkalowNov 6, 2009
  21. Junio C HamanoNov 6, 2009
  22. 10/13 Allow helpers to report in "list" command that the ref is unchangedSverre Rabbelier, Nov 4, 2009
  23. 11/13 Allow helpers to request the path to the .git directorySverre Rabbelier, Nov 4, 2009
  24. Daniel BarkalowNov 4, 2009
  25. Sverre RabbelierNov 4, 2009
  26. Daniel BarkalowNov 4, 2009
  27. Sverre RabbelierNov 4, 2009
  28. Daniel BarkalowNov 4, 2009
  29. Sverre RabbelierNov 4, 2009
  30. Daniel BarkalowNov 4, 2009
  31. Junio C HamanoNov 5, 2009
  32. Sverre RabbelierNov 5, 2009
  33. 12/13 Basic build infrastructure for Python scriptsSverre Rabbelier, Nov 4, 2009
  34. 13/13 Add Python support library for remote helpersSverre Rabbelier, Nov 4, 2009
  35. Johan HerlandNov 5, 2009
  36. Sverre RabbelierNov 6, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.