/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1534.4.39 by Robert Collins
Basic BzrDir support.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1534.4.39 by Robert Collins
Basic BzrDir support.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1534.4.39 by Robert Collins
Basic BzrDir support.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""BzrDir logic. The BzrDir is the basic control directory used by bzr.
18
19
At format 7 this was split out into Branch, Repository and Checkout control
20
directories.
21
"""
22
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
23
# TODO: Can we move specific formats into separate modules to make this file
24
# smaller?
25
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
26
from cStringIO import StringIO
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
27
import os
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
28
29
from bzrlib.lazy_import import lazy_import
30
lazy_import(globals(), """
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
31
from stat import S_ISDIR
2711.2.1 by Martin Pool
Deprecate BzrDir.create_repository
32
import textwrap
33
from warnings import warn
1534.4.39 by Robert Collins
Basic BzrDir support.
34
35
import bzrlib
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
36
from bzrlib import (
37
    errors,
38
    lockable_files,
39
    lockdir,
2204.4.1 by Aaron Bentley
Add 'formats' help topic
40
    registry,
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
41
    remote,
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
42
    revision as _mod_revision,
2204.4.12 by Aaron Bentley
Deprecate bzrdir.BzrDirFormat.set_default_format
43
    symbol_versioning,
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
44
    ui,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
45
    urlutils,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
46
    xml4,
47
    xml5,
2255.12.1 by Robert Collins
Implement upgrade for working trees.
48
    workingtree,
49
    workingtree_4,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
50
    )
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
51
from bzrlib.osutils import (
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
52
    sha_strings,
53
    sha_string,
54
    )
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
55
from bzrlib.smart.client import _SmartClient
2432.3.1 by Andrew Bennetts
Try a version 1 hello probe to determine if we can use RemoteBzrDir on a particular transport, allowing smooth interoperation with older servers.
56
from bzrlib.smart import protocol
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
57
from bzrlib.store.revision.text import TextRevisionStore
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
58
from bzrlib.store.text import TextStore
1563.2.25 by Robert Collins
Merge in upstream.
59
from bzrlib.store.versioned import WeaveStore
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
60
from bzrlib.transactions import WriteTransaction
2164.2.21 by Vincent Ladeuil
Take bundles into account.
61
from bzrlib.transport import (
62
    do_catching_redirections,
63
    get_transport,
64
    )
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
65
from bzrlib.weave import Weave
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
66
""")
67
2164.2.1 by v.ladeuil+lp at free
First rough http branch redirection implementation.
68
from bzrlib.trace import (
69
    mutter,
70
    note,
71
    )
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
72
from bzrlib.transport.local import LocalTransport
2711.2.1 by Martin Pool
Deprecate BzrDir.create_repository
73
from bzrlib.symbol_versioning import (
74
    deprecated_function,
75
    deprecated_method,
76
    zero_ninetyone,
77
    )
1534.4.39 by Robert Collins
Basic BzrDir support.
78
79
80
class BzrDir(object):
81
    """A .bzr control diretory.
82
    
83
    BzrDir instances let you create or open any of the things that can be
84
    found within .bzr - checkouts, branches and repositories.
85
    
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
86
    transport
