Rev 4459: Bring in the fix to only extract raw records 1 time for get_record_stream() in http://bazaar.launchpad.net/~jameinel/bzr/1.17-rework-annotate

John Arbash Meinel john at arbash-meinel.com
Wed Jun 17 22:08:39 BST 2009


At http://bazaar.launchpad.net/~jameinel/bzr/1.17-rework-annotate

------------------------------------------------------------
revno: 4459 [merge]
revision-id: john at arbash-meinel.com-20090617210828-p644ef085zyidov6
parent: john at arbash-meinel.com-20090617203250-x0v6nnrrk7j4z173
parent: john at arbash-meinel.com-20090617210032-dncrm60dq52za21g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.17-rework-annotate
timestamp: Wed 2009-06-17 16:08:28 -0500
message:
  Bring in the fix to only extract raw records 1 time for get_record_stream()
modified:
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
-------------- next part --------------
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py	2009-06-11 20:34:56 +0000
+++ b/bzrlib/knit.py	2009-06-17 21:00:32 +0000
@@ -2005,8 +2005,8 @@
                 missing_keys.remove(record.key)
                 yield record
 
-        self._raw_record_map = self.vf._get_record_map_unparsed(self.keys,
-            allow_missing=True)
+        if self._raw_record_map is None:
+            raise AssertionError('_raw_record_map should have been filled')
         first = True
         for key in self.keys:
             if key in self.nonlocal_keys:



More information about the bazaar-commits mailing list