/brz/remove-bazaar

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