~bzr-pqm/bzr/bzr.dev

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