connect: display connection progress

Make git notify the user about host resolution/connection attempts.
This is useful both as a progress indicator on slow links, and helps
reassure the user there are no firewall problems.

Signed-off-by: Michael S. Tsirkin <mst@dev.mellanox.co.il>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-archive.c b/builtin-archive.c
index 7f4e409c998ba4a864bd39032556d71693ff6793..187491bc172571b783a0be4f4dfa3d94d58bb0fe 100644 (file)
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -45,7 +45,7 @@ static int run_remote_archiver(const char *remote, int argc,
        }
 
        url = xstrdup(remote);
        }
 
        url = xstrdup(remote);

-       pid = git_connect(fd, url, exec);
+       pid = git_connect(fd, url, exec, 0);

        if (pid < 0)
                return pid;
 
        if (pid < 0)
                return pid;
 

diff --git a/cache.h b/cache.h
index aaeb04a1b9f756d946b06cad8561625ead9bb8a9..206bbe4fd5c77b59851d1f891a16676bc5818429 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -463,7 +463,8 @@ struct ref {
 #define REF_HEADS      (1u << 1)
 #define REF_TAGS       (1u << 2)
 
 #define REF_HEADS      (1u << 1)
 #define REF_TAGS       (1u << 2)
 

-extern pid_t git_connect(int fd[2], char *url, const char *prog);
+#define CONNECT_VERBOSE       (1u << 0)
+extern pid_t git_connect(int fd[2], char *url, const char *prog, int flags);

 extern int finish_connect(pid_t pid);
 extern int path_match(const char *path, int nr, char **match);
 extern int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
 extern int finish_connect(pid_t pid);
 extern int path_match(const char *path, int nr, char **match);
 extern int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,

diff --git a/connect.c b/connect.c
index da89c9cfcf3469dfab789f2644f953ea46666e90..2a26fdbe0d96f1f1a689e6113b7b86e16e205652 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -394,7 +394,7 @@ static enum protocol get_protocol(const char *name)
 /*
  * Returns a connected socket() fd, or else die()s.
  */
 /*
  * Returns a connected socket() fd, or else die()s.
  */

-static int git_tcp_connect_sock(char *host)
+static int git_tcp_connect_sock(char *host, int flags)

 {
        int sockfd = -1, saved_errno = 0;
        char *colon, *end;
 {
        int sockfd = -1, saved_errno = 0;
        char *colon, *end;


@@ -425,10 +425,16 @@ static int git_tcp_connect_sock(char *host)
        hints.ai_socktype = SOCK_STREAM;
        hints.ai_protocol = IPPROTO_TCP;
 
        hints.ai_socktype = SOCK_STREAM;
        hints.ai_protocol = IPPROTO_TCP;
 

+       if (flags & CONNECT_VERBOSE)
+               fprintf(stderr, "Looking up %s ... ", host);
+

        gai = getaddrinfo(host, port, &hints, &ai);
        if (gai)
                die("Unable to look up %s (port %s) (%s)", host, port, gai_strerror(gai));
 
        gai = getaddrinfo(host, port, &hints, &ai);
        if (gai)
                die("Unable to look up %s (port %s) (%s)", host, port, gai_strerror(gai));
 

+       if (flags & CONNECT_VERBOSE)
+               fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port);
+

        for (ai0 = ai; ai; ai = ai->ai_next) {
                sockfd = socket(ai->ai_family,
                                ai->ai_socktype, ai->ai_protocol);
        for (ai0 = ai; ai; ai = ai->ai_next) {
                sockfd = socket(ai->ai_family,
                                ai->ai_socktype, ai->ai_protocol);


@@ -450,6 +456,9 @@ static int git_tcp_connect_sock(char *host)
        if (sockfd < 0)
                die("unable to connect a socket (%s)", strerror(saved_errno));
 
        if (sockfd < 0)
                die("unable to connect a socket (%s)", strerror(saved_errno));
 

+       if (flags & CONNECT_VERBOSE)
+               fprintf(stderr, "done.\n");
+

        return sockfd;
 }
 
        return sockfd;
 }
 


@@ -458,7 +467,7 @@ static int git_tcp_connect_sock(char *host)
 /*
  * Returns a connected socket() fd, or else die()s.
  */
 /*
  * Returns a connected socket() fd, or else die()s.
  */

-static int git_tcp_connect_sock(char *host)
+static int git_tcp_connect_sock(char *host, int flags)

 {
        int sockfd = -1, saved_errno = 0;
        char *colon, *end;
 {
        int sockfd = -1, saved_errno = 0;
        char *colon, *end;


@@ -485,6 +494,9 @@ static int git_tcp_connect_sock(char *host)
                port = colon + 1;
        }
 
                port = colon + 1;
        }
 

+       if (flags & CONNECT_VERBOSE)
+               fprintf(stderr, "Looking up %s ... ", host);
+

        he = gethostbyname(host);
        if (!he)
                die("Unable to look up %s (%s)", host, hstrerror(h_errno));
        he = gethostbyname(host);
        if (!he)
                die("Unable to look up %s (%s)", host, hstrerror(h_errno));


@@ -497,6 +509,9 @@ static int git_tcp_connect_sock(char *host)
                nport = se->s_port;
        }
 
                nport = se->s_port;
        }
 

