/brz/remove-bazaar

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