~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitpack_repo.py

MergeĀ knitpackrepo-4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
lazy_import(globals(), """
21
21
from bzrlib import (
22
22
    bzrdir,
 
23
    knit,
 
24
    osutils,
23
25
    revision as _mod_revision,
 
26
    tsort,
24
27
    xml5,
25
28
    xml6,
26
29
    xml7,
37
40
    )
38
41
from bzrlib.index import (
39
42
    GraphIndex,
 
43
    GraphIndexPrefixAdapter,
40
44
    InMemoryGraphIndex,
41
45
    )
42
46
from bzrlib.repofmt.knitrepo import (
648
652
            self.new_pack.text_index,
649
653
            ('blank', ), 1,
650
654
            add_nodes_callback=self.new_pack.text_index.add_nodes)
651
 
        data_access = _DirectPackAccess(
 
655
        data_access = knit._DirectPackAccess(
652
656
                {self.new_pack.text_index:self.new_pack.access_tuple()})
653
657
        data_access.set_writer(self.new_pack._writer, self.new_pack.text_index,
654
658
            self.new_pack.access_tuple())