Rev 3920: Fix a bug introduced into GCPacker. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/pack_stream_source

John Arbash Meinel john at arbash-meinel.com
Tue Mar 31 22:09:19 BST 2009


At http://bzr.arbash-meinel.com/branches/bzr/brisbane/pack_stream_source

------------------------------------------------------------
revno: 3920
revision-id: john at arbash-meinel.com-20090331210916-f79e4xykho194v77
parent: john at arbash-meinel.com-20090331204453-outiarodlcsfqbu2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: pack_stream_source
timestamp: Tue 2009-03-31 16:09:16 -0500
message:
  Fix a bug introduced into GCPacker.
-------------- next part --------------
=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- a/bzrlib/repofmt/groupcompress_repo.py	2009-03-31 20:44:53 +0000
+++ b/bzrlib/repofmt/groupcompress_repo.py	2009-03-31 21:09:16 +0000
@@ -222,7 +222,7 @@
             # don't need these sets anymore
             id_roots_set.clear()
             p_id_roots_set.clear()
-        return 'inventories', _filtered_inv_stream()
+        return _filtered_inv_stream()
 
     def _get_chk_streams(self, source_vf, keys, pb=None):
         # We want to stream the keys from 'id_roots', and things they
@@ -871,6 +871,8 @@
     def _get_text_stream(self):
         # Note: We know we don't have to handle adding root keys, because both
         # the source and target are GCCHK, and those always support rich-roots
+        # We may want to request as 'unordered', in case the source has done a
+        # 'split' packing
         return ('texts', self.from_repository.texts.get_record_stream(
                             self._text_keys, 'groupcompress', False))
 



More information about the bazaar-commits mailing list