Rev 3104: Update the last couple of places that referred to Provider.get_parents() directly. in http://bzr.arbash-meinel.com/branches/bzr/1.1-dev/graph_optimization

John Arbash Meinel john at arbash-meinel.com
Tue Dec 18 20:57:57 GMT 2007


At http://bzr.arbash-meinel.com/branches/bzr/1.1-dev/graph_optimization

------------------------------------------------------------
revno: 3104
revision-id:john at arbash-meinel.com-20071218205734-khopeuh6xh1gcqbk
parent: john at arbash-meinel.com-20071218194430-h9mlqul4vtacs9bf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: graph_optimization
timestamp: Tue 2007-12-18 14:57:34 -0600
message:
  Update the last couple of places that referred to Provider.get_parents() directly.
modified:
  bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
-------------- next part --------------
=== modified file 'bzrlib/bundle/serializer/v4.py'
--- a/bzrlib/bundle/serializer/v4.py	2007-11-10 15:11:08 +0000
+++ b/bzrlib/bundle/serializer/v4.py	2007-12-18 20:57:34 +0000
@@ -343,8 +343,9 @@
             revision_order.remove(self.target)
             revision_order.append(self.target)
         self.add_mp_records('inventory', None, inv_vf, revision_order)
-        parents_list = self.repository.get_parents(revision_order)
-        for parents, revision_id in zip(parents_list, revision_order):
+        parent_map = self.repository.get_parent_map(revision_order)
+        for revision_id in revision_order:
+            parents = parent_map.get(revision_id, None)
             revision_text = self.repository.get_revision_xml(revision_id)
             self.bundle.add_fulltext_record(revision_text, parents,
                                        'revision', revision_id)

=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py	2007-12-07 06:36:56 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py	2007-12-18 20:57:34 +0000
@@ -631,10 +631,10 @@
 
     def test__make_parents_provider(self):
         """Repositories must have a _make_parents_provider method that returns
-        an object with a get_parents method.
+        an object with a get_parent_map method.
         """
         repo = self.make_repository('repo')
-        repo._make_parents_provider().get_parents
+        repo._make_parents_provider().get_parent_map
 
 
 class TestRepositoryLocking(TestCaseWithRepository):



More information about the bazaar-commits mailing list