/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/repofmt/pack_repo.py

  • Committer: Martin Pool
  • Date: 2008-05-22 05:48:22 UTC
  • mfrom: (3407.2.16 controlfiles)
  • mto: This revision was merged to the branch mainline in revision 3448.
  • Revision ID: mbp@sourcefrog.net-20080522054822-lrq17tx62wbfzj8r
merge further LockableFile deprecations

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/pack_repo.py
1827
1827
 
1828
1828
 
1829
1829
class KnitPackRepository(KnitRepository):
1830
 
    """Experimental graph-knit using repository."""
 
1830
    """Repository with knit objects stored inside pack containers."""
1831
1831
 
1832
1832
    def __init__(self, _format, a_bzrdir, control_files, _revision_store,
1833
1833
        control_store, text_store, _commit_builder_class, _serializer):
1834
1834
        KnitRepository.__init__(self, _format, a_bzrdir, control_files,
1835
1835
            _revision_store, control_store, text_store, _commit_builder_class,
1836
1836
            _serializer)
1837
 
        index_transport = control_files._transport.clone('indices')
1838
 
        self._pack_collection = RepositoryPackCollection(self, control_files._transport,
 
1837
        index_transport = self._transport.clone('indices')
 
1838
        self._pack_collection = RepositoryPackCollection(self,
 
1839
            self._transport,
1839
1840
            index_transport,
1840
 
            control_files._transport.clone('upload'),
1841
 
            control_files._transport.clone('packs'))
 
1841
            self._transport.clone('upload'),
 
1842
            self._transport.clone('packs'))
1842
1843
        self._revision_store = KnitPackRevisionStore(self, index_transport, self._revision_store)
1843
1844
        self.weave_store = KnitPackTextStore(self, index_transport, self.weave_store)
1844
1845
        self._inv_thunk = InventoryKnitThunk(self, index_transport)
2130
2131
        else:
2131
2132
            repo_transport = a_bzrdir.get_repository_transport(None)
2132
2133
        control_files = lockable_files.LockableFiles(repo_transport,
2133
 
                                'lock', lockdir.LockDir)
 
2134
            'lock', lockdir.LockDir)
2134
2135
        text_store = self._get_text_store(repo_transport, control_files)
2135
2136
        control_store = self._get_control_store(repo_transport, control_files)
2136
2137
        _revision_store = self._get_revision_store(repo_transport, control_files)