Rev 3819: Autopack needs to handle that the chk index is now a graph. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/hack

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3819
revision-id: john at arbash-meinel.com-20081223215908-hadmlw44raasi2b1
parent: john at arbash-meinel.com-20081223215151-ap2f6vkfrnwlncz8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hack
timestamp: Tue 2008-12-23 15:59:08 -0600
message:
  Autopack needs to handle that the chk index is now a graph.
-------------- next part --------------
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2008-12-23 21:37:19 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2008-12-23 21:59:08 +0000
@@ -885,14 +885,11 @@
             'chk_index')
         chk_nodes = self._index_contents(chk_indices, refs)
         new_refs = set()
-        def accumlate_refs(lines):
-            # XXX: move to a generic location
-            # Yay mismatch:
+        for line in self._copy_nodes_graph(chk_nodes, chk_index_map,
+            self.new_pack._writer, self.new_pack.chk_index, output_lines=True):
             bytes = ''.join(lines)
             node = chk_map._deserialise(bytes, ("unknown",))
             new_refs.update(node.refs())
-        self._copy_nodes(chk_nodes, chk_index_map, self.new_pack._writer,
-            self.new_pack.chk_index, output_lines=accumlate_refs)
         return new_refs
 
     def _copy_nodes(self, nodes, index_map, writer, write_index,