Allow programs to not depend on remotes having urls

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-fetch.c b/builtin-fetch.c
index a35a6f8cb8030bf9be98a001da26fddf0efdb912..013a6ba1b9d4522863d22516a6134142bbcaaa68 100644 (file)
--- 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));
 
        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;
 
        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?");
 
        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)
        if (verbosity >= 2)
                transport->verbose = 1;
        if (verbosity < 0)

diff --git a/builtin-ls-remote.c b/builtin-ls-remote.c
index 78a88f74769645f0be86aa77d3dee3f5e99c916f..d625df2f4e6c44f1986b0a090d923e7fee78878e 100644 (file)
--- a/builtin-ls-remote.c
+++ b/builtin-ls-remote.c
@@ -89,7 +89,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
        remote = nongit ? NULL : remote_get(dest);
        if (remote && !remote->url_nr)
                die("remote %s has no configured URL", dest);
        remote = nongit ? NULL : remote_get(dest);
        if (remote && !remote->url_nr)
                die("remote %s has no configured URL", dest);

-       transport = transport_get(remote, remote ? remote->url[0] : dest);
+       transport = transport_get(remote, NULL);

        if (uploadpack != NULL)
                transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
 
        if (uploadpack != NULL)
                transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
 

diff --git a/builtin-push.c b/builtin-push.c
index b5cd2cdad04548f053d0a9ff24e661d4c3ee1d39..9846c638a611c07a98598464a7c72c4d8120fcea 100644 (file)
--- 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;
 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;
        }
                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;
 }
        }
        return !!errs;
 }

diff --git a/transport.c b/transport.c
index 644a30a0b200b339d291f4cc3d35b2268d12facd..9daa68609f51048be096bb2df2279e65f288d60b 100644 (file)
--- 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;
        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:")) {
        ret->url = url;
 
        if (!prefixcmp(url, "rsync:")) {