87
        the transport which this bzr dir is rooted at (i.e. file:///.../.bzr/)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
88
    root_transport
89
        a transport connected to the directory this bzr was opened from.
1534.4.39 by Robert Collins
Basic BzrDir support.
90
    """
91
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
92
    def break_lock(self):
93
        """Invoke break_lock on the first object in the bzrdir.
94
95
        If there is a tree, the tree is opened and break_lock() called.
96
        Otherwise, branch is tried, and finally repository.
97
        """
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
98
        # XXX: This seems more like a UI function than something that really
99
        # belongs in this class.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
100
        try:
101
            thing_to_unlock = self.open_workingtree()
102
        except (errors.NotLocalUrl, errors.NoWorkingTree):
103
            try:
104
                thing_to_unlock = self.open_branch()
105
            except errors.NotBranchError:
106
                try:
107
                    thing_to_unlock = self.open_repository()
108
                except errors.NoRepositoryPresent:
109
                    return
110
        thing_to_unlock.break_lock()
111
1534.5.16 by Robert Collins
Review feedback.
112
    def can_convert_format(self):
113
        """Return true if this bzrdir is one whose format we can convert from."""
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
114
        return True
115
1910.2.12 by Aaron Bentley
Implement knit repo format 2
116
    def check_conversion_target(self, target_format):
117
        target_repo_format = target_format.repository_format
118
        source_repo_format = self._format.repository_format
119
        source_repo_format.check_conversion_target(target_repo_format)
120
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
121
    @staticmethod
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
122
    def _check_supported(format, allow_unsupported,
123
        recommend_upgrade=True,
124
        basedir=None):
125
        """Give an error or warning on old formats.
126
127
        :param format: may be any kind of format - workingtree, branch, 
128
        or repository.
129
130
        :param allow_unsupported: If true, allow opening 
131
        formats that are strongly deprecated, and which may 
132
        have limited functionality.
133
134
        :param recommend_upgrade: If true (default), warn
135
        the user through the ui object that they may wish
136
        to upgrade the object.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
137
        """
2323.5.19 by Martin Pool
No upgrade recommendation on source when cloning
138
        # TODO: perhaps move this into a base Format class; it's not BzrDir
139
        # specific. mbp 20070323
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
140
        if not allow_unsupported and not format.is_supported():
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
141
            # see open_downlevel to open legacy branches.
1740.5.6 by Martin Pool
Clean up many exception classes.
142
            raise errors.UnsupportedFormatError(format=format)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
143
        if recommend_upgrade \
144
            and getattr(format, 'upgrade_recommended', False):
145
            ui.ui_factory.recommend_upgrade(
146
                format.get_format_description(),
147
                basedir)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
148
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
149
    def clone(self, url, revision_id=None, force_new_repo=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
150
        """Clone this bzrdir and its contents to url verbatim.
151
152
        If urls last component does not exist, it will be created.
153
154
        if revision_id is not None, then the clone operation may tune
155
            itself to download less data.
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
156
        :param force_new_repo: Do not use a shared repository for the target 
157
                               even if one is available.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
158
        """
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
159
        return self.clone_on_transport(get_transport(url),
160
                                       revision_id=revision_id,
161
                                       force_new_repo=force_new_repo)
162
163
    def clone_on_transport(self, transport, revision_id=None,
164
                           force_new_repo=False):
165
        """Clone this bzrdir and its contents to transport verbatim.
166
167
        If the target directory does not exist, it will be created.
168
169
        if revision_id is not None, then the clone operation may tune
170
            itself to download less data.
171
        :param force_new_repo: Do not use a shared repository for the target 
172
                               even if one is available.
173
        """
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
174
        transport.ensure_base()
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
175
        result = self._format.initialize_on_transport(transport)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
176
        try:
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
177
            local_repo = self.find_repository()
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
178
        except errors.NoRepositoryPresent:
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
179
            local_repo = None
180
        if local_repo:
181
            # may need to copy content in
182
            if force_new_repo:
1707.1.1 by Robert Collins
Bugfixes to bzrdir.sprout and clone. Sprout was failing to reset the
183
                result_repo = local_repo.clone(
184
                    result,
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
185
                    revision_id=revision_id)
1707.1.1 by Robert Collins
Bugfixes to bzrdir.sprout and clone. Sprout was failing to reset the
186
                result_repo.set_make_working_trees(local_repo.make_working_trees())
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
187
            else:
188
                try:
189
                    result_repo = result.find_repository()
190
                    # fetch content this dir needs.
191
                    result_repo.fetch(local_repo, revision_id=revision_id)
192
                except errors.NoRepositoryPresent:
193
                    # needed to make one anyway.
1707.1.1 by Robert Collins
Bugfixes to bzrdir.sprout and clone. Sprout was failing to reset the
194
                    result_repo = local_repo.clone(
195
                        result,
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
196
                        revision_id=revision_id)
1707.1.1 by Robert Collins
Bugfixes to bzrdir.sprout and clone. Sprout was failing to reset the
197
                    result_repo.set_make_working_trees(local_repo.make_working_trees())
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
198
        # 1 if there is a branch present
199
        #   make sure its content is available in the target repository
200
        #   clone it.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
201
        try:
202
            self.open_branch().clone(result, revision_id=revision_id)
203
        except errors.NotBranchError:
204
            pass
205
        try:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
206
            self.open_workingtree().clone(result)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
207
        except (errors.NoWorkingTree, errors.NotLocalUrl):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
208
            pass
209
        return result
210
1685.1.61 by Martin Pool
[broken] Change BzrDir._make_tail to use urlutils.split
211
    # TODO: This should be given a Transport, and should chdir up; otherwise
212
    # this will open a new connection.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
213
    def _make_tail(self, url):
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
214
        t = get_transport(url)
215
        t.ensure_base()
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
216
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
217
    @classmethod
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
218
    def create(cls, base, format=None, possible_transports=None):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
219
        """Create a new BzrDir at the url 'base'.
1534.4.39 by Robert Collins
Basic BzrDir support.
220
        
221
        This will call the current default formats initialize with base
222
        as the only parameter.
223
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
224
        :param format: If supplied, the format of branch to create.  If not
225
            supplied, the default is used.
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
226
        :param possible_transports: If supplied, a list of transports that 
227
            can be reused to share a remote connection.
1534.4.39 by Robert Collins
Basic BzrDir support.
228
        """
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
229
        if cls is not BzrDir:
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
230
            raise AssertionError("BzrDir.create always creates the default"
231
                " format, not one of %r" % cls)
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
232
        t = get_transport(base, possible_transports)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
233
        t.ensure_base()
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
234
        if format is None:
235
            format = BzrDirFormat.get_default_format()
2485.8.45 by Vincent Ladeuil
Take jam's remarks into account.
236
        return format.initialize(base, possible_transports)
1534.4.39 by Robert Collins
Basic BzrDir support.
237
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
238
    def create_branch(self):
239
        """Create a branch in this BzrDir.
240
241
        The bzrdirs format will control what branch format is created.
242
        For more control see BranchFormatXX.create(a_bzrdir).
243
        """
244
        raise NotImplementedError(self.create_branch)
245
246
    @staticmethod
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
247
    def create_branch_and_repo(base, force_new_repo=False, format=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
248
        """Create a new BzrDir, Branch and Repository at the url 'base'.
249
250
        This will use the current default BzrDirFormat, and use whatever 
251
        repository format that that uses via bzrdir.create_branch and
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
252
        create_repository. If a shared repository is available that is used
253
        preferentially.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
254
255
        The created Branch object is returned.
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
256
257
        :param base: The URL to create the branch at.
258
        :param force_new_repo: If True a new repository is always created.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
259
        """
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
260
        bzrdir = BzrDir.create(base, format)
1534.6.11 by Robert Collins
Review feedback.
261
        bzrdir._find_or_create_repository(force_new_repo)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
262
        return bzrdir.create_branch()
1534.6.11 by Robert Collins
Review feedback.
263
264
    def _find_or_create_repository(self, force_new_repo):
265
        """Create a new repository if needed, returning the repository."""
266
        if force_new_repo:
267
            return self.create_repository()
268
        try:
269
            return self.find_repository()
270
        except errors.NoRepositoryPresent:
271
            return self.create_repository()
2476.3.6 by Vincent Ladeuil
Fix the 'init connects multiple times' in a different way.
272
        
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
273
    @staticmethod
2476.3.6 by Vincent Ladeuil
Fix the 'init connects multiple times' in a different way.
274
    def create_branch_convenience(base, force_new_repo=False,
275
                                  force_new_tree=None, format=None,
2476.3.11 by Vincent Ladeuil
Cosmetic changes.
276
                                  possible_transports=None):
1534.6.10 by Robert Collins
Finish use of repositories support.
277
        """Create a new BzrDir, Branch and Repository at the url 'base'.
278
279
        This is a convenience function - it will use an existing repository
280
        if possible, can be told explicitly whether to create a working tree or
1534.6.12 by Robert Collins
Typo found by John Meinel.
281
        not.
1534.6.10 by Robert Collins
Finish use of repositories support.
282
283
        This will use the current default BzrDirFormat, and use whatever 
284
        repository format that that uses via bzrdir.create_branch and
285
        create_repository. If a shared repository is available that is used
286
        preferentially. Whatever repository is used, its tree creation policy
287
        is followed.
288
289
        The created Branch object is returned.
290
        If a working tree cannot be made due to base not being a file:// url,
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
291
        no error is raised unless force_new_tree is True, in which case no 
292
        data is created on disk and NotLocalUrl is raised.
1534.6.10 by Robert Collins
Finish use of repositories support.
293
294
        :param base: The URL to create the branch at.
295
        :param force_new_repo: If True a new repository is always created.
296
        :param force_new_tree: If True or False force creation of a tree or 
297
                               prevent such creation respectively.
2476.3.6 by Vincent Ladeuil
Fix the 'init connects multiple times' in a different way.
298
        :param format: Override for the for the bzrdir format to create.
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
299
        :param possible_transports: An optional reusable transports list.
1534.6.10 by Robert Collins
Finish use of repositories support.
300
        """
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
301
        if force_new_tree:
302
            # check for non local urls
2485.8.45 by Vincent Ladeuil
Take jam's remarks into account.
303
            t = get_transport(base, possible_transports)
2476.3.6 by Vincent Ladeuil
Fix the 'init connects multiple times' in a different way.
304
            if not isinstance(t, LocalTransport):
305
                raise errors.NotLocalUrl(base)
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
306
        bzrdir = BzrDir.create(base, format, possible_transports)
1534.6.11 by Robert Collins
Review feedback.
307
        repo = bzrdir._find_or_create_repository(force_new_repo)
1534.6.10 by Robert Collins
Finish use of repositories support.
308
        result = bzrdir.create_branch()
2476.3.4 by Vincent Ladeuil
Add tests.
309
        if force_new_tree or (repo.make_working_trees() and
1534.6.10 by Robert Collins
Finish use of repositories support.
310
                              force_new_tree is None):
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
311
            try:
312
                bzrdir.create_workingtree()
313
            except errors.NotLocalUrl:
314
                pass
1534.6.10 by Robert Collins
Finish use of repositories support.
315
        return result
2476.3.4 by Vincent Ladeuil
Add tests.
316
1551.8.2 by Aaron Bentley
Add create_checkout_convenience
317
    @staticmethod
2711.2.1 by Martin Pool
Deprecate BzrDir.create_repository
318
    @deprecated_function(zero_ninetyone)
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
319
    def create_repository(base, shared=False, format=None):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
320
        """Create a new BzrDir and Repository at the url 'base'.
321
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
322
        If no format is supplied, this will default to the current default
323
        BzrDirFormat by default, and use whatever repository format that that
324
        uses for bzrdirformat.create_repository.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
325
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
326
        :param shared: Create a shared repository rather than a standalone
1534.6.1 by Robert Collins
allow API creation of shared repositories
327
                       repository.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
328
        The Repository object is returned.
329
330
        This must be overridden as an instance method in child classes, where
331
        it should take no parameters and construct whatever repository format
332
        that child class desires.
2711.2.1 by Martin Pool
Deprecate BzrDir.create_repository
333
334
        This method is deprecated, please call create_repository on a bzrdir
335
        instance instead.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
336
        """
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
337
        bzrdir = BzrDir.create(base, format)
1841.2.1 by Jelmer Vernooij
Fix handling of `shared' parameter in BzrDir.create_repository().
338
        return bzrdir.create_repository(shared)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
339
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
340
    @staticmethod
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
341
    def create_standalone_workingtree(base, format=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
342
        """Create a new BzrDir, WorkingTree, Branch and Repository at 'base'.
343
344
        'base' must be a local path or a file:// url.
345
346
        This will use the current default BzrDirFormat, and use whatever 
347
        repository format that that uses for bzrdirformat.create_workingtree,
348
        create_branch and create_repository.
349
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
350
        :return: The WorkingTree object.
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
351
        """
2485.8.45 by Vincent Ladeuil
Take jam's remarks into account.
352
        t = get_transport(base)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
353
        if not isinstance(t, LocalTransport):
354
            raise errors.NotLocalUrl(base)
2485.8.45 by Vincent Ladeuil
Take jam's remarks into account.
355
        bzrdir = BzrDir.create_branch_and_repo(base,
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
356
                                               force_new_repo=True,
357
                                               format=format).bzrdir
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
358
        return bzrdir.create_workingtree()
359
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
360
    def create_workingtree(self, revision_id=None):
361
        """Create a working tree at this BzrDir.
362
        
363
        revision_id: create it as of this revision id.
364
        """
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
365
        raise NotImplementedError(self.create_workingtree)
366
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
367
    def retire_bzrdir(self):
368
        """Permanently disable the bzrdir.
369
370
        This is done by renaming it to give the user some ability to recover
371
        if there was a problem.
372
373
        This will have horrible consequences if anyone has anything locked or
374
        in use.
375
        """
376
        for i in xrange(10000):
377
            try:
378
                to_path = '.bzr.retired.%d' % i
379
                self.root_transport.rename('.bzr', to_path)
380
                note("renamed %s to %s"
381
                    % (self.root_transport.abspath('.bzr'), to_path))
382
                break
383
            except (errors.TransportError, IOError, errors.PathError):
384
                pass
385
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
386
    def destroy_workingtree(self):
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
387
        """Destroy the working tree at this BzrDir.
388
389
        Formats that do not support this may raise UnsupportedOperation.
390
        """
391
        raise NotImplementedError(self.destroy_workingtree)
392
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
393
    def destroy_workingtree_metadata(self):
394
        """Destroy the control files for the working tree at this BzrDir.
395
396
        The contents of working tree files are not affected.
397
        Formats that do not support this may raise UnsupportedOperation.
398
        """
399
        raise NotImplementedError(self.destroy_workingtree_metadata)
400
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
401
    def find_repository(self):
402
        """Find the repository that should be used for a_bzrdir.
403
404
        This does not require a branch as we use it to find the repo for
405
        new branches as well as to hook existing branches up to their
406
        repository.
407
        """
408
        try:
409
            return self.open_repository()
410
        except errors.NoRepositoryPresent:
411
            pass
412
        next_transport = self.root_transport.clone('..')
413
        while True:
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
414
            # find the next containing bzrdir
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
415
            try:
1534.6.11 by Robert Collins
Review feedback.
416
                found_bzrdir = BzrDir.open_containing_from_transport(
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
417
                    next_transport)[0]
418
            except errors.NotBranchError:
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
419
                # none found
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
420
                raise errors.NoRepositoryPresent(self)
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
421
            # does it have a repository ?
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
422
            try:
423
                repository = found_bzrdir.open_repository()
424
            except errors.NoRepositoryPresent:
425
                next_transport = found_bzrdir.root_transport.clone('..')
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
426
                if (found_bzrdir.root_transport.base == next_transport.base):
427
                    # top of the file system
428
                    break
429
                else:
430
                    continue
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
431
            if ((found_bzrdir.root_transport.base ==
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
432
                 self.root_transport.base) or repository.is_shared()):
433
                return repository
434
            else:
435
                raise errors.NoRepositoryPresent(self)
436
        raise errors.NoRepositoryPresent(self)
437
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
438
    def get_branch_reference(self):
439
        """Return the referenced URL for the branch in this bzrdir.
440
441
        :raises NotBranchError: If there is no Branch.
442
        :return: The URL the branch in this bzrdir references if it is a
443
            reference branch, or None for regular branches.
444
        """
445
        return None
446
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
447
    def get_branch_transport(self, branch_format):
448
        """Get the transport for use by branch format in this BzrDir.
449
450
        Note that bzr dirs that do not support format strings will raise
451
        IncompatibleFormat if the branch format they are given has
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
452
        a format string, and vice versa.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
453
454
        If branch_format is None, the transport is returned with no 
455
        checking. if it is not None, then the returned transport is
456
        guaranteed to point to an existing directory ready for use.
457
        """
458
        raise NotImplementedError(self.get_branch_transport)
459
        
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
460
    def get_repository_transport(self, repository_format):
461
        """Get the transport for use by repository format in this BzrDir.
462
463
        Note that bzr dirs that do not support format strings will raise
464
        IncompatibleFormat if the repository format they are given has
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
465
        a format string, and vice versa.
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
466
467
        If repository_format is None, the transport is returned with no 
468
        checking. if it is not None, then the returned transport is
469
        guaranteed to point to an existing directory ready for use.
470
        """
471
        raise NotImplementedError(self.get_repository_transport)
472
        
1534.4.53 by Robert Collins
Review feedback from John Meinel.
473
    def get_workingtree_transport(self, tree_format):
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
474
        """Get the transport for use by workingtree format in this BzrDir.
475
476
        Note that bzr dirs that do not support format strings will raise
2100.3.11 by Aaron Bentley
Add join --reference support
477
        IncompatibleFormat if the workingtree format they are given has a
478
        format string, and vice versa.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
479
480
        If workingtree_format is None, the transport is returned with no 
481
        checking. if it is not None, then the returned transport is
482
        guaranteed to point to an existing directory ready for use.
483
        """
484
        raise NotImplementedError(self.get_workingtree_transport)
485
        
1534.4.39 by Robert Collins
Basic BzrDir support.
486
    def __init__(self, _transport, _format):
487
        """Initialize a Bzr control dir object.
488
        
489
        Only really common logic should reside here, concrete classes should be
490
        made with varying behaviours.
491
1534.4.53 by Robert Collins
Review feedback from John Meinel.
492
        :param _format: the format that is creating this BzrDir instance.
493
        :param _transport: the transport this dir is based at.
1534.4.39 by Robert Collins
Basic BzrDir support.
494
        """
495
        self._format = _format
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
496
        self.transport = _transport.clone('.bzr')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
497
        self.root_transport = _transport
1534.4.39 by Robert Collins
Basic BzrDir support.
498
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
499
    def is_control_filename(self, filename):
500
        """True if filename is the name of a path which is reserved for bzrdir's.
501
        
502
        :param filename: A filename within the root transport of this bzrdir.
503
504
        This is true IF and ONLY IF the filename is part of the namespace reserved
505
        for bzr control dirs. Currently this is the '.bzr' directory in the root
506
        of the root_transport. it is expected that plugins will need to extend
507
        this in the future - for instance to make bzr talk with svn working
508
        trees.
509
        """
510
        # this might be better on the BzrDirFormat class because it refers to 
511
        # all the possible bzrdir disk formats. 
512
        # This method is tested via the workingtree is_control_filename tests- 
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
513
        # it was extracted from WorkingTree.is_control_filename. If the methods
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
514
        # contract is extended beyond the current trivial  implementation please
515
        # add new tests for it to the appropriate place.
516
        return filename == '.bzr' or filename.startswith('.bzr/')
517
1534.5.16 by Robert Collins
Review feedback.
518
    def needs_format_conversion(self, format=None):
519
        """Return true if this bzrdir needs convert_format run on it.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
520
        
521
        For instance, if the repository format is out of date but the 
522
        branch and working tree are not, this should return True.
1534.5.13 by Robert Collins
Correct buggy test.
523
524
        :param format: Optional parameter indicating a specific desired
1534.5.16 by Robert Collins
Review feedback.
525
                       format we plan to arrive at.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
526
        """
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
527
        raise NotImplementedError(self.needs_format_conversion)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
528
1534.4.39 by Robert Collins
Basic BzrDir support.
529
    @staticmethod
530
    def open_unsupported(base):
531
        """Open a branch which is not supported."""
532
        return BzrDir.open(base, _unsupported=True)
533
        
534
    @staticmethod
535
    def open(base, _unsupported=False):
1534.4.53 by Robert Collins
Review feedback from John Meinel.
536
        """Open an existing bzrdir, rooted at 'base' (url)
1534.4.39 by Robert Collins
Basic BzrDir support.
537
        
538
        _unsupported is a private parameter to the BzrDir class.
539
        """
540
        t = get_transport(base)
1910.11.1 by Andrew Bennetts
Add BzrDir.open_from_transport, refactored from duplicate code, no explicit tests.
541
        return BzrDir.open_from_transport(t, _unsupported=_unsupported)
542
543
    @staticmethod
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
544
    def open_from_transport(transport, _unsupported=False,
545
                            _server_formats=True):
1910.11.1 by Andrew Bennetts
Add BzrDir.open_from_transport, refactored from duplicate code, no explicit tests.
546
        """Open a bzrdir within a particular directory.
547
548
        :param transport: Transport containing the bzrdir.
549
        :param _unsupported: private.
550
        """
2164.2.21 by Vincent Ladeuil
Take bundles into account.
551
        base = transport.base
552
553
        def find_format(transport):
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
554
            return transport, BzrDirFormat.find_format(
555
                transport, _server_formats=_server_formats)
2164.2.21 by Vincent Ladeuil
Take bundles into account.
556
557
        def redirected(transport, e, redirection_notice):
558
            qualified_source = e.get_source_url()
559
            relpath = transport.relpath(qualified_source)
560
            if not e.target.endswith(relpath):
561
                # Not redirected to a branch-format, not a branch
562
                raise errors.NotBranchError(path=e.target)
563
            target = e.target[:-len(relpath)]
564
            note('%s is%s redirected to %s',
565
                 transport.base, e.permanently, target)
566
            # Let's try with a new transport
567
            qualified_target = e.get_target_url()[:-len(relpath)]
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
568
            # FIXME: If 'transport' has a qualifier, this should
2164.2.21 by Vincent Ladeuil
Take bundles into account.
569
            # be applied again to the new transport *iff* the
570
            # schemes used are the same. It's a bit tricky to
571
            # verify, so I'll punt for now
572
            # -- vila20070212
573
            return get_transport(target)
574
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
575
        try:
2164.2.28 by Vincent Ladeuil
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions.
576
            transport, format = do_catching_redirections(find_format,
577
                                                         transport,
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
578
                                                         redirected)
579
        except errors.TooManyRedirections:
580
            raise errors.NotBranchError(base)
2164.2.21 by Vincent Ladeuil
Take bundles into account.
581
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
582
        BzrDir._check_supported(format, _unsupported)
1910.11.1 by Andrew Bennetts
Add BzrDir.open_from_transport, refactored from duplicate code, no explicit tests.
583
        return format.open(transport, _found=True)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
584
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
585
    def open_branch(self, unsupported=False):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
586
        """Open the branch object at this BzrDir if one is present.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
587
588
        If unsupported is True, then no longer supported branch formats can
589
        still be opened.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
590
        
591
        TODO: static convenience version of this?
592
        """
593
        raise NotImplementedError(self.open_branch)
1534.4.39 by Robert Collins
Basic BzrDir support.
594
595
    @staticmethod
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
596
    def open_containing(url, possible_transports=None):
1534.4.39 by Robert Collins
Basic BzrDir support.
597
        """Open an existing branch which contains url.
598
        
1534.6.3 by Robert Collins
find_repository sufficiently robust.
599
        :param url: url to search from.
1534.6.11 by Robert Collins
Review feedback.
600
        See open_containing_from_transport for more detail.
1534.6.3 by Robert Collins
find_repository sufficiently robust.
601
        """
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
602
        transport = get_transport(url, possible_transports)
603
        return BzrDir.open_containing_from_transport(transport)
1534.6.3 by Robert Collins
find_repository sufficiently robust.
604
    
605
    @staticmethod
1534.6.11 by Robert Collins
Review feedback.
606
    def open_containing_from_transport(a_transport):
1534.6.3 by Robert Collins
find_repository sufficiently robust.
607
        """Open an existing branch which contains a_transport.base
608
609
        This probes for a branch at a_transport, and searches upwards from there.
1534.4.39 by Robert Collins
Basic BzrDir support.
610
611
        Basically we keep looking up until we find the control directory or
612
        run into the root.  If there isn't one, raises NotBranchError.
613
        If there is one and it is either an unrecognised format or an unsupported 
614
        format, UnknownFormatError or UnsupportedFormatError are raised.
615
        If there is one, it is returned, along with the unused portion of url.
1685.1.27 by John Arbash Meinel
BzrDir works in URLs, but WorkingTree works in unicode paths
616
1685.1.28 by John Arbash Meinel
Changing open_containing to always return a unicode path.
617
        :return: The BzrDir that contains the path, and a Unicode path 
618
                for the rest of the URL.
1534.4.39 by Robert Collins
Basic BzrDir support.
619
        """
620
        # this gets the normalised url back. I.e. '.' -> the full path.
1534.6.3 by Robert Collins
find_repository sufficiently robust.
621
        url = a_transport.base
1534.4.39 by Robert Collins
Basic BzrDir support.
622
        while True:
623
            try:
1910.11.1 by Andrew Bennetts
Add BzrDir.open_from_transport, refactored from duplicate code, no explicit tests.
624
                result = BzrDir.open_from_transport(a_transport)
625
                return result, urlutils.unescape(a_transport.relpath(url))
1534.4.39 by Robert Collins
Basic BzrDir support.
626
            except errors.NotBranchError, e:
1685.1.60 by Martin Pool
[broken] NotBranchError should unescape the url if possible
627
                pass
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
628
            try:
629
                new_t = a_transport.clone('..')
630
            except errors.InvalidURLJoin:
631
                # reached the root, whatever that may be
632
                raise errors.NotBranchError(path=url)
1534.6.3 by Robert Collins
find_repository sufficiently robust.
633
            if new_t.base == a_transport.base:
1534.4.39 by Robert Collins
Basic BzrDir support.
634
                # reached the root, whatever that may be
635
                raise errors.NotBranchError(path=url)
1534.6.3 by Robert Collins
find_repository sufficiently robust.
636
            a_transport = new_t
1534.4.39 by Robert Collins
Basic BzrDir support.
637
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
638
    @classmethod
639
    def open_containing_tree_or_branch(klass, location):
640
        """Return the branch and working tree contained by a location.
641
642
        Returns (tree, branch, relpath).
643
        If there is no tree at containing the location, tree will be None.
644
        If there is no branch containing the location, an exception will be
645
        raised
646
        relpath is the portion of the path that is contained by the branch.
647
        """
648
        bzrdir, relpath = klass.open_containing(location)
649
        try:
650
            tree = bzrdir.open_workingtree()
2215.3.5 by Aaron Bentley
Add support for remote ls
651
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
652
            tree = None
653
            branch = bzrdir.open_branch()
654
        else:
655
            branch = tree.branch
656
        return tree, branch, relpath
657
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
658
    def open_repository(self, _unsupported=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
659
        """Open the repository object at this BzrDir if one is present.
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
660
661
        This will not follow the Branch object pointer - its strictly a direct
662
        open facility. Most client code should use open_branch().repository to
663
        get at a repository.
664
665
        _unsupported is a private parameter, not part of the api.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
666
        TODO: static convenience version of this?
667
        """
668
        raise NotImplementedError(self.open_repository)
669
2400.2.2 by Robert Collins
Document BzrDir.open_workingtree's new recommend_upgrade parameter.
670
    def open_workingtree(self, _unsupported=False,
671
            recommend_upgrade=True):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
672
        """Open the workingtree object at this BzrDir if one is present.
2400.2.2 by Robert Collins
Document BzrDir.open_workingtree's new recommend_upgrade parameter.
673
674
        :param recommend_upgrade: Optional keyword parameter, when True (the
675
            default), emit through the ui module a recommendation that the user
676
            upgrade the working tree when the workingtree being opened is old
677
            (but still fully supported).
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
678
        """
679
        raise NotImplementedError(self.open_workingtree)
680
1662.1.19 by Martin Pool
Better error message when initting existing tree
681
    def has_branch(self):
682
        """Tell if this bzrdir contains a branch.
683
        
684
        Note: if you're going to open the branch, you should just go ahead
685
        and try, and not ask permission first.  (This method just opens the 
686
        branch and discards it, and that's somewhat expensive.) 
687
        """
688
        try:
689
            self.open_branch()
690
            return True
691
        except errors.NotBranchError:
692
            return False
693
694
    def has_workingtree(self):
695
        """Tell if this bzrdir contains a working tree.
696
697
        This will still raise an exception if the bzrdir has a workingtree that
698
        is remote & inaccessible.
699
        
700
        Note: if you're going to open the working tree, you should just go ahead
701
        and try, and not ask permission first.  (This method just opens the 
702
        workingtree and discards it, and that's somewhat expensive.) 
703
        """
704
        try:
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
705
            self.open_workingtree(recommend_upgrade=False)
1662.1.19 by Martin Pool
Better error message when initting existing tree
706
            return True
707
        except errors.NoWorkingTree:
708
            return False
709
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
710
    def _cloning_metadir(self):
1910.2.41 by Aaron Bentley
Clean up clone format creation
711
        """Produce a metadir suitable for cloning with"""
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
712
        result_format = self._format.__class__()
713
        try:
1910.2.41 by Aaron Bentley
Clean up clone format creation
714
            try:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
715
                branch = self.open_branch()
716
                source_repository = branch.repository
1910.2.41 by Aaron Bentley
Clean up clone format creation
717
            except errors.NotBranchError:
718
                source_branch = None
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
719
                source_repository = self.open_repository()
2305.3.1 by Andrew Bennetts
Tidy up BzrDir.cloning_metadir: bogus try/except, and basis argument isn't actually used.
720
        except errors.NoRepositoryPresent:
2100.3.24 by Aaron Bentley
Get all tests passing again
721
            source_repository = None
2305.3.1 by Andrew Bennetts
Tidy up BzrDir.cloning_metadir: bogus try/except, and basis argument isn't actually used.
722
        else:
2018.5.138 by Robert Collins
Merge bzr.dev.
723
            # XXX TODO: This isinstance is here because we have not implemented
724
            # the fix recommended in bug # 103195 - to delegate this choice the
725
            # repository itself.
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
726
            repo_format = source_repository._format
727
            if not isinstance(repo_format, remote.RemoteRepositoryFormat):
728
                result_format.repository_format = repo_format
2100.3.28 by Aaron Bentley
Make sprout recursive
729
        try:
2323.5.19 by Martin Pool
No upgrade recommendation on source when cloning
730
            # TODO: Couldn't we just probe for the format in these cases,
731
            # rather than opening the whole tree?  It would be a little
732
            # faster. mbp 20070401
733
            tree = self.open_workingtree(recommend_upgrade=False)
2100.3.28 by Aaron Bentley
Make sprout recursive
734
        except (errors.NoWorkingTree, errors.NotLocalUrl):
735
            result_format.workingtree_format = None
736
        else:
737
            result_format.workingtree_format = tree._format.__class__()
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
738
        return result_format, source_repository
739
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
740
    def cloning_metadir(self):
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
741
        """Produce a metadir suitable for cloning or sprouting with.
1910.2.41 by Aaron Bentley
Clean up clone format creation
742
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
743
        These operations may produce workingtrees (yes, even though they're
744
        "cloning" something that doesn't have a tree, so a viable workingtree
745
        format must be selected.
746
        """
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
747
        format, repository = self._cloning_metadir()
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
748
        if format._workingtree_format is None:
2100.3.34 by Aaron Bentley
Fix BzrDir.cloning_metadir with no format
749
            if repository is None:
750
                return format
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
751
            tree_format = repository._format._matchingbzrdir.workingtree_format
2100.3.28 by Aaron Bentley
Make sprout recursive
752
            format.workingtree_format = tree_format.__class__()
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
753
        return format
754
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
755
    def checkout_metadir(self):
756
        return self.cloning_metadir()
757
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
758
    def sprout(self, url, revision_id=None, force_new_repo=False,
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
759
               recurse='down', possible_transports=None):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
760
        """Create a copy of this bzrdir prepared for use as a new line of
761
        development.
762
763
        If urls last component does not exist, it will be created.
764
765
        Attributes related to the identity of the source branch like
766
        branch nickname will be cleaned, a working tree is created
767
        whether one existed before or not; and a local branch is always
768
        created.
769
770
        if revision_id is not None, then the clone operation may tune
771
            itself to download less data.
772
        """
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
773
        target_transport = get_transport(url, possible_transports)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
774
        target_transport.ensure_base()
2305.3.1 by Andrew Bennetts
Tidy up BzrDir.cloning_metadir: bogus try/except, and basis argument isn't actually used.
775
        cloning_format = self.cloning_metadir()
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
776
        result = cloning_format.initialize_on_transport(target_transport)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
777
        try:
778
            source_branch = self.open_branch()
779
            source_repository = source_branch.repository
780
        except errors.NotBranchError:
781
            source_branch = None
782
            try:
783
                source_repository = self.open_repository()
784
            except errors.NoRepositoryPresent:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
785
                source_repository = None
1534.6.9 by Robert Collins
sprouting into shared repositories
786
        if force_new_repo:
787
            result_repo = None
788
        else:
789
            try:
790
                result_repo = result.find_repository()
791
            except errors.NoRepositoryPresent:
792
                result_repo = None
793
        if source_repository is None and result_repo is not None:
794
            pass
795
        elif source_repository is None and result_repo is None:
796
            # no repo available, make a new one
797
            result.create_repository()
798
        elif source_repository is not None and result_repo is None:
1707.1.1 by Robert Collins
Bugfixes to bzrdir.sprout and clone. Sprout was failing to reset the
799
            # have source, and want to make a new target repo
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
800
            result_repo = source_repository.sprout(result,
801
                                                   revision_id=revision_id)
2440.1.1 by Martin Pool
Add new Repository.sprout,
802
        else:
1534.6.9 by Robert Collins
sprouting into shared repositories
803
            # fetch needed content into target.
1910.4.10 by Andrew Bennetts
Skip various test_sprout* tests when sprouting to non-local bzrdirs that can't have working trees; plus fix a test method naming clash and the bug it revealed in bzrdir.sprout.
804
            if source_repository is not None:
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
805
                # would rather do 
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
806
                # source_repository.copy_content_into(result_repo,
807
                #                                     revision_id=revision_id)
2018.18.20 by Martin Pool
Route branch operations through remote copy_content_into
808
                # so we can override the copy method
1910.4.10 by Andrew Bennetts
Skip various test_sprout* tests when sprouting to non-local bzrdirs that can't have working trees; plus fix a test method naming clash and the bug it revealed in bzrdir.sprout.
809
                result_repo.fetch(source_repository, revision_id=revision_id)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
810
        if source_branch is not None:
811
            source_branch.sprout(result, revision_id=revision_id)
812
        else:
813
            result.create_branch()
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
814
        if isinstance(target_transport, LocalTransport) and (
815
            result_repo is None or result_repo.make_working_trees()):
1731.1.33 by Aaron Bentley
Revert no-special-root changes
816
            wt = result.create_workingtree()
2255.2.77 by Robert Collins
Tune working inventory generation more: walk the blocks, skipping deleted rows.
817
            wt.lock_write()
818
            try:
819
                if wt.path2id('') is None:
820
                    try:
821
                        wt.set_root_id(self.open_workingtree.get_root_id())
822
                    except errors.NoWorkingTree:
823
                        pass
824
            finally:
825
                wt.unlock()
2100.3.28 by Aaron Bentley
Make sprout recursive
826
        else:
827
            wt = None
828
        if recurse == 'down':
829
            if wt is not None:
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
830
                basis = wt.basis_tree()
831
                basis.lock_read()
832
                subtrees = basis.iter_references()
2100.3.28 by Aaron Bentley
Make sprout recursive
833
                recurse_branch = wt.branch
834
            elif source_branch is not None:
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
835
                basis = source_branch.basis_tree()
836
                basis.lock_read()
837
                subtrees = basis.iter_references()
2100.3.28 by Aaron Bentley
Make sprout recursive
838
                recurse_branch = source_branch
839
            else:
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
840
                subtrees = []
841
                basis = None
842
            try:
843
                for path, file_id in subtrees:
844
                    target = urlutils.join(url, urlutils.escape(path))
845
                    sublocation = source_branch.reference_parent(file_id, path)
846
                    sublocation.bzrdir.sprout(target,
847
                        basis.get_reference_revision(file_id, path),
848
                        force_new_repo=force_new_repo, recurse=recurse)
849
            finally:
850
                if basis is not None:
851
                    basis.unlock()
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
852
        return result
853
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
854
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
855
class BzrDirPreSplitOut(BzrDir):
856
    """A common class for the all-in-one formats."""
857
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
858
    def __init__(self, _transport, _format):
859
        """See BzrDir.__init__."""
860
        super(BzrDirPreSplitOut, self).__init__(_transport, _format)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
861
        assert self._format._lock_class == lockable_files.TransportLock
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
862
        assert self._format._lock_file_name == 'branch-lock'
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
863
        self._control_files = lockable_files.LockableFiles(
864
                                            self.get_branch_transport(None),
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
865
                                            self._format._lock_file_name,
866
                                            self._format._lock_class)
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
867
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
868
    def break_lock(self):
869
        """Pre-splitout bzrdirs do not suffer from stale locks."""
870
        raise NotImplementedError(self.break_lock)
871
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
872
    def clone(self, url, revision_id=None, force_new_repo=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
873
        """See BzrDir.clone()."""
874
        from bzrlib.workingtree import WorkingTreeFormat2
875
        self._make_tail(url)
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
876
        result = self._format._initialize_for_clone(url)
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
877
        self.open_repository().clone(result, revision_id=revision_id)
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
878
        from_branch = self.open_branch()
879
        from_branch.clone(result, revision_id=revision_id)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
880
        try:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
881
            self.open_workingtree().clone(result)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
882
        except errors.NotLocalUrl:
883
            # make a new one, this format always has to have one.
1563.2.38 by Robert Collins
make push preserve tree formats.
884
            try:
885
                WorkingTreeFormat2().initialize(result)
886
            except errors.NotLocalUrl:
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
887
                # but we cannot do it for remote trees.
888
                to_branch = result.open_branch()
889
                WorkingTreeFormat2().stub_initialize_remote(to_branch.control_files)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
890
        return result
891
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
892
    def create_branch(self):
893
        """See BzrDir.create_branch."""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
894
        return self.open_branch()
895
1534.6.1 by Robert Collins
allow API creation of shared repositories
896
    def create_repository(self, shared=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
897
        """See BzrDir.create_repository."""
1534.6.1 by Robert Collins
allow API creation of shared repositories
898
        if shared:
899
            raise errors.IncompatibleFormat('shared repository', self._format)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
900
        return self.open_repository()
901
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
902
    def create_workingtree(self, revision_id=None):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
903
        """See BzrDir.create_workingtree."""
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
904
        # this looks buggy but is not -really-
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
905
        # because this format creates the workingtree when the bzrdir is
906
        # created
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
907
        # clone and sprout will have set the revision_id
908
        # and that will have set it for us, its only
909
        # specific uses of create_workingtree in isolation
910
        # that can do wonky stuff here, and that only
911
        # happens for creating checkouts, which cannot be 
912
        # done on this format anyway. So - acceptable wart.
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
913
        result = self.open_workingtree(recommend_upgrade=False)
1508.1.24 by Robert Collins
Add update command for use with checkouts.
914
        if revision_id is not None:
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
915
            if revision_id == _mod_revision.NULL_REVISION:
1551.8.20 by Aaron Bentley
Fix BzrDir.create_workingtree for NULL_REVISION
916
                result.set_parent_ids([])
917
            else:
918
                result.set_parent_ids([revision_id])
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
919
        return result
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
920
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
921
    def destroy_workingtree(self):
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
922
        """See BzrDir.destroy_workingtree."""
923
        raise errors.UnsupportedOperation(self.destroy_workingtree, self)
924
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
925
    def destroy_workingtree_metadata(self):
926
        """See BzrDir.destroy_workingtree_metadata."""
927
        raise errors.UnsupportedOperation(self.destroy_workingtree_metadata, 
928
                                          self)
929
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
930
    def get_branch_transport(self, branch_format):
931
        """See BzrDir.get_branch_transport()."""
932
        if branch_format is None:
933
            return self.transport
934
        try:
935
            branch_format.get_format_string()
936
        except NotImplementedError:
937
            return self.transport
938
        raise errors.IncompatibleFormat(branch_format, self._format)
939
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
940
    def get_repository_transport(self, repository_format):
941
        """See BzrDir.get_repository_transport()."""
942
        if repository_format is None:
943
            return self.transport
944
        try:
945
            repository_format.get_format_string()
946
        except NotImplementedError:
947
            return self.transport
948
        raise errors.IncompatibleFormat(repository_format, self._format)
949
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
950
    def get_workingtree_transport(self, workingtree_format):
951
        """See BzrDir.get_workingtree_transport()."""
952
        if workingtree_format is None:
953
            return self.transport
954
        try:
955
            workingtree_format.get_format_string()
956
        except NotImplementedError:
957
            return self.transport
958
        raise errors.IncompatibleFormat(workingtree_format, self._format)
959
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
960
    def needs_format_conversion(self, format=None):
961
        """See BzrDir.needs_format_conversion()."""
962
        # if the format is not the same as the system default,
963
        # an upgrade is needed.
964
        if format is None:
965
            format = BzrDirFormat.get_default_format()
966
        return not isinstance(self._format, format.__class__)
967
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
968
    def open_branch(self, unsupported=False):
969
        """See BzrDir.open_branch."""
970
        from bzrlib.branch import BzrBranchFormat4
971
        format = BzrBranchFormat4()
972
        self._check_supported(format, unsupported)
973
        return format.open(self, _found=True)
974
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
975
    def sprout(self, url, revision_id=None, force_new_repo=False,
976
               possible_transports=None):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
977
        """See BzrDir.sprout()."""
978
        from bzrlib.workingtree import WorkingTreeFormat2
979
        self._make_tail(url)
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
980
        result = self._format._initialize_for_clone(url)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
981
        try:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
982
            self.open_repository().clone(result, revision_id=revision_id)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
983
        except errors.NoRepositoryPresent:
984
            pass
985
        try:
986
            self.open_branch().sprout(result, revision_id=revision_id)
987
        except errors.NotBranchError:
988
            pass
1587.1.5 by Robert Collins
Put bzr branch behaviour back to the 0.7 ignore-working-tree state.
989
        # we always want a working tree
990
        WorkingTreeFormat2().initialize(result)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
991
        return result
992
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
993
994
class BzrDir4(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
995
    """A .bzr version 4 control object.
996
    
997
    This is a deprecated format and may be removed after sept 2006.
998
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
999
1534.6.1 by Robert Collins
allow API creation of shared repositories
1000
    def create_repository(self, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1001
        """See BzrDir.create_repository."""
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1002
        return self._format.repository_format.initialize(self, shared)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1003
1534.5.16 by Robert Collins
Review feedback.
1004
    def needs_format_conversion(self, format=None):
1005
        """Format 4 dirs are always in need of conversion."""
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1006
        return True
1007
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1008
    def open_repository(self):
1009
        """See BzrDir.open_repository."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1010
        from bzrlib.repofmt.weaverepo import RepositoryFormat4
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1011
        return RepositoryFormat4().open(self, _found=True)
1012
1013
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1014
class BzrDir5(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
1015
    """A .bzr version 5 control object.
1016
1017
    This is a deprecated format and may be removed after sept 2006.
1018
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1019
1020
    def open_repository(self):
1021
        """See BzrDir.open_repository."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1022
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1023
        return RepositoryFormat5().open(self, _found=True)
1024
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1025
    def open_workingtree(self, _unsupported=False,
1026
            recommend_upgrade=True):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1027
        """See BzrDir.create_workingtree."""
1028
        from bzrlib.workingtree import WorkingTreeFormat2
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1029
        wt_format = WorkingTreeFormat2()
1030
        # we don't warn here about upgrades; that ought to be handled for the
1031
        # bzrdir as a whole
1032
        return wt_format.open(self, _found=True)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1033
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1034
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1035
class BzrDir6(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
1036
    """A .bzr version 6 control object.
1037
1038
    This is a deprecated format and may be removed after sept 2006.
1039
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1040
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1041
    def open_repository(self):
1042
        """See BzrDir.open_repository."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1043
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1044
        return RepositoryFormat6().open(self, _found=True)
1045
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1046
    def open_workingtree(self, _unsupported=False,
1047
        recommend_upgrade=True):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1048
        """See BzrDir.create_workingtree."""
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1049
        # we don't warn here about upgrades; that ought to be handled for the
1050
        # bzrdir as a whole
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1051
        from bzrlib.workingtree import WorkingTreeFormat2
1052
        return WorkingTreeFormat2().open(self, _found=True)
1053
1054
1055
class BzrDirMeta1(BzrDir):
1056
    """A .bzr meta version 1 control object.
1057
    
1058
    This is the first control object where the 
1553.5.67 by Martin Pool
doc
1059
    individual aspects are really split out: there are separate repository,
1060
    workingtree and branch subdirectories and any subset of the three can be
1061
    present within a BzrDir.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1062
    """
1063
1534.5.16 by Robert Collins
Review feedback.
1064
    def can_convert_format(self):
1065
        """See BzrDir.can_convert_format()."""
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1066
        return True
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1067
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1068
    def create_branch(self):
1069
        """See BzrDir.create_branch."""
2230.3.55 by Aaron Bentley
Updates from review
1070
        return self._format.get_branch_format().initialize(self)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1071
1534.6.1 by Robert Collins
allow API creation of shared repositories
1072
    def create_repository(self, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1073
        """See BzrDir.create_repository."""
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1074
        return self._format.repository_format.initialize(self, shared)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1075
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1076
    def create_workingtree(self, revision_id=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1077
        """See BzrDir.create_workingtree."""
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1078
        from bzrlib.workingtree import WorkingTreeFormat
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1079
        return self._format.workingtree_format.initialize(self, revision_id)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1080
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1081
    def destroy_workingtree(self):
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
1082
        """See BzrDir.destroy_workingtree."""
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1083
        wt = self.open_workingtree(recommend_upgrade=False)
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1084
        repository = wt.branch.repository
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
1085
        empty = repository.revision_tree(_mod_revision.NULL_REVISION)
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1086
        wt.revert([], old_tree=empty)
1087
        self.destroy_workingtree_metadata()
1088
1089
    def destroy_workingtree_metadata(self):
1090
        self.transport.delete_tree('checkout')
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
1091
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1092
    def find_branch_format(self):
1093
        """Find the branch 'format' for this bzrdir.
1094
1095
        This might be a synthetic object for e.g. RemoteBranch and SVN.
1096
        """
1097
        from bzrlib.branch import BranchFormat
1098
        return BranchFormat.find_format(self)
1099
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1100
    def _get_mkdir_mode(self):
1101
        """Figure out the mode to use when creating a bzrdir subdir."""
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1102
        temp_control = lockable_files.LockableFiles(self.transport, '',
1103
                                     lockable_files.TransportLock)
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1104
        return temp_control._dir_mode
1105
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1106
    def get_branch_reference(self):
1107
        """See BzrDir.get_branch_reference()."""
1108
        from bzrlib.branch import BranchFormat
1109
        format = BranchFormat.find_format(self)
1110
        return format.get_reference(self)
1111
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1112
    def get_branch_transport(self, branch_format):
1113
        """See BzrDir.get_branch_transport()."""
1114
        if branch_format is None:
1115
            return self.transport.clone('branch')
1116
        try:
1117
            branch_format.get_format_string()
1118
        except NotImplementedError:
1119
            raise errors.IncompatibleFormat(branch_format, self._format)
1120
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1121
            self.transport.mkdir('branch', mode=self._get_mkdir_mode())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1122
        except errors.FileExists:
1123
            pass
1124
        return self.transport.clone('branch')
1125
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1126
    def get_repository_transport(self, repository_format):
1127
        """See BzrDir.get_repository_transport()."""
1128
        if repository_format is None:
1129
            return self.transport.clone('repository')
1130
        try:
1131
            repository_format.get_format_string()
1132
        except NotImplementedError:
1133
            raise errors.IncompatibleFormat(repository_format, self._format)
1134
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1135
            self.transport.mkdir('repository', mode=self._get_mkdir_mode())
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1136
        except errors.FileExists:
1137
            pass
1138
        return self.transport.clone('repository')
1139
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1140
    def get_workingtree_transport(self, workingtree_format):
1141
        """See BzrDir.get_workingtree_transport()."""
1142
        if workingtree_format is None:
1143
            return self.transport.clone('checkout')
1144
        try:
1145
            workingtree_format.get_format_string()
1146
        except NotImplementedError:
1147
            raise errors.IncompatibleFormat(workingtree_format, self._format)
1148
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1149
            self.transport.mkdir('checkout', mode=self._get_mkdir_mode())
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1150
        except errors.FileExists:
1151
            pass
1152
        return self.transport.clone('checkout')
1153
1534.5.16 by Robert Collins
Review feedback.
1154
    def needs_format_conversion(self, format=None):
1155
        """See BzrDir.needs_format_conversion()."""
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1156
        if format is None:
1157
            format = BzrDirFormat.get_default_format()
1158
        if not isinstance(self._format, format.__class__):
1159
            # it is not a meta dir format, conversion is needed.
1160
            return True
1161
        # we might want to push this down to the repository?
1162
        try:
1163
            if not isinstance(self.open_repository()._format,
1164
                              format.repository_format.__class__):
1165
                # the repository needs an upgrade.
1166
                return True
1167
        except errors.NoRepositoryPresent:
1168
            pass
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
1169
        try:
1170
            if not isinstance(self.open_branch()._format,
2230.3.55 by Aaron Bentley
Updates from review
1171
                              format.get_branch_format().__class__):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1172
                # the branch needs an upgrade.
1173
                return True
1174
        except errors.NotBranchError:
1175
            pass
1176
        try:
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1177
            my_wt = self.open_workingtree(recommend_upgrade=False)
1178
            if not isinstance(my_wt._format,
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1179
                              format.workingtree_format.__class__):
1180
                # the workingtree needs an upgrade.
1181
                return True
2255.2.196 by Robert Collins
Fix test_upgrade defects related to non local or absent working trees.
1182
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1183
            pass
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1184
        return False
1185
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1186
    def open_branch(self, unsupported=False):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1187
        """See BzrDir.open_branch."""
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1188
        format = self.find_branch_format()
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1189
        self._check_supported(format, unsupported)
1190
        return format.open(self, _found=True)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1191
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1192
    def open_repository(self, unsupported=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1193
        """See BzrDir.open_repository."""
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1194
        from bzrlib.repository import RepositoryFormat
1195
        format = RepositoryFormat.find_format(self)
1196
        self._check_supported(format, unsupported)
1197
        return format.open(self, _found=True)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1198
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1199
    def open_workingtree(self, unsupported=False,
1200
            recommend_upgrade=True):
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1201
        """See BzrDir.open_workingtree."""
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1202
        from bzrlib.workingtree import WorkingTreeFormat
1203
        format = WorkingTreeFormat.find_format(self)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1204
        self._check_supported(format, unsupported,
1205
            recommend_upgrade,
2323.6.5 by Martin Pool
Recommended-upgrade message should give base dir not the control dir url
1206
            basedir=self.root_transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1207
        return format.open(self, _found=True)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1208
1534.4.39 by Robert Collins
Basic BzrDir support.
1209
1210
class BzrDirFormat(object):
1211
    """An encapsulation of the initialization and open routines for a format.
1212
1213
    Formats provide three things:
1214
     * An initialization routine,
1215
     * a format string,
1216
     * an open routine.
1217
1218
    Formats are placed in an dict by their format string for reference 
1219
    during bzrdir opening. These should be subclasses of BzrDirFormat
1220
    for consistency.
1221
1222
    Once a format is deprecated, just deprecate the initialize and open
1223
    methods on the format class. Do not deprecate the object, as the 
1224
    object will be created every system load.
1225
    """
1226
1227
    _default_format = None
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1228
    """The default format used for new .bzr dirs."""
1534.4.39 by Robert Collins
Basic BzrDir support.
1229
1230
    _formats = {}
1231
    """The known formats."""
1232
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
1233
    _control_formats = []
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1234
    """The registered control formats - .bzr, ....
1235
    
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
1236
    This is a list of BzrDirFormat objects.
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1237
    """
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1238
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
1239
    _control_server_formats = []
1240
    """The registered control server formats, e.g. RemoteBzrDirs.
1241
1242
    This is a list of BzrDirFormat objects.
1243
    """
1244
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1245
    _lock_file_name = 'branch-lock'
1246
1247
    # _lock_class must be set in subclasses to the lock type, typ.
1248
    # TransportLock or LockDir
1249
1534.4.39 by Robert Collins
Basic BzrDir support.
1250
    @classmethod
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
1251
    def find_format(klass, transport, _server_formats=True):
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1252
        """Return the format present at transport."""
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
1253
        if _server_formats:
1254
            formats = klass._control_server_formats + klass._control_formats
1255
        else:
1256
            formats = klass._control_formats
1257
        for format in formats:
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1258
            try:
1259
                return format.probe_transport(transport)
1260
            except errors.NotBranchError:
1261
                # this format does not find a control dir here.
1262
                pass
1263
        raise errors.NotBranchError(path=transport.base)
1264
1265
    @classmethod
1266
    def probe_transport(klass, transport):
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1267
        """Return the .bzrdir style format present in a directory."""
1534.4.39 by Robert Collins
Basic BzrDir support.
1268
        try:
2164.2.18 by Vincent Ladeuil
Take Aaron comments into account.
1269
            format_string = transport.get(".bzr/branch-format").read()
1733.2.3 by Michael Ellerman
Don't coallesce try blocks, it can lead to confusing exceptions.
1270
        except errors.NoSuchFile:
1271
            raise errors.NotBranchError(path=transport.base)
1272
1273
        try:
1534.4.39 by Robert Collins
Basic BzrDir support.
1274
            return klass._formats[format_string]
1275
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
1276
            raise errors.UnknownFormatError(format=format_string)
1534.4.39 by Robert Collins
Basic BzrDir support.
1277
1278
    @classmethod
1279
    def get_default_format(klass):
1280
        """Return the current default format."""
1281
        return klass._default_format
1282
1283
    def get_format_string(self):
1284
        """Return the ASCII format string that identifies this format."""
1285
        raise NotImplementedError(self.get_format_string)
1286
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1287
    def get_format_description(self):
1288
        """Return the short description for this format."""
1289
        raise NotImplementedError(self.get_format_description)
1290
1534.5.16 by Robert Collins
Review feedback.
1291
    def get_converter(self, format=None):
1292
        """Return the converter to use to convert bzrdirs needing converts.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1293
1294
        This returns a bzrlib.bzrdir.Converter object.
1295
1296
        This should return the best upgrader to step this format towards the
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1297
        current default format. In the case of plugins we can/should provide
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1298
        some means for them to extend the range of returnable converters.
1534.5.13 by Robert Collins
Correct buggy test.
1299
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1300
        :param format: Optional format to override the default format of the 
1534.5.13 by Robert Collins
Correct buggy test.
1301
                       library.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1302
        """
1534.5.16 by Robert Collins
Review feedback.
1303
        raise NotImplementedError(self.get_converter)
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1304
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
1305
    def initialize(self, url, possible_transports=None):
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1306
        """Create a bzr control dir at this url and return an opened copy.
1307
        
1308
        Subclasses should typically override initialize_on_transport
1309
        instead of this method.
1310
        """
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
1311
        return self.initialize_on_transport(get_transport(url,
1312
                                                          possible_transports))
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1313
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1314
    def initialize_on_transport(self, transport):
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1315
        """Initialize a new bzrdir in the base directory of a Transport."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1316
        # Since we don't have a .bzr directory, inherit the
1534.4.39 by Robert Collins
Basic BzrDir support.
1317
        # mode from the root directory
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1318
        temp_control = lockable_files.LockableFiles(transport,
1319
                            '', lockable_files.TransportLock)
1534.4.39 by Robert Collins
Basic BzrDir support.
1320
        temp_control._transport.mkdir('.bzr',
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1321
                                      # FIXME: RBC 20060121 don't peek under
1534.4.39 by Robert Collins
Basic BzrDir support.
1322
                                      # the covers
1323
                                      mode=temp_control._dir_mode)
1324
        file_mode = temp_control._file_mode
1325
        del temp_control
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1326
        mutter('created control directory in ' + transport.base)
1327
        control = transport.clone('.bzr')
1534.4.39 by Robert Collins
Basic BzrDir support.
1328
        utf8_files = [('README', 
1329
                       "This is a Bazaar-NG control directory.\n"
1330
                       "Do not change any files in this directory.\n"),
1331
                      ('branch-format', self.get_format_string()),
1332
                      ]
1333
        # NB: no need to escape relative paths that are url safe.
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1334
        control_files = lockable_files.LockableFiles(control,
1335
                            self._lock_file_name, self._lock_class)
1553.5.60 by Martin Pool
New LockableFiles.create_lock() method
1336
        control_files.create_lock()
1534.4.39 by Robert Collins
Basic BzrDir support.
1337
        control_files.lock_write()
1338
        try:
1339
            for file, content in utf8_files:
1340
                control_files.put_utf8(file, content)
1341
        finally:
1342
            control_files.unlock()
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1343
        return self.open(transport, _found=True)
1534.4.39 by Robert Collins
Basic BzrDir support.
1344
1345
    def is_supported(self):
1346
        """Is this format supported?
1347
1348
        Supported formats must be initializable and openable.
1349
        Unsupported formats may not support initialization or committing or 
1350
        some other features depending on the reason for not being supported.
1351
        """
1352
        return True
1353
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1354
    def same_model(self, target_format):
1355
        return (self.repository_format.rich_root_data == 
1356
            target_format.rich_root_data)
1357
1733.1.3 by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
1358
    @classmethod
1359
    def known_formats(klass):
1360
        """Return all the known formats.
1361
        
1362
        Concrete formats should override _known_formats.
1363
        """
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1364
        # There is double indirection here to make sure that control 
1365
        # formats used by more than one dir format will only be probed 
1366
        # once. This can otherwise be quite expensive for remote connections.
1733.1.3 by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
1367
        result = set()
1368
        for format in klass._control_formats:
1369
            result.update(format._known_formats())
1370
        return result
1371
    
1372
    @classmethod
1373
    def _known_formats(klass):
1374
        """Return the known format instances for this control format."""
1375
        return set(klass._formats.values())
1376
1534.4.39 by Robert Collins
Basic BzrDir support.
1377
    def open(self, transport, _found=False):
1378
        """Return an instance of this format for the dir transport points at.
1379
        
1380
        _found is a private parameter, do not use it.
1381
        """
1382
        if not _found:
2090.2.2 by Martin Pool
Fix an assertion with side effects
1383
            found_format = BzrDirFormat.find_format(transport)
1384
            if not isinstance(found_format, self.__class__):
1385
                raise AssertionError("%s was asked to open %s, but it seems to need "
1386
                        "format %s" 
1387
                        % (self, transport, found_format))
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1388
        return self._open(transport)
1389
1390
    def _open(self, transport):
1391
        """Template method helper for opening BzrDirectories.
1392
1393
        This performs the actual open and any additional logic or parameter
1394
        passing.
1395
        """
1396
        raise NotImplementedError(self._open)
1534.4.39 by Robert Collins
Basic BzrDir support.
1397
1398
    @classmethod
1399
    def register_format(klass, format):
1400
        klass._formats[format.get_format_string()] = format
1401
1402
    @classmethod
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1403
    def register_control_format(klass, format):
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
1404
        """Register a format that does not use '.bzr' for its control dir.
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1405
1406
        TODO: This should be pulled up into a 'ControlDirFormat' base class
1407
        which BzrDirFormat can inherit from, and renamed to register_format 
1408
        there. It has been done without that for now for simplicity of
1409
        implementation.
1410
        """
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
1411
        klass._control_formats.append(format)
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1412
1413
    @classmethod
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1414
    def register_control_server_format(klass, format):
1415
        """Register a control format for client-server environments.
1416
1417
        These formats will be tried before ones registered with
1418
        register_control_format.  This gives implementations that decide to the
1419
        chance to grab it before anything looks at the contents of the format
1420
        file.
1421
        """
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
1422
        klass._control_server_formats.append(format)
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1423
1424
    @classmethod
2204.4.12 by Aaron Bentley
Deprecate bzrdir.BzrDirFormat.set_default_format
1425
    @symbol_versioning.deprecated_method(symbol_versioning.zero_fourteen)
1534.4.39 by Robert Collins
Basic BzrDir support.
1426
    def set_default_format(klass, format):
2204.5.2 by Aaron Bentley
Tweak set_default_format
1427
        klass._set_default_format(format)
1534.4.39 by Robert Collins
Basic BzrDir support.
1428
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
1429
    @classmethod
1430
    def _set_default_format(klass, format):
1431
        """Set default format (for testing behavior of defaults only)"""
1432
        klass._default_format = format
1433
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
1434
    def __str__(self):
1435
        return self.get_format_string()[:-1]
1436
1534.4.39 by Robert Collins
Basic BzrDir support.
1437
    @classmethod
1438
    def unregister_format(klass, format):
1439
        assert klass._formats[format.get_format_string()] is format
1440
        del klass._formats[format.get_format_string()]
1441
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1442
    @classmethod
1443
    def unregister_control_format(klass, format):
1444
        klass._control_formats.remove(format)
1445
1446
1534.4.39 by Robert Collins
Basic BzrDir support.
1447
class BzrDirFormat4(BzrDirFormat):
1448
    """Bzr dir format 4.
1449
1450
    This format is a combined format for working tree, branch and repository.
1451
    It has:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1452
     - Format 1 working trees [always]
1453
     - Format 4 branches [always]
1454
     - Format 4 repositories [always]
1534.4.39 by Robert Collins
Basic BzrDir support.
1455
1456
    This format is deprecated: it indexes texts using a text it which is
1457
    removed in format 5; write support for this format has been removed.
1458
    """
1459
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1460
    _lock_class = lockable_files.TransportLock
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1461
1534.4.39 by Robert Collins
Basic BzrDir support.
1462
    def get_format_string(self):
1463
        """See BzrDirFormat.get_format_string()."""
1464
        return "Bazaar-NG branch, format 0.0.4\n"
1465
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1466
    def get_format_description(self):
1467
        """See BzrDirFormat.get_format_description()."""
1468
        return "All-in-one format 4"
1469
1534.5.16 by Robert Collins
Review feedback.
1470
    def get_converter(self, format=None):
1471
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
1472
        # there is one and only one upgrade path here.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1473
        return ConvertBzrDir4To5()
1474
        
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1475
    def initialize_on_transport(self, transport):
1534.4.39 by Robert Collins
Basic BzrDir support.
1476
        """Format 4 branches cannot be created."""
1477
        raise errors.UninitializableFormat(self)
1478
1479
    def is_supported(self):
1480
        """Format 4 is not supported.
1481
1482
        It is not supported because the model changed from 4 to 5 and the
1483
        conversion logic is expensive - so doing it on the fly was not 
1484
        feasible.
1485
        """
1486
        return False
1487
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1488
    def _open(self, transport):
1489
        """See BzrDirFormat._open."""
1490
        return BzrDir4(transport, self)
1491
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1492
    def __return_repository_format(self):
1493
        """Circular import protection."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1494
        from bzrlib.repofmt.weaverepo import RepositoryFormat4
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1495
        return RepositoryFormat4()
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1496
    repository_format = property(__return_repository_format)
1497
1534.4.39 by Robert Collins
Basic BzrDir support.
1498
1499
class BzrDirFormat5(BzrDirFormat):
1500
    """Bzr control format 5.
1501
1502
    This format is a combined format for working tree, branch and repository.
1503
    It has:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1504
     - Format 2 working trees [always] 
1505
     - Format 4 branches [always] 
1534.4.53 by Robert Collins
Review feedback from John Meinel.
1506
     - Format 5 repositories [always]
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1507
       Unhashed stores in the repository.
1534.4.39 by Robert Collins
Basic BzrDir support.
1508
    """
1509
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1510
    _lock_class = lockable_files.TransportLock
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1511
1534.4.39 by Robert Collins
Basic BzrDir support.
1512
    def get_format_string(self):
1513
        """See BzrDirFormat.get_format_string()."""
1514
        return "Bazaar-NG branch, format 5\n"
1515
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1516
    def get_format_description(self):
1517
        """See BzrDirFormat.get_format_description()."""
1518
        return "All-in-one format 5"
1519
1534.5.16 by Robert Collins
Review feedback.
1520
    def get_converter(self, format=None):
1521
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
1522
        # there is one and only one upgrade path here.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1523
        return ConvertBzrDir5To6()
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1524
1525
    def _initialize_for_clone(self, url):
1526
        return self.initialize_on_transport(get_transport(url), _cloning=True)
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1527
        
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1528
    def initialize_on_transport(self, transport, _cloning=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1529
        """Format 5 dirs always have working tree, branch and repository.
1530
        
1531
        Except when they are being cloned.
1532
        """
1533
        from bzrlib.branch import BzrBranchFormat4
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1534
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1535
        from bzrlib.workingtree import WorkingTreeFormat2
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1536
        result = (super(BzrDirFormat5, self).initialize_on_transport(transport))
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1537
        RepositoryFormat5().initialize(result, _internal=True)
1538
        if not _cloning:
1910.5.1 by Andrew Bennetts
Make some old formats create at least a stub working tree rather than incomplete bzrdirs, and change some tests to use the test suite transport rather than hard-coded to local-only.
1539
            branch = BzrBranchFormat4().initialize(result)
1540
            try:
1541
                WorkingTreeFormat2().initialize(result)
1542
            except errors.NotLocalUrl:
1543
                # Even though we can't access the working tree, we need to
1544
                # create its control files.
1545
                WorkingTreeFormat2().stub_initialize_remote(branch.control_files)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1546
        return result
1547
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1548
    def _open(self, transport):
1549
        """See BzrDirFormat._open."""
1550
        return BzrDir5(transport, self)
1551
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1552
    def __return_repository_format(self):
1553
        """Circular import protection."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1554
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1555
        return RepositoryFormat5()
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1556
    repository_format = property(__return_repository_format)
1557
1534.4.39 by Robert Collins
Basic BzrDir support.
1558
1559
class BzrDirFormat6(BzrDirFormat):
1560
    """Bzr control format 6.
1561
1562
    This format is a combined format for working tree, branch and repository.
1563
    It has:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1564
     - Format 2 working trees [always] 
1565
     - Format 4 branches [always] 
1566
     - Format 6 repositories [always]
1534.4.39 by Robert Collins
Basic BzrDir support.
1567
    """
1568
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1569
    _lock_class = lockable_files.TransportLock
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1570
1534.4.39 by Robert Collins
Basic BzrDir support.
1571
    def get_format_string(self):
1572
        """See BzrDirFormat.get_format_string()."""
1573
        return "Bazaar-NG branch, format 6\n"
1574
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1575
    def get_format_description(self):
1576
        """See BzrDirFormat.get_format_description()."""
1577
        return "All-in-one format 6"
1578
1534.5.16 by Robert Collins
Review feedback.
1579
    def get_converter(self, format=None):
1580
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
1581
        # there is one and only one upgrade path here.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1582
        return ConvertBzrDir6ToMeta()
1583
        
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1584
    def _initialize_for_clone(self, url):
1585
        return self.initialize_on_transport(get_transport(url), _cloning=True)
1586
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1587
    def initialize_on_transport(self, transport, _cloning=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1588
        """Format 6 dirs always have working tree, branch and repository.
1589
        
1590
        Except when they are being cloned.
1591
        """
1592
        from bzrlib.branch import BzrBranchFormat4
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1593
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1594
        from bzrlib.workingtree import WorkingTreeFormat2
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1595
        result = super(BzrDirFormat6, self).initialize_on_transport(transport)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1596
        RepositoryFormat6().initialize(result, _internal=True)
1597
        if not _cloning:
1910.5.1 by Andrew Bennetts
Make some old formats create at least a stub working tree rather than incomplete bzrdirs, and change some tests to use the test suite transport rather than hard-coded to local-only.
1598
            branch = BzrBranchFormat4().initialize(result)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1599
            try:
1600
                WorkingTreeFormat2().initialize(result)
1601
            except errors.NotLocalUrl:
1910.5.1 by Andrew Bennetts
Make some old formats create at least a stub working tree rather than incomplete bzrdirs, and change some tests to use the test suite transport rather than hard-coded to local-only.
1602
                # Even though we can't access the working tree, we need to
1603
                # create its control files.
1604
                WorkingTreeFormat2().stub_initialize_remote(branch.control_files)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1605
        return result
1606
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1607
    def _open(self, transport):
1608
        """See BzrDirFormat._open."""
1609
        return BzrDir6(transport, self)
1610
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1611
    def __return_repository_format(self):
1612
        """Circular import protection."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1613
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1614
        return RepositoryFormat6()
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1615
    repository_format = property(__return_repository_format)
1616
1534.4.39 by Robert Collins
Basic BzrDir support.
1617
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1618
class BzrDirMetaFormat1(BzrDirFormat):
1619
    """Bzr meta control format 1
1620
1621
    This is the first format with split out working tree, branch and repository
1622
    disk storage.
1623
    It has:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1624
     - Format 3 working trees [optional]
1625
     - Format 5 branches [optional]
1626
     - Format 7 repositories [optional]
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1627
    """
1628
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1629
    _lock_class = lockdir.LockDir
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1630
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1631
    def __init__(self):
1632
        self._workingtree_format = None
2230.3.1 by Aaron Bentley
Get branch6 creation working
1633
        self._branch_format = None
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1634
2100.3.15 by Aaron Bentley
get test suite passing
1635
    def __eq__(self, other):
1636
        if other.__class__ is not self.__class__:
1637
            return False
1638
        if other.repository_format != self.repository_format:
1639
            return False
1640
        if other.workingtree_format != self.workingtree_format:
1641
            return False
1642
        return True
1643
2100.3.35 by Aaron Bentley
equality operations on bzrdir
1644
    def __ne__(self, other):
1645
        return not self == other
1646
2230.3.55 by Aaron Bentley
Updates from review
1647
    def get_branch_format(self):
2230.3.1 by Aaron Bentley
Get branch6 creation working
1648
        if self._branch_format is None:
1649
            from bzrlib.branch import BranchFormat
1650
            self._branch_format = BranchFormat.get_default_format()
1651
        return self._branch_format
1652
2230.3.55 by Aaron Bentley
Updates from review
1653
    def set_branch_format(self, format):
2230.3.1 by Aaron Bentley
Get branch6 creation working
1654
        self._branch_format = format
1655
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1656
    def get_converter(self, format=None):
1657
        """See BzrDirFormat.get_converter()."""
1658
        if format is None:
1659
            format = BzrDirFormat.get_default_format()
1660
        if not isinstance(self, format.__class__):
1661
            # converting away from metadir is not implemented
1662
            raise NotImplementedError(self.get_converter)
1663
        return ConvertMetaToMeta(format)
1664
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1665
    def get_format_string(self):
1666
        """See BzrDirFormat.get_format_string()."""
1667
        return "Bazaar-NG meta directory, format 1\n"
1668
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1669
    def get_format_description(self):
1670
        """See BzrDirFormat.get_format_description()."""
1671
        return "Meta directory format 1"
1672
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1673
    def _open(self, transport):
1674
        """See BzrDirFormat._open."""
2230.3.24 by Aaron Bentley
Remove format-on-open code
1675
        return BzrDirMeta1(transport, self)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1676
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1677
    def __return_repository_format(self):
1678
        """Circular import protection."""
1679
        if getattr(self, '_repository_format', None):
1680
            return self._repository_format
1681
        from bzrlib.repository import RepositoryFormat
1682
        return RepositoryFormat.get_default_format()
1683
1684
    def __set_repository_format(self, value):
1685
        """Allow changint the repository format for metadir formats."""
1686
        self._repository_format = value
1553.5.72 by Martin Pool
Clean up test for Branch5 lockdirs
1687
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1688
    repository_format = property(__return_repository_format, __set_repository_format)
1689
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1690
    def __get_workingtree_format(self):
1691
        if self._workingtree_format is None:
1692
            from bzrlib.workingtree import WorkingTreeFormat
1693
            self._workingtree_format = WorkingTreeFormat.get_default_format()
1694
        return self._workingtree_format
1695
1696
    def __set_workingtree_format(self, wt_format):
1697
        self._workingtree_format = wt_format
1698
1699
    workingtree_format = property(__get_workingtree_format,
1700
                                  __set_workingtree_format)
1701
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1702
2164.2.19 by Vincent Ladeuil
Revert BzrDirFormat1 registering.
1703
# Register bzr control format
1704
BzrDirFormat.register_control_format(BzrDirFormat)
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
1705
1706
# Register bzr formats
1534.4.39 by Robert Collins
Basic BzrDir support.
1707
BzrDirFormat.register_format(BzrDirFormat4())
1708
BzrDirFormat.register_format(BzrDirFormat5())
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1709
BzrDirFormat.register_format(BzrDirFormat6())
1710
__default_format = BzrDirMetaFormat1()
1534.4.39 by Robert Collins
Basic BzrDir support.
1711
BzrDirFormat.register_format(__default_format)
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
1712
BzrDirFormat._default_format = __default_format
1534.4.39 by Robert Collins
Basic BzrDir support.
1713
1714
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1715
class Converter(object):
1716
    """Converts a disk format object from one format to another."""
1717
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1718
    def convert(self, to_convert, pb):
1719
        """Perform the conversion of to_convert, giving feedback via pb.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1720
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1721
        :param to_convert: The disk object to convert.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1722
        :param pb: a progress bar to use for progress information.
1723
        """
1724
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1725
    def step(self, message):
1726
        """Update the pb by a step."""
1727
        self.count +=1
1728
        self.pb.update(message, self.count, self.total)
1729
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1730
1731
class ConvertBzrDir4To5(Converter):
1732
    """Converts format 4 bzr dirs to format 5."""
1733
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1734
    def __init__(self):
1735
        super(ConvertBzrDir4To5, self).__init__()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1736
        self.converted_revs = set()
1737
        self.absent_revisions = set()
1738
        self.text_count = 0
1739
        self.revisions = {}
1740
        
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1741
    def convert(self, to_convert, pb):
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1742
        """See Converter.convert()."""
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1743
        self.bzrdir = to_convert
1744
        self.pb = pb
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1745
        self.pb.note('starting upgrade from format 4 to 5')
1746
        if isinstance(self.bzrdir.transport, LocalTransport):
1747
            self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
1748
        self._convert_to_weaves()
1749
        return BzrDir.open(self.bzrdir.root_transport.base)
1750
1751
    def _convert_to_weaves(self):
1752
        self.pb.note('note: upgrade may be faster if all store files are ungzipped first')
1753
        try:
1754
            # TODO permissions
1755
            stat = self.bzrdir.transport.stat('weaves')
1756
            if not S_ISDIR(stat.st_mode):
1757
                self.bzrdir.transport.delete('weaves')
1758
                self.bzrdir.transport.mkdir('weaves')
1759
        except errors.NoSuchFile:
1760
            self.bzrdir.transport.mkdir('weaves')
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
1761
        # deliberately not a WeaveFile as we want to build it up slowly.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1762
        self.inv_weave = Weave('inventory')
1763
        # holds in-memory weaves for all files
1764
        self.text_weaves = {}
1765
        self.bzrdir.transport.delete('branch-format')
1766
        self.branch = self.bzrdir.open_branch()
1767
        self._convert_working_inv()
1768
        rev_history = self.branch.revision_history()
1769
        # to_read is a stack holding the revisions we still need to process;
1770
        # appending to it adds new highest-priority revisions
1771
        self.known_revisions = set(rev_history)
1772
        self.to_read = rev_history[-1:]
1773
        while self.to_read:
1774
            rev_id = self.to_read.pop()
1775
            if (rev_id not in self.revisions
1776
                and rev_id not in self.absent_revisions):
1777
                self._load_one_rev(rev_id)
1778
        self.pb.clear()
1779
        to_import = self._make_order()
1780
        for i, rev_id in enumerate(to_import):
1781
            self.pb.update('converting revision', i, len(to_import))
1782
            self._convert_one_rev(rev_id)
1783
        self.pb.clear()
1784
        self._write_all_weaves()
1785
        self._write_all_revs()
1786
        self.pb.note('upgraded to weaves:')
1787
        self.pb.note('  %6d revisions and inventories', len(self.revisions))
1788
        self.pb.note('  %6d revisions not present', len(self.absent_revisions))
1789
        self.pb.note('  %6d texts', self.text_count)
1790
        self._cleanup_spare_files_after_format4()
1791
        self.branch.control_files.put_utf8('branch-format', BzrDirFormat5().get_format_string())
1792
1793
    def _cleanup_spare_files_after_format4(self):
1794
        # FIXME working tree upgrade foo.
1795
        for n in 'merged-patches', 'pending-merged-patches':
1796
            try:
1797
                ## assert os.path.getsize(p) == 0
1798
                self.bzrdir.transport.delete(n)
1799
            except errors.NoSuchFile:
1800
                pass
1801
        self.bzrdir.transport.delete_tree('inventory-store')
1802
        self.bzrdir.transport.delete_tree('text-store')
1803
1804
    def _convert_working_inv(self):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1805
        inv = xml4.serializer_v4.read_inventory(
1806
                    self.branch.control_files.get('inventory'))
1807
        new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1808
        # FIXME inventory is a working tree change.
1955.3.4 by John Arbash Meinel
Fix 2 calls to 'put()' that were using strings instead of files
1809
        self.branch.control_files.put('inventory', StringIO(new_inv_xml))
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1810
1811
    def _write_all_weaves(self):
1812
        controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)
1813
        weave_transport = self.bzrdir.transport.clone('weaves')
1814
        weaves = WeaveStore(weave_transport, prefixed=False)
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
1815
        transaction = WriteTransaction()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1816
1817
        try:
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
1818
            i = 0
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1819
            for file_id, file_weave in self.text_weaves.items():
1820
                self.pb.update('writing weave', i, len(self.text_weaves))
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
1821
                weaves._put_weave(file_id, file_weave, transaction)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1822
                i += 1
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
1823
            self.pb.update('inventory', 0, 1)
1824
            controlweaves._put_weave('inventory', self.inv_weave, transaction)
1825
            self.pb.update('inventory', 1, 1)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1826
        finally:
1827
            self.pb.clear()
1828
1829
    def _write_all_revs(self):
1830
        """Write all revisions out in new form."""
1831
        self.bzrdir.transport.delete_tree('revision-store')
1832
        self.bzrdir.transport.mkdir('revision-store')
1833
        revision_transport = self.bzrdir.transport.clone('revision-store')
1834
        # TODO permissions
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1835
        _revision_store = TextRevisionStore(TextStore(revision_transport,
1836
                                                      prefixed=False,
1837
                                                      compressed=True))
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1838
        try:
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1839
            transaction = WriteTransaction()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1840
            for i, rev_id in enumerate(self.converted_revs):
1841
                self.pb.update('write revision', i, len(self.converted_revs))
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1842
                _revision_store.add_revision(self.revisions[rev_id], transaction)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1843
        finally:
1844
            self.pb.clear()
1845
            
1846
    def _load_one_rev(self, rev_id):
1847
        """Load a revision object into memory.
1848
1849
        Any parents not either loaded or abandoned get queued to be
1850
        loaded."""
1851
        self.pb.update('loading revision',
1852
                       len(self.revisions),
1853
                       len(self.known_revisions))
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1854
        if not self.branch.repository.has_revision(rev_id):
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1855
            self.pb.clear()
1856
            self.pb.note('revision {%s} not present in branch; '
1857
                         'will be converted as a ghost',
1858
                         rev_id)
1859
            self.absent_revisions.add(rev_id)
1860
        else:
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1861
            rev = self.branch.repository._revision_store.get_revision(rev_id,
1862
                self.branch.repository.get_transaction())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1863
            for parent_id in rev.parent_ids:
1864
                self.known_revisions.add(parent_id)
1865
                self.to_read.append(parent_id)
1866
            self.revisions[rev_id] = rev
1867
1868
    def _load_old_inventory(self, rev_id):
1869
        assert rev_id not in self.converted_revs
1870
        old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1871
        inv = xml4.serializer_v4.read_inventory_from_string(old_inv_xml)
1910.2.36 by Aaron Bentley
Get upgrade from format4 under test and fixed for all formats
1872
        inv.revision_id = rev_id
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1873
        rev = self.revisions[rev_id]
1874
        if rev.inventory_sha1:
1875
            assert rev.inventory_sha1 == sha_string(old_inv_xml), \
1876
                'inventory sha mismatch for {%s}' % rev_id
1877
        return inv
1878
1879
    def _load_updated_inventory(self, rev_id):
1880
        assert rev_id in self.converted_revs
1881
        inv_xml = self.inv_weave.get_text(rev_id)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1882
        inv = xml5.serializer_v5.read_inventory_from_string(inv_xml)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1883
        return inv
1884
1885
    def _convert_one_rev(self, rev_id):
1886
        """Convert revision and all referenced objects to new format."""
1887
        rev = self.revisions[rev_id]
1888
        inv = self._load_old_inventory(rev_id)
1889
        present_parents = [p for p in rev.parent_ids
1890
                           if p not in self.absent_revisions]
1891
        self._convert_revision_contents(rev, inv, present_parents)
1892
        self._store_new_weave(rev, inv, present_parents)
1893
        self.converted_revs.add(rev_id)
1894
1895
    def _store_new_weave(self, rev, inv, present_parents):
1896
        # the XML is now updated with text versions
1897
        if __debug__:
1907.1.8 by Aaron Bentley
Remove is_root
1898
            entries = inv.iter_entries()
1899
            entries.next()
1900
            for path, ie in entries:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1901
                assert getattr(ie, 'revision', None) is not None, \
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1902
                    'no revision on {%s} in {%s}' % \
1903
                    (file_id, rev.revision_id)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1904
        new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1905
        new_inv_sha1 = sha_string(new_inv_xml)
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1906
        self.inv_weave.add_lines(rev.revision_id, 
1907
                                 present_parents,
1908
                                 new_inv_xml.splitlines(True))
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1909
        rev.inventory_sha1 = new_inv_sha1
1910
1911
    def _convert_revision_contents(self, rev, inv, present_parents):
1912
        """Convert all the files within a revision.
1913
1914
        Also upgrade the inventory to refer to the text revision ids."""
1915
        rev_id = rev.revision_id
1916
        mutter('converting texts of revision {%s}',
1917
               rev_id)
1918
        parent_invs = map(self._load_updated_inventory, present_parents)
1731.1.62 by Aaron Bentley
Changes from review comments
1919
        entries = inv.iter_entries()
1920
        entries.next()
1921
        for path, ie in entries:
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1922
            self._convert_file_version(rev, ie, parent_invs)
1923
1924
    def _convert_file_version(self, rev, ie, parent_invs):
1925
        """Convert one version of one file.
1926
1927
        The file needs to be added into the weave if it is a merge
1928
        of >=2 parents or if it's changed from its parent.
1929
        """
1930
        file_id = ie.file_id
1931
        rev_id = rev.revision_id
1932
        w = self.text_weaves.get(file_id)
1933
        if w is None:
1934
            w = Weave(file_id)
1935
            self.text_weaves[file_id] = w
1936
        text_changed = False
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
1937
        previous_entries = ie.find_previous_heads(parent_invs,
1938
                                                  None,
1939
                                                  None,
1940
                                                  entry_vf=w)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1941
        for old_revision in previous_entries:
1942
                # if this fails, its a ghost ?
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1943
                assert old_revision in self.converted_revs, \
1944
                    "Revision {%s} not in converted_revs" % old_revision
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1945
        self.snapshot_ie(previous_entries, ie, w, rev_id)
1946
        del ie.text_id
1947
        assert getattr(ie, 'revision', None) is not None
1948
1949
    def snapshot_ie(self, previous_revisions, ie, w, rev_id):
1950
        # TODO: convert this logic, which is ~= snapshot to
1951
        # a call to:. This needs the path figured out. rather than a work_tree
1952
        # a v4 revision_tree can be given, or something that looks enough like
1953
        # one to give the file content to the entry if it needs it.
1954
        # and we need something that looks like a weave store for snapshot to 
1955
        # save against.
1956
        #ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
1957
        if len(previous_revisions) == 1:
1958
            previous_ie = previous_revisions.values()[0]
1959
            if ie._unchanged(previous_ie):
1960
                ie.revision = previous_ie.revision
1961
                return
1962
        if ie.has_text():
2661.1.1 by Robert Collins
Ancient unused Repository.text_store attribute has been removed. (Robert Collins)
1963
            text = self.branch.repository.weave_store.get(ie.text_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1964
            file_lines = text.readlines()
1965
            assert sha_strings(file_lines) == ie.text_sha1
1966
            assert sum(map(len, file_lines)) == ie.text_size
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1967
            w.add_lines(rev_id, previous_revisions, file_lines)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1968
            self.text_count += 1
1969
        else:
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1970
            w.add_lines(rev_id, previous_revisions, [])
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1971
        ie.revision = rev_id
1972
1973
    def _make_order(self):
1974
        """Return a suitable order for importing revisions.
1975
1976
        The order must be such that an revision is imported after all
1977
        its (present) parents.
1978
        """
1979
        todo = set(self.revisions.keys())
1980
        done = self.absent_revisions.copy()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1981
        order = []
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1982
        while todo:
1983
            # scan through looking for a revision whose parents
1984
            # are all done
1985
            for rev_id in sorted(list(todo)):
1986
                rev = self.revisions[rev_id]
1987
                parent_ids = set(rev.parent_ids)
1988
                if parent_ids.issubset(done):
1989
                    # can take this one now
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1990
                    order.append(rev_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1991
                    todo.remove(rev_id)
1992
                    done.add(rev_id)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1993
        return order
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1994
1995
1996
class ConvertBzrDir5To6(Converter):
1997
    """Converts format 5 bzr dirs to format 6."""
1998
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1999
    def convert(self, to_convert, pb):
2000
        """See Converter.convert()."""
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2001
        self.bzrdir = to_convert
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2002
        self.pb = pb
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2003
        self.pb.note('starting upgrade from format 5 to 6')
2004
        self._convert_to_prefixed()
2005
        return BzrDir.open(self.bzrdir.root_transport.base)
2006
2007
    def _convert_to_prefixed(self):
1608.2.1 by Martin Pool
[merge] Storage filename escaping
2008
        from bzrlib.store import TransportStore
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2009
        self.bzrdir.transport.delete('branch-format')
2010
        for store_name in ["weaves", "revision-store"]:
1608.2.1 by Martin Pool
[merge] Storage filename escaping
2011
            self.pb.note("adding prefixes to %s" % store_name)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2012
            store_transport = self.bzrdir.transport.clone(store_name)
1608.2.1 by Martin Pool
[merge] Storage filename escaping
2013
            store = TransportStore(store_transport, prefixed=True)
1608.1.1 by Martin Pool
[patch] LocalTransport.list_dir should return url-quoted strings (ddaa)
2014
            for urlfilename in store_transport.list_dir('.'):
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
2015
                filename = urlutils.unescape(urlfilename)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2016
                if (filename.endswith(".weave") or
2017
                    filename.endswith(".gz") or
2018
                    filename.endswith(".sig")):
2019
                    file_id = os.path.splitext(filename)[0]
2020
                else:
2021
                    file_id = filename
1608.2.1 by Martin Pool
[merge] Storage filename escaping
2022
                prefix_dir = store.hash_prefix(file_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2023
                # FIXME keep track of the dirs made RBC 20060121
2024
                try:
2025
                    store_transport.move(filename, prefix_dir + '/' + filename)
2026
                except errors.NoSuchFile: # catches missing dirs strangely enough
2027
                    store_transport.mkdir(prefix_dir)
2028
                    store_transport.move(filename, prefix_dir + '/' + filename)
2029
        self.bzrdir._control_files.put_utf8('branch-format', BzrDirFormat6().get_format_string())
2030
2031
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2032
class ConvertBzrDir6ToMeta(Converter):
2033
    """Converts format 6 bzr dirs to metadirs."""
2034
2035
    def convert(self, to_convert, pb):
2036
        """See Converter.convert()."""
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
2037
        from bzrlib.repofmt.weaverepo import RepositoryFormat7
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
2038
        from bzrlib.branch import BzrBranchFormat5
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2039
        self.bzrdir = to_convert
2040
        self.pb = pb
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2041
        self.count = 0
2042
        self.total = 20 # the steps we know about
2043
        self.garbage_inventories = []
2044
1534.5.13 by Robert Collins
Correct buggy test.
2045
        self.pb.note('starting upgrade from format 6 to metadir')
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2046
        self.bzrdir._control_files.put_utf8('branch-format', "Converting to format 6")
2047
        # its faster to move specific files around than to open and use the apis...
2048
        # first off, nuke ancestry.weave, it was never used.
2049
        try:
2050
            self.step('Removing ancestry.weave')
2051
            self.bzrdir.transport.delete('ancestry.weave')
2052
        except errors.NoSuchFile:
2053
            pass
2054
        # find out whats there
2055
        self.step('Finding branch files')
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
2056
        last_revision = self.bzrdir.open_branch().last_revision()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2057
        bzrcontents = self.bzrdir.transport.list_dir('.')
2058
        for name in bzrcontents:
2059
            if name.startswith('basis-inventory.'):
2060
                self.garbage_inventories.append(name)
2061
        # create new directories for repository, working tree and branch
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
2062
        self.dir_mode = self.bzrdir._control_files._dir_mode
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2063
        self.file_mode = self.bzrdir._control_files._file_mode
2064
        repository_names = [('inventory.weave', True),
2065
                            ('revision-store', True),
2066
                            ('weaves', True)]
2067
        self.step('Upgrading repository  ')
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
2068
        self.bzrdir.transport.mkdir('repository', mode=self.dir_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2069
        self.make_lock('repository')
2070
        # we hard code the formats here because we are converting into
2071
        # the meta format. The meta format upgrader can take this to a 
2072
        # future format within each component.
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
2073
        self.put_format('repository', RepositoryFormat7())
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2074
        for entry in repository_names:
2075
            self.move_entry('repository', entry)
2076
2077
        self.step('Upgrading branch      ')
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
2078
        self.bzrdir.transport.mkdir('branch', mode=self.dir_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2079
        self.make_lock('branch')
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
2080
        self.put_format('branch', BzrBranchFormat5())
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2081
        branch_files = [('revision-history', True),
2082
                        ('branch-name', True),
2083
                        ('parent', False)]
2084
        for entry in branch_files:
2085
            self.move_entry('branch', entry)
2086
2087
        checkout_files = [('pending-merges', True),
2088
                          ('inventory', True),
2089
                          ('stat-cache', False)]
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
2090
        # If a mandatory checkout file is not present, the branch does not have
2091
        # a functional checkout. Do not create a checkout in the converted
2092
        # branch.
2093
        for name, mandatory in checkout_files:
2094
            if mandatory and name not in bzrcontents:
2095
                has_checkout = False
2096
                break
2097
        else:
2098
            has_checkout = True
2099
        if not has_checkout:
2100
            self.pb.note('No working tree.')
2101
            # If some checkout files are there, we may as well get rid of them.
2102
            for name, mandatory in checkout_files:
2103
                if name in bzrcontents:
2104
                    self.bzrdir.transport.delete(name)
2105
        else:
2123.2.1 by John Arbash Meinel
Fix bug #70716, make bzrlib.bzrdir directly import bzrlib.workingtree
2106
            from bzrlib.workingtree import WorkingTreeFormat3
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
2107
            self.step('Upgrading working tree')
2108
            self.bzrdir.transport.mkdir('checkout', mode=self.dir_mode)
2109
            self.make_lock('checkout')
2110
            self.put_format(
2123.2.1 by John Arbash Meinel
Fix bug #70716, make bzrlib.bzrdir directly import bzrlib.workingtree
2111
                'checkout', WorkingTreeFormat3())
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
2112
            self.bzrdir.transport.delete_multi(
2113
                self.garbage_inventories, self.pb)
2114
            for entry in checkout_files:
2115
                self.move_entry('checkout', entry)
2116
            if last_revision is not None:
2117
                self.bzrdir._control_files.put_utf8(
2118
                    'checkout/last-revision', last_revision)
2119
        self.bzrdir._control_files.put_utf8(
2120
            'branch-format', BzrDirMetaFormat1().get_format_string())
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2121
        return BzrDir.open(self.bzrdir.root_transport.base)
2122
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2123
    def make_lock(self, name):
2124
        """Make a lock for the new control dir name."""
2125
        self.step('Make %s lock' % name)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
2126
        ld = lockdir.LockDir(self.bzrdir.transport,
2127
                             '%s/lock' % name,
2128
                             file_modebits=self.file_mode,
2129
                             dir_modebits=self.dir_mode)
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
2130
        ld.create()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2131
2132
    def move_entry(self, new_dir, entry):
2133
        """Move then entry name into new_dir."""
2134
        name = entry[0]
2135
        mandatory = entry[1]
2136
        self.step('Moving %s' % name)
2137
        try:
2138
            self.bzrdir.transport.move(name, '%s/%s' % (new_dir, name))
2139
        except errors.NoSuchFile:
2140
            if mandatory:
2141
                raise
2142
2143
    def put_format(self, dirname, format):
2144
        self.bzrdir._control_files.put_utf8('%s/format' % dirname, format.get_format_string())
2145
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
2146
2147
class ConvertMetaToMeta(Converter):
2148
    """Converts the components of metadirs."""
2149
2150
    def __init__(self, target_format):
2151
        """Create a metadir to metadir converter.
2152
2153
        :param target_format: The final metadir format that is desired.
2154
        """
2155
        self.target_format = target_format
2156
2157
    def convert(self, to_convert, pb):
2158
        """See Converter.convert()."""
2159
        self.bzrdir = to_convert
2160
        self.pb = pb
2161
        self.count = 0
2162
        self.total = 1
2163
        self.step('checking repository format')
2164
        try:
2165
            repo = self.bzrdir.open_repository()
2166
        except errors.NoRepositoryPresent:
2167
            pass
2168
        else:
2169
            if not isinstance(repo._format, self.target_format.repository_format.__class__):
2170
                from bzrlib.repository import CopyConverter
2171
                self.pb.note('starting repository conversion')
2172
                converter = CopyConverter(self.target_format.repository_format)
2173
                converter.convert(repo, pb)
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2174
        try:
2175
            branch = self.bzrdir.open_branch()
2176
        except errors.NotBranchError:
2177
            pass
2178
        else:
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2179
            # TODO: conversions of Branch and Tree should be done by
2180
            # InterXFormat lookups
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2181
            # Avoid circular imports
2182
            from bzrlib import branch as _mod_branch
2183
            if (branch._format.__class__ is _mod_branch.BzrBranchFormat5 and
2230.3.55 by Aaron Bentley
Updates from review
2184
                self.target_format.get_branch_format().__class__ is
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2185
                _mod_branch.BzrBranchFormat6):
2186
                branch_converter = _mod_branch.Converter5to6()
2187
                branch_converter.convert(branch)
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2188
        try:
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2189
            tree = self.bzrdir.open_workingtree(recommend_upgrade=False)
2255.2.196 by Robert Collins
Fix test_upgrade defects related to non local or absent working trees.
2190
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2191
            pass
2192
        else:
2193
            # TODO: conversions of Branch and Tree should be done by
2194
            # InterXFormat lookups
2195
            if (isinstance(tree, workingtree.WorkingTree3) and
2255.2.212 by Robert Collins
Fix upgrade bug exposed via repository tests, dont replace dirstate format trees during upgrade.
2196
                not isinstance(tree, workingtree_4.WorkingTree4) and
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2197
                isinstance(self.target_format.workingtree_format,
2198
                    workingtree_4.WorkingTreeFormat4)):
2199
                workingtree_4.Converter3to4().convert(tree)
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
2200
        return to_convert
1731.2.18 by Aaron Bentley
Get extract in repository under test
2201
2202
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2203
# This is not in remote.py because it's small, and needs to be registered.
2204
# Putting it in remote.py creates a circular import problem.
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
2205
# we can make it a lazy object if the control formats is turned into something
2206
# like a registry.
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2207
class RemoteBzrDirFormat(BzrDirMetaFormat1):
2208
    """Format representing bzrdirs accessed via a smart server"""
2209
2210
    def get_format_description(self):
2211
        return 'bzr remote bzrdir'
2212
    
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
2213
    @classmethod
2214
    def probe_transport(klass, transport):
2215
        """Return a RemoteBzrDirFormat object if it looks possible."""
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2216
        try:
2432.3.1 by Andrew Bennetts
Try a version 1 hello probe to determine if we can use RemoteBzrDir on a particular transport, allowing smooth interoperation with older servers.
2217
            client = transport.get_smart_client()
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2218
        except (NotImplementedError, AttributeError,
2219
                errors.TransportNotPossible):
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
2220
            # no smart server, so not a branch for this format type.
2221
            raise errors.NotBranchError(path=transport.base)
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2222
        else:
2432.3.3 by Andrew Bennetts
Update comment according to Martin's suggestion.
2223
            # Send a 'hello' request in protocol version one, and decline to
2224
            # open it if the server doesn't support our required version (2) so
2225
            # that the VFS-based transport will do it.
2432.3.1 by Andrew Bennetts
Try a version 1 hello probe to determine if we can use RemoteBzrDir on a particular transport, allowing smooth interoperation with older servers.
2226
            request = client.get_request()
2227
            smart_protocol = protocol.SmartClientRequestProtocolOne(request)
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
2228
            server_version = smart_protocol.query_version()
2229
            if server_version != 2:
2432.3.1 by Andrew Bennetts
Try a version 1 hello probe to determine if we can use RemoteBzrDir on a particular transport, allowing smooth interoperation with older servers.
2230
                raise errors.NotBranchError(path=transport.base)
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
2231
            return klass()
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2232
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
2233
    def initialize_on_transport(self, transport):
2018.5.128 by Robert Collins
Have RemoteBzrDirFormat create a local format object when it is asked to initialize something on a non-smart transport - allowing sprout to work cleanly.
2234
        try:
2235
            # hand off the request to the smart server
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
2236
            shared_medium = transport.get_shared_medium()
2018.5.128 by Robert Collins
Have RemoteBzrDirFormat create a local format object when it is asked to initialize something on a non-smart transport - allowing sprout to work cleanly.
2237
        except errors.NoSmartMedium:
2238
            # TODO: lookup the local format from a server hint.
2239
            local_dir_format = BzrDirMetaFormat1()
2240
            return local_dir_format.initialize_on_transport(transport)
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
2241
        client = _SmartClient(shared_medium)
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
2242
        path = client.remote_path_from_transport(transport)
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
2243
        response = _SmartClient(shared_medium).call('BzrDirFormat.initialize',
2244
                                                    path)
2018.5.52 by Wouter van Heyst
Provide more information when encountering unexpected responses from a smart
2245
        assert response[0] in ('ok', ), 'unexpected response code %s' % (response,)
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
2246
        return remote.RemoteBzrDir(transport)
2247
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2248
    def _open(self, transport):
2249
        return remote.RemoteBzrDir(transport)
2250
2251
    def __eq__(self, other):
2252
        if not isinstance(other, RemoteBzrDirFormat):
2253
            return False
2254
        return self.get_format_description() == other.get_format_description()
2255
2256
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
2257
BzrDirFormat.register_control_server_format(RemoteBzrDirFormat)
2018.5.45 by Andrew Bennetts
Merge from bzr.dev
2258
2259
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2260
class BzrDirFormatInfo(object):
2261
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2262
    def __init__(self, native, deprecated, hidden):
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2263
        self.deprecated = deprecated
2264
        self.native = native
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2265
        self.hidden = hidden
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2266
2267
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2268
class BzrDirFormatRegistry(registry.Registry):
2269
    """Registry of user-selectable BzrDir subformats.
2270
    
2271
    Differs from BzrDirFormat._control_formats in that it provides sub-formats,
2272
    e.g. BzrDirMeta1 with weave repository.  Also, it's more user-oriented.
2273
    """
2274
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2275
    def register_metadir(self, key,
2276
             repository_format, help, native=True, deprecated=False,
2277
             branch_format=None,
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2278
             tree_format=None,
2279
             hidden=False):
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2280
        """Register a metadir subformat.
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2281
2282
        These all use a BzrDirMetaFormat1 bzrdir, but can be parameterized
2283
        by the Repository format.
2284
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2285
        :param repository_format: The fully-qualified repository format class
2286
            name as a string.
2287
        :param branch_format: Fully-qualified branch format class name as
2288
            a string.
2289
        :param tree_format: Fully-qualified tree format class name as
2290
            a string.
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2291
        """
2292
        # This should be expanded to support setting WorkingTree and Branch
2293
        # formats, once BzrDirMetaFormat1 supports that.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2294
        def _load(full_name):
2295
            mod_name, factory_name = full_name.rsplit('.', 1)
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
2296
            try:
2297
                mod = __import__(mod_name, globals(), locals(),
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2298
                        [factory_name])
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
2299
            except ImportError, e:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2300
                raise ImportError('failed to load %s: %s' % (full_name, e))
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
2301
            try:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2302
                factory = getattr(mod, factory_name)
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2303
            except AttributeError:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2304
                raise AttributeError('no factory %s in module %r'
2305
                    % (full_name, mod))
2306
            return factory()
2307
2308
        def helper():
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2309
            bd = BzrDirMetaFormat1()
2230.3.1 by Aaron Bentley
Get branch6 creation working
2310
            if branch_format is not None:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2311
                bd.set_branch_format(_load(branch_format))
2312
            if tree_format is not None:
2313
                bd.workingtree_format = _load(tree_format)
2314
            if repository_format is not None:
2315
                bd.repository_format = _load(repository_format)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2316
            return bd
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2317
        self.register(key, helper, help, native, deprecated, hidden)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2318
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2319
    def register(self, key, factory, help, native=True, deprecated=False,
2320
                 hidden=False):
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2321
        """Register a BzrDirFormat factory.
2322
        
2323
        The factory must be a callable that takes one parameter: the key.
2324
        It must produce an instance of the BzrDirFormat when called.
2325
2326
        This function mainly exists to prevent the info object from being
2327
        supplied directly.
2328
        """
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2329
        registry.Registry.register(self, key, factory, help, 
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2330
            BzrDirFormatInfo(native, deprecated, hidden))
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2331
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
2332
    def register_lazy(self, key, module_name, member_name, help, native=True,
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2333
                      deprecated=False, hidden=False):
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
2334
        registry.Registry.register_lazy(self, key, module_name, member_name, 
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2335
            help, BzrDirFormatInfo(native, deprecated, hidden))
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2336
2337
    def set_default(self, key):
2338
        """Set the 'default' key to be a clone of the supplied key.
2339
        
2340
        This method must be called once and only once.
2341
        """
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2342
        registry.Registry.register(self, 'default', self.get(key), 
2343
            self.get_help(key), info=self.get_info(key))
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2344
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
2345
    def set_default_repository(self, key):
2346
        """Set the FormatRegistry default and Repository default.
2347
        
2348
        This is a transitional method while Repository.set_default_format
2349
        is deprecated.
2350
        """
2351
        if 'default' in self:
2352
            self.remove('default')
2353
        self.set_default(key)
2354
        format = self.get('default')()
2355
        assert isinstance(format, BzrDirMetaFormat1)
2356
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2357
    def make_bzrdir(self, key):
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
2358
        return self.get(key)()
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2359
2360
    def help_topic(self, topic):
2361
        output = textwrap.dedent("""\
2362
            These formats can be used for creating branches, working trees, and
2363
            repositories.
2204.4.2 by Aaron Bentley
Tweak topic appearance
2364
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2365
            """)
2711.2.4 by Martin Pool
Fix unbound variable error in BzrDirFormatRegistry.get_help (test order dependent)
2366
        default_realkey = None
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2367
        default_help = self.get_help('default')
2368
        help_pairs = []
2369
        for key in self.keys():
2370
            if key == 'default':
2371
                continue
2372
            help = self.get_help(key)
2373
            if help == default_help:
2374
                default_realkey = key
2375
            else:
2376
                help_pairs.append((key, help))
2377
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2378
        def wrapped(key, help, info):
2379
            if info.native:
2380
                help = '(native) ' + help
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2381
            return ':%s:\n%s\n\n' % (key, 
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2382
                    textwrap.fill(help, initial_indent='    ', 
2383
                    subsequent_indent='    '))
2711.2.4 by Martin Pool
Fix unbound variable error in BzrDirFormatRegistry.get_help (test order dependent)
2384
        if default_realkey is not None:
2385
            output += wrapped(default_realkey, '(default) %s' % default_help,
2386
                              self.get_info('default'))
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2387
        deprecated_pairs = []
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2388
        for key, help in help_pairs:
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2389
            info = self.get_info(key)
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2390
            if info.hidden:
2391
                continue
2392
            elif info.deprecated:
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2393
                deprecated_pairs.append((key, help))
2394
            else:
2395
                output += wrapped(key, help, info)
2396
        if len(deprecated_pairs) > 0:
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2397
            output += "Deprecated formats are shown below.\n\n"
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2398
            for key, help in deprecated_pairs:
2399
                info = self.get_info(key)
2400
                output += wrapped(key, help, info)
2401
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2402
        return output
2403
2404
2405
format_registry = BzrDirFormatRegistry()
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
2406
format_registry.register('weave', BzrDirFormat6,
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2407
    'Pre-0.8 format.  Slower than knit and does not'
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
2408
    ' support checkouts or shared repositories.',
2409
    deprecated=True)
2410
format_registry.register_metadir('knit',
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
2411
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2412
    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
2413
    branch_format='bzrlib.branch.BzrBranchFormat5',
2255.2.199 by Robert Collins
Fix definition of knit format; typos are not good.
2414
    tree_format='bzrlib.workingtree.WorkingTreeFormat3')
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
2415
format_registry.register_metadir('metaweave',
2416
    'bzrlib.repofmt.weaverepo.RepositoryFormat7',
2230.3.30 by Aaron Bentley
Fix whitespace issues
2417
    'Transitional format in 0.8.  Slower than knit.',
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2418
    branch_format='bzrlib.branch.BzrBranchFormat5',
2255.2.209 by Robert Collins
Remove circular imports in bzrdir format definitions.
2419
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2420
    deprecated=True)
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2421
format_registry.register_metadir('dirstate',
2422
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2423
    help='New in 0.15: Fast local operations. Compatible with bzr 0.8 and '
2424
        'above when accessed over the network.',
2425
    branch_format='bzrlib.branch.BzrBranchFormat5',
2255.2.209 by Robert Collins
Remove circular imports in bzrdir format definitions.
2426
    # this uses bzrlib.workingtree.WorkingTreeFormat4 because importing
2427
    # directly from workingtree_4 triggers a circular import.
2428
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2429
    )
1551.13.1 by Aaron Bentley
Introduce dirstate-tags format
2430
format_registry.register_metadir('dirstate-tags',
2431
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2432
    help='New in 0.15: Fast local operations and improved scaling for '
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2433
        'network operations. Additionally adds support for tags.'
2434
        ' Incompatible with bzr < 0.15.',
1551.13.1 by Aaron Bentley
Introduce dirstate-tags format
2435
    branch_format='bzrlib.branch.BzrBranchFormat6',
2436
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2437
    )
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2438
format_registry.register_metadir('dirstate-with-subtree',
2439
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
2440
    help='New in 0.15: Fast local operations and improved scaling for '
2441
        'network operations. Additionally adds support for versioning nested '
2442
        'bzr branches. Incompatible with bzr < 0.15.',
2443
    branch_format='bzrlib.branch.BzrBranchFormat6',
2255.2.209 by Robert Collins
Remove circular imports in bzrdir format definitions.
2444
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2445
    hidden=True,
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2446
    )
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
2447
format_registry.set_default('dirstate-tags')