Rev 397: Use global configuration object. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

[Jelmer Vernooij]

------------------------------------------------------------
revno: 397
revision-id: jelmer at samba.org-20070114233809-pjrkm3wnr2ezy6eo
parent: jelmer at samba.org-20070114052234-aj73nfyj8sslv3n9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-15 00:38:09 +0100
message:
  Use global configuration object.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  checkout.py                    workingtree.py-20060306120941-b083cb0fdd4a69de
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'branch.py'
--- a/branch.py	2007-01-09 03:22:00 +0000
+++ b/branch.py	2007-01-14 23:38:09 +0000
@@ -33,7 +33,7 @@
 
 from commit import push_as_merged
 from repository import SvnRepository
-from transport import bzr_to_svn_url
+from transport import bzr_to_svn_url, svn_config
 from tree import SvnRevisionTree
 
 
@@ -101,6 +101,7 @@
             mutter('hist: %r' % self.revision_history())
 
         client_ctx = svn.client.create_context()
+        client_ctx.config = svn_config
         svn.client.checkout(bzr_to_svn_url(self.base), to_location, rev, 
                             True, client_ctx)
 

=== modified file 'checkout.py'
--- a/checkout.py	2007-01-10 01:50:47 +0000
+++ b/checkout.py	2007-01-14 23:38:09 +0000
@@ -62,8 +62,9 @@
         self.bzrdir = bzrdir
         self._branch = branch
         self.base_revnum = 0
+        self.pool = Pool()
         self.client_ctx = svn.client.create_context()
-        self.pool = Pool()
+        self.client_ctx.config = svn_config
         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)
 

=== modified file 'commit.py'
--- a/commit.py	2007-01-01 22:18:53 +0000
+++ b/commit.py	2007-01-14 23:38:09 +0000
@@ -289,7 +289,7 @@
             self.date = date
             self.author = author
             mutter('committed %r, author: %r, date: %r' % (revision, author, date))
-
+        
         mutter('obtaining commit editor')
         self.editor, editor_baton = self.repository.transport.get_commit_editor(
             message, done, None, False)

=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py	2007-01-10 01:50:47 +0000
+++ b/tests/test_workingtree.py	2007-01-14 23:38:09 +0000
@@ -338,6 +338,17 @@
         orig_tree = tree.basis_tree()
         tree.commit(message_callback=lambda x: "data")
 
+    def test_commit_nested(self):
+        repos_url = self.make_client('a', 'dc')
+        self.build_tree({"dc/branches/foobranch/file": "data"})
+        self.client_add("dc/branches")
+        self.client_commit("dc", "initial changes")
+        self.make_checkout(repos_url + "/branches/foobranch", "de")
+        tree = WorkingTree.open("de")
+        self.build_tree({'de/file': "foo"})
+        orig_tree = tree.basis_tree()
+        tree.commit(message="data")
+
     def test_update_after_commit(self):
         self.make_client('a', 'dc')
         self.build_tree({"dc/bl": "data"})

=== modified file 'transport.py'
--- a/transport.py	2007-01-01 16:26:35 +0000
+++ b/transport.py	2007-01-14 23:38:09 +0000
@@ -104,6 +104,7 @@
 
         self._client = svn.client.create_context(self.pool)
         self._client.auth_baton = _create_auth_baton(self.pool)
+        self._client.config = svn_config
 
         try:
             mutter('opening SVN RA connection to %r' % self.svn_url)