changeset 752:53d9d6cd644e

git_handler: drop lots of compat cruft for old dulwich versions
author Augie Fackler <raf@durin42.com>
date Sat, 23 Aug 2014 12:36:53 -0400
parents e5e1a287121d
children 1d94f54b3502
files hggit/git_handler.py
diffstat 1 files changed, 3 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -1406,26 +1406,13 @@
 
             return transport(host, port=port), path
 
-        httpclient = getattr(client, 'HttpGitClient', None)
-
         if uri.startswith('git+http://') or uri.startswith('git+https://'):
             uri = uri[4:]
 
         if uri.startswith('http://') or uri.startswith('https://'):
-            if not httpclient:
-                raise RepoError('git via HTTP requires dulwich 0.8.1 or later')
-            else:
-                auth_handler = urllib2.HTTPBasicAuthHandler(url.passwordmgr(self.ui))
-                opener = urllib2.build_opener(auth_handler)
-                try:
-                    return client.HttpGitClient(uri, opener=opener), uri
-                except TypeError as e:
-                    if e.message.find("unexpected keyword argument 'opener'") >= 0:
-                        # using a version of dulwich that doesn't support
-                        # http(s) authentication -- try without authentication
-                        return client.HttpGitClient(uri), uri
-                    else:
-                        raise
+            auth_handler = urllib2.HTTPBasicAuthHandler(url.passwordmgr(self.ui))
+            opener = urllib2.build_opener(auth_handler)
+            return client.HttpGitClient(uri, opener=opener), uri
 
         # if its not git or git+ssh, try a local url..
         return client.SubprocessGitClient(), uri