/brz/remove-bazaar

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