Merge lp:~spiv/bzr/stacked-2a-reconcile into lp:bzr

[Andrew Bennetts]

See description of bug 615236; GCCHKPacker got fixed at some point to take parent inventories for stacking into account, but the GCCHKReconcilePacker didn't get a corresponding change. This patch makes them share the relevant code.

Probably this should have a test before merging, but I'd like to get feedback on whether my understanding of the code is correct, if anyone knows :)

[Robert Collins (lifeless)]

Looks sane offhand.

[Vincent Ladeuil (vila)]

Considering Robert's comment as addressing your feedback query, I'll mark this as WIP waiting for your test :)

Unmerged revisions

5375. By Andrew Bennetts on 2010-08-09

Reuse GCCHKPacker's _copy_inventory_texts in GCCHKReconcilePacker, including missing_inventories logic.

=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- bzrlib/repofmt/groupcompress_repo.py	2010-05-14 13:25:05 +0000
+++ bzrlib/repofmt/groupcompress_repo.py	2010-08-09 08:52:44 +0000
@@ -424,6 +424,7 @@
                 % (missing_inventories,))
         self._copy_stream(source_vf, target_vf, inventory_keys,
                           'inventories', self._get_filtered_inv_stream, 2)
+        return source_vf
 
     def _copy_chk_texts(self):
         source_vf, target_vf = self._build_vfs('chk', False, False)
@@ -506,9 +507,7 @@
         self._gather_text_refs = True
 
     def _copy_inventory_texts(self):
-        source_vf, target_vf = self._build_vfs('inventory', True, True)
-        self._copy_stream(source_vf, target_vf, self.revision_keys,
-                          'inventories', self._get_filtered_inv_stream, 2)
+        source_vf = super(GCCHKReconcilePacker, self)._copy_inventory_texts()
         if source_vf.keys() != self.revision_keys:
             self._data_changed = True