Merge 0.4.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 01:13:47 +0000 (03:13 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 01:13:47 +0000 (03:13 +0200)
1  2 
auth.py
commit.py
logwalker.py
remote.py
tree.py
workingtree.py

diff --cc auth.py
+++ 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.ra import (get_username_prompt_provider, 
+                                    get_simple_prompt_provider,
+                                    get_ssl_server_trust_prompt_provider,
+                                    get_ssl_client_cert_pw_prompt_provider)
 -
 -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)
++                                   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 urlparse
  import urllib
  
diff --cc commit.py
+++ b/commit.py
@@@ -27,10 -27,9 +27,10 @@@ from bzrlib.repository import RootCommi
  from bzrlib.revision import NULL_REVISION
  from bzrlib.trace import mutter, warning
  
- from bzrlib.plugins.svn import properties
+ from bzrlib.plugins.svn import core, properties
  
  from cStringIO import StringIO
 +
  from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed, ERR_FS_TXN_OUT_OF_DATE, ERR_REPOS_DISABLED_FEATURE
  from bzrlib.plugins.svn.svk import (generate_svk_feature, serialize_svk_features, 
                   parse_svk_features, SVN_PROP_SVK_MERGE)
diff --cc logwalker.py
@@@ -20,14 -20,15 +20,14 @@@ from bzrlib.errors import NoSuchRevisio
  from bzrlib.trace import mutter
  import bzrlib.ui as ui
  
 -from svn.core import SubversionException, Pool
 -from transport import SvnRaTransport
 -import svn.core
 +from bzrlib.plugins.svn.core import SubversionException
 +from bzrlib.plugins.svn.transport import SvnRaTransport
 +from bzrlib.plugins.svn import core
  
+ from bzrlib.plugins.svn import changes, core
  from bzrlib.plugins.svn.cache import CacheTable
  from bzrlib.plugins.svn.errors import ERR_FS_NO_SUCH_REVISION, ERR_FS_NOT_FOUND
- from bzrlib.plugins.svn import changes
 -
 -LOG_CHUNK_LIMIT = 0
 +from bzrlib.plugins.svn.ra import DIRENT_KIND
  
  class lazy_dict(object):
      def __init__(self, initial, create_fn, *args):
diff --cc remote.py
+++ b/remote.py
@@@ -22,9 -22,10 +22,10 @@@ from bzrlib.errors import (NotBranchErr
                             NoWorkingTree, AlreadyBranchError)
  from bzrlib.transport.local import LocalTransport
  
 -from svn.core import SubversionException
 -import svn.core, svn.repos
 +from core import SubversionException
 +import core 
  
+ from bzrlib.plugins.svn import core
  from bzrlib.plugins.svn.errors import NoSvnRepositoryPresent
  from bzrlib.plugins.svn.format import get_rich_root_format, SvnRemoteFormat
  from bzrlib.plugins.svn.repository import SvnRepository
diff --cc tree.py
+++ b/tree.py
@@@ -28,8 -28,10 +28,8 @@@ import md
  from cStringIO import StringIO
  import urllib
  
 -import svn.core, svn.wc, svn.delta
 -from svn.core import Pool
 -
 -from bzrlib.plugins.svn import errors, properties, core
 +from bzrlib.plugins.svn.delta import apply_txdelta_handler
- from bzrlib.plugins.svn import core, errors, wc, properties
++from bzrlib.plugins.svn import core, errors, properties, wc
  
  def parse_externals_description(base_url, val):
      """Parse an svn:externals property value.
diff --cc workingtree.py
Simple merge