# HG changeset patch # User mpm@selenic.com # Date 1120083316 28800 # Node ID 55af04e26bad1d8a323a8f4c5d23b38106501094 # Parent 337163e4d4b9c6a0df1ee6fa2083d3bcae419cd4 show connect message on push -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 show connect message on push manifest hash: 3edbff798a71719c91890b9ab5fda5c2bd64f256 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwx10ywK+sNU5EO8RAv0uAJsGMalwZ2aEElzZ8io5zlM/DjwqJACglVLb 7KXzzHdXfKGXOr00gUV4mvc= =sfeK -----END PGP SIGNATURE----- diff -r 337163e4d4b9 -r 55af04e26bad mercurial/commands.py --- a/mercurial/commands.py Wed Jun 29 14:10:17 2005 -0800 +++ b/mercurial/commands.py Wed Jun 29 14:15:16 2005 -0800 @@ -575,13 +575,13 @@ return 1 user, host, port, path = map(m.group, (2, 3, 5, 7)) - host = user and ("%s@%s" % (user, host)) or host + uhost = user and ("%s@%s" % (user, host)) or host port = port and (" -p %s") % port or "" path = path or "" sport = random.randrange(30000, 60000) cmd = "ssh %s%s -R %d:localhost:%d 'cd %s; hg pull http://localhost:%d/'" - cmd = cmd % (host, port, sport+1, sport, path, sport+1) + cmd = cmd % (uhost, port, sport+1, sport, path, sport+1) child = os.fork() if not child: @@ -589,6 +589,7 @@ sys.stderr = sys.stdout hgweb.server(repo.root, "pull", "", "localhost", sport) else: + ui.status("connecting to %s\n" % host) r = os.system(cmd) os.kill(child, signal.SIGTERM) return r