Rev 3042: Post-review cleanups from Robert for KnitVersionedFile.get_data_stream in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3042
revision-id:pqm at pqm.ubuntu.com-20071128053506-it05wgucjiw2chfq
parent: pqm at pqm.ubuntu.com-20071128045852-9ii8fj85vxz1om46
parent: mbp at sourcefrog.net-20071127074755-4nsgzhsaqxr9nwv8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-11-28 05:35:06 +0000
message:
  Post-review cleanups from Robert for KnitVersionedFile.get_data_stream
modified:
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 3034.3.1
    revision-id:mbp at sourcefrog.net-20071127074755-4nsgzhsaqxr9nwv8
    parent: pqm at pqm.ubuntu.com-20071127023739-a1ajr28wi7so2up6
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: 164637-delta-order
    timestamp: Tue 2007-11-27 18:47:55 +1100
    message:
      Post-review cleanups from Robert for KnitVersionedFile.get_data_stream
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py	2007-11-27 20:35:02 +0000
+++ b/bzrlib/knit.py	2007-11-28 05:35:06 +0000
@@ -599,13 +599,12 @@
         # first, read all relevant index data, enough to sort into the right
         # order to return
         for version_id in required_versions:
-            if not self.has_version(version_id):
-                raise RevisionNotPresent(version_id, self.filename)
             options = self._index.get_options(version_id)
             parents = self._index.get_parents_with_ghosts(version_id)
             index_memo = self._index.get_position(version_id)
             version_index[version_id] = (index_memo, options, parents)
-            if parents and parents[0] in required_version_set:
+            if ('line-delta' in options
+                and parents[0] in required_version_set):
                 # must wait until the parent has been sent
                 deferred.setdefault(parents[0], []). \
                     append(version_id)