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