~bzr-pqm/bzr/bzr.dev

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