/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

Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
49
49
    remote,
50
50
    repository,
51
51
    revision as _mod_revision,
 
52
    transport as _mod_transport,
52
53
    ui,
53
54
    urlutils,
54
55
    versionedfile,
66
67
    )
67
68
from bzrlib.repofmt import pack_repo
68
69
from bzrlib.smart.client import _SmartClient
69
 
from bzrlib.store.versioned import WeaveStore
 
70
from bzrlib.store.versioned import VersionedFileStore
70
71
from bzrlib.transactions import WriteTransaction
71
72
from bzrlib.transport import (
72
73
    do_catching_redirections,
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 (
275
278
    # TODO: This should be given a Transport, and should chdir up; otherwise
276
279
    # this will open a new connection.
277
280
    def _make_tail(self, url):
278
 
        t = get_transport(url)
 
281
        t = _mod_transport.get_transport(url)
279
282
        t.ensure_base()
280
283
 
281
284
    @staticmethod
465
468
        """
466
469
        if force_new_tree:
467
470
            # check for non local urls
468
 
            t = get_transport(base, possible_transports)
 
471
            t = _mod_transport.get_transport(base, possible_transports)
469
472
            if not isinstance(t, local.LocalTransport):
470
473
                raise errors.NotLocalUrl(base)
471
474
        bzrdir = BzrDir.create(base, format, possible_transports)
493
496
        :param format: Override for the bzrdir format to create.
494
497
        :return: The WorkingTree object.
495
498
        """
496
 
        t = get_transport(base)
 
499
        t = _mod_transport.get_transport(base)
497
500
        if not isinstance(t, local.LocalTransport):
498
501
            raise errors.NotLocalUrl(base)
499
502
        bzrdir = BzrDir.create_branch_and_repo(base,
713
716
 
714
717
        :param _unsupported: a private parameter to the BzrDir class.
715
718
        """
716
 
        t = get_transport(base, possible_transports=possible_transports)
 
719
        t = _mod_transport.get_transport(base, possible_transports)
717
720
        return BzrDir.open_from_transport(t, _unsupported=_unsupported)
718
721
 
719
722
    @staticmethod
758
761
        :param url: url to search from.
759
762
        See open_containing_from_transport for more detail.
760
763
        """
761
 
        transport = get_transport(url, possible_transports)
 
764
        transport = _mod_transport.get_transport(url, possible_transports)
762
765
        return BzrDir.open_containing_from_transport(transport)
763
766
 
764
767
    @staticmethod
920
923
        if cls is not BzrDir:
921
924
            raise AssertionError("BzrDir.create always creates the"
922
925
                "default format, not one of %r" % cls)
923
 
        t = get_transport(base, possible_transports)
 
926
        t = _mod_transport.get_transport(base, possible_transports)
924
927
        t.ensure_base()
925
928
        if format is None:
926
929
            format = controldir.ControlDirFormat.get_default_format()
1843
1846
        return ConvertBzrDir5To6()
1844
1847
 
1845
1848
    def _initialize_for_clone(self, url):
1846
 
        return self.initialize_on_transport(get_transport(url), _cloning=True)
 
1849
        return self.initialize_on_transport(
 
1850
            _mod_transport.get_transport(url), _cloning=True)
1847
1851
 
1848
1852
    def initialize_on_transport(self, transport, _cloning=False):
1849
1853
        """Format 5 dirs always have working tree, branch and repository.
1903
1907
        return ConvertBzrDir6ToMeta()
1904
1908
 
1905
1909
    def _initialize_for_clone(self, url):
1906
 
        return self.initialize_on_transport(get_transport(url), _cloning=True)
 
1910
        return self.initialize_on_transport(
 
1911
            _mod_transport.get_transport(url), _cloning=True)
1907
1912
 
1908
1913
    def initialize_on_transport(self, transport, _cloning=False):
1909
1914
        """Format 6 dirs always have working tree, branch and repository.
2252
2257
            mode=self.bzrdir._get_file_mode())
2253
2258
 
2254
2259
    def _write_all_weaves(self):
2255
 
        controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)
 
2260
        controlweaves = VersionedFileStore(self.bzrdir.transport, prefixed=False,
 
2261
                                           versionedfile_class=WeaveFile)
2256
2262
        weave_transport = self.bzrdir.transport.clone('weaves')
2257
 
        weaves = WeaveStore(weave_transport, prefixed=False)
 
2263
        weaves = VersionedFileStore(weave_transport, prefixed=False,
 
2264
                            versionedfile_class=WeaveFile)
2258
2265
        transaction = WriteTransaction()
2259
2266
 
2260
2267
        try: