/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

Fix test_plan_file_merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
1197
1197
        # We create a new provider because a fallback may have been added.
1198
1198
        # If we make fallbacks private we can update a stack list and avoid
1199
1199
        # object creation thrashing.
 
1200
        keys = set(keys)
 
1201
        result = {}
 
1202
        if revision.NULL_REVISION in keys:
 
1203
            keys.remove(revision.NULL_REVISION)
 
1204
            result[revision.NULL_REVISION] = ()
1200
1205
        self._providers = self._providers[:1] + self.fallback_versionedfiles
1201
 
        result = _StackedParentsProvider(self._providers).get_parent_map(keys)
 
1206
        result.update(
 
1207
            _StackedParentsProvider(self._providers).get_parent_map(keys))
1202
1208
        for key, parents in result.iteritems():
1203
1209
            if parents == ():
1204
1210
                result[key] = (revision.NULL_REVISION,)