Rev 726: Fix 'bzr checkout --lightweight' for http and https branches. (#144032) in file:///data/jelmer/bzr-svn/0.4/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/0.4/

------------------------------------------------------------
revno: 726
revision-id: jelmer at samba.org-20071016232541-ph07b3y33c3wg4c8
parent: jelmer at samba.org-20071016124017-kmwoodryt9t90x1r
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2007-10-17 01:25:41 +0200
message:
  Fix 'bzr checkout --lightweight' for http and https branches. (#144032)
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'NEWS'
--- a/NEWS	2007-10-16 12:40:17 +0000
+++ b/NEWS	2007-10-16 23:25:41 +0000
@@ -33,6 +33,9 @@
    * Encode = in list branching scheme names (unusable in Subversion property 
      names). (#125751)
 
+   * Fix 'bzr checkout --lightweight' for http and https branches. 
+     (#144032)
+
   DOCUMENTATION
 
    * Add simple FAQ file. (#144388)

=== modified file 'branch.py'
--- a/branch.py	2007-09-17 13:18:46 +0000
+++ b/branch.py	2007-10-16 23:25:41 +0000
@@ -25,13 +25,13 @@
 from bzrlib.workingtree import WorkingTree
 
 import svn.client, svn.core
-from svn.core import SubversionException
+from svn.core import SubversionException, Pool
 
 from commit import push
 from errors import NotSvnBranchPath
 from format import get_rich_root_format
 from repository import SvnRepository
-from transport import bzr_to_svn_url, svn_config
+from transport import bzr_to_svn_url, create_svn_client
 
 
 class FakeControlFiles(object):
@@ -169,8 +169,7 @@
             rev.kind = svn.core.svn_opt_revision_number
             rev.value.number = revnum
 
-        client_ctx = svn.client.create_context()
-        client_ctx.config = svn_config
+        client_ctx = create_svn_client(Pool())
         svn.client.checkout(bzr_to_svn_url(self.base), to_location, rev, 
                             True, client_ctx)
 

=== modified file 'transport.py'
--- a/transport.py	2007-10-10 23:24:17 +0000
+++ b/transport.py	2007-10-16 23:25:41 +0000
@@ -45,6 +45,13 @@
     return svn.core.svn_auth_open(providers, pool)
 
 
+def create_svn_client(pool):
+    client = svn.client.create_context(pool)
+    client.auth_baton = _create_auth_baton(pool)
+    client.config = svn_config
+    return client
+
+
 # Don't run any tests on SvnTransport as it is not intended to be 
 # a full implementation of Transport
 def get_test_permutations():
@@ -193,10 +200,7 @@
         self._backing_url = _backing_url.rstrip("/")
         Transport.__init__(self, bzr_url)
 
-        self._client = svn.client.create_context(self.pool)
-        self._client.auth_baton = _create_auth_baton(self.pool)
-        self._client.config = svn_config
-
+        self._client = create_svn_client(self.pool)
         try:
             self.mutter('opening SVN RA connection to %r' % self._backing_url)
             self._ra = svn.client.open_ra_session(self._backing_url.encode('utf8'), 

=== modified file 'workingtree.py'
--- a/workingtree.py	2007-09-17 13:18:46 +0000
+++ b/workingtree.py	2007-10-16 23:25:41 +0000
@@ -41,8 +41,7 @@
                         revision_id_to_svk_feature, generate_revision_metadata) 
 from revids import escape_svn_path
 from scheme import BranchingScheme
-from transport import (SvnRaTransport, svn_config, bzr_to_svn_url, 
-                       _create_auth_baton) 
+from transport import (SvnRaTransport, bzr_to_svn_url, create_svn_client) 
 from tree import SvnBasisTree
 
 import os
@@ -71,11 +70,9 @@
         self._branch = branch
         self.base_revnum = 0
         self.pool = Pool()
-        self.client_ctx = svn.client.create_context()
-        self.client_ctx.config = svn_config
+        self.client_ctx = create_svn_client(self.pool)
         self.client_ctx.log_msg_func2 = \
                 svn.client.svn_swig_py_get_commit_log_func
-        self.client_ctx.auth_baton = _create_auth_baton(self.pool)
 
         self._get_wc()
         status = svn.wc.revision_status(self.basedir, None, True, None, None)