← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

Update to bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
304
304
            try:
305
305
                knit_versions.update(parent_map[version_id])
306
306
            except KeyError:
307
 
                raise RevisionNotPresent(version_id, self)
 
307
                raise errors.RevisionNotPresent(version_id, self)
308
308
        # We need to filter out ghosts, because we can't diff against them.
309
309
        knit_versions = set(self.get_parent_map(knit_versions).keys())
310
310
        lines = dict(zip(knit_versions,
316
316
                parents = [lines[p] for p in parent_map[version_id] if p in
317
317
                    knit_versions]
318
318
            except KeyError:
319
 
                raise RevisionNotPresent(version_id, self)
 
319
                # I don't know how this could ever trigger.
 
320
                # parent_map[version_id] was already triggered in the previous
 
321
                # for loop, and lines[p] has the 'if p in knit_versions' check,
 
322
                # so we again won't have a KeyError.
 
323
                raise errors.RevisionNotPresent(version_id, self)
320
324
            if len(parents) > 0:
321
325
                left_parent_blocks = self._extract_blocks(version_id,
322
326
                                                          parents[0], target)
1194
1198
        # If we make fallbacks private we can update a stack list and avoid
1195
1199
        # object creation thrashing.
1196
1200
        self._providers = self._providers[:1] + self.fallback_versionedfiles
1197
 
        return _StackedParentsProvider(self._providers).get_parent_map(keys)
 
1201
        result = _StackedParentsProvider(self._providers).get_parent_map(keys)
 
1202
        for key, parents in result.iteritems():
 
1203
            if parents == ():
 
1204
                result[key] = (revision.NULL_REVISION,)
 
1205
        return result
1198
1206
 
1199
1207
 
1200
1208
class PlanWeaveMerge(TextMerge):