Rev 3812: Update AggregateIndex to pass the reload_func into _DirectPackAccess in http://bzr.arbash-meinel.com/branches/bzr/1.9-dev/pack_retry_153786

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.9-dev/pack_retry_153786

------------------------------------------------------------
revno: 3812
revision-id: john at arbash-meinel.com-20081025024012-1vobzpomrefm43a7
parent: john at arbash-meinel.com-20081025023735-bsht1lfu6jye6z7o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: pack_retry_153786
timestamp: Fri 2008-10-24 21:40:12 -0500
message:
  Update AggregateIndex to pass the reload_func into _DirectPackAccess
  
  And update the pack_repository tests so they now pass, yipee!
-------------- next part --------------
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2008-10-25 00:38:53 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2008-10-25 02:40:12 +0000
@@ -462,7 +462,8 @@
         self._reload_func = reload_func
         self.index_to_pack = {}
         self.combined_index = CombinedGraphIndex([], reload_func=reload_func)
-        self.data_access = _DirectPackAccess(self.index_to_pack)
+        self.data_access = _DirectPackAccess(self.index_to_pack,
+                                             reload_func=reload_func)
         self.add_callback = None
 
     def replace_indices(self, index_to_pack, indices):

=== modified file 'bzrlib/tests/test_pack_repository.py'
--- a/bzrlib/tests/test_pack_repository.py	2008-10-25 00:27:29 +0000
+++ b/bzrlib/tests/test_pack_repository.py	2008-10-25 02:40:12 +0000
@@ -420,6 +420,7 @@
         try:
             rev1 = tree.commit('one')
             rev2 = tree.commit('two')
+            keys = [(rev1,), (rev2,)]
             r2 = repository.Repository.open('tree')
             r2.lock_read()
             try:
@@ -427,7 +428,6 @@
                 # trigger a repack mid-way
                 packed = False
                 result = {}
-                keys = [(rev1,), (rev2,)]
                 record_stream = r2.revisions.get_record_stream(keys,
                                     'unordered', False)
                 for record in record_stream:
@@ -437,7 +437,7 @@
                         packed = True
                 # The first record will be found in the original location, but
                 # after the pack, we have to reload to find the next record
-                self.assertEqual(sorted([rev1, rev2]), sorted(result.keys()))
+                self.assertEqual(sorted(keys), sorted(result.keys()))
             finally:
                 r2.unlock()
         finally: