Commits

Marcin Kasperski  committed 04f4128 Merge

merge

  • Participants
  • Parent commits 06e30fe, d0d1640

Comments (0)

Files changed (2)

 syntax: regexp
 
 \.pyc$
+\.pyo$
 ~$
 ^\.\#
 ^\.(project|pydevproject)$

File mercurial_keyring.py

             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: