# HG changeset patch
# User Henrik Stuart <hg@hstuart.dk>
# Date 1245510589 -7200
# Node ID 89b71acdac9a2c29fc570c398c730295e47142a2
# Parent  7951f385fcb71f9b684ceb467d37aa43ddecefda
url: let host port take precedence when connecting to HTTPS

Fixes use of HTTPS connections on non-standard ports.

diff -r 7951f385fcb7 -r 89b71acdac9a mercurial/url.py
--- a/mercurial/url.py	Sat Jun 20 10:58:57 2009 +0200
+++ b/mercurial/url.py	Sat Jun 20 17:09:49 2009 +0200
@@ -438,6 +438,12 @@
                 keyfile = self.auth['key']
                 certfile = self.auth['cert']
 
+            # let host port take precedence
+            if ':' in host and '[' not in host or ']:' in host:
+                host, port = host.rsplit(':', 1)
+                if '[' in host:
+                    host = host[1:-1]
+
             return httpsconnection(host, port, keyfile, certfile, *args, **kwargs)
 
 # In python < 2.5 AbstractDigestAuthHandler raises a ValueError if