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