Rev 4459: (jam) Remove a spurious call to _get_raw_record, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4459
revision-id: pqm at pqm.ubuntu.com-20090618061159-nwe8eie5p489xqss
parent: pqm at pqm.ubuntu.com-20090618051343-c9ltrfncx8hvw729
parent: john at arbash-meinel.com-20090618050254-zu1hykw31nobgs0w
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-06-18 07:11:59 +0100
message:
  (jam) Remove a spurious call to _get_raw_record,
  	speeds up get_record_stream(..., True)
modified:
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
    ------------------------------------------------------------
    revno: 4454.2.2
    revision-id: john at arbash-meinel.com-20090618050254-zu1hykw31nobgs0w
    parent: john at arbash-meinel.com-20090617210032-dncrm60dq52za21g
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: 1.17-extract-one-time
    timestamp: Thu 2009-06-18 00:02:54 -0500
    message:
      turns out the new code removes a round trip to the server, which bumps an acceptance test.
    modified:
      bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
    ------------------------------------------------------------
    revno: 4454.2.1
    revision-id: john at arbash-meinel.com-20090617210032-dncrm60dq52za21g
    parent: pqm at pqm.ubuntu.com-20090617100437-gavn9zkum4dj5yjz
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: 1.17-extract-one-time
    timestamp: Wed 2009-06-17 16:00:32 -0500
    message:
      Don't populate self._raw_record_map in _work, it was done in __init__
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
=== 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:

=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- a/bzrlib/tests/blackbox/test_branch.py	2009-06-10 03:56:49 +0000
+++ b/bzrlib/tests/blackbox/test_branch.py	2009-06-18 05:02:54 +0000
@@ -273,7 +273,7 @@
         # being too low. If rpc_count increases, more network roundtrips have
         # become necessary for this use case. Please do not adjust this number
         # upwards without agreement from bzr's network support maintainers.
-        self.assertLength(39, self.hpss_calls)
+        self.assertLength(38, self.hpss_calls)
 
     def test_branch_from_trivial_branch_streaming_acceptance(self):
         self.setup_smart_server_with_call_log()