/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/bzrdir.py

  • Committer: Martin Pool
  • Date: 2011-01-20 23:07:25 UTC
  • mfrom: (5626 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5630.
  • Revision ID: mbp@canonical.com-20110120230725-12l7ltnko5x3fgnz
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
66
66
    )
67
67
from bzrlib.repofmt import pack_repo
68
68
from bzrlib.smart.client import _SmartClient
69
 
from bzrlib.store.versioned import WeaveStore
 
69
from bzrlib.store.versioned import VersionedFileStore
70
70
from bzrlib.transactions import WriteTransaction
71
71
from bzrlib.transport import (
72
72
    do_catching_redirections,
73
73
    get_transport,
74
74
    local,
75
75
    )
76
 
from bzrlib.weave import Weave
 
76
from bzrlib.weave import (
 
77
    WeaveFile,
 
78
    Weave,
 
79
    )
77
80
""")
78
81
 
79
82
from bzrlib.trace import (
2252
2255
            mode=self.bzrdir._get_file_mode())
2253
2256
 
2254
2257
    def _write_all_weaves(self):
2255
 
        controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)
 
2258
        controlweaves = VersionedFileStore(self.bzrdir.transport, prefixed=False,
 
2259
                                           versionedfile_class=WeaveFile)
2256
2260
        weave_transport = self.bzrdir.transport.clone('weaves')
2257
 
        weaves = WeaveStore(weave_transport, prefixed=False)
 
2261
        weaves = VersionedFileStore(weave_transport, prefixed=False,
 
2262
                            versionedfile_class=WeaveFile)
2258
2263
        transaction = WriteTransaction()
2259
2264
 
2260
2265
        try: