← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/pack_repo.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/repofmt/pack_repo.py
37
37
    CombinedGraphIndex,
38
38
    GraphIndexPrefixAdapter,
39
39
    )
40
 
from bzrlib.knit import (
41
 
    _DirectPackAccess,
42
 
    )
43
40
""")
44
41
from bzrlib import (
45
42
    btree_index,
570
567
        self._reload_func = reload_func
571
568
        self.index_to_pack = {}
572
569
        self.combined_index = CombinedGraphIndex([], reload_func=reload_func)
573
 
        self.data_access = _DirectPackAccess(self.index_to_pack,
 
570
        self.data_access = pack._DirectPackAccess(self.index_to_pack,
574
571
                                             reload_func=reload_func,
575
572
                                             flush_func=flush_func)
576
573
        self.add_callback = None