Merge 0.4.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 01:31:59 +0000 (03:31 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 01:31:59 +0000 (03:31 +0200)
1  2 
auth.py
transport.py

diff --cc auth.py
index b613676ca33b56f3a25b2e4e58e28263e7fc8429,062ac6187a9bb5713a006389d52d52a1cd4e25da..5887199abe9c840d1a8b55e2e0c705be56942a7d
+++ b/auth.py
@@@ -20,14 -20,18 +20,14 @@@ from bzrlib.ui import ui_factor
  from bzrlib.plugins.svn.ra import (get_username_prompt_provider, 
                                     get_simple_prompt_provider,
                                     get_ssl_server_trust_prompt_provider,
-                                    get_ssl_client_cert_pw_prompt_provider)
+                                    get_ssl_client_cert_pw_prompt_provider,
 +                                   get_simple_provider, get_username_provider, 
 +                                   get_ssl_client_cert_file_provider, 
 +                                   get_ssl_client_cert_pw_file_provider,
 +                                   get_ssl_server_trust_file_provider,
                                     Auth
                                     )
 -
 -import svn.core
 -from svn.core import (svn_auth_cred_username_t, 
 -                      svn_auth_cred_simple_t,
 -                      svn_auth_cred_ssl_client_cert_t,
 -                      svn_auth_cred_ssl_client_cert_pw_t,
 -                      svn_auth_cred_ssl_server_trust_t,
 -                      svn_auth_open)
 +from bzrlib.plugins.svn import ra
  import urlparse
  import urllib
  
@@@ -83,15 -102,16 +89,15 @@@ class SubversionAuthenticationConfig(Au
          if (credentials is not None and 
              credentials.has_key("verify_certificates") and 
              credentials["verify_certificates"] == False):
 -            ssl_server_trust.accepted_failures = (
 +            accepted_failures = (
-                     AUTH_SSL_NOTYETVALID + 
-                     AUTH_SSL_EXPIRED +
-                     AUTH_SSL_CNMISMATCH +
-                     AUTH_SSL_UNKNOWNCA +
-                     AUTH_SSL_OTHER)
+                     SSL_NOTYETVALID + 
+                     SSL_EXPIRED +
+                     SSL_CNMISMATCH +
+                     SSL_UNKNOWNCA +
+                     SSL_OTHER)
          else:
 -            ssl_server_trust.accepted_failures = 0
 -        ssl_server_trust.may_save = False
 -        return ssl_server_trust
 +            accepted_failures = 0
 +        return (accepted_failures, False)
  
      def get_svn_username_prompt_provider(self, retries):
          """Return a Subversion auth provider for retrieving the username, as 
diff --cc transport.py
index 9c1cd8e8f7771973fe2253081d46221e2bf5e740,88b4b2b1458e0ca203324833f3c1bc5032e576b5..fae4b8c3fa572b8c7499686677aff44af7518076
@@@ -21,11 -21,14 +21,12 @@@ from bzrlib.errors import (NoSuchFile, 
  from bzrlib.trace import mutter
  from bzrlib.transport import Transport
  
 -from svn.core import SubversionException, Pool
 -import svn.ra
 -import svn.core
 -import svn.client
 +from bzrlib.plugins.svn.core import SubversionException
 +from bzrlib.plugins.svn.auth import create_auth_baton
  
 -from bzrlib.plugins.svn import properties
 +from bzrlib.plugins.svn import core, properties, ra
  from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent, ERR_BAD_URL, ERR_RA_SVN_REPOS_NOT_FOUND, ERR_FS_ALREADY_EXISTS, ERR_FS_NOT_FOUND, ERR_FS_NOT_DIRECTORY
+ from bzrlib.plugins.svn.ra import DIRENT_KIND
  import urlparse
  import urllib