← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

merge bzr.dev and tweaks to lower threads

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
254
254
            try:
255
255
                knit_versions.update(parent_map[version_id])
256
256
            except KeyError:
257
 
                raise RevisionNotPresent(version_id, self)
 
257
                raise errors.RevisionNotPresent(version_id, self)
258
258
        # We need to filter out ghosts, because we can't diff against them.
259
259
        knit_versions = set(self.get_parent_map(knit_versions).keys())
260
260
        lines = dict(zip(knit_versions,
266
266
                parents = [lines[p] for p in parent_map[version_id] if p in
267
267
                    knit_versions]
268
268
            except KeyError:
269
 
                raise RevisionNotPresent(version_id, self)
 
269
                # I don't know how this could ever trigger.
 
270
                # parent_map[version_id] was already triggered in the previous
 
271
                # for loop, and lines[p] has the 'if p in knit_versions' check,
 
272
                # so we again won't have a KeyError.
 
273
                raise errors.RevisionNotPresent(version_id, self)
270
274
            if len(parents) > 0:
271
275
                left_parent_blocks = self._extract_blocks(version_id,
272
276
                                                          parents[0], target)