+       if (flags & CONNECT_VERBOSE)
+               fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port);
+

        for (ap = he->h_addr_list; *ap; ap++) {
                sockfd = socket(he->h_addrtype, SOCK_STREAM, 0);
                if (sockfd < 0) {
        for (ap = he->h_addr_list; *ap; ap++) {
                sockfd = socket(he->h_addrtype, SOCK_STREAM, 0);
                if (sockfd < 0) {


@@ -521,15 +536,18 @@ static int git_tcp_connect_sock(char *host)
        if (sockfd < 0)
                die("unable to connect a socket (%s)", strerror(saved_errno));
 
        if (sockfd < 0)
                die("unable to connect a socket (%s)", strerror(saved_errno));
 

+       if (flags & CONNECT_VERBOSE)
+               fprintf(stderr, "done.\n");
+

        return sockfd;
 }
 
 #endif /* NO_IPV6 */
 
 
        return sockfd;
 }
 
 #endif /* NO_IPV6 */
 
 

-static void git_tcp_connect(int fd[2], char *host)
+static void git_tcp_connect(int fd[2], char *host, int flags)

 {
 {

-       int sockfd = git_tcp_connect_sock(host);
+       int sockfd = git_tcp_connect_sock(host, flags);

 
        fd[0] = sockfd;
        fd[1] = dup(sockfd);
 
        fd[0] = sockfd;
        fd[1] = dup(sockfd);


@@ -646,7 +664,7 @@ static void git_proxy_connect(int fd[2], char *host)
  *
  * Does not return a negative value on error; it just dies.
  */
  *
  * Does not return a negative value on error; it just dies.
  */

-pid_t git_connect(int fd[2], char *url, const char *prog)
+pid_t git_connect(int fd[2], char *url, const char *prog, int flags)

 {
        char *host, *path = url;
        char *end;
 {
        char *host, *path = url;
        char *end;


@@ -719,7 +737,7 @@ pid_t git_connect(int fd[2], char *url, const char *prog)
                if (git_use_proxy(host))
                        git_proxy_connect(fd, host);
                else
                if (git_use_proxy(host))
                        git_proxy_connect(fd, host);
                else

-                       git_tcp_connect(fd, host);
+                       git_tcp_connect(fd, host, flags);

                /*
                 * Separate original protocol components prog and path
                 * from extended components with a NUL byte.
                /*
                 * Separate original protocol components prog and path
                 * from extended components with a NUL byte.

diff --git a/fetch-pack.c b/fetch-pack.c
index 06f4aeced439312c43f2736a1684f9e22218899b..aa59043c036e492a314c75080a61ab3d6a2b403d 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -733,7 +733,7 @@ int main(int argc, char **argv)
        }
        if (!dest)
                usage(fetch_pack_usage);
        }
        if (!dest)
                usage(fetch_pack_usage);

-       pid = git_connect(fd, dest, uploadpack);
+       pid = git_connect(fd, dest, uploadpack, verbose ? CONNECT_VERBOSE : 0);

        if (pid < 0)
                return 1;
        if (heads && nr_heads)
        if (pid < 0)
                return 1;
        if (heads && nr_heads)

diff --git a/peek-remote.c b/peek-remote.c
index 96bfac498bdc58c90c9bc136a1df7bac9bfa0d92..ceb787170e17df130e26658e5a189bb63684ab3e 100644 (file)
--- a/peek-remote.c
+++ b/peek-remote.c
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
        if (!dest || i != argc - 1)
                usage(peek_remote_usage);
 
        if (!dest || i != argc - 1)
                usage(peek_remote_usage);
 

-       pid = git_connect(fd, dest, uploadpack);
+       pid = git_connect(fd, dest, uploadpack, 0);

        if (pid < 0)
                return 1;
        ret = peek_remote(fd, flags);
        if (pid < 0)
                return 1;
        ret = peek_remote(fd, flags);

diff --git a/send-pack.c b/send-pack.c
index d5b51628dfbcc44b22b5069df19eeac67dda1e57..83ee87dcf82d1720c1c39ae377b4c7a595c5a059 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -393,7 +393,7 @@ int main(int argc, char **argv)
                usage(send_pack_usage);
        verify_remote_names(nr_heads, heads);
 
                usage(send_pack_usage);
        verify_remote_names(nr_heads, heads);
 

-       pid = git_connect(fd, dest, receivepack);
+       pid = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0);

        if (pid < 0)
                return 1;
        ret = send_pack(fd[0], fd[1], nr_heads, heads);
        if (pid < 0)
                return 1;
        ret = send_pack(fd[0], fd[1], nr_heads, heads);