/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/groupcompress.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-19 02:03:54 UTC
  • mfrom: (5757.8.11 knitpackrepo-7)
  • Revision ID: pqm@pqm.ubuntu.com-20110419020354-qu7nt76r2uj4pb5c
(jelmer) Move _KeyRefs from bzrlib.knit to bzrlib.versionedfile. (Jelmer
 Vernooij)

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,
29
31
    errors,
30
32
    graph as _mod_graph,
31
 
    knit,
32
33
    osutils,
33
34
    pack,
34
35
    static_tuple,
35
36
    trace,
 
37
    tsort,
36
38
    )
 
39
 
 
40
from bzrlib.repofmt import pack_repo
 
41
""")
 
42
 
37
43
from bzrlib.btree_index import BTreeBuilder
38
44
from bzrlib.lru_cache import LRUSizeCache
39
 
from bzrlib.repofmt import pack_repo
40
 
from bzrlib.tsort import topo_sort
41
45
from bzrlib.versionedfile import (
 
46
    _KeyRefs,
42
47
    adapter_registry,
43
48
    AbsentContentFactory,
44
49
    ChunkedContentFactory,
78
83
 
79
84
    present_keys = []
80
85
    for prefix in sorted(per_prefix_map):
81
 
        present_keys.extend(reversed(topo_sort(per_prefix_map[prefix])))
 
86
        present_keys.extend(reversed(tsort.topo_sort(per_prefix_map[prefix])))
82
87
    return present_keys
83
88
 
84
89
 
1471
1476
            the defined order, regardless of source.
1472
1477
        """
1473
1478
        if ordering == 'topological':
1474
 
            present_keys = topo_sort(parent_map)
 
1479
            present_keys = tsort.topo_sort(parent_map)
1475
1480
        else:
1476
1481
            # ordering == 'groupcompress'
1477
1482
            # XXX: This only optimizes for the target ordering. We may need
1922
1927
        # repeated over and over, this creates a surplus of ints
1923
1928
        self._int_cache = {}
1924
1929
        if track_external_parent_refs:
1925
 
            self._key_dependencies = knit._KeyRefs(
 
1930
            self._key_dependencies = _KeyRefs(
1926
1931
                track_new_keys=track_new_keys)
1927
1932
        else:
1928
1933
            self._key_dependencies = None