← 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 14:48:54 UTC
  • mto: (5757.7.2 knitpackrepo-6)
  • mto: This revision was merged to the branch mainline in revision 5771.
  • Revision ID: jelmer@samba.org-20110405144854-a9803ggiflk8u4zq
Revert noknit branch for the moment.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/pack_repo.py
41
41
    KnitPlainFactory,
42
42
    KnitVersionedFiles,
43
43
    _KnitGraphIndex,
 
44
    _DirectPackAccess,
44
45
    )
45
46
""")
46
47
from bzrlib import (
574
575
        self._reload_func = reload_func
575
576
        self.index_to_pack = {}
576
577
        self.combined_index = CombinedGraphIndex([], reload_func=reload_func)
577
 
        self.data_access = pack._DirectPackAccess(self.index_to_pack,
 
578
        self.data_access = _DirectPackAccess(self.index_to_pack,
578
579
                                             reload_func=reload_func,
579
580
                                             flush_func=flush_func)
580
581
        self.add_callback = None
1294
1295
            self.new_pack.text_index,
1295
1296
            ('blank', ), 1,
1296
1297
            add_nodes_callback=self.new_pack.text_index.add_nodes)
1297
 
        data_access = pack._DirectPackAccess(
 
1298
        data_access = _DirectPackAccess(
1298
1299
                {self.new_pack.text_index:self.new_pack.access_tuple()})
1299
1300
        data_access.set_writer(self.new_pack._writer, self.new_pack.text_index,
1300
1301
            self.new_pack.access_tuple())