Merge 0.4.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 18 Jun 2008 12:01:37 +0000 (14:01 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 18 Jun 2008 12:01:37 +0000 (14:01 +0200)
1  2 
auth.py
commit.py
fetch.py
workingtree.py

diff --cc auth.py
index 3576a82dbf2b27f7348a934bc0d8af04bc965315,38279538c9c325a07ffde38e3b16172ec54395e3..f1f682ab0e493e730268e8705e1874ca6fa35afa
+++ b/auth.py
  
  from bzrlib.config import AuthenticationConfig
  from bzrlib.ui import ui_factory
- 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_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
-                                    )
  from bzrlib.plugins.svn import ra
 -import svn.core
  import urlparse
  import urllib
  
@@@ -140,15 -131,16 +130,15 @@@ def get_ssl_client_cert_pw(realm, may_s
  
  
  def get_ssl_client_cert_pw_provider(tries):
-     return get_ssl_client_cert_pw_prompt_provider(
+     return ra.get_ssl_client_cert_pw_prompt_provider(
                  get_ssl_client_cert_pw, tries)
  
 -
  def get_stock_svn_providers():
-     providers = [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(),
+     providers = [ra.get_simple_provider(),
+             ra.get_username_provider(),
+             ra.get_ssl_client_cert_file_provider(),
+             ra.get_ssl_client_cert_pw_file_provider(),
+             ra.get_ssl_server_trust_file_provider(),
              ]
  
      if hasattr(ra, 'get_windows_simple_provider'):
diff --cc commit.py
Simple merge
diff --cc fetch.py
Simple merge
diff --cc workingtree.py
Simple merge