← 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:52:20 UTC
  • mto: This revision was merged to the branch mainline in revision 5801.
  • Revision ID: jelmer@samba.org-20110405175220-07pi4se33fhvore7
Avoid bzrlib.knit imports when using groupcompress repositories.

Add bzrlib.knit to the blacklist in test_import_tariff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/groupcompress.py
28
28
    debug,
29
29
    errors,
30
30
    graph as _mod_graph,
31
 
    knit,
32
31
    osutils,
33
32
    pack,
34
33
    static_tuple,
38
37
from bzrlib.lru_cache import LRUSizeCache
39
38
from bzrlib.tsort import topo_sort
40
39
from bzrlib.versionedfile import (
 
40
    _KeyRefs,
41
41
    adapter_registry,
42
42
    AbsentContentFactory,
43
43
    ChunkedContentFactory,
1046
1046
        index = _GCGraphIndex(graph_index, lambda:True, parents=parents,
1047
1047
            add_callback=graph_index.add_nodes,
1048
1048
            inconsistency_fatal=inconsistency_fatal)
1049
 
        access = knit._DirectPackAccess({})
 
1049
        access = pack._DirectPackAccess({})
1050
1050
        access.set_writer(writer, graph_index, (transport, 'newpack'))
1051
1051
        result = GroupCompressVersionedFiles(index, access, delta)
1052
1052
        result.stream = stream
1921
1921
        # repeated over and over, this creates a surplus of ints
1922
1922
        self._int_cache = {}
1923
1923
        if track_external_parent_refs:
1924
 
            self._key_dependencies = knit._KeyRefs(
 
1924
            self._key_dependencies = _KeyRefs(
1925
1925
                track_new_keys=track_new_keys)
1926
1926
        else:
1927
1927
            self._key_dependencies = None