Rev 3850: Bring in Ian's quick-fix for iteritems() with a key_filter in http://bazaar.launchpad.net/%7Ebzr/bzr/brisbane-core

[John Arbash Meinel]

At http://bazaar.launchpad.net/%7Ebzr/bzr/brisbane-core

------------------------------------------------------------
revno: 3850
revision-id: john at arbash-meinel.com-20090306142456-6zily2byb31185af
parent: ian.clatworthy at canonical.com-20090306052742-w2948uzup5wbzsfu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: brisbane-core
timestamp: Fri 2009-03-06 08:24:56 -0600
message:
  Bring in Ian's quick-fix for iteritems() with a key_filter
-------------- next part --------------
=== modified file 'bzrlib/chk_map.py'
--- a/bzrlib/chk_map.py	2009-03-05 15:13:25 +0000
+++ b/bzrlib/chk_map.py	2009-03-06 14:24:56 +0000
@@ -930,7 +930,11 @@
         return result
 
     def iteritems(self, store, key_filter=None):
-        for node in self._iter_nodes(store, key_filter=key_filter):
+        # XXX: It doesn't work if we pass the key-filter to _iter_nodes
+        # when filtering (parent_file_id,) against the parent_id_basename
+        # CHKMap. We probably need to fix something in iter_nodes but, for
+        # now, this at least gets things working - IGC 20090306
+        for node in self._iter_nodes(store, key_filter=None):
             for item in node.iteritems(store, key_filter=key_filter):
                 yield item