Rev 3194: Missed two parent providers. in http://people.ubuntu.com/~robertc/baz2.0/search-results

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/search-results

------------------------------------------------------------
revno: 3194
revision-id:robertc at robertcollins.net-20080118034035-ay3xbm04pypsago2
parent: robertc at robertcollins.net-20080118023657-1uxxihxthnarju4q
committer: Robert Collins <robertc at robertcollins.net>
branch nick: get_parent_map
timestamp: Fri 2008-01-18 14:40:35 +1100
message:
  Missed two parent providers.
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2008-01-17 13:45:16 +0000
+++ b/bzrlib/bzrdir.py	2008-01-18 03:40:35 +0000
@@ -2114,7 +2114,7 @@
         for revision_id in revision_ids:
             yield self.revisions[revision_id].parent_ids
 
-    def get_parent_map(self, revision_ids):
+    def get_parent_map(self, revision_ids, current_search=None):
         """See graph._StackedParentsProvider.get_parent_map"""
         return dict((revision_id, self.revisions[revision_id])
                     for revision_id in revision_ids

=== modified file 'bzrlib/index.py'
--- a/bzrlib/index.py	2007-12-18 19:42:10 +0000
+++ b/bzrlib/index.py	2008-01-18 03:40:35 +0000
@@ -1016,7 +1016,7 @@
         parent_map = self.get_parent_map(revision_ids)
         return [parent_map.get(r, None) for r in revision_ids]
 
-    def get_parent_map(self, keys):
+    def get_parent_map(self, keys, current_search=None):
         """See graph._StackedParentsProvider.get_parent_map"""
         search_keys = set(keys)
         if NULL_REVISION in search_keys: