/brz/remove-bazaar

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