Rev 2251: Remove more references to weaves from the repository.py file in file:///home/mbp/bzr/Work/repoformats/

[Martin Pool]

------------------------------------------------------------
revno: 2251
revision-id: mbp at sourcefrog.net-20070207120941-gd7ow6jzt5b4ughi
parent: mbp at sourcefrog.net-20070207092559-yqv8864d88qnrlez
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 23:09:41 +1100
message:
  Remove more references to weaves from the repository.py file
modified:
  bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'bzrlib/repofmt/weaverepo.py'
--- a/bzrlib/repofmt/weaverepo.py	2007-02-07 09:22:47 +0000
+++ b/bzrlib/repofmt/weaverepo.py	2007-02-07 12:09:41 +0000
@@ -119,7 +119,6 @@
     """Base class for the pre split out repository formats."""
 
     rich_root_data = False
-    _serializer = xml5.serializer_v5
 
     def initialize(self, a_bzrdir, shared=False, _internal=False):
         """Create a weave repository.
@@ -252,6 +251,8 @@
      - TextStores for revisions and signatures.
     """
 
+    _versionedfile_class = weave.WeaveFile
+
     def __init__(self):
         super(RepositoryFormat5, self).__init__()
         self._matchingbzrdir = bzrdir.BzrDirFormat5()
@@ -282,6 +283,8 @@
      - TextStores for revisions and signatures.
     """
 
+    _versionedfile_class = weave.WeaveFile
+
     def __init__(self):
         super(RepositoryFormat6, self).__init__()
         self._matchingbzrdir = bzrdir.BzrDirFormat6()
@@ -315,6 +318,8 @@
      - an optional 'no-working-trees' flag
     """
 
+    _versionedfile_class = weave.WeaveFile
+
     def _get_control_store(self, repo_transport, control_files):
         """Return the control store for this repository."""
         return self._get_versioned_file_store('',

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-02-07 09:25:59 +0000
+++ b/bzrlib/repository.py	2007-02-07 12:09:41 +0000
@@ -38,7 +38,6 @@
     symbol_versioning,
     transactions,
     ui,
-    weave,
     )
 from bzrlib.revisiontree import RevisionTree
 from bzrlib.store.versioned import VersionedFileStore
@@ -985,9 +984,11 @@
                                   transport,
                                   control_files,
                                   prefixed=True,
-                                  versionedfile_class=weave.WeaveFile,
+                                  versionedfile_class=None,
                                   versionedfile_kwargs={},
                                   escaped=False):
+        if versionedfile_class is None:
+            versionedfile_class = self._versionedfile_class
         weave_transport = control_files._transport.clone(name)
         dir_mode = control_files._dir_mode
         file_mode = control_files._file_mode