← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/groupcompress.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-05 17:57:02 UTC
  • mto: This revision was merged to the branch mainline in revision 5801.
  • Revision ID: jelmer@samba.org-20110405175702-hgzt4iv0offvkdmt
Avoid annotate import during 'bzr st'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/groupcompress.py
23
23
except ImportError:
24
24
    pylzma = None
25
25
 
 
26
from bzrlib.lazy_import import lazy_import
 
27
lazy_import(globals(), """
26
28
from bzrlib import (
27
29
    annotate,
28
30
    debug,
32
34
    pack,
33
35
    static_tuple,
34
36
    trace,
 
37
    tsort,
35
38
    )
 
39
""")
 
40
 
36
41
from bzrlib.btree_index import BTreeBuilder
37
42
from bzrlib.lru_cache import LRUSizeCache
38
 
from bzrlib.tsort import topo_sort
39
43
from bzrlib.versionedfile import (
40
44
    _KeyRefs,
41
45
    adapter_registry,
77
81
 
78
82
    present_keys = []
79
83
    for prefix in sorted(per_prefix_map):
80
 
        present_keys.extend(reversed(topo_sort(per_prefix_map[prefix])))
 
84
        present_keys.extend(reversed(tsort.topo_sort(per_prefix_map[prefix])))
81
85
    return present_keys
82
86
 
83
87
 
1470
1474
            the defined order, regardless of source.
1471
1475
        """
1472
1476
        if ordering == 'topological':
1473
 
            present_keys = topo_sort(parent_map)
 
1477
            present_keys = tsort.tsort.topo_sort(parent_map)
1474
1478
        else:
1475
1479
            # ordering == 'groupcompress'
1476
1480
            # XXX: This only optimizes for the target ordering. We may need