← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-28 05:35:06 UTC
  • mfrom: (3034.3.1 164637-delta-order)
  • Revision ID: pqm@pqm.ubuntu.com-20071128053506-it05wgucjiw2chfq
Post-review cleanups from Robert for KnitVersionedFile.get_data_stream

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
599
599
        # first, read all relevant index data, enough to sort into the right
600
600
        # order to return
601
601
        for version_id in required_versions:
602
 
            if not self.has_version(version_id):
603
 
                raise RevisionNotPresent(version_id, self.filename)
604
602
            options = self._index.get_options(version_id)
605
603
            parents = self._index.get_parents_with_ghosts(version_id)
606
604
            index_memo = self._index.get_position(version_id)
607
605
            version_index[version_id] = (index_memo, options, parents)
608
 
            if parents and parents[0] in required_version_set:
 
606
            if ('line-delta' in options
 
607
                and parents[0] in required_version_set):
609
608
                # must wait until the parent has been sent
610
609
                deferred.setdefault(parents[0], []). \
611
610
                    append(version_id)