Rev 32: Simplify the internals. We've already checked 'chk_support' so we don't need to check again. in http://bazaar.launchpad.net/%7Ebzr/bzr-groupcompress/trunk

[John Arbash Meinel]

At http://bazaar.launchpad.net/%7Ebzr/bzr-groupcompress/trunk

------------------------------------------------------------
revno: 32
revision-id: john at arbash-meinel.com-20090213220413-4tc60ow7v7wnh3r1
parent: john at arbash-meinel.com-20090213215548-ht1f0gulkobqw1g9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Fri 2009-02-13 16:04:13 -0600
message:
  Simplify the internals. We've already checked 'chk_support' so we don't need to check again.
-------------- next part --------------
=== modified file 'repofmt.py'
--- a/repofmt.py	2009-02-13 21:55:48 +0000
+++ b/repofmt.py	2009-02-13 22:04:13 +0000
@@ -313,22 +313,14 @@
                 _commit_builder_class, _serializer)
             # and now replace everything it did :)
             index_transport = self._transport.clone('indices')
-            if chk_support:
-                self._pack_collection = GCRepositoryPackCollection(self,
-                    self._transport, index_transport,
-                    self._transport.clone('upload'),
-                    self._transport.clone('packs'),
-                    _format.index_builder_class,
-                    _format.index_class,
-                    use_chk_index=self._format.supports_chks,
-                    )
-            else:
-                self._pack_collection = GCRepositoryPackCollection(self,
-                    self._transport, index_transport,
-                    self._transport.clone('upload'),
-                    self._transport.clone('packs'),
-                    _format.index_builder_class,
-                    _format.index_class)
+            self._pack_collection = GCRepositoryPackCollection(self,
+                self._transport, index_transport,
+                self._transport.clone('upload'),
+                self._transport.clone('packs'),
+                _format.index_builder_class,
+                _format.index_class,
+                use_chk_index=self._format.supports_chks,
+                )
             self.inventories = GroupCompressVersionedFiles(
                 _GCGraphIndex(self._pack_collection.inventory_index.combined_index,
                     add_callback=self._pack_collection.inventory_index.add_callback,
@@ -351,19 +343,15 @@
                     add_callback=self._pack_collection.text_index.add_callback,
                     parents=True, is_locked=self.is_locked),
                 access=self._pack_collection.text_index.data_access)
-            if chk_support and _format.supports_chks:
-                # No graph, no compression:- references from chks are between
-                # different objects not temporal versions of the same; and without
-                # some sort of temporal structure knit compression will just fail.
-                self.chk_bytes = GroupCompressVersionedFiles(
-                    _GCGraphIndex(self._pack_collection.chk_index.combined_index,
-                        add_callback=self._pack_collection.chk_index.add_callback,
-                        parents=False, is_locked=self.is_locked),
-                    access=self._pack_collection.chk_index.data_access)
-            else:
-                self.chk_bytes = None
+            assert _format.supports_chks
+            # No parents, individual CHK pages don't have specific ancestry
+            self.chk_bytes = GroupCompressVersionedFiles(
+                _GCGraphIndex(self._pack_collection.chk_index.combined_index,
+                    add_callback=self._pack_collection.chk_index.add_callback,
+                    parents=False, is_locked=self.is_locked),
+                access=self._pack_collection.chk_index.data_access)
             # True when the repository object is 'write locked' (as opposed to the
-            # physical lock only taken out around changes to the pack-names list.) 
+            # physical lock only taken out around changes to the pack-names list.)
             # Another way to represent this would be a decorator around the control
             # files object that presents logical locks as physical ones - if this
             # gets ugly consider that alternative design. RBC 20071011
@@ -440,9 +428,6 @@
                 ", interoperates with pack-0.92\n")
 
 
-
-
-
 def pack_incompatible(source, target, orig_method=InterPackRepo.is_compatible):
     """Be incompatible with the regular fetch code."""
     formats = (RepositoryFormatPackGCPlain, RepositoryFormatPackGCRichRoot,