Dropping support for hg < 2.0 (old readauthoforuri)

mercurial_keyring.py

@@ -29,12 +29,26 b''
 #
 # See README.txt for more details.
 
-''' securely save HTTP and SMTP authentication details
-mercurial_keyring is a Mercurial extension used to securely save
-HTTP and SMTP authentication passwords in password databases (Gnome
-Keyring, KDE KWallet, OSXKeyChain, specific solutions for Win32 and
-command line). This extension uses and wraps services of the keyring
-library.
+'''securely save HTTP and SMTP passwords to encrypted storage
+
+mercurial_keyring securely saves HTTP and SMTP passwords in password
+databases (Gnome Keyring, KDE KWallet, OSXKeyChain, Win32 crypto
+services).
+
+The process is automatic.  Whenever bare Mercurial just prompts for
+the password, Mercurial with mercurial_keyring enabled checks whether
+saved password is available first.  If so, it is used.  If not, you
+will be prompted for the password, but entered password will be
+saved for the future use.
+
+In case saved password turns out to be invalid (HTTP or SMTP login
+fails) it is dropped, and you are asked for current password.
+
+Actual password storage is implemented by Python keyring library, this
+extension glues those services to Mercurial. Consult keyring
+documentation for information how to configure actual password
+backend (by default keyring guesses, usually correctly, for example
+you get KDE Wallet under KDE, and Gnome Keyring under Gnome or Unity).
 '''
 
 from mercurial import util, sslutil
@@ -411,27 +425,18 b' class HTTPPasswordHandler(object):'
         local_ui = _ui(ui)
         if repo_root:
             local_ui.readconfig(os.path.join(repo_root, ".hg", "hgrc"))
-        try:
-            local_passwordmgr = passwordmgr(local_ui)
-            auth_token = local_passwordmgr.readauthtoken(base_url)
-        except AttributeError:
-            try:
-                # hg 1.8
-                import mercurial.url
-                readauthforuri = mercurial.url.readauthforuri
-            except (ImportError, AttributeError):
-                # hg 1.9
-                import mercurial.httpconnection
-                readauthforuri = mercurial.httpconnection.readauthforuri
-            if readauthforuri.func_code.co_argcount == 3:
-                # Since hg.0593e8f81c71
-                res = readauthforuri(local_ui, base_url, user)
-            else:
-                res = readauthforuri(local_ui, base_url)
-            if res:
-                group, auth_token = res
-            else:
-                auth_token = None
+
+        from mercurial.httpconnection import readauthforuri
+        if readauthforuri.func_code.co_argcount == 3:
+            # Since hg.0593e8f81c71
+            res = readauthforuri(local_ui, base_url, user)
+        else:
+            res = readauthforuri(local_ui, base_url)
+        if res:
+            group, auth_token = res
+        else:
+            auth_token = None
+
         if auth_token:
             username = auth_token.get('username')
             password = auth_token.get('password')
@@ -496,6 +501,8 b' def find_user_password(self, realm, auth'
 
 @monkeypatch_method(urllib2.AbstractBasicAuthHandler, "http_error_auth_reqed")
 def basic_http_error_auth_reqed(self, authreq, host, req, headers):
+    """Preserves current HTTP request so it can be consulted
+    in find_user_password above"""
     self.passwd._http_req = req
     try:
         return basic_http_error_auth_reqed.orig(self, authreq, host, req, headers)
@@ -505,6 +512,8 b' def basic_http_error_auth_reqed(self, au'
 
 @monkeypatch_method(urllib2.AbstractDigestAuthHandler, "http_error_auth_reqed")
 def digest_http_error_auth_reqed(self, authreq, host, req, headers):
+    """Preserves current HTTP request so it can be consulted
+    in find_user_password above"""
     self.passwd._http_req = req
     try:
         return digest_http_error_auth_reqed.orig(self, authreq, host, req, headers)
@@ -643,3 +652,8 b' def _smtp(ui):'
         return keyring_supported_smtp(ui, username)
     else:
         return _smtp.orig(ui)
+
+
+############################################################
+# Custom commands
+############################################################