Rev 1258: Fix dependency on svn.repos in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1258
revision-id: jelmer at samba.org-20080622074304-a2bbhhxj8sskh0gj
parent: jelmer at samba.org-20080622073816-k3b3c3jkddeqr287
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-06-22 09:43:04 +0200
message:
  Fix dependency on svn.repos
modified:
  repos.py                       repos.py-20080621160832-kvb89lus284oufuq-1
  tests/test_convert.py          test_convert.py-20060705203611-b1l0bapeku6foco0-1
=== modified file 'repos.py'
--- a/repos.py	2008-06-22 04:41:33 +0000
+++ b/repos.py	2008-06-22 07:43:04 +0000
@@ -23,6 +23,14 @@
     r = svn.repos.create(path, '', '', None, None)
     return Repository(path, r)
 
+class Fs(object):
+    def __init__(self, fs):
+        self.fs = fs
+
+    def get_uuid(self):
+        return svn.fs.get_uuid(self.fs)
+
+
 class Repository(object):
     def __init__(self, local_path, _repos=None):
         if _repos is not None:
@@ -31,7 +39,7 @@
             self.repos = svn.repos.svn_repos_open(local_path)
 
     def fs(self):
-        return svn.repos.fs(self.repos)
+        return Fs(svn.repos.fs(self.repos))
 
     def load_fs(self, dumpstream, feedback_stream, uuid_action=LOAD_UUID_DEFAULT,
                 parent_dir="", use_pre_commit_hook=False, use_post_commit_hook=False, 

=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py	2008-06-22 07:37:15 +0000
+++ b/tests/test_convert.py	2008-06-22 07:43:04 +0000
@@ -25,6 +25,7 @@
 from bzrlib.trace import mutter
 
 import os, sys
+from bzrlib.plugins.svn import repos
 from bzrlib.plugins.svn.convert import convert_repository, NotDumpFile, load_dumpfile
 from bzrlib.plugins.svn.format import get_rich_root_format
 from bzrlib.plugins.svn.mapping3 import set_branching_scheme
@@ -50,10 +51,9 @@
 PROPS-END
 """)
         load_dumpfile(dumpfile, "d")
-        repos = svn.repos.open("d")
-        fs = svn.repos.fs(repos)
+        fs = repos.Repository("d").fs()
         self.assertEqual("6987ef2d-cd6b-461f-9991-6f1abef3bd59", 
-                svn.fs.get_uuid(fs))
+                fs.get_uuid())
 
     def test_loaddumpfile_invalid(self):
         dumpfile = os.path.join(self.test_dir, "dumpfile")