Rev 2910: Switch the pack repositories over to using the new _KnitDataV2 in http://bzr.arbash-meinel.com/branches/bzr/0.92-dev/knit_parents

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.92-dev/knit_parents

------------------------------------------------------------
revno: 2910
revision-id:john at arbash-meinel.com-20071026214819-639ei1ltc5p75rho
parent: john at arbash-meinel.com-20071026212959-ykxve73f185v37n7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_parents
timestamp: Fri 2007-10-26 16:48:19 -0500
message:
  Switch the pack repositories over to using the new _KnitDataV2
modified:
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
-------------- next part --------------
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py	2007-10-26 21:29:59 +0000
+++ b/bzrlib/knit.py	2007-10-26 21:48:19 +0000
@@ -451,7 +451,8 @@
 
     def __init__(self, relpath, transport, file_mode=None, access_mode=None,
         factory=None, delta=True, create=False, create_parent_dir=False,
-        delay_create=False, dir_mode=None, index=None, access_method=None):
+        delay_create=False, dir_mode=None, index=None, access_method=None,
+        data_class=None):
         """Construct a knit at location specified by relpath.
         
         :param create: If not True, only open an existing knit.
@@ -488,7 +489,10 @@
             _access = access_method
         if create and not len(self) and not delay_create:
             _access.create()
-        self._data = _KnitData(_access)
+        if data_class is None:
+            self._data = _KnitData(_access)
+        else:
+            self._data = data_class(_access)
 
     def __repr__(self):
         return '%s(%s)' % (self.__class__.__name__,

=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2007-10-26 08:56:09 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2007-10-26 21:48:19 +0000
@@ -33,7 +33,7 @@
     CombinedGraphIndex,
     GraphIndexPrefixAdapter,
     )
-from bzrlib.knit import KnitGraphIndex, _PackAccess, _KnitData
+from bzrlib.knit import KnitGraphIndex, _PackAccess, _KnitDataV2
 from bzrlib.osutils import rand_chars
 from bzrlib.pack import ContainerWriter
 from bzrlib.store import revision
@@ -864,7 +864,7 @@
             an iterator.
         """
         # for record verification
-        knit_data = _KnitData(None)
+        knit_data = _KnitDataV2(None)
         # for line extraction when requested (inventories only)
         if output_lines:
             factory = knit.KnitPlainFactory()
@@ -1285,7 +1285,8 @@
             self.repo.control_files._file_mode,
             create=False, access_mode=self.repo._access_mode(),
             index=knit_index, delta=False, factory=knit.KnitPlainFactory(),
-            access_method=self.repo._pack_collection.revision_index.knit_access)
+            access_method=self.repo._pack_collection.revision_index.knit_access,
+            data_class=knit._KnitDataV2)
         return self.repo._revision_knit
 
     def get_signature_file(self, transaction):
@@ -1303,7 +1304,8 @@
             self.repo.control_files._file_mode,
             create=False, access_mode=self.repo._access_mode(),
             index=knit_index, delta=False, factory=knit.KnitPlainFactory(),
-            access_method=self.repo._pack_collection.signature_index.knit_access)
+            access_method=self.repo._pack_collection.signature_index.knit_access,
+            data_class=knit._KnitDataV2)
         return self.repo._signature_knit
 
 
@@ -1352,7 +1354,8 @@
             None,
             index=knit_index,
             access_method=self.repo._pack_collection.text_index.knit_access,
-            factory=knit.KnitPlainFactory())
+            factory=knit.KnitPlainFactory(),
+            data_class=knit._KnitDataV2)
 
     get_weave = get_weave_or_empty
 
@@ -1392,7 +1395,8 @@
             self.repo.control_files._file_mode,
             create=False, access_mode=self.repo._access_mode(),
             index=knit_index, delta=True, factory=knit.KnitPlainFactory(),
-            access_method=self.repo._pack_collection.inventory_index.knit_access)
+            access_method=self.repo._pack_collection.inventory_index.knit_access,
+            data_class=knit._KnitDataV2)
 
 
 class KnitPackRepository(KnitRepository):
@@ -1584,7 +1588,8 @@
             prefixed=False,
             file_mode=control_files._file_mode,
             versionedfile_class=knit.KnitVersionedFile,
-            versionedfile_kwargs={'factory': knit.KnitPlainFactory()},
+            versionedfile_kwargs={'factory': knit.KnitPlainFactory(),
+                                  'data_class': knit._KnitDataV2},
             )
 
     def _get_revision_store(self, repo_transport, control_files):
@@ -1597,6 +1602,7 @@
             versionedfile_class=knit.KnitVersionedFile,
             versionedfile_kwargs={'delta': False,
                                   'factory': knit.KnitPlainFactory(),
+                                  'data_class': knit._KnitDataV2,
                                  },
             escaped=True,
             )
@@ -1612,6 +1618,7 @@
                                       'create_parent_dir': True,
                                       'delay_create': True,
                                       'dir_mode': control_files._dir_mode,
+                                      'data_class': knit._KnitDataV2,
                                   },
                                   escaped=True)
 
@@ -1681,7 +1688,7 @@
 
     def get_format_string(self):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar pack repository format 1 (needs bzr 0.92)\n"
+        return "Bazaar pack repository format 1 exp (needs bzr 0.92)\n"
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""