← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Robert J. Tanner
  • Date: 2009-06-10 03:56:49 UTC
  • mfrom: (4423 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4425.
  • Revision ID: tanner@real-time.com-20090610035649-7rfx4cls4550zc3c
Merge 1.15.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
40
40
    revision,
41
41
    ui,
42
42
    )
43
 
from bzrlib.graph import DictParentsProvider, Graph, _StackedParentsProvider
 
43
from bzrlib.graph import DictParentsProvider, Graph, StackedParentsProvider
44
44
from bzrlib.transport.memory import MemoryTransport
45
45
""")
46
46
from bzrlib.inter import InterObject
47
47
from bzrlib.registry import Registry
48
48
from bzrlib.symbol_versioning import *
49
49
from bzrlib.textmerge import TextMerge
50
 
from bzrlib.util import bencode
 
50
from bzrlib import bencode
51
51
 
52
52
 
53
53
adapter_registry = Registry()
1333
1333
            result[revision.NULL_REVISION] = ()
1334
1334
        self._providers = self._providers[:1] + self.fallback_versionedfiles
1335
1335
        result.update(
1336
 
            _StackedParentsProvider(self._providers).get_parent_map(keys))
 
1336
            StackedParentsProvider(self._providers).get_parent_map(keys))
1337
1337
        for key, parents in result.iteritems():
1338
1338
            if parents == ():
1339
1339
                result[key] = (revision.NULL_REVISION,)