merge

.hgignore

@@ -1,6 +1,7 b''
 syntax: regexp
 
 \.pyc$
+\.pyo$
 ~$
 ^\.\#
 ^\.(project|pydevproject)$

mercurial_keyring.py

@@ -241,7 +241,10 b' class HTTPPasswordHandler(object):'
             except ImportError:
                 # hg 1.9
                 from mercurial.httpconnection import readauthforuri
-            res = readauthforuri(local_ui, base_url)
+            try:
+                res = readauthforuri(local_ui, base_url)
+            except:
+                res = readauthforuri(local_ui, base_url, '')
             if res:
                 group, auth_token = res
             else: