/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5557.1.7 by John Arbash Meinel
Merge in the bzr.dev 5582
1
# Copyright (C) 2006-2011 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1534.4.39 by Robert Collins
Basic BzrDir support.
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
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
28
from __future__ import absolute_import
29
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
30
import sys
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
31
32
from bzrlib.lazy_import import lazy_import
33
lazy_import(globals(), """
1534.4.39 by Robert Collins
Basic BzrDir support.
34
import bzrlib
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
35
from bzrlib import (
5753.2.1 by Jelmer Vernooij
Work around lazy import issues.
36
    branch as _mod_branch,
5735.1.1 by Jelmer Vernooij
Move ControlDir.sprout to BzrDir.
37
    cleanup,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
38
    errors,
5735.1.1 by Jelmer Vernooij
Move ControlDir.sprout to BzrDir.
39
    fetch,
2776.1.5 by Robert Collins
Add reasonably comprehensive tests for path last modified and per file graph behaviour.
40
    graph,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
41
    lockable_files,
42
    lockdir,
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
43
    osutils,
5436.2.1 by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__.
44
    pyutils,
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
45
    remote,
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
46
    repository,
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
47
    revision as _mod_revision,
5609.9.1 by Martin
Blindly change all users of get_transport to address the function via the transport module
48
    transport as _mod_transport,
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
49
    ui,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
50
    urlutils,
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
51
    vf_search,
3023.1.2 by Alexander Belchenko
Martin's review.
52
    win32utils,
5816.5.1 by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3.
53
    workingtree_3,
3023.1.2 by Alexander Belchenko
Martin's review.
54
    workingtree_4,
3978.3.14 by Jelmer Vernooij
Move BranchBzrDirInter.push() to BzrDir.push().
55
    )
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
56
from bzrlib.repofmt import knitpack_repo
2164.2.21 by Vincent Ladeuil
Take bundles into account.
57
from bzrlib.transport import (
58
    do_catching_redirections,
3224.5.24 by Andrew Bennetts
More minor import tidying suggested by pyflakes.
59
    local,
2164.2.21 by Vincent Ladeuil
Take bundles into account.
60
    )
6138.3.1 by Jonathan Riddell
use gettext() in more files
61
from bzrlib.i18n import gettext
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
62
""")
63
2164.2.1 by v.ladeuil+lp at free
First rough http branch redirection implementation.
64
from bzrlib.trace import (
5735.1.1 by Jelmer Vernooij
Move ControlDir.sprout to BzrDir.
65
    mutter,
2164.2.1 by v.ladeuil+lp at free
First rough http branch redirection implementation.
66
    note,
67
    )
3224.5.24 by Andrew Bennetts
More minor import tidying suggested by pyflakes.
68
69
from bzrlib import (
5904.1.2 by Martin Pool
Various pyflakes import fixes.
70
    config,
71
    controldir,
5712.3.8 by Jelmer Vernooij
Support lazy registration of BzrDir formats.
72
    registry,
2711.2.1 by Martin Pool
Deprecate BzrDir.create_repository
73
    )
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
74
from bzrlib.symbol_versioning import (
75
    deprecated_in,
76
    deprecated_method,
77
    )
5363.2.2 by Jelmer Vernooij
Rename per_bzrdir => per_controldir.
78
79
5363.2.20 by Jelmer Vernooij
use controldir.X
80
class BzrDir(controldir.ControlDir):
1534.4.39 by Robert Collins
Basic BzrDir support.
81
    """A .bzr control diretory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
82
1534.4.39 by Robert Collins
Basic BzrDir support.
83
    BzrDir instances let you create or open any of the things that can be
84
    found within .bzr - checkouts, branches and repositories.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
85
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
86
    :ivar transport:
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
87
        the transport which this bzr dir is rooted at (i.e. file:///.../.bzr/)
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
88
    :ivar root_transport:
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
89
        a transport connected to the directory this bzr was opened from
90
        (i.e. the parent directory holding the .bzr directory).
3416.2.1 by Martin Pool
Add BzrDir._get_file_mode and _get_dir_mode
91
92
    Everything in the bzrdir should have the same file permissions.
4160.1.1 by Robert Collins
Add a BzrDir.pre_open hook for use by the smart server gaol.
93
94
    :cvar hooks: An instance of BzrDirHooks.
1534.4.39 by Robert Collins
Basic BzrDir support.
95
    """
96
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
97
    def break_lock(self):
98
        """Invoke break_lock on the first object in the bzrdir.
99
100
        If there is a tree, the tree is opened and break_lock() called.
101
        Otherwise, branch is tried, and finally repository.
102
        """
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
103
        # XXX: This seems more like a UI function than something that really
104
        # belongs in this class.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
105
        try:
106
            thing_to_unlock = self.open_workingtree()
107
        except (errors.NotLocalUrl, errors.NoWorkingTree):
108
            try:
109
                thing_to_unlock = self.open_branch()
110
            except errors.NotBranchError:
111
                try:
112
                    thing_to_unlock = self.open_repository()
113
                except errors.NoRepositoryPresent:
114
                    return
115
        thing_to_unlock.break_lock()
116
1910.2.12 by Aaron Bentley
Implement knit repo format 2
117
    def check_conversion_target(self, target_format):
4634.2.1 by Robert Collins
Fix regression in upgrade introduced with the change to upgrade in rev 4622.
118
        """Check that a bzrdir as a whole can be converted to a new format."""
119
        # The only current restriction is that the repository content can be 
120
        # fetched compatibly with the target.
1910.2.12 by Aaron Bentley
Implement knit repo format 2
121
        target_repo_format = target_format.repository_format
4634.2.1 by Robert Collins
Fix regression in upgrade introduced with the change to upgrade in rev 4622.
122
        try:
123
            self.open_repository()._format.check_conversion_target(
124
                target_repo_format)
125
        except errors.NoRepositoryPresent:
126
            # No repo, no problem.
127
            pass
1910.2.12 by Aaron Bentley
Implement knit repo format 2
128
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
129
    def clone_on_transport(self, transport, revision_id=None,
4294.2.2 by Robert Collins
Move use_existing and create_prefix all the way down to clone_on_transport, reducing duplicate work.
130
        force_new_repo=False, preserve_stacking=False, stacked_on=None,
5448.6.1 by Matthew Gordon
Added --no-tree option to pull. Needs testing and help text.
131
        create_prefix=False, use_existing_dir=True, no_tree=False):
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
132
        """Clone this bzrdir and its contents to transport verbatim.
133
3242.3.36 by Aaron Bentley
Updates from review comments
134
        :param transport: The transport for the location to produce the clone
135
            at.  If the target directory does not exist, it will be created.
136
        :param revision_id: The tip revision-id to use for any branch or
137
            working tree.  If not None, then the clone operation may tune
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
138
            itself to download less data.
3242.3.35 by Aaron Bentley
Cleanups and documentation
139
        :param force_new_repo: Do not use a shared repository for the target,
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
140
                               even if one is available.
3242.3.22 by Aaron Bentley
Make clone stacking optional
141
        :param preserve_stacking: When cloning a stacked branch, stack the
142
            new branch on top of the other branch's stacked-on branch.
4294.2.2 by Robert Collins
Move use_existing and create_prefix all the way down to clone_on_transport, reducing duplicate work.
143
        :param create_prefix: Create any missing directories leading up to
144
            to_transport.
145
        :param use_existing_dir: Use an existing directory if one exists.
5664.1.1 by Jelmer Vernooij
Document no_tree option to ControlDir.clone_on_transport.
146
        :param no_tree: If set to true prevents creation of a working tree.
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
147
        """
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
148
        # Overview: put together a broad description of what we want to end up
149
        # with; then make as few api calls as possible to do it.
5363.2.2 by Jelmer Vernooij
Rename per_bzrdir => per_controldir.
150
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
151
        # We may want to create a repo/branch/tree, if we do so what format
152
        # would we want for each:
3650.5.1 by Aaron Bentley
Fix push to use clone all the time.
153
        require_stacking = (stacked_on is not None)
4017.2.1 by Robert Collins
Add BzrDirFormatMeta1 test for the amount of rpc calls made initializing over the network.
154
        format = self.cloning_metadir(require_stacking)
5363.2.2 by Jelmer Vernooij
Rename per_bzrdir => per_controldir.
155
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
156
        # Figure out what objects we want:
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.
157
        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.
158
            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.
159
        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.
160
            local_repo = None
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
161
        try:
162
            local_branch = self.open_branch()
163
        except errors.NotBranchError:
164
            local_branch = None
165
        else:
166
            # enable fallbacks when branch is not a branch reference
167
            if local_branch.repository.has_same_location(local_repo):
168
                local_repo = local_branch.repository
169
            if preserve_stacking:
170
                try:
3650.5.1 by Aaron Bentley
Fix push to use clone all the time.
171
                    stacked_on = local_branch.get_stacked_on_url()
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
172
                except (errors.UnstackableBranchFormat,
173
                        errors.UnstackableRepositoryFormat,
174
                        errors.NotStacked):
175
                    pass
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
176
        # Bug: We create a metadir without knowing if it can support stacking,
177
        # we should look up the policy needs first, or just use it as a hint,
178
        # or something.
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.
179
        if local_repo:
5448.6.1 by Matthew Gordon
Added --no-tree option to pull. Needs testing and help text.
180
            make_working_trees = local_repo.make_working_trees() and not no_tree
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
181
            want_shared = local_repo.is_shared()
182
            repo_format_name = format.repository_format.network_name()
183
        else:
184
            make_working_trees = False
185
            want_shared = False
186
            repo_format_name = None
187
188
        result_repo, result, require_stacking, repository_policy = \
189
            format.initialize_on_transport_ex(transport,
190
            use_existing_dir=use_existing_dir, create_prefix=create_prefix,
191
            force_new_repo=force_new_repo, stacked_on=stacked_on,
192
            stack_on_pwd=self.root_transport.base,
193
            repo_format_name=repo_format_name,
194
            make_working_trees=make_working_trees, shared_repo=want_shared)
195
        if repo_format_name:
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
196
            try:
197
                # If the result repository is in the same place as the
198
                # resulting bzr dir, it will have no content, further if the
199
                # result is not stacked then we know all content should be
200
                # copied, and finally if we are copying up to a specific
201
                # revision_id then we can use the pending-ancestry-result which
202
                # does not require traversing all of history to describe it.
5158.6.9 by Martin Pool
Simplify various code to use user_url
203
                if (result_repo.user_url == result.user_url
204
                    and not require_stacking and
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
205
                    revision_id is not None):
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
206
                    fetch_spec = vf_search.PendingAncestryResult(
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
207
                        [revision_id], local_repo)
208
                    result_repo.fetch(local_repo, fetch_spec=fetch_spec)
209
                else:
210
                    result_repo.fetch(local_repo, revision_id=revision_id)
211
            finally:
212
                result_repo.unlock()
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
213
        else:
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
214
            if result_repo is not None:
215
                raise AssertionError('result_repo not None(%r)' % result_repo)
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.
216
        # 1 if there is a branch present
217
        #   make sure its content is available in the target repository
218
        #   clone it.
3242.3.37 by Aaron Bentley
Updates from reviews
219
        if local_branch is not None:
4050.1.1 by Robert Collins
Fix race condition with branch hooks during cloning when the new branch is stacked.
220
            result_branch = local_branch.clone(result, revision_id=revision_id,
221
                repository_policy=repository_policy)
4044.1.5 by Robert Collins
Stop trying to create working trees during clone when the target bzrdir cannot have a local abspath created for it.
222
        try:
223
            # Cheaper to check if the target is not local, than to try making
224
            # the tree and fail.
225
            result.root_transport.local_abspath('.')
226
            if result_repo is None or result_repo.make_working_trees():
6182.1.18 by Jelmer Vernooij
Fix last test.
227
                self.open_workingtree().clone(result, revision_id=revision_id)
4044.1.5 by Robert Collins
Stop trying to create working trees during clone when the target bzrdir cannot have a local abspath created for it.
228
        except (errors.NoWorkingTree, errors.NotLocalUrl):
229
            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.
230
        return result
231
1685.1.61 by Martin Pool
[broken] Change BzrDir._make_tail to use urlutils.split
232
    # TODO: This should be given a Transport, and should chdir up; otherwise
233
    # 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.
234
    def _make_tail(self, url):
6039.1.9 by Jelmer Vernooij
Fix weave tests.
235
        t = _mod_transport.get_transport(url)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
236
        t.ensure_base()
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
237
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
238
    def determine_repository_policy(self, force_new_repo=False, stack_on=None,
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
239
                                    stack_on_pwd=None, require_stacking=False):
3242.2.13 by Aaron Bentley
Update docs
240
        """Return an object representing a policy to use.
241
4165.2.1 by Robert Collins
Fix bzr failing to stack when a server requests it and the branch it is pushing from cannot stack but the branch it should stack on can.
242
        This controls whether a new repository is created, and the format of
243
        that repository, or some existing shared repository used instead.
3242.3.35 by Aaron Bentley
Cleanups and documentation
244
245
        If stack_on is supplied, will not seek a containing shared repo.
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
246
3242.3.35 by Aaron Bentley
Cleanups and documentation
247
        :param force_new_repo: If True, require a new repository to be created.
248
        :param stack_on: If supplied, the location to stack on.  If not
249
            supplied, a default_stack_on location may be used.
250
        :param stack_on_pwd: If stack_on is relative, the location it is
251
            relative to.
3242.2.13 by Aaron Bentley
Update docs
252
        """
3242.3.3 by Aaron Bentley
Use _find_containing to determine repository policy
253
        def repository_policy(found_bzrdir):
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
254
            stack_on = None
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
255
            stack_on_pwd = None
3641.1.1 by John Arbash Meinel
Merge in 1.6rc5 and revert disabling default stack on policy
256
            config = found_bzrdir.get_config()
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
257
            stop = False
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
258
            stack_on = config.get_default_stack_on()
259
            if stack_on is not None:
5158.6.9 by Martin Pool
Simplify various code to use user_url
260
                stack_on_pwd = found_bzrdir.user_url
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
261
                stop = True
3242.3.3 by Aaron Bentley
Use _find_containing to determine repository policy
262
            # does it have a repository ?
263
            try:
264
                repository = found_bzrdir.open_repository()
265
            except errors.NoRepositoryPresent:
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
266
                repository = None
267
            else:
5158.6.9 by Martin Pool
Simplify various code to use user_url
268
                if (found_bzrdir.user_url != self.user_url 
269
                    and not repository.is_shared()):
4165.2.1 by Robert Collins
Fix bzr failing to stack when a server requests it and the branch it is pushing from cannot stack but the branch it should stack on can.
270
                    # Don't look higher, can't use a higher shared repo.
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
271
                    repository = None
4165.2.1 by Robert Collins
Fix bzr failing to stack when a server requests it and the branch it is pushing from cannot stack but the branch it should stack on can.
272
                    stop = True
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
273
                else:
274
                    stop = True
275
            if not stop:
3242.3.3 by Aaron Bentley
Use _find_containing to determine repository policy
276
                return None, False
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
277
            if repository:
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
278
                return UseExistingRepository(repository, stack_on,
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
279
                    stack_on_pwd, require_stacking=require_stacking), True
3242.3.3 by Aaron Bentley
Use _find_containing to determine repository policy
280
            else:
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
281
                return CreateRepository(self, stack_on, stack_on_pwd,
282
                    require_stacking=require_stacking), True
3242.3.3 by Aaron Bentley
Use _find_containing to determine repository policy
283
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
284
        if not force_new_repo:
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
285
            if stack_on is None:
286
                policy = self._find_containing(repository_policy)
287
                if policy is not None:
288
                    return policy
289
            else:
290
                try:
291
                    return UseExistingRepository(self.open_repository(),
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
292
                        stack_on, stack_on_pwd,
293
                        require_stacking=require_stacking)
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
294
                except errors.NoRepositoryPresent:
295
                    pass
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
296
        return CreateRepository(self, stack_on, stack_on_pwd,
297
                                require_stacking=require_stacking)
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
298
1534.6.11 by Robert Collins
Review feedback.
299
    def _find_or_create_repository(self, force_new_repo):
300
        """Create a new repository if needed, returning the repository."""
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
301
        policy = self.determine_repository_policy(force_new_repo)
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
302
        return policy.acquire_repository()[0]
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
303
5735.1.1 by Jelmer Vernooij
Move ControlDir.sprout to BzrDir.
304
    def _find_source_repo(self, add_cleanup, source_branch):
305
        """Find the source branch and repo for a sprout operation.
306
        
307
        This is helper intended for use by _sprout.
308
309
        :returns: (source_branch, source_repository).  Either or both may be
310
            None.  If not None, they will be read-locked (and their unlock(s)
311
            scheduled via the add_cleanup param).
312
        """
313
        if source_branch is not None:
314
            add_cleanup(source_branch.lock_read().unlock)
315
            return source_branch, source_branch.repository
316
        try:
317
            source_branch = self.open_branch()
318
            source_repository = source_branch.repository
319
        except errors.NotBranchError:
320
            source_branch = None
321
            try:
322
                source_repository = self.open_repository()
323
            except errors.NoRepositoryPresent:
324
                source_repository = None
325
            else:
326
                add_cleanup(source_repository.lock_read().unlock)
327
        else:
328
            add_cleanup(source_branch.lock_read().unlock)
329
        return source_branch, source_repository
330
331
    def sprout(self, url, revision_id=None, force_new_repo=False,
332
               recurse='down', possible_transports=None,
333
               accelerator_tree=None, hardlink=False, stacked=False,
334
               source_branch=None, create_tree_if_local=True):
335
        """Create a copy of this controldir prepared for use as a new line of
336
        development.
337
338
        If url's last component does not exist, it will be created.
339
340
        Attributes related to the identity of the source branch like
341
        branch nickname will be cleaned, a working tree is created
342
        whether one existed before or not; and a local branch is always
343
        created.
344
345
        if revision_id is not None, then the clone operation may tune
346
            itself to download less data.
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
347
5735.1.1 by Jelmer Vernooij
Move ControlDir.sprout to BzrDir.
348
        :param accelerator_tree: A tree which can be used for retrieving file
349
            contents more quickly than the revision tree, i.e. a workingtree.
350
            The revision tree will be used for cases where accelerator_tree's
351
            content is different.
352
        :param hardlink: If true, hard-link files from accelerator_tree,
353
            where possible.
354
        :param stacked: If true, create a stacked branch referring to the
355
            location of this control directory.
356
        :param create_tree_if_local: If true, a working-tree will be created
357
            when working locally.
358
        """
359
        operation = cleanup.OperationWithCleanups(self._sprout)
360
        return operation.run(url, revision_id=revision_id,
361
            force_new_repo=force_new_repo, recurse=recurse,
362
            possible_transports=possible_transports,
363
            accelerator_tree=accelerator_tree, hardlink=hardlink,
364
            stacked=stacked, source_branch=source_branch,
365
            create_tree_if_local=create_tree_if_local)
366
367
    def _sprout(self, op, url, revision_id=None, force_new_repo=False,
368
               recurse='down', possible_transports=None,
369
               accelerator_tree=None, hardlink=False, stacked=False,
370
               source_branch=None, create_tree_if_local=True):
371
        add_cleanup = op.add_cleanup
372
        fetch_spec_factory = fetch.FetchSpecFactory()
373
        if revision_id is not None:
374
            fetch_spec_factory.add_revision_ids([revision_id])
375
            fetch_spec_factory.source_branch_stop_revision_id = revision_id
6305.3.1 by Jelmer Vernooij
Save a connection to the server when using --stacked.
376
        if possible_transports is None:
377
            possible_transports = []
378
        else:
379
            possible_transports = list(possible_transports) + [
6305.3.5 by Jelmer Vernooij
Avoid .control_transport, as it triggers _ensure_real.
380
                self.root_transport]
5735.1.1 by Jelmer Vernooij
Move ControlDir.sprout to BzrDir.
381
        target_transport = _mod_transport.get_transport(url,
382
            possible_transports)
383
        target_transport.ensure_base()
384
        cloning_format = self.cloning_metadir(stacked)
385
        # Create/update the result branch
5268.8.11 by Jelmer Vernooij
Fix sprouting into control directories.
386
        try:
387
            result = controldir.ControlDir.open_from_transport(target_transport)
388
        except errors.NotBranchError:
389
            result = cloning_format.initialize_on_transport(target_transport)
5735.1.1 by Jelmer Vernooij
Move ControlDir.sprout to BzrDir.
390
        source_branch, source_repository = self._find_source_repo(
391
            add_cleanup, source_branch)
392
        fetch_spec_factory.source_branch = source_branch
393
        # if a stacked branch wasn't requested, we don't create one
394
        # even if the origin was stacked
395
        if stacked and source_branch is not None:
396
            stacked_branch_url = self.root_transport.base
397
        else:
398
            stacked_branch_url = None
399
        repository_policy = result.determine_repository_policy(
400
            force_new_repo, stacked_branch_url, require_stacking=stacked)
6305.3.1 by Jelmer Vernooij
Save a connection to the server when using --stacked.
401
        result_repo, is_new_repo = repository_policy.acquire_repository(
402
            possible_transports=possible_transports)
5735.1.1 by Jelmer Vernooij
Move ControlDir.sprout to BzrDir.
403
        add_cleanup(result_repo.lock_write().unlock)
404
        fetch_spec_factory.source_repo = source_repository
405
        fetch_spec_factory.target_repo = result_repo
406
        if stacked or (len(result_repo._fallback_repositories) != 0):
407
            target_repo_kind = fetch.TargetRepoKinds.STACKED
408
        elif is_new_repo:
409
            target_repo_kind = fetch.TargetRepoKinds.EMPTY
410
        else:
411
            target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
412
        fetch_spec_factory.target_repo_kind = target_repo_kind
413
        if source_repository is not None:
414
            fetch_spec = fetch_spec_factory.make_fetch_spec()
415
            result_repo.fetch(source_repository, fetch_spec=fetch_spec)
416
417
        if source_branch is None:
418
            # this is for sprouting a controldir without a branch; is that
419
            # actually useful?
420
            # Not especially, but it's part of the contract.
421
            result_branch = result.create_branch()
422
        else:
423
            result_branch = source_branch.sprout(result,
424
                revision_id=revision_id, repository_policy=repository_policy,
425
                repository=result_repo)
426
        mutter("created new branch %r" % (result_branch,))
427
428
        # Create/update the result working tree
5268.8.11 by Jelmer Vernooij
Fix sprouting into control directories.
429
        if (create_tree_if_local and not result.has_workingtree() and
5735.1.1 by Jelmer Vernooij
Move ControlDir.sprout to BzrDir.
430
            isinstance(target_transport, local.LocalTransport) and
431
            (result_repo is None or result_repo.make_working_trees())):
432
            wt = result.create_workingtree(accelerator_tree=accelerator_tree,
433
                hardlink=hardlink, from_branch=result_branch)
434
            wt.lock_write()
435
            try:
436
                if wt.path2id('') is None:
437
                    try:
438
                        wt.set_root_id(self.open_workingtree.get_root_id())
439
                    except errors.NoWorkingTree:
440
                        pass
441
            finally:
442
                wt.unlock()
443
        else:
444
            wt = None
445
        if recurse == 'down':
446
            basis = None
447
            if wt is not None:
448
                basis = wt.basis_tree()
449
            elif result_branch is not None:
450
                basis = result_branch.basis_tree()
451
            elif source_branch is not None:
452
                basis = source_branch.basis_tree()
453
            if basis is not None:
454
                add_cleanup(basis.lock_read().unlock)
455
                subtrees = basis.iter_references()
456
            else:
457
                subtrees = []
458
            for path, file_id in subtrees:
459
                target = urlutils.join(url, urlutils.escape(path))
460
                sublocation = source_branch.reference_parent(file_id, path)
461
                sublocation.bzrdir.sprout(target,
462
                    basis.get_reference_revision(file_id, path),
463
                    force_new_repo=force_new_repo, recurse=recurse,
464
                    stacked=stacked)
465
        return result
466
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
467
    @deprecated_method(deprecated_in((2, 3, 0)))
5340.8.4 by Marius Kruger
* gen_backup_name => generate_backup_name
468
    def generate_backup_name(self, base):
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
469
        return self._available_backup_name(base)
470
471
    def _available_backup_name(self, base):
5409.5.8 by Vincent Ladeuil
Be more explicit about race conditions and LBYL being discouraged
472
        """Find a non-existing backup file name based on base.
473
474
        See bzrlib.osutils.available_backup_name about race conditions.
475
        """
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
476
        return osutils.available_backup_name(base, self.root_transport.has)
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
477
3872.3.2 by Jelmer Vernooij
make backup_bzrdir determine the name for the backup files.
478
    def backup_bzrdir(self):
3872.3.1 by Jelmer Vernooij
Allow BzrDir implementation to implement backing up of control directory.
479
        """Backup this bzr control directory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
480
3872.3.2 by Jelmer Vernooij
make backup_bzrdir determine the name for the backup files.
481
        :return: Tuple with old path name and new path name
3872.3.1 by Jelmer Vernooij
Allow BzrDir implementation to implement backing up of control directory.
482
        """
5035.4.1 by Parth Malwankar
fixes 335033.
483
3943.2.4 by Martin Pool
Move backup progress indicators from upgrade.py into backup_bzrdir, and tweak text
484
        pb = ui.ui_factory.nested_progress_bar()
485
        try:
486
            old_path = self.root_transport.abspath('.bzr')
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
487
            backup_dir = self._available_backup_name('backup.bzr')
5035.4.2 by Parth Malwankar
name_gen now works with all transports.
488
            new_path = self.root_transport.abspath(backup_dir)
6147.1.1 by Jonathan Riddell
use .format() instead of % for string formatting where there are multiple formats in one string to allow for translations
489
            ui.ui_factory.note(gettext('making backup of {0}\n  to {1}').format(
6072.3.2 by Jelmer Vernooij
Use utf8 as encoding for urls passed to note().
490
                urlutils.unescape_for_display(old_path, 'utf-8'),
491
                urlutils.unescape_for_display(new_path, 'utf-8')))
5035.4.2 by Parth Malwankar
name_gen now works with all transports.
492
            self.root_transport.copy_tree('.bzr', backup_dir)
3943.2.4 by Martin Pool
Move backup progress indicators from upgrade.py into backup_bzrdir, and tweak text
493
            return (old_path, new_path)
494
        finally:
495
            pb.finished()
3872.3.1 by Jelmer Vernooij
Allow BzrDir implementation to implement backing up of control directory.
496
2830.1.2 by Ian Clatworthy
Incorporate feedback from poolie's review
497
    def retire_bzrdir(self, limit=10000):
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
498
        """Permanently disable the bzrdir.
499
500
        This is done by renaming it to give the user some ability to recover
501
        if there was a problem.
502
503
        This will have horrible consequences if anyone has anything locked or
504
        in use.
2830.1.2 by Ian Clatworthy
Incorporate feedback from poolie's review
505
        :param limit: number of times to retry
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
506
        """
2830.1.2 by Ian Clatworthy
Incorporate feedback from poolie's review
507
        i  = 0
508
        while True:
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
509
            try:
510
                to_path = '.bzr.retired.%d' % i
511
                self.root_transport.rename('.bzr', to_path)
6138.3.1 by Jonathan Riddell
use gettext() in more files
512
                note(gettext("renamed {0} to {1}").format(
513
                    self.root_transport.abspath('.bzr'), to_path))
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
514
                return
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
515
            except (errors.TransportError, IOError, errors.PathError):
2830.1.2 by Ian Clatworthy
Incorporate feedback from poolie's review
516
                i += 1
517
                if i > limit:
518
                    raise
519
                else:
520
                    pass
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
521
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
522
    def _find_containing(self, evaluate):
3242.2.13 by Aaron Bentley
Update docs
523
        """Find something in a containing control directory.
524
525
        This method will scan containing control dirs, until it finds what
526
        it is looking for, decides that it will never find it, or runs out
527
        of containing control directories to check.
528
529
        It is used to implement find_repository and
530
        determine_repository_policy.
531
532
        :param evaluate: A function returning (value, stop).  If stop is True,
533
            the value will be returned.
534
        """
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
535
        found_bzrdir = self
536
        while True:
537
            result, stop = evaluate(found_bzrdir)
538
            if stop:
539
                return result
540
            next_transport = found_bzrdir.root_transport.clone('..')
5158.6.9 by Martin Pool
Simplify various code to use user_url
541
            if (found_bzrdir.user_url == next_transport.base):
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
542
                # top of the file system
543
                return None
544
            # find the next containing bzrdir
545
            try:
6207.3.1 by jelmer at samba
use classmethods.
546
                found_bzrdir = self.open_containing_from_transport(
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
547
                    next_transport)[0]
548
            except errors.NotBranchError:
549
                return None
550
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.
551
    def find_repository(self):
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
552
        """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.
553
554
        This does not require a branch as we use it to find the repo for
555
        new branches as well as to hook existing branches up to their
556
        repository.
557
        """
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
558
        def usable_repository(found_bzrdir):
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
559
            # 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.
560
            try:
561
                repository = found_bzrdir.open_repository()
562
            except errors.NoRepositoryPresent:
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
563
                return None, False
5158.6.9 by Martin Pool
Simplify various code to use user_url
564
            if found_bzrdir.user_url == self.user_url:
3242.2.5 by Aaron Bentley
Avoid unnecessary is_shared check
565
                return repository, True
566
            elif repository.is_shared():
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
567
                return repository, True
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.
568
            else:
3242.2.5 by Aaron Bentley
Avoid unnecessary is_shared check
569
                return None, True
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
570
571
        found_repo = self._find_containing(usable_repository)
572
        if found_repo is None:
573
            raise errors.NoRepositoryPresent(self)
574
        return found_repo
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.
575
3416.2.1 by Martin Pool
Add BzrDir._get_file_mode and _get_dir_mode
576
    def _find_creation_modes(self):
577
        """Determine the appropriate modes for files and directories.
3641.2.1 by John Arbash Meinel
Fix bug #259855, if a Transport returns 0 for permission bits, ignore it
578
3416.2.1 by Martin Pool
Add BzrDir._get_file_mode and _get_dir_mode
579
        They're always set to be consistent with the base directory,
580
        assuming that this transport allows setting modes.
581
        """
582
        # TODO: Do we need or want an option (maybe a config setting) to turn
583
        # this off or override it for particular locations? -- mbp 20080512
584
        if self._mode_check_done:
585
            return
586
        self._mode_check_done = True
587
        try:
588
            st = self.transport.stat('.')
589
        except errors.TransportNotPossible:
590
            self._dir_mode = None
591
            self._file_mode = None
592
        else:
593
            # Check the directory mode, but also make sure the created
594
            # directories and files are read-write for this user. This is
595
            # mostly a workaround for filesystems which lie about being able to
596
            # write to a directory (cygwin & win32)
3641.2.1 by John Arbash Meinel
Fix bug #259855, if a Transport returns 0 for permission bits, ignore it
597
            if (st.st_mode & 07777 == 00000):
598
                # FTP allows stat but does not return dir/file modes
599
                self._dir_mode = None
600
                self._file_mode = None
601
            else:
602
                self._dir_mode = (st.st_mode & 07777) | 00700
603
                # Remove the sticky and execute bits for files
604
                self._file_mode = self._dir_mode & ~07111
3416.2.1 by Martin Pool
Add BzrDir._get_file_mode and _get_dir_mode
605
606
    def _get_file_mode(self):
607
        """Return Unix mode for newly created files, or None.
608
        """
609
        if not self._mode_check_done:
610
            self._find_creation_modes()
611
        return self._file_mode
612
613
    def _get_dir_mode(self):
614
        """Return Unix mode for newly created directories, or None.
615
        """
616
        if not self._mode_check_done:
617
            self._find_creation_modes()
618
        return self._dir_mode
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
619
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
620
    def get_config(self):
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
621
        """Get configuration for this BzrDir."""
622
        return config.BzrDirConfig(self)
623
624
    def _get_config(self):
625
        """By default, no configuration is available."""
626
        return None
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
627
1534.4.39 by Robert Collins
Basic BzrDir support.
628
    def __init__(self, _transport, _format):
629
        """Initialize a Bzr control dir object.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
630
1534.4.39 by Robert Collins
Basic BzrDir support.
631
        Only really common logic should reside here, concrete classes should be
632
        made with varying behaviours.
633
1534.4.53 by Robert Collins
Review feedback from John Meinel.
634
        :param _format: the format that is creating this BzrDir instance.
635
        :param _transport: the transport this dir is based at.
1534.4.39 by Robert Collins
Basic BzrDir support.
636
        """
637
        self._format = _format
5158.6.1 by Martin Pool
Add ControlComponent interface and make BzrDir implement it
638
        # these are also under the more standard names of 
639
        # control_transport and user_transport
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
640
        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.
641
        self.root_transport = _transport
3416.2.1 by Martin Pool
Add BzrDir._get_file_mode and _get_dir_mode
642
        self._mode_check_done = False
5363.2.2 by Jelmer Vernooij
Rename per_bzrdir => per_controldir.
643
5158.6.1 by Martin Pool
Add ControlComponent interface and make BzrDir implement it
644
    @property 
645
    def user_transport(self):
646
        return self.root_transport
5363.2.2 by Jelmer Vernooij
Rename per_bzrdir => per_controldir.
647
5158.6.1 by Martin Pool
Add ControlComponent interface and make BzrDir implement it
648
    @property
649
    def control_transport(self):
650
        return self.transport
1534.4.39 by Robert Collins
Basic BzrDir support.
651
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
652
    def is_control_filename(self, filename):
653
        """True if filename is the name of a path which is reserved for bzrdir's.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
654
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
655
        :param filename: A filename within the root transport of this bzrdir.
656
657
        This is true IF and ONLY IF the filename is part of the namespace reserved
658
        for bzr control dirs. Currently this is the '.bzr' directory in the root
5363.2.2 by Jelmer Vernooij
Rename per_bzrdir => per_controldir.
659
        of the root_transport. 
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
660
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
661
        # this might be better on the BzrDirFormat class because it refers to
662
        # all the possible bzrdir disk formats.
663
        # This method is tested via the workingtree is_control_filename tests-
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
664
        # it was extracted from WorkingTree.is_control_filename. If the method's
665
        # 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).
666
        # add new tests for it to the appropriate place.
667
        return filename == '.bzr' or filename.startswith('.bzr/')
668
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
669
    def _cloning_metadir(self):
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
670
        """Produce a metadir suitable for cloning with.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
671
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
672
        :returns: (destination_bzrdir_format, source_repository)
673
        """
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
674
        result_format = self._format.__class__()
675
        try:
1910.2.41 by Aaron Bentley
Clean up clone format creation
676
            try:
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
677
                branch = self.open_branch(ignore_fallbacks=True)
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
678
                source_repository = branch.repository
3650.2.5 by Aaron Bentley
Stop creating a new instance
679
                result_format._branch_format = branch._format
1910.2.41 by Aaron Bentley
Clean up clone format creation
680
            except errors.NotBranchError:
681
                source_branch = None
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
682
                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.
683
        except errors.NoRepositoryPresent:
2100.3.24 by Aaron Bentley
Get all tests passing again
684
            source_repository = None
2305.3.1 by Andrew Bennetts
Tidy up BzrDir.cloning_metadir: bogus try/except, and basis argument isn't actually used.
685
        else:
2018.5.138 by Robert Collins
Merge bzr.dev.
686
            # XXX TODO: This isinstance is here because we have not implemented
687
            # the fix recommended in bug # 103195 - to delegate this choice the
688
            # repository itself.
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
689
            repo_format = source_repository._format
3705.2.1 by Andrew Bennetts
Possible fix for bug 269214
690
            if isinstance(repo_format, remote.RemoteRepositoryFormat):
691
                source_repository._ensure_real()
692
                repo_format = source_repository._real_repository._format
693
            result_format.repository_format = repo_format
2100.3.28 by Aaron Bentley
Make sprout recursive
694
        try:
2323.5.19 by Martin Pool
No upgrade recommendation on source when cloning
695
            # TODO: Couldn't we just probe for the format in these cases,
696
            # rather than opening the whole tree?  It would be a little
697
            # faster. mbp 20070401
698
            tree = self.open_workingtree(recommend_upgrade=False)
2100.3.28 by Aaron Bentley
Make sprout recursive
699
        except (errors.NoWorkingTree, errors.NotLocalUrl):
700
            result_format.workingtree_format = None
701
        else:
702
            result_format.workingtree_format = tree._format.__class__()
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
703
        return result_format, source_repository
704
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
705
    def cloning_metadir(self, require_stacking=False):
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
706
        """Produce a metadir suitable for cloning or sprouting with.
1910.2.41 by Aaron Bentley
Clean up clone format creation
707
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
708
        These operations may produce workingtrees (yes, even though they're
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
709
        "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
710
        format must be selected.
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
711
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
712
        :require_stacking: If True, non-stackable formats will be upgraded
713
            to similar stackable formats.
6207.3.1 by jelmer at samba
use classmethods.
714
        :returns: a ControlDirFormat with all component formats either set
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
715
            appropriately or set to None if that component should not be
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
716
            created.
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
717
        """
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
718
        format, repository = self._cloning_metadir()
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
719
        if format._workingtree_format is None:
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
720
            # No tree in self.
2100.3.34 by Aaron Bentley
Fix BzrDir.cloning_metadir with no format
721
            if repository is None:
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
722
                # No repository either
2100.3.34 by Aaron Bentley
Fix BzrDir.cloning_metadir with no format
723
                return format
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
724
            # We have a repository, so set a working tree? (Why? This seems to
725
            # contradict the stated return value in the docstring).
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
726
            tree_format = repository._format._matchingbzrdir.workingtree_format
2100.3.28 by Aaron Bentley
Make sprout recursive
727
            format.workingtree_format = tree_format.__class__()
3904.3.1 by Andrew Bennetts
Probable fix for GaryvdM's bug when pushing a stacked qbzr branch to Launchpad.
728
        if require_stacking:
729
            format.require_stacking()
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
730
        return format
731
5699.4.1 by Jelmer Vernooij
Move get_branch_transport, .get_workingtree_transport and .get_repository_transport
732
    def get_branch_transport(self, branch_format, name=None):
5699.4.5 by Jelmer Vernooij
Refer to BzrDir, not ControlDir in docstrings.
733
        """Get the transport for use by branch format in this BzrDir.
5699.4.1 by Jelmer Vernooij
Move get_branch_transport, .get_workingtree_transport and .get_repository_transport
734
735
        Note that bzr dirs that do not support format strings will raise
736
        IncompatibleFormat if the branch format they are given has
737
        a format string, and vice versa.
738
739
        If branch_format is None, the transport is returned with no
740
        checking. If it is not None, then the returned transport is
741
        guaranteed to point to an existing directory ready for use.
742
        """
743
        raise NotImplementedError(self.get_branch_transport)
744
745
    def get_repository_transport(self, repository_format):
5699.4.5 by Jelmer Vernooij
Refer to BzrDir, not ControlDir in docstrings.
746
        """Get the transport for use by repository format in this BzrDir.
5699.4.1 by Jelmer Vernooij
Move get_branch_transport, .get_workingtree_transport and .get_repository_transport
747
748
        Note that bzr dirs that do not support format strings will raise
749
        IncompatibleFormat if the repository format they are given has
750
        a format string, and vice versa.
751
752
        If repository_format is None, the transport is returned with no
753
        checking. If it is not None, then the returned transport is
754
        guaranteed to point to an existing directory ready for use.
755
        """
756
        raise NotImplementedError(self.get_repository_transport)
757
758
    def get_workingtree_transport(self, tree_format):
5699.4.5 by Jelmer Vernooij
Refer to BzrDir, not ControlDir in docstrings.
759
        """Get the transport for use by workingtree format in this BzrDir.
5699.4.1 by Jelmer Vernooij
Move get_branch_transport, .get_workingtree_transport and .get_repository_transport
760
761
        Note that bzr dirs that do not support format strings will raise
762
        IncompatibleFormat if the workingtree format they are given has a
763
        format string, and vice versa.
764
765
        If workingtree_format is None, the transport is returned with no
766
        checking. If it is not None, then the returned transport is
767
        guaranteed to point to an existing directory ready for use.
768
        """
769
        raise NotImplementedError(self.get_workingtree_transport)
770
6207.3.2 by jelmer at samba
Move convenience methods to ControlDir.
771
    @classmethod
772
    def create(cls, base, format=None, possible_transports=None):
773
        """Create a new BzrDir at the url 'base'.
774
775
        :param format: If supplied, the format of branch to create.  If not
776
            supplied, the default is used.
777
        :param possible_transports: If supplied, a list of transports that
778
            can be reused to share a remote connection.
779
        """
780
        if cls is not BzrDir:
6207.3.3 by jelmer at samba
Fix tests and the like.
781
            raise AssertionError("BzrDir.create always creates the "
6207.3.2 by jelmer at samba
Move convenience methods to ControlDir.
782
                "default format, not one of %r" % cls)
783
        return controldir.ControlDir.create(base, format=format,
784
                possible_transports=possible_transports)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
785
6240.2.1 by Jelmer Vernooij
Add BzrDir.__repr__.
786
    def __repr__(self):
787
        return "<%s at %r>" % (self.__class__.__name__, self.user_url)
788
6213.1.56 by Jelmer Vernooij
Add BzrDir.update_feature_flags.
789
    def update_feature_flags(self, updated_flags):
790
        """Update the features required by this bzrdir.
791
792
        :param updated_flags: Dictionary mapping feature names to necessities
793
            A necessity can be None to indicate the feature should be removed
794
        """
795
        self.control_files.lock_write()
796
        try:
6213.1.58 by Jelmer Vernooij
Use update_feature_flags everywhere.
797
            self._format._update_feature_flags(updated_flags)
6213.1.56 by Jelmer Vernooij
Add BzrDir.update_feature_flags.
798
            self.transport.put_bytes('branch-format', self._format.as_string())
799
        finally:
800
            self.control_files.unlock()
801
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
802
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
803
class BzrDirMeta1(BzrDir):
804
    """A .bzr meta version 1 control object.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
805
806
    This is the first control object where the
1553.5.67 by Martin Pool
doc
807
    individual aspects are really split out: there are separate repository,
808
    workingtree and branch subdirectories and any subset of the three can be
809
    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.
810
    """
811
6213.1.56 by Jelmer Vernooij
Add BzrDir.update_feature_flags.
812
    def __init__(self, _transport, _format):
813
        super(BzrDirMeta1, self).__init__(_transport, _format)
814
        self.control_files = lockable_files.LockableFiles(self.control_transport,
815
            self._format._lock_file_name, self._format._lock_class)
816
1534.5.16 by Robert Collins
Review feedback.
817
    def can_convert_format(self):
818
        """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.
819
        return True
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
820
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
821
    def create_branch(self, name=None, repository=None,
822
            append_revisions_only=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
823
        """See BzrDir.create_branch."""
6240.2.2 by Jelmer Vernooij
Put the branch name into the branch URL.
824
        if name is None:
825
            name = self._get_selected_branch()
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
826
        return self._format.get_branch_format().initialize(self, name=name,
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
827
                repository=repository,
828
                append_revisions_only=append_revisions_only)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
829
5051.3.1 by Jelmer Vernooij
Add optional name argument to BzrDir.destroy_branch.
830
    def destroy_branch(self, name=None):
2796.2.6 by Aaron Bentley
Implement destroy_branch
831
        """See BzrDir.create_branch."""
6083.2.8 by Jelmer Vernooij
Write/read branch list.
832
        if name is not None:
6083.2.10 by Jelmer Vernooij
Move more to colo class.
833
            raise errors.NoColocatedBranchSupport(self)
834
        self.transport.delete_tree('branch')
2796.2.6 by Aaron Bentley
Implement destroy_branch
835
1534.6.1 by Robert Collins
allow API creation of shared repositories
836
    def create_repository(self, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
837
        """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.
838
        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.
839
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
840
    def destroy_repository(self):
841
        """See BzrDir.destroy_repository."""
6266.2.2 by Jelmer Vernooij
Fix tests.
842
        try:
843
            self.transport.delete_tree('repository')
844
        except errors.NoSuchFile:
845
            raise errors.NoRepositoryPresent(self)
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
846
3123.5.2 by Aaron Bentley
Allow checkout --files_from
847
    def create_workingtree(self, revision_id=None, from_branch=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
848
                           accelerator_tree=None, hardlink=False):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
849
        """See BzrDir.create_workingtree."""
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
850
        return self._format.workingtree_format.initialize(
3123.5.2 by Aaron Bentley
Allow checkout --files_from
851
            self, revision_id, from_branch=from_branch,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
852
            accelerator_tree=accelerator_tree, hardlink=hardlink)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
853
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
854
    def destroy_workingtree(self):
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
855
        """See BzrDir.destroy_workingtree."""
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
856
        wt = self.open_workingtree(recommend_upgrade=False)
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
857
        repository = wt.branch.repository
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
858
        empty = repository.revision_tree(_mod_revision.NULL_REVISION)
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
859
        # We ignore the conflicts returned by wt.revert since we're about to
860
        # delete the wt metadata anyway, all that should be left here are
5409.7.3 by Vincent Ladeuil
Orphan unversioned files to avoid 'missing parent' conflicts
861
        # detritus. But see bug #634470 about subtree .bzr dirs.
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
862
        conflicts = wt.revert(old_tree=empty)
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
863
        self.destroy_workingtree_metadata()
864
865
    def destroy_workingtree_metadata(self):
866
        self.transport.delete_tree('checkout')
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
867
5147.4.1 by Jelmer Vernooij
Pass branch names in more places.
868
    def find_branch_format(self, name=None):
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
869
        """Find the branch 'format' for this bzrdir.
870
871
        This might be a synthetic object for e.g. RemoteBranch and SVN.
872
        """
6213.1.13 by Jelmer Vernooij
make some methods class methods.
873
        from bzrlib.branch import BranchFormatMetadir
874
        return BranchFormatMetadir.find_format(self, name=name)
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
875
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
876
    def _get_mkdir_mode(self):
877
        """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
878
        temp_control = lockable_files.LockableFiles(self.transport, '',
879
                                     lockable_files.TransportLock)
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
880
        return temp_control._dir_mode
881
5147.4.3 by Jelmer Vernooij
Support branch name argument to BzrDir.get_branch_reference.
882
    def get_branch_reference(self, name=None):
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
883
        """See BzrDir.get_branch_reference()."""
6213.1.17 by Jelmer Vernooij
Fix find_format calls.
884
        from bzrlib.branch import BranchFormatMetadir
885
        format = BranchFormatMetadir.find_format(self, name=name)
5147.4.3 by Jelmer Vernooij
Support branch name argument to BzrDir.get_branch_reference.
886
        return format.get_reference(self, name=name)
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
887
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
888
    def get_branch_transport(self, branch_format, name=None):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
889
        """See BzrDir.get_branch_transport()."""
6083.2.11 by Jelmer Vernooij
Add development-colo format.
890
        if name is not None:
891
            raise errors.NoColocatedBranchSupport(self)
4570.3.6 by Martin Pool
doc
892
        # XXX: this shouldn't implicitly create the directory if it's just
893
        # promising to get a transport -- mbp 20090727
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
894
        if branch_format is None:
6083.2.11 by Jelmer Vernooij
Add development-colo format.
895
            return self.transport.clone('branch')
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
896
        try:
897
            branch_format.get_format_string()
898
        except NotImplementedError:
899
            raise errors.IncompatibleFormat(branch_format, self._format)
6083.2.5 by Jelmer Vernooij
Fix colocated branch handling.
900
        try:
6083.2.11 by Jelmer Vernooij
Add development-colo format.
901
            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.
902
        except errors.FileExists:
903
            pass
6083.2.11 by Jelmer Vernooij
Add development-colo format.
904
        return self.transport.clone('branch')
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
905
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
906
    def get_repository_transport(self, repository_format):
907
        """See BzrDir.get_repository_transport()."""
908
        if repository_format is None:
909
            return self.transport.clone('repository')
910
        try:
911
            repository_format.get_format_string()
912
        except NotImplementedError:
913
            raise errors.IncompatibleFormat(repository_format, self._format)
914
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
915
            self.transport.mkdir('repository', mode=self._get_mkdir_mode())
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
916
        except errors.FileExists:
917
            pass
918
        return self.transport.clone('repository')
919
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
920
    def get_workingtree_transport(self, workingtree_format):
921
        """See BzrDir.get_workingtree_transport()."""
922
        if workingtree_format is None:
923
            return self.transport.clone('checkout')
924
        try:
925
            workingtree_format.get_format_string()
926
        except NotImplementedError:
927
            raise errors.IncompatibleFormat(workingtree_format, self._format)
928
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
929
            self.transport.mkdir('checkout', mode=self._get_mkdir_mode())
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
930
        except errors.FileExists:
931
            pass
932
        return self.transport.clone('checkout')
933
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
934
    def has_workingtree(self):
935
        """Tell if this bzrdir contains a working tree.
936
937
        Note: if you're going to open the working tree, you should just go
938
        ahead and try, and not ask permission first.
939
        """
6349.2.1 by Jelmer Vernooij
Add BzrDirMetaComponentFormat.
940
        from bzrlib.workingtree import WorkingTreeFormatMetaDir
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
941
        try:
6349.2.1 by Jelmer Vernooij
Add BzrDirMetaComponentFormat.
942
            WorkingTreeFormatMetaDir.find_format_string(self)
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
943
        except errors.NoWorkingTree:
944
            return False
945
        return True
946
5670.1.1 by Jelmer Vernooij
Remove all methods and arguments that were deprecated before bzr 2.0.0.
947
    def needs_format_conversion(self, format):
1534.5.16 by Robert Collins
Review feedback.
948
        """See BzrDir.needs_format_conversion()."""
6207.1.1 by Jelmer Vernooij
Support upgrading between 2a and development-colo.
949
        if (not isinstance(self._format, format.__class__) or
950
            self._format.get_format_string() != format.get_format_string()):
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.
951
            # it is not a meta dir format, conversion is needed.
952
            return True
953
        # we might want to push this down to the repository?
954
        try:
955
            if not isinstance(self.open_repository()._format,
956
                              format.repository_format.__class__):
957
                # the repository needs an upgrade.
958
                return True
959
        except errors.NoRepositoryPresent:
960
            pass
5051.3.4 by Jelmer Vernooij
Support name to BzrDir.open_branch.
961
        for branch in self.list_branches():
962
            if not isinstance(branch._format,
2230.3.55 by Aaron Bentley
Updates from review
963
                              format.get_branch_format().__class__):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
964
                # the branch needs an upgrade.
965
                return True
966
        try:
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
967
            my_wt = self.open_workingtree(recommend_upgrade=False)
968
            if not isinstance(my_wt._format,
2255.12.1 by Robert Collins
Implement upgrade for working trees.
969
                              format.workingtree_format.__class__):
970
                # the workingtree needs an upgrade.
971
                return True
2255.2.196 by Robert Collins
Fix test_upgrade defects related to non local or absent working trees.
972
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
973
            pass
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
974
        return False
975
5051.3.4 by Jelmer Vernooij
Support name to BzrDir.open_branch.
976
    def open_branch(self, name=None, unsupported=False,
6305.3.2 by Jelmer Vernooij
Only make a single connection.
977
                    ignore_fallbacks=False, possible_transports=None):
978
        """See ControlDir.open_branch."""
6240.2.2 by Jelmer Vernooij
Put the branch name into the branch URL.
979
        if name is None:
980
            name = self._get_selected_branch()
5147.4.3 by Jelmer Vernooij
Support branch name argument to BzrDir.get_branch_reference.
981
        format = self.find_branch_format(name=name)
5717.1.7 by Jelmer Vernooij
Rename check_status -> check_support_status.
982
        format.check_support_status(unsupported)
5051.3.13 by Jelmer Vernooij
Pass colocated branch name around rather than raising an exception directly.
983
        return format.open(self, name=name,
6305.3.2 by Jelmer Vernooij
Only make a single connection.
984
            _found=True, ignore_fallbacks=ignore_fallbacks,
985
            possible_transports=possible_transports)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
986
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
987
    def open_repository(self, unsupported=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
988
        """See BzrDir.open_repository."""
6349.2.1 by Jelmer Vernooij
Add BzrDirMetaComponentFormat.
989
        from bzrlib.repository import RepositoryFormatMetaDir
990
        format = RepositoryFormatMetaDir.find_format(self)
5717.1.7 by Jelmer Vernooij
Rename check_status -> check_support_status.
991
        format.check_support_status(unsupported)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
992
        return format.open(self, _found=True)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
993
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
994
    def open_workingtree(self, unsupported=False,
995
            recommend_upgrade=True):
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
996
        """See BzrDir.open_workingtree."""
6213.1.16 by Jelmer Vernooij
Feature support in repository.
997
        from bzrlib.workingtree import WorkingTreeFormatMetaDir
998
        format = WorkingTreeFormatMetaDir.find_format(self)
5717.1.7 by Jelmer Vernooij
Rename check_status -> check_support_status.
999
        format.check_support_status(unsupported, recommend_upgrade,
2323.6.5 by Martin Pool
Recommended-upgrade message should give base dir not the control dir url
1000
            basedir=self.root_transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1001
        return format.open(self, _found=True)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1002
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1003
    def _get_config(self):
4288.1.1 by Robert Collins
Add support for a RemoteBzrDirConfig to support optimising push operations which need to look for default stacking locations.
1004
        return config.TransportConfig(self.transport, 'control.conf')
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1005
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1006
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
1007
class BzrDirMeta1Colo(BzrDirMeta1):
1008
    """BzrDirMeta1 with support for colocated branches.
1009
6083.2.13 by Jelmer Vernooij
Fix metadircolo initialization.
1010
    This format is experimental, and will eventually be merged back into
1011
    BzrDirMeta1.
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
1012
    """
1013
1014
    def _get_branch_path(self, name):
1015
        """Obtain the branch path to use.
1016
1017
        This uses the API specified branch name first, and then falls back to
1018
        the branch name specified in the URL. If neither of those is specified,
1019
        it uses the default branch.
1020
1021
        :param name: Optional branch name to use
6240.2.2 by Jelmer Vernooij
Put the branch name into the branch URL.
1022
        :return: Relative path to branch
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
1023
        """
1024
        if name is None:
6240.2.2 by Jelmer Vernooij
Put the branch name into the branch URL.
1025
            return 'branch'
6240.2.8 by Jelmer Vernooij
Consistent handling of unicode.
1026
        return urlutils.join('branches', name.encode("utf-8"))
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
1027
1028
    def _read_branch_list(self):
1029
        """Read the branch list.
1030
1031
        :return: List of utf-8 encoded branch names.
1032
        """
1033
        try:
1034
            f = self.control_transport.get('branch-list')
1035
        except errors.NoSuchFile:
1036
            return []
1037
1038
        ret = []
1039
        try:
1040
            for name in f:
1041
                ret.append(name.rstrip("\n"))
1042
        finally:
1043
            f.close()
1044
        return ret
1045
1046
    def _write_branch_list(self, branches):
1047
        """Write out the branch list.
1048
1049
        :param branches: List of utf-8 branch names to write
1050
        """
1051
        self.transport.put_bytes('branch-list',
1052
            "".join([name+"\n" for name in branches]))
1053
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1054
    def destroy_branch(self, name=None):
1055
        """See BzrDir.create_branch."""
6240.2.2 by Jelmer Vernooij
Put the branch name into the branch URL.
1056
        if name is None:
1057
            name = self._get_selected_branch()
1058
        path = self._get_branch_path(name)
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1059
        if name is not None:
1060
            self.control_files.lock_write()
1061
            try:
1062
                branches = self._read_branch_list()
1063
                try:
6240.2.8 by Jelmer Vernooij
Consistent handling of unicode.
1064
                    branches.remove(name.encode("utf-8"))
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1065
                except ValueError:
1066
                    raise errors.NotBranchError(name)
6240.2.8 by Jelmer Vernooij
Consistent handling of unicode.
1067
                self._write_branch_list(branches)
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1068
            finally:
1069
                self.control_files.unlock()
1070
        self.transport.delete_tree(path)
1071
6282.5.4 by Neil Martinsen-Burrell
add get_branches method to return a dictionary of names and branches
1072
    def get_branches(self):
1073
        """See ControlDir.get_branches."""
1074
        ret = {}
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1075
        try:
6282.5.4 by Neil Martinsen-Burrell
add get_branches method to return a dictionary of names and branches
1076
            ret[None] = self.open_branch()
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1077
        except (errors.NotBranchError, errors.NoRepositoryPresent):
1078
            pass
1079
6282.5.4 by Neil Martinsen-Burrell
add get_branches method to return a dictionary of names and branches
1080
        for name in self._read_branch_list():
1081
            ret[name] = self.open_branch(name.decode('utf-8'))
1082
6282.5.3 by Neil Martinsen-Burrell
avoid trivial duplicates in BzrDir.list_branches
1083
        return ret
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1084
1085
    def get_branch_transport(self, branch_format, name=None):
1086
        """See BzrDir.get_branch_transport()."""
6240.2.2 by Jelmer Vernooij
Put the branch name into the branch URL.
1087
        path = self._get_branch_path(name)
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1088
        # XXX: this shouldn't implicitly create the directory if it's just
1089
        # promising to get a transport -- mbp 20090727
5268.8.23 by Jelmer Vernooij
Fix branch format check.
1090
        if branch_format is None:
1091
            return self.transport.clone(path)
1092
        try:
1093
            branch_format.get_format_string()
1094
        except NotImplementedError:
1095
            raise errors.IncompatibleFormat(branch_format, self._format)
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1096
        if name is not None:
1097
            try:
1098
                self.transport.mkdir('branches', mode=self._get_mkdir_mode())
1099
            except errors.FileExists:
1100
                pass
1101
            branches = self._read_branch_list()
6240.2.8 by Jelmer Vernooij
Consistent handling of unicode.
1102
            utf8_name = name.encode("utf-8")
1103
            if not utf8_name in branches:
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1104
                self.control_files.lock_write()
1105
                try:
1106
                    branches = self._read_branch_list()
6240.2.8 by Jelmer Vernooij
Consistent handling of unicode.
1107
                    branches.append(utf8_name)
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1108
                    self._write_branch_list(branches)
1109
                finally:
1110
                    self.control_files.unlock()
1111
        try:
1112
            self.transport.mkdir(path, mode=self._get_mkdir_mode())
1113
        except errors.FileExists:
1114
            pass
1115
        return self.transport.clone(path)
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
1116
1117
6213.1.30 by Jelmer Vernooij
Add BzrFormat.
1118
class BzrFormat(object):
6349.2.4 by Jelmer Vernooij
Add test for WorkingTreeFormat.from_string.
1119
    """Base class for all formats of things living in metadirs.
1120
1121
    This class manages the format string that is stored in the 'format'
1122
    or 'branch-format' file.
6349.2.7 by Jelmer Vernooij
More docs.
1123
1124
    All classes for (branch-, repository-, workingtree-) formats that
1125
    live in meta directories and have their own 'format' file
1126
    (i.e. different from .bzr/branch-format) derive from this class,
1127
    as well as the relevant base class for their kind
1128
    (BranchFormat, WorkingTreeFormat, RepositoryFormat).
6213.1.40 by Jelmer Vernooij
Merge common-bzrdir-component
1129
1130
    Each format is identified by a "format" or "branch-format" file with a
1131
    single line containing the base format name and then an optional list of
1132
    feature flags.
6213.1.32 by Jelmer Vernooij
Fix check support status.
1133
6213.1.38 by Jelmer Vernooij
Clarify docstring.
1134
    Feature flags are supported as of bzr 2.5. Setting feature flags on formats
6213.1.32 by Jelmer Vernooij
Fix check support status.
1135
    will render them inaccessible to older versions of bzr.
1136
1137
    :ivar features: Dictionary mapping feature names to their necessity
6213.1.30 by Jelmer Vernooij
Add BzrFormat.
1138
    """
6213.1.24 by Jelmer Vernooij
More refactoring.
1139
1140
    _present_features = set()
1141
1142
    def __init__(self):
6213.1.52 by Jelmer Vernooij
Don't use ordereddict.
1143
        self.features = {}
6213.1.24 by Jelmer Vernooij
More refactoring.
1144
1145
    @classmethod
1146
    def register_feature(cls, name):
1147
        """Register a feature as being present.
1148
1149
        :param name: Name of the feature
1150
        """
6213.1.48 by Jelmer Vernooij
Drop feature bit, don't allow spaces.
1151
        if " " in name:
1152
            raise ValueError("spaces are not allowed in feature names")
6213.1.43 by Jelmer Vernooij
Cope with features already existing.
1153
        if name in cls._present_features:
1154
            raise errors.FeatureAlreadyRegistered(name)
6213.1.24 by Jelmer Vernooij
More refactoring.
1155
        cls._present_features.add(name)
1156
1157
    @classmethod
1158
    def unregister_feature(cls, name):
1159
        """Unregister a feature."""
1160
        cls._present_features.remove(name)
1161
1162
    def check_support_status(self, allow_unsupported, recommend_upgrade=True,
1163
            basedir=None):
6213.1.32 by Jelmer Vernooij
Fix check support status.
1164
        for name, necessity in self.features.iteritems():
6213.1.31 by Jelmer Vernooij
Fix more tests.
1165
            if name in self._present_features:
1166
                continue
1167
            if necessity == "optional":
1168
                mutter("ignoring optional missing feature %s", name)
1169
                continue
1170
            elif necessity == "required":
1171
                raise errors.MissingFeature(name)
1172
            else:
1173
                mutter("treating unknown necessity as require for %s",
1174
                       name)
1175
                raise errors.MissingFeature(name)
6213.1.24 by Jelmer Vernooij
More refactoring.
1176
1177
    @classmethod
1178
    def get_format_string(cls):
1179
        """Return the ASCII format string that identifies this format."""
6349.2.1 by Jelmer Vernooij
Add BzrDirMetaComponentFormat.
1180
        raise NotImplementedError(cls.get_format_string)
6213.1.24 by Jelmer Vernooij
More refactoring.
1181
1182
    @classmethod
6213.1.31 by Jelmer Vernooij
Fix more tests.
1183
    def from_string(cls, text):
1184
        format_string = cls.get_format_string()
1185
        if not text.startswith(format_string):
6213.1.53 by Jelmer Vernooij
Add ParseFormatError.
1186
            raise AssertionError("Invalid format header %r for %r" % (text, cls))
6213.1.31 by Jelmer Vernooij
Fix more tests.
1187
        lines = text[len(format_string):].splitlines()
6213.1.40 by Jelmer Vernooij
Merge common-bzrdir-component
1188
        ret = cls()
6213.1.31 by Jelmer Vernooij
Fix more tests.
1189
        for lineno, line in enumerate(lines):
6213.1.53 by Jelmer Vernooij
Add ParseFormatError.
1190
            try:
1191
                (necessity, feature) = line.split(" ", 1)
1192
            except ValueError:
1193
                raise errors.ParseFormatError(format=cls, lineno=lineno+2,
1194
                    line=line, text=text)
6213.1.48 by Jelmer Vernooij
Drop feature bit, don't allow spaces.
1195
            ret.features[feature] = necessity
6213.1.24 by Jelmer Vernooij
More refactoring.
1196
        return ret
1197
1198
    def as_string(self):
6213.1.31 by Jelmer Vernooij
Fix more tests.
1199
        """Return the string representation of this format.
1200
        """
1201
        lines = [self.get_format_string()]
6213.1.48 by Jelmer Vernooij
Drop feature bit, don't allow spaces.
1202
        lines.extend([("%s %s\n" % (item[1], item[0])) for item in
6213.1.32 by Jelmer Vernooij
Fix check support status.
1203
            self.features.iteritems()])
6213.1.31 by Jelmer Vernooij
Fix more tests.
1204
        return "".join(lines)
6213.1.24 by Jelmer Vernooij
More refactoring.
1205
1206
    @classmethod
1207
    def _find_format(klass, registry, kind, format_string):
1208
        try:
1209
            first_line = format_string[:format_string.index("\n")+1]
1210
        except ValueError:
1211
            first_line = format_string
1212
        try:
1213
            cls = registry.get(first_line)
1214
        except KeyError:
1215
            raise errors.UnknownFormatError(format=first_line, kind=kind)
1216
        return cls.from_string(format_string)
1217
1218
    def network_name(self):
1219
        """A simple byte string uniquely identifying this format for RPC calls.
1220
1221
        Metadir branch formats use their format string.
1222
        """
1223
        return self.as_string()
1224
1225
    def __eq__(self, other):
1226
        return (self.__class__ is other.__class__ and
6213.1.32 by Jelmer Vernooij
Fix check support status.
1227
                self.features == other.features)
6213.1.24 by Jelmer Vernooij
More refactoring.
1228
6213.1.58 by Jelmer Vernooij
Use update_feature_flags everywhere.
1229
    def _update_feature_flags(self, updated_flags):
1230
        """Update the feature flags in this format.
1231
1232
        :param updated_flags: Updated feature flags
1233
        """
1234
        for name, necessity in updated_flags.iteritems():
1235
            if necessity is None:
1236
                try:
1237
                    del self.features[name]
1238
                except KeyError:
1239
                    pass
1240
            else:
1241
                self.features[name] = necessity
1242
6213.1.24 by Jelmer Vernooij
More refactoring.
1243
5363.2.20 by Jelmer Vernooij
use controldir.X
1244
class BzrProber(controldir.Prober):
5363.2.8 by Jelmer Vernooij
Docstrings.
1245
    """Prober for formats that use a .bzr/ control directory."""
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1246
5712.3.8 by Jelmer Vernooij
Support lazy registration of BzrDir formats.
1247
    formats = registry.FormatRegistry(controldir.network_format_registry)
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1248
    """The known .bzr formats."""
1249
1250
    @classmethod
5712.3.1 by Jelmer Vernooij
Use registry for BzrProber.formats.
1251
    @deprecated_method(deprecated_in((2, 4, 0)))
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1252
    def register_bzrdir_format(klass, format):
5712.3.8 by Jelmer Vernooij
Support lazy registration of BzrDir formats.
1253
        klass.formats.register(format.get_format_string(), format)
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1254
1255
    @classmethod
5712.3.1 by Jelmer Vernooij
Use registry for BzrProber.formats.
1256
    @deprecated_method(deprecated_in((2, 4, 0)))
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
1257
    def unregister_bzrdir_format(klass, format):
5712.3.8 by Jelmer Vernooij
Support lazy registration of BzrDir formats.
1258
        klass.formats.remove(format.get_format_string())
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1259
5363.2.7 by Jelmer Vernooij
Fix tests.
1260
    @classmethod
1261
    def probe_transport(klass, transport):
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1262
        """Return the .bzrdir style format present in a directory."""
1263
        try:
1264
            format_string = transport.get_bytes(".bzr/branch-format")
1265
        except errors.NoSuchFile:
1266
            raise errors.NotBranchError(path=transport.base)
1267
        try:
6213.1.8 by Jelmer Vernooij
Support loading directories with featurs.
1268
            first_line = format_string[:format_string.index("\n")+1]
1269
        except ValueError:
1270
            first_line = format_string
1271
        try:
1272
            cls = klass.formats.get(first_line)
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1273
        except KeyError:
6213.1.8 by Jelmer Vernooij
Support loading directories with featurs.
1274
            raise errors.UnknownFormatError(format=first_line, kind='bzrdir')
1275
        return cls.from_string(format_string)
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1276
5712.3.15 by Jelmer Vernooij
Remove unused register format functions.
1277
    @classmethod
1278
    def known_formats(cls):
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
1279
        result = set()
5712.3.15 by Jelmer Vernooij
Remove unused register format functions.
1280
        for name, format in cls.formats.iteritems():
5712.4.9 by Jelmer Vernooij
Fix lazy control directory discovery.
1281
            if callable(format):
1282
                format = format()
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
1283
            result.add(format)
1284
        return result
1285
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1286
5363.2.20 by Jelmer Vernooij
use controldir.X
1287
controldir.ControlDirFormat.register_prober(BzrProber)
1288
1289
1290
class RemoteBzrProber(controldir.Prober):
5363.2.8 by Jelmer Vernooij
Docstrings.
1291
    """Prober for remote servers that provide a Bazaar smart server."""
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1292
1293
    @classmethod
1294
    def probe_transport(klass, transport):
1295
        """Return a RemoteBzrDirFormat object if it looks possible."""
1296
        try:
1297
            medium = transport.get_smart_medium()
1298
        except (NotImplementedError, AttributeError,
1299
                errors.TransportNotPossible, errors.NoSmartMedium,
1300
                errors.SmartProtocolError):
1301
            # no smart server, so not a branch for this format type.
1302
            raise errors.NotBranchError(path=transport.base)
1303
        else:
1304
            # Decline to open it if the server doesn't support our required
1305
            # version (3) so that the VFS-based transport will do it.
1306
            if medium.should_probe():
1307
                try:
1308
                    server_version = medium.protocol_version()
1309
                except errors.SmartProtocolError:
1310
                    # Apparently there's no usable smart server there, even though
1311
                    # the medium supports the smart protocol.
1312
                    raise errors.NotBranchError(path=transport.base)
1313
                if server_version != '2':
1314
                    raise errors.NotBranchError(path=transport.base)
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
1315
            from bzrlib.remote import RemoteBzrDirFormat
5363.2.7 by Jelmer Vernooij
Fix tests.
1316
            return RemoteBzrDirFormat()
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1317
5712.3.15 by Jelmer Vernooij
Remove unused register format functions.
1318
    @classmethod
1319
    def known_formats(cls):
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
1320
        from bzrlib.remote import RemoteBzrDirFormat
1321
        return set([RemoteBzrDirFormat()])
1322
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
1323
6213.1.30 by Jelmer Vernooij
Add BzrFormat.
1324
class BzrDirFormat(BzrFormat, controldir.ControlDirFormat):
5363.2.3 by Jelmer Vernooij
Add ControlDirFormat.
1325
    """ControlDirFormat base class for .bzr/ directories.
1534.4.39 by Robert Collins
Basic BzrDir support.
1326
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1327
    Formats are placed in a dict by their format string for reference
1534.4.39 by Robert Collins
Basic BzrDir support.
1328
    during bzrdir opening. These should be subclasses of BzrDirFormat
1329
    for consistency.
1330
1331
    Once a format is deprecated, just deprecate the initialize and open
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1332
    methods on the format class. Do not deprecate the object, as the
1534.4.39 by Robert Collins
Basic BzrDir support.
1333
    object will be created every system load.
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.
1334
    """
1335
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1336
    _lock_file_name = 'branch-lock'
1337
1338
    # _lock_class must be set in subclasses to the lock type, typ.
1339
    # TransportLock or LockDir
1340
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1341
    def initialize_on_transport(self, transport):
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1342
        """Initialize a new bzrdir in the base directory of a Transport."""
4017.2.2 by Robert Collins
Perform creation of BzrDirMetaFormat1 control directories using an RPC where possible. (Robert Collins)
1343
        try:
1344
            # can we hand off the request to the smart server rather than using
1345
            # vfs calls?
1346
            client_medium = transport.get_smart_medium()
1347
        except errors.NoSmartMedium:
1348
            return self._initialize_on_transport_vfs(transport)
1349
        else:
1350
            # Current RPC's only know how to create bzr metadir1 instances, so
1351
            # we still delegate to vfs methods if the requested format is not a
1352
            # metadir1
1353
            if type(self) != BzrDirMetaFormat1:
1354
                return self._initialize_on_transport_vfs(transport)
5712.3.13 by Jelmer Vernooij
Add Prober.known_formats().
1355
            from bzrlib.remote import RemoteBzrDirFormat
4017.2.2 by Robert Collins
Perform creation of BzrDirMetaFormat1 control directories using an RPC where possible. (Robert Collins)
1356
            remote_format = RemoteBzrDirFormat()
1357
            self._supply_sub_formats_to(remote_format)
1358
            return remote_format.initialize_on_transport(transport)
1359
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1360
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
1361
        create_prefix=False, force_new_repo=False, stacked_on=None,
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
1362
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
1363
        shared_repo=False, vfs_only=False):
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1364
        """Create this format on transport.
1365
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
1366
        The directory to initialize will be created.
1367
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1368
        :param force_new_repo: Do not use a shared repository for the target,
1369
                               even if one is available.
1370
        :param create_prefix: Create any missing directories leading up to
1371
            to_transport.
1372
        :param use_existing_dir: Use an existing directory if one exists.
1373
        :param stacked_on: A url to stack any created branch on, None to follow
1374
            any target stacking policy.
1375
        :param stack_on_pwd: If stack_on is relative, the location it is
1376
            relative to.
1377
        :param repo_format_name: If non-None, a repository will be
1378
            made-or-found. Should none be found, or if force_new_repo is True
1379
            the repo_format_name is used to select the format of repository to
1380
            create.
1381
        :param make_working_trees: Control the setting of make_working_trees
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
1382
            for a new shared repository when one is made. None to use whatever
1383
            default the format has.
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1384
        :param shared_repo: Control whether made repositories are shared or
1385
            not.
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
1386
        :param vfs_only: If True do not attempt to use a smart server
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
1387
        :return: repo, bzrdir, require_stacking, repository_policy. repo is
1388
            None if none was created or found, bzrdir is always valid.
1389
            require_stacking is the result of examining the stacked_on
1390
            parameter and any stacking policy found for the target.
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1391
        """
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
1392
        if not vfs_only:
1393
            # Try to hand off to a smart server 
1394
            try:
1395
                client_medium = transport.get_smart_medium()
1396
            except errors.NoSmartMedium:
1397
                pass
1398
            else:
5712.3.15 by Jelmer Vernooij
Remove unused register format functions.
1399
                from bzrlib.remote import RemoteBzrDirFormat
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
1400
                # TODO: lookup the local format from a server hint.
1401
                remote_dir_format = RemoteBzrDirFormat()
1402
                remote_dir_format._network_name = self.network_name()
1403
                self._supply_sub_formats_to(remote_dir_format)
1404
                return remote_dir_format.initialize_on_transport_ex(transport,
1405
                    use_existing_dir=use_existing_dir, create_prefix=create_prefix,
1406
                    force_new_repo=force_new_repo, stacked_on=stacked_on,
1407
                    stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
1408
                    make_working_trees=make_working_trees, shared_repo=shared_repo)
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1409
        # XXX: Refactor the create_prefix/no_create_prefix code into a
1410
        #      common helper function
1411
        # The destination may not exist - if so make it according to policy.
1412
        def make_directory(transport):
1413
            transport.mkdir('.')
1414
            return transport
1415
        def redirected(transport, e, redirection_notice):
1416
            note(redirection_notice)
1417
            return transport._redirected_to(e.source, e.target)
1418
        try:
1419
            transport = do_catching_redirections(make_directory, transport,
1420
                redirected)
1421
        except errors.FileExists:
1422
            if not use_existing_dir:
1423
                raise
1424
        except errors.NoSuchFile:
1425
            if not create_prefix:
1426
                raise
1427
            transport.create_prefix()
1428
1429
        require_stacking = (stacked_on is not None)
1430
        # Now the target directory exists, but doesn't have a .bzr
1431
        # directory. So we need to create it, along with any work to create
1432
        # all of the dependent branches, etc.
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
1433
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1434
        result = self.initialize_on_transport(transport)
1435
        if repo_format_name:
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
1436
            try:
1437
                # use a custom format
1438
                result._format.repository_format = \
1439
                    repository.network_format_registry.get(repo_format_name)
1440
            except AttributeError:
1441
                # The format didn't permit it to be set.
1442
                pass
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1443
            # A repository is desired, either in-place or shared.
1444
            repository_policy = result.determine_repository_policy(
1445
                force_new_repo, stacked_on, stack_on_pwd,
1446
                require_stacking=require_stacking)
1447
            result_repo, is_new_repo = repository_policy.acquire_repository(
1448
                make_working_trees, shared_repo)
1449
            if not require_stacking and repository_policy._require_stacking:
1450
                require_stacking = True
1451
                result._format.require_stacking()
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
1452
            result_repo.lock_write()
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1453
        else:
1454
            result_repo = None
1455
            repository_policy = None
1456
        return result_repo, result, require_stacking, repository_policy
1457
4017.2.2 by Robert Collins
Perform creation of BzrDirMetaFormat1 control directories using an RPC where possible. (Robert Collins)
1458
    def _initialize_on_transport_vfs(self, transport):
1459
        """Initialize a new bzrdir using VFS calls.
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
1460
4017.2.2 by Robert Collins
Perform creation of BzrDirMetaFormat1 control directories using an RPC where possible. (Robert Collins)
1461
        :param transport: The transport to create the .bzr directory in.
1462
        :return: A
1463
        """
1464
        # Since we are creating a .bzr directory, inherit the
1534.4.39 by Robert Collins
Basic BzrDir support.
1465
        # mode from the root directory
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1466
        temp_control = lockable_files.LockableFiles(transport,
1467
                            '', lockable_files.TransportLock)
1534.4.39 by Robert Collins
Basic BzrDir support.
1468
        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.
1469
                                      # FIXME: RBC 20060121 don't peek under
1534.4.39 by Robert Collins
Basic BzrDir support.
1470
                                      # the covers
1471
                                      mode=temp_control._dir_mode)
3224.5.24 by Andrew Bennetts
More minor import tidying suggested by pyflakes.
1472
        if sys.platform == 'win32' and isinstance(transport, local.LocalTransport):
3023.1.2 by Alexander Belchenko
Martin's review.
1473
            win32utils.set_file_attr_hidden(transport._abspath('.bzr'))
1534.4.39 by Robert Collins
Basic BzrDir support.
1474
        file_mode = temp_control._file_mode
1475
        del temp_control
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1476
        bzrdir_transport = transport.clone('.bzr')
1477
        utf8_files = [('README',
3250.2.1 by Marius Kruger
update .bzr/README to not refer to Bazaar-NG, and add link to website.
1478
                       "This is a Bazaar control directory.\n"
1479
                       "Do not change any files in this directory.\n"
5560.2.1 by Vincent Ladeuil
Fix the remaining references to http://bazaar-vcs.org (except the explicitly historical ones).
1480
                       "See http://bazaar.canonical.com/ for more information about Bazaar.\n"),
6213.1.56 by Jelmer Vernooij
Add BzrDir.update_feature_flags.
1481
                      ('branch-format', self.as_string()),
1534.4.39 by Robert Collins
Basic BzrDir support.
1482
                      ]
1483
        # NB: no need to escape relative paths that are url safe.
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1484
        control_files = lockable_files.LockableFiles(bzrdir_transport,
1485
            self._lock_file_name, self._lock_class)
1553.5.60 by Martin Pool
New LockableFiles.create_lock() method
1486
        control_files.create_lock()
1534.4.39 by Robert Collins
Basic BzrDir support.
1487
        control_files.lock_write()
1488
        try:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1489
            for (filename, content) in utf8_files:
3407.2.12 by Martin Pool
Fix creation mode of control files
1490
                bzrdir_transport.put_bytes(filename, content,
1491
                    mode=file_mode)
1534.4.39 by Robert Collins
Basic BzrDir support.
1492
        finally:
1493
            control_files.unlock()
4017.2.2 by Robert Collins
Perform creation of BzrDirMetaFormat1 control directories using an RPC where possible. (Robert Collins)
1494
        return self.open(transport, _found=True)
1534.4.39 by Robert Collins
Basic BzrDir support.
1495
1496
    def open(self, transport, _found=False):
1497
        """Return an instance of this format for the dir transport points at.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1498
1534.4.39 by Robert Collins
Basic BzrDir support.
1499
        _found is a private parameter, do not use it.
1500
        """
1501
        if not _found:
5363.2.20 by Jelmer Vernooij
use controldir.X
1502
            found_format = controldir.ControlDirFormat.find_format(transport)
2090.2.2 by Martin Pool
Fix an assertion with side effects
1503
            if not isinstance(found_format, self.__class__):
1504
                raise AssertionError("%s was asked to open %s, but it seems to need "
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1505
                        "format %s"
2090.2.2 by Martin Pool
Fix an assertion with side effects
1506
                        % (self, transport, found_format))
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1507
            # Allow subclasses - use the found format.
1508
            self._supply_sub_formats_to(found_format)
1509
            return found_format._open(transport)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1510
        return self._open(transport)
1511
1512
    def _open(self, transport):
1513
        """Template method helper for opening BzrDirectories.
1514
1515
        This performs the actual open and any additional logic or parameter
1516
        passing.
1517
        """
1518
        raise NotImplementedError(self._open)
1534.4.39 by Robert Collins
Basic BzrDir support.
1519
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1520
    def _supply_sub_formats_to(self, other_format):
1521
        """Give other_format the same values for sub formats as this has.
1522
1523
        This method is expected to be used when parameterising a
1524
        RemoteBzrDirFormat instance with the parameters from a
1525
        BzrDirMetaFormat1 instance.
1526
1527
        :param other_format: other_format is a format which should be
1528
            compatible with whatever sub formats are supported by self.
1529
        :return: None.
1530
        """
6213.1.32 by Jelmer Vernooij
Fix check support status.
1531
        other_format.features = dict(self.features)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1532
6205.3.1 by Jelmer Vernooij
Add ControlDirFormat.supports_transport.
1533
    def supports_transport(self, transport):
1534
        # bzr formats can be opened over all known transports
1535
        return True
1536
6213.1.32 by Jelmer Vernooij
Fix check support status.
1537
    def check_support_status(self, allow_unsupported, recommend_upgrade=True,
1538
            basedir=None):
1539
        controldir.ControlDirFormat.check_support_status(self,
1540
            allow_unsupported=allow_unsupported, recommend_upgrade=recommend_upgrade,
1541
            basedir=basedir)
1542
        BzrFormat.check_support_status(self, allow_unsupported=allow_unsupported,
1543
            recommend_upgrade=recommend_upgrade, basedir=basedir)
1544
1545
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1546
class BzrDirMetaFormat1(BzrDirFormat):
1547
    """Bzr meta control format 1
1548
1549
    This is the first format with split out working tree, branch and repository
1550
    disk storage.
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1551
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1552
    It has:
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1553
1554
    - Format 3 working trees [optional]
6083.2.11 by Jelmer Vernooij
Add development-colo format.
1555
    - Format 5 branches [optional]
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1556
    - 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.
1557
    """
1558
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1559
    _lock_class = lockdir.LockDir
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1560
5673.1.3 by Jelmer Vernooij
Change flexible_components to fixed_components.
1561
    fixed_components = False
1562
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1563
    colocated_branches = False
6083.2.1 by Jelmer Vernooij
Support passing names to BzrDir methods.
1564
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1565
    def __init__(self):
6213.1.30 by Jelmer Vernooij
Add BzrFormat.
1566
        BzrDirFormat.__init__(self)
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1567
        self._workingtree_format = None
2230.3.1 by Aaron Bentley
Get branch6 creation working
1568
        self._branch_format = None
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
1569
        self._repository_format = None
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1570
2100.3.15 by Aaron Bentley
get test suite passing
1571
    def __eq__(self, other):
1572
        if other.__class__ is not self.__class__:
1573
            return False
1574
        if other.repository_format != self.repository_format:
1575
            return False
1576
        if other.workingtree_format != self.workingtree_format:
1577
            return False
6213.1.32 by Jelmer Vernooij
Fix check support status.
1578
        if other.features != self.features:
6213.1.8 by Jelmer Vernooij
Support loading directories with featurs.
1579
            return False
2100.3.15 by Aaron Bentley
get test suite passing
1580
        return True
1581
2100.3.35 by Aaron Bentley
equality operations on bzrdir
1582
    def __ne__(self, other):
1583
        return not self == other
1584
2230.3.55 by Aaron Bentley
Updates from review
1585
    def get_branch_format(self):
2230.3.1 by Aaron Bentley
Get branch6 creation working
1586
        if self._branch_format is None:
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1587
            from bzrlib.branch import format_registry as branch_format_registry
1588
            self._branch_format = branch_format_registry.get_default()
2230.3.1 by Aaron Bentley
Get branch6 creation working
1589
        return self._branch_format
1590
2230.3.55 by Aaron Bentley
Updates from review
1591
    def set_branch_format(self, format):
2230.3.1 by Aaron Bentley
Get branch6 creation working
1592
        self._branch_format = format
1593
4456.2.1 by Andrew Bennetts
Fix automatic branch format upgrades triggered by a default stacking policy on a 1.16rc1 (or later) smart server.
1594
    def require_stacking(self, stack_on=None, possible_transports=None,
1595
            _skip_repo=False):
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
1596
        """We have a request to stack, try to ensure the formats support it.
1597
1598
        :param stack_on: If supplied, it is the URL to a branch that we want to
1599
            stack on. Check to see if that format supports stacking before
1600
            forcing an upgrade.
1601
        """
1602
        # Stacking is desired. requested by the target, but does the place it
1603
        # points at support stacking? If it doesn't then we should
1604
        # not implicitly upgrade. We check this here.
1605
        new_repo_format = None
1606
        new_branch_format = None
1607
1608
        # a bit of state for get_target_branch so that we don't try to open it
1609
        # 2 times, for both repo *and* branch
1610
        target = [None, False, None] # target_branch, checked, upgrade anyway
1611
        def get_target_branch():
1612
            if target[1]:
1613
                # We've checked, don't check again
1614
                return target
1615
            if stack_on is None:
1616
                # No target format, that means we want to force upgrading
1617
                target[:] = [None, True, True]
1618
                return target
1619
            try:
1620
                target_dir = BzrDir.open(stack_on,
1621
                    possible_transports=possible_transports)
1622
            except errors.NotBranchError:
1623
                # Nothing there, don't change formats
1624
                target[:] = [None, True, False]
1625
                return target
1626
            except errors.JailBreak:
1627
                # JailBreak, JFDI and upgrade anyway
1628
                target[:] = [None, True, True]
1629
                return target
1630
            try:
1631
                target_branch = target_dir.open_branch()
1632
            except errors.NotBranchError:
1633
                # No branch, don't upgrade formats
1634
                target[:] = [None, True, False]
1635
                return target
1636
            target[:] = [target_branch, True, False]
1637
            return target
1638
4456.2.1 by Andrew Bennetts
Fix automatic branch format upgrades triggered by a default stacking policy on a 1.16rc1 (or later) smart server.
1639
        if (not _skip_repo and
1640
                 not self.repository_format.supports_external_lookups):
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
1641
            # We need to upgrade the Repository.
1642
            target_branch, _, do_upgrade = get_target_branch()
1643
            if target_branch is None:
1644
                # We don't have a target branch, should we upgrade anyway?
1645
                if do_upgrade:
1646
                    # stack_on is inaccessible, JFDI.
1647
                    # TODO: bad monkey, hard-coded formats...
1648
                    if self.repository_format.rich_root_data:
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
1649
                        new_repo_format = knitpack_repo.RepositoryFormatKnitPack5RichRoot()
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
1650
                    else:
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
1651
                        new_repo_format = knitpack_repo.RepositoryFormatKnitPack5()
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
1652
            else:
1653
                # If the target already supports stacking, then we know the
1654
                # project is already able to use stacking, so auto-upgrade
1655
                # for them
1656
                new_repo_format = target_branch.repository._format
1657
                if not new_repo_format.supports_external_lookups:
1658
                    # target doesn't, source doesn't, so don't auto upgrade
1659
                    # repo
1660
                    new_repo_format = None
1661
            if new_repo_format is not None:
1662
                self.repository_format = new_repo_format
6138.3.1 by Jonathan Riddell
use gettext() in more files
1663
                note(gettext('Source repository format does not support stacking,'
1664
                     ' using format:\n  %s'),
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
1665
                     new_repo_format.get_format_description())
1666
3904.3.1 by Andrew Bennetts
Probable fix for GaryvdM's bug when pushing a stacked qbzr branch to Launchpad.
1667
        if not self.get_branch_format().supports_stacking():
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
1668
            # We just checked the repo, now lets check if we need to
1669
            # upgrade the branch format
1670
            target_branch, _, do_upgrade = get_target_branch()
1671
            if target_branch is None:
1672
                if do_upgrade:
1673
                    # TODO: bad monkey, hard-coded formats...
5675.2.6 by Jelmer Vernooij
Fix some tests.
1674
                    from bzrlib.branch import BzrBranchFormat7
1675
                    new_branch_format = BzrBranchFormat7()
3904.3.1 by Andrew Bennetts
Probable fix for GaryvdM's bug when pushing a stacked qbzr branch to Launchpad.
1676
            else:
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
1677
                new_branch_format = target_branch._format
1678
                if not new_branch_format.supports_stacking():
1679
                    new_branch_format = None
1680
            if new_branch_format is not None:
1681
                # Does support stacking, use its format.
1682
                self.set_branch_format(new_branch_format)
6138.3.1 by Jonathan Riddell
use gettext() in more files
1683
                note(gettext('Source branch format does not support stacking,'
1684
                     ' using format:\n  %s'),
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
1685
                     new_branch_format.get_format_description())
3904.3.1 by Andrew Bennetts
Probable fix for GaryvdM's bug when pushing a stacked qbzr branch to Launchpad.
1686
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.
1687
    def get_converter(self, format=None):
1688
        """See BzrDirFormat.get_converter()."""
1689
        if format is None:
1690
            format = BzrDirFormat.get_default_format()
6207.1.1 by Jelmer Vernooij
Support upgrading between 2a and development-colo.
1691
        if (type(self) is BzrDirMetaFormat1 and
1692
            type(format) is BzrDirMetaFormat1Colo):
1693
            return ConvertMetaToColo(format)
1694
        if (type(self) is BzrDirMetaFormat1Colo and
1695
            type(format) is BzrDirMetaFormat1):
1696
            return ConvertMetaRemoveColo(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.
1697
        if not isinstance(self, format.__class__):
1698
            # converting away from metadir is not implemented
1699
            raise NotImplementedError(self.get_converter)
1700
        return ConvertMetaToMeta(format)
1701
5712.3.15 by Jelmer Vernooij
Remove unused register format functions.
1702
    @classmethod
1703
    def get_format_string(cls):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1704
        """See BzrDirFormat.get_format_string()."""
1705
        return "Bazaar-NG meta directory, format 1\n"
1706
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1707
    def get_format_description(self):
1708
        """See BzrDirFormat.get_format_description()."""
1709
        return "Meta directory format 1"
1710
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1711
    def _open(self, transport):
1712
        """See BzrDirFormat._open."""
4294.2.12 by Robert Collins
Prevent aliasing issues with BzrDirMetaFormat1 by making a new format object in _open.
1713
        # Create a new format instance because otherwise initialisation of new
1714
        # metadirs share the global default format object leading to alias
1715
        # problems.
1716
        format = BzrDirMetaFormat1()
1717
        self._supply_sub_formats_to(format)
1718
        return BzrDirMeta1(transport, format)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1719
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.
1720
    def __return_repository_format(self):
1721
        """Circular import protection."""
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
1722
        if self._repository_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.
1723
            return self._repository_format
5651.3.2 by Jelmer Vernooij
Fix deprecation warnings in test suite.
1724
        from bzrlib.repository import format_registry
1725
        return format_registry.get_default()
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.
1726
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1727
    def _set_repository_format(self, value):
3015.2.8 by Robert Collins
Typo in __set_repository_format's docstring.
1728
        """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.
1729
        self._repository_format = value
1553.5.72 by Martin Pool
Clean up test for Branch5 lockdirs
1730
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1731
    repository_format = property(__return_repository_format,
1732
        _set_repository_format)
1733
1734
    def _supply_sub_formats_to(self, other_format):
1735
        """Give other_format the same values for sub formats as this has.
1736
1737
        This method is expected to be used when parameterising a
1738
        RemoteBzrDirFormat instance with the parameters from a
1739
        BzrDirMetaFormat1 instance.
1740
1741
        :param other_format: other_format is a format which should be
1742
            compatible with whatever sub formats are supported by self.
1743
        :return: None.
1744
        """
6213.1.32 by Jelmer Vernooij
Fix check support status.
1745
        super(BzrDirMetaFormat1, self)._supply_sub_formats_to(other_format)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1746
        if getattr(self, '_repository_format', None) is not None:
1747
            other_format.repository_format = self.repository_format
1748
        if self._branch_format is not None:
1749
            other_format._branch_format = self._branch_format
1750
        if self._workingtree_format is not None:
1751
            other_format.workingtree_format = self.workingtree_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.
1752
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1753
    def __get_workingtree_format(self):
1754
        if self._workingtree_format is None:
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
1755
            from bzrlib.workingtree import (
1756
                format_registry as wt_format_registry,
1757
                )
1758
            self._workingtree_format = wt_format_registry.get_default()
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1759
        return self._workingtree_format
1760
1761
    def __set_workingtree_format(self, wt_format):
1762
        self._workingtree_format = wt_format
1763
6213.1.7 by Jelmer Vernooij
Features doesn't use format string.
1764
    def __repr__(self):
6349.2.1 by Jelmer Vernooij
Add BzrDirMetaComponentFormat.
1765
        return "<%r>" % (self.__class__.__name__,)
6213.1.7 by Jelmer Vernooij
Features doesn't use format string.
1766
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1767
    workingtree_format = property(__get_workingtree_format,
1768
                                  __set_workingtree_format)
1769
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1770
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
1771
# Register bzr formats
5712.3.23 by Jelmer Vernooij
Register BzrMetaDir1 as a class in the BzrDir subformat registry. This subformat registry inherits from bzrlib.controldir.network_format_registry, which previously contained classes rather than instances.
1772
BzrProber.formats.register(BzrDirMetaFormat1.get_format_string(),
1773
    BzrDirMetaFormat1)
1774
controldir.ControlDirFormat._default_format = BzrDirMetaFormat1()
1534.4.39 by Robert Collins
Basic BzrDir support.
1775
1776
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1777
class BzrDirMetaFormat1Colo(BzrDirMetaFormat1):
6083.2.11 by Jelmer Vernooij
Add development-colo format.
1778
    """BzrDirMeta1 format with support for colocated branches."""
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1779
1780
    colocated_branches = True
1781
1782
    @classmethod
1783
    def get_format_string(cls):
1784
        """See BzrDirFormat.get_format_string()."""
1785
        return "Bazaar meta directory, format 1 (with colocated branches)\n"
1786
1787
    def get_format_description(self):
1788
        """See BzrDirFormat.get_format_description()."""
1789
        return "Meta directory format 1 with support for colocated branches"
1790
6083.2.11 by Jelmer Vernooij
Add development-colo format.
1791
    def _open(self, transport):
1792
        """See BzrDirFormat._open."""
1793
        # Create a new format instance because otherwise initialisation of new
1794
        # metadirs share the global default format object leading to alias
1795
        # problems.
1796
        format = BzrDirMetaFormat1Colo()
1797
        self._supply_sub_formats_to(format)
1798
        return BzrDirMeta1Colo(transport, format)
1799
6083.2.10 by Jelmer Vernooij
Move more to colo class.
1800
1801
BzrProber.formats.register(BzrDirMetaFormat1Colo.get_format_string(),
1802
    BzrDirMetaFormat1Colo)
1803
1804
5692.1.1 by Jelmer Vernooij
Move Converter (which is generic) from bzrlib.bzrdir to bzrlib.controldir.
1805
class ConvertMetaToMeta(controldir.Converter):
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.
1806
    """Converts the components of metadirs."""
1807
1808
    def __init__(self, target_format):
1809
        """Create a metadir to metadir converter.
1810
1811
        :param target_format: The final metadir format that is desired.
1812
        """
1813
        self.target_format = target_format
1814
1815
    def convert(self, to_convert, pb):
1816
        """See Converter.convert()."""
1817
        self.bzrdir = to_convert
4961.2.14 by Martin Pool
Further pb cleanups
1818
        self.pb = ui.ui_factory.nested_progress_bar()
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.
1819
        self.count = 0
1820
        self.total = 1
1821
        self.step('checking repository format')
1822
        try:
1823
            repo = self.bzrdir.open_repository()
1824
        except errors.NoRepositoryPresent:
1825
            pass
1826
        else:
1827
            if not isinstance(repo._format, self.target_format.repository_format.__class__):
1828
                from bzrlib.repository import CopyConverter
6138.3.1 by Jonathan Riddell
use gettext() in more files
1829
                ui.ui_factory.note(gettext('starting repository 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.
1830
                converter = CopyConverter(self.target_format.repository_format)
1831
                converter.convert(repo, pb)
4997.1.3 by Jelmer Vernooij
Use list_branches during upgrades.
1832
        for branch in self.bzrdir.list_branches():
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1833
            # TODO: conversions of Branch and Tree should be done by
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
1834
            # InterXFormat lookups/some sort of registry.
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
1835
            # Avoid circular imports
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
1836
            old = branch._format.__class__
1837
            new = self.target_format.get_branch_format().__class__
1838
            while old != new:
1839
                if (old == _mod_branch.BzrBranchFormat5 and
1840
                    new in (_mod_branch.BzrBranchFormat6,
4273.1.13 by Aaron Bentley
Implement upgrade from branch format 7 to 8.
1841
                        _mod_branch.BzrBranchFormat7,
1842
                        _mod_branch.BzrBranchFormat8)):
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
1843
                    branch_converter = _mod_branch.Converter5to6()
1844
                elif (old == _mod_branch.BzrBranchFormat6 and
4273.1.13 by Aaron Bentley
Implement upgrade from branch format 7 to 8.
1845
                    new in (_mod_branch.BzrBranchFormat7,
1846
                            _mod_branch.BzrBranchFormat8)):
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
1847
                    branch_converter = _mod_branch.Converter6to7()
4273.1.13 by Aaron Bentley
Implement upgrade from branch format 7 to 8.
1848
                elif (old == _mod_branch.BzrBranchFormat7 and
1849
                      new is _mod_branch.BzrBranchFormat8):
1850
                    branch_converter = _mod_branch.Converter7to8()
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
1851
                else:
4608.1.3 by Martin Pool
BadConversionTarget error includes source format
1852
                    raise errors.BadConversionTarget("No converter", new,
1853
                        branch._format)
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
1854
                branch_converter.convert(branch)
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
1855
                branch = self.bzrdir.open_branch()
1856
                old = branch._format.__class__
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1857
        try:
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1858
            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.
1859
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1860
            pass
1861
        else:
1862
            # TODO: conversions of Branch and Tree should be done by
1863
            # InterXFormat lookups
5816.5.1 by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3.
1864
            if (isinstance(tree, workingtree_3.WorkingTree3) and
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1865
                not isinstance(tree, workingtree_4.DirStateWorkingTree) and
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1866
                isinstance(self.target_format.workingtree_format,
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1867
                    workingtree_4.DirStateWorkingTreeFormat)):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1868
                workingtree_4.Converter3to4().convert(tree)
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1869
            if (isinstance(tree, workingtree_4.DirStateWorkingTree) and
1870
                not isinstance(tree, workingtree_4.WorkingTree5) and
3586.1.8 by Ian Clatworthy
add workingtree_5 and initial upgrade code
1871
                isinstance(self.target_format.workingtree_format,
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
1872
                    workingtree_4.WorkingTreeFormat5)):
1873
                workingtree_4.Converter4to5().convert(tree)
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
1874
            if (isinstance(tree, workingtree_4.DirStateWorkingTree) and
1875
                not isinstance(tree, workingtree_4.WorkingTree6) and
1876
                isinstance(self.target_format.workingtree_format,
1877
                    workingtree_4.WorkingTreeFormat6)):
1878
                workingtree_4.Converter4or5to6().convert(tree)
4961.2.14 by Martin Pool
Further pb cleanups
1879
        self.pb.finished()
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.
1880
        return to_convert
1731.2.18 by Aaron Bentley
Get extract in repository under test
1881
1882
6207.1.1 by Jelmer Vernooij
Support upgrading between 2a and development-colo.
1883
class ConvertMetaToColo(controldir.Converter):
1884
    """Add colocated branch support."""
1885
1886
    def __init__(self, target_format):
1887
        """Create a converter.that upgrades a metadir to the colo format.
1888
1889
        :param target_format: The final metadir format that is desired.
1890
        """
1891
        self.target_format = target_format
1892
1893
    def convert(self, to_convert, pb):
1894
        """See Converter.convert()."""
1895
        to_convert.transport.put_bytes('branch-format',
6213.1.56 by Jelmer Vernooij
Add BzrDir.update_feature_flags.
1896
            self.target_format.as_string())
6207.1.1 by Jelmer Vernooij
Support upgrading between 2a and development-colo.
1897
        return BzrDir.open_from_transport(to_convert.root_transport)
1898
1899
1900
class ConvertMetaRemoveColo(controldir.Converter):
1901
    """Remove colocated branch support from a bzrdir."""
1902
1903
    def __init__(self, target_format):
1904
        """Create a converter.that downgrades a colocated branch metadir
1905
        to a regular metadir.
1906
1907
        :param target_format: The final metadir format that is desired.
1908
        """
1909
        self.target_format = target_format
1910
1911
    def convert(self, to_convert, pb):
1912
        """See Converter.convert()."""
1913
        to_convert.control_files.lock_write()
1914
        try:
1915
            branches = to_convert.list_branches()
1916
            if len(branches) > 1:
1917
                raise errors.BzrError("remove all but a single "
1918
                    "colocated branch when downgrading")
1919
        finally:
1920
            to_convert.control_files.unlock()
1921
        to_convert.transport.put_bytes('branch-format',
6213.1.56 by Jelmer Vernooij
Add BzrDir.update_feature_flags.
1922
            self.target_format.as_string())
6207.1.1 by Jelmer Vernooij
Support upgrading between 2a and development-colo.
1923
        return BzrDir.open_from_transport(to_convert.root_transport)
1924
1925
5363.2.20 by Jelmer Vernooij
use controldir.X
1926
controldir.ControlDirFormat.register_server_prober(RemoteBzrProber)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
1927
1928
3242.2.14 by Aaron Bentley
Update from review comments
1929
class RepositoryAcquisitionPolicy(object):
1930
    """Abstract base class for repository acquisition policies.
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
1931
3242.2.14 by Aaron Bentley
Update from review comments
1932
    A repository acquisition policy decides how a BzrDir acquires a repository
1933
    for a branch that is being created.  The most basic policy decision is
1934
    whether to create a new repository or use an existing one.
1935
    """
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
1936
    def __init__(self, stack_on, stack_on_pwd, require_stacking):
3242.3.35 by Aaron Bentley
Cleanups and documentation
1937
        """Constructor.
1938
1939
        :param stack_on: A location to stack on
1940
        :param stack_on_pwd: If stack_on is relative, the location it is
1941
            relative to.
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
1942
        :param require_stacking: If True, it is a failure to not stack.
3242.3.35 by Aaron Bentley
Cleanups and documentation
1943
        """
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
1944
        self._stack_on = stack_on
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
1945
        self._stack_on_pwd = stack_on_pwd
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
1946
        self._require_stacking = require_stacking
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
1947
1948
    def configure_branch(self, branch):
3242.2.13 by Aaron Bentley
Update docs
1949
        """Apply any configuration data from this policy to the branch.
1950
3242.3.18 by Aaron Bentley
Clean up repository-policy work
1951
        Default implementation sets repository stacking.
3242.2.13 by Aaron Bentley
Update docs
1952
        """
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
1953
        if self._stack_on is None:
1954
            return
1955
        if self._stack_on_pwd is None:
1956
            stack_on = self._stack_on
1957
        else:
1958
            try:
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
1959
                stack_on = urlutils.rebase_url(self._stack_on,
1960
                    self._stack_on_pwd,
5158.6.9 by Martin Pool
Simplify various code to use user_url
1961
                    branch.user_url)
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
1962
            except errors.InvalidRebaseURLs:
1963
                stack_on = self._get_full_stack_on()
3242.3.37 by Aaron Bentley
Updates from reviews
1964
        try:
3537.3.5 by Martin Pool
merge trunk including stacking policy
1965
            branch.set_stacked_on_url(stack_on)
4126.1.1 by Andrew Bennetts
Fix bug when pushing stackable branch in unstackable repo to default-stacking target.
1966
        except (errors.UnstackableBranchFormat,
1967
                errors.UnstackableRepositoryFormat):
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
1968
            if self._require_stacking:
1969
                raise
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
1970
4617.3.1 by Robert Collins
Fix test_stacking tests for 2a as a default format. The change to 2a exposed some actual bugs, both in tests and bzrdir/branch code.
1971
    def requires_stacking(self):
1972
        """Return True if this policy requires stacking."""
1973
        return self._stack_on is not None and self._require_stacking
1974
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
1975
    def _get_full_stack_on(self):
3242.3.35 by Aaron Bentley
Cleanups and documentation
1976
        """Get a fully-qualified URL for the stack_on location."""
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
1977
        if self._stack_on is None:
1978
            return None
1979
        if self._stack_on_pwd is None:
1980
            return self._stack_on
1981
        else:
1982
            return urlutils.join(self._stack_on_pwd, self._stack_on)
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
1983
3928.3.2 by John Arbash Meinel
Track down the other cause of us connecting multiple times.
1984
    def _add_fallback(self, repository, possible_transports=None):
3242.3.35 by Aaron Bentley
Cleanups and documentation
1985
        """Add a fallback to the supplied repository, if stacking is set."""
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
1986
        stack_on = self._get_full_stack_on()
1987
        if stack_on is None:
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
1988
            return
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
1989
        try:
1990
            stacked_dir = BzrDir.open(stack_on,
1991
                                      possible_transports=possible_transports)
1992
        except errors.JailBreak:
1993
            # We keep the stacking details, but we are in the server code so
1994
            # actually stacking is not needed.
1995
            return
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
1996
        try:
1997
            stacked_repo = stacked_dir.open_branch().repository
1998
        except errors.NotBranchError:
1999
            stacked_repo = stacked_dir.open_repository()
3242.3.37 by Aaron Bentley
Updates from reviews
2000
        try:
2001
            repository.add_fallback_repository(stacked_repo)
2002
        except errors.UnstackableRepositoryFormat:
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2003
            if self._require_stacking:
2004
                raise
3904.3.1 by Andrew Bennetts
Probable fix for GaryvdM's bug when pushing a stacked qbzr branch to Launchpad.
2005
        else:
2006
            self._require_stacking = True
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
2007
6305.3.1 by Jelmer Vernooij
Save a connection to the server when using --stacked.
2008
    def acquire_repository(self, make_working_trees=None, shared=False,
2009
            possible_transports=None):
3242.2.14 by Aaron Bentley
Update from review comments
2010
        """Acquire a repository for this bzrdir.
2011
2012
        Implementations may create a new repository or use a pre-exising
2013
        repository.
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
2014
3242.2.14 by Aaron Bentley
Update from review comments
2015
        :param make_working_trees: If creating a repository, set
2016
            make_working_trees to this value (if non-None)
2017
        :param shared: If creating a repository, make it shared if True
4070.9.8 by Andrew Bennetts
Use MiniSearchResult in clone_on_transport down (further tightening the test_push ratchets), and improve acquire_repository docstrings.
2018
        :return: A repository, is_new_flag (True if the repository was
2019
            created).
3242.2.14 by Aaron Bentley
Update from review comments
2020
        """
6213.1.46 by Jelmer Vernooij
Fix typo.
2021
        raise NotImplementedError(RepositoryAcquisitionPolicy.acquire_repository)
3242.2.14 by Aaron Bentley
Update from review comments
2022
2023
2024
class CreateRepository(RepositoryAcquisitionPolicy):
3242.2.13 by Aaron Bentley
Update docs
2025
    """A policy of creating a new repository"""
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
2026
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2027
    def __init__(self, bzrdir, stack_on=None, stack_on_pwd=None,
2028
                 require_stacking=False):
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
2029
        """Constructor.
2030
3242.3.35 by Aaron Bentley
Cleanups and documentation
2031
        :param bzrdir: The bzrdir to create the repository on.
2032
        :param stack_on: A location to stack on
2033
        :param stack_on_pwd: If stack_on is relative, the location it is
2034
            relative to.
2035
        """
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2036
        RepositoryAcquisitionPolicy.__init__(self, stack_on, stack_on_pwd,
2037
                                             require_stacking)
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
2038
        self._bzrdir = bzrdir
2039
6305.3.1 by Jelmer Vernooij
Save a connection to the server when using --stacked.
2040
    def acquire_repository(self, make_working_trees=None, shared=False,
2041
            possible_transports=None):
3242.2.14 by Aaron Bentley
Update from review comments
2042
        """Implementation of RepositoryAcquisitionPolicy.acquire_repository
3242.2.13 by Aaron Bentley
Update docs
2043
3242.2.14 by Aaron Bentley
Update from review comments
2044
        Creates the desired repository in the bzrdir we already have.
3242.2.13 by Aaron Bentley
Update docs
2045
        """
6305.3.1 by Jelmer Vernooij
Save a connection to the server when using --stacked.
2046
        if possible_transports is None:
2047
            possible_transports = []
2048
        else:
2049
            possible_transports = list(possible_transports)
2050
        possible_transports.append(self._bzrdir.root_transport)
4165.2.1 by Robert Collins
Fix bzr failing to stack when a server requests it and the branch it is pushing from cannot stack but the branch it should stack on can.
2051
        stack_on = self._get_full_stack_on()
2052
        if stack_on:
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
2053
            format = self._bzrdir._format
2054
            format.require_stacking(stack_on=stack_on,
6305.3.1 by Jelmer Vernooij
Save a connection to the server when using --stacked.
2055
                                    possible_transports=possible_transports)
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
2056
            if not self._require_stacking:
2057
                # We have picked up automatic stacking somewhere.
6150.3.5 by Jonathan Riddell
more gettext()
2058
                note(gettext('Using default stacking branch {0} at {1}').format(
2059
                    self._stack_on, self._stack_on_pwd))
3650.3.9 by Aaron Bentley
Move responsibility for stackable repo format to _get_metadir
2060
        repository = self._bzrdir.create_repository(shared=shared)
3928.3.2 by John Arbash Meinel
Track down the other cause of us connecting multiple times.
2061
        self._add_fallback(repository,
6305.3.1 by Jelmer Vernooij
Save a connection to the server when using --stacked.
2062
                           possible_transports=possible_transports)
3242.2.4 by Aaron Bentley
Only set working tree policty when specified
2063
        if make_working_trees is not None:
3242.3.6 by Aaron Bentley
Work around strange test failure
2064
            repository.set_make_working_trees(make_working_trees)
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
2065
        return repository, True
3242.2.2 by Aaron Bentley
Merge policy updates from stacked-policy thread
2066
2067
3242.2.14 by Aaron Bentley
Update from review comments
2068
class UseExistingRepository(RepositoryAcquisitionPolicy):
3242.2.13 by Aaron Bentley
Update docs
2069
    """A policy of reusing an existing repository"""
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
2070
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2071
    def __init__(self, repository, stack_on=None, stack_on_pwd=None,
2072
                 require_stacking=False):
3242.3.35 by Aaron Bentley
Cleanups and documentation
2073
        """Constructor.
2074
2075
        :param repository: The repository to use.
2076
        :param stack_on: A location to stack on
2077
        :param stack_on_pwd: If stack_on is relative, the location it is
2078
            relative to.
2079
        """
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2080
        RepositoryAcquisitionPolicy.__init__(self, stack_on, stack_on_pwd,
2081
                                             require_stacking)
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
2082
        self._repository = repository
2083
6305.3.1 by Jelmer Vernooij
Save a connection to the server when using --stacked.
2084
    def acquire_repository(self, make_working_trees=None, shared=False,
2085
            possible_transports=None):
3242.2.14 by Aaron Bentley
Update from review comments
2086
        """Implementation of RepositoryAcquisitionPolicy.acquire_repository
3242.2.13 by Aaron Bentley
Update docs
2087
4070.9.8 by Andrew Bennetts
Use MiniSearchResult in clone_on_transport down (further tightening the test_push ratchets), and improve acquire_repository docstrings.
2088
        Returns an existing repository to use.
3242.2.13 by Aaron Bentley
Update docs
2089
        """
6305.3.1 by Jelmer Vernooij
Save a connection to the server when using --stacked.
2090
        if possible_transports is None:
2091
            possible_transports = []
2092
        else:
2093
            possible_transports = list(possible_transports)
2094
        possible_transports.append(self._repository.bzrdir.transport)
3928.3.2 by John Arbash Meinel
Track down the other cause of us connecting multiple times.
2095
        self._add_fallback(self._repository,
6305.3.1 by Jelmer Vernooij
Save a connection to the server when using --stacked.
2096
                       possible_transports=possible_transports)
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
2097
        return self._repository, False
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
2098
2099
5363.2.9 by Jelmer Vernooij
Fix some tests.
2100
def register_metadir(registry, key,
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
2101
         repository_format, help, native=True, deprecated=False,
2102
         branch_format=None,
2103
         tree_format=None,
2104
         hidden=False,
2105
         experimental=False,
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
2106
         alias=False, bzrdir_format=None):
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
2107
    """Register a metadir subformat.
2108
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
2109
    These all use a meta bzrdir, but can be parameterized by the
2110
    Repository/Branch/WorkingTreeformats.
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
2111
2112
    :param repository_format: The fully-qualified repository format class
2113
        name as a string.
2114
    :param branch_format: Fully-qualified branch format class name as
2115
        a string.
2116
    :param tree_format: Fully-qualified tree format class name as
2117
        a string.
2118
    """
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
2119
    if bzrdir_format is None:
2120
        bzrdir_format = BzrDirMetaFormat1
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
2121
    # This should be expanded to support setting WorkingTree and Branch
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
2122
    # formats, once the API supports that.
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
2123
    def _load(full_name):
2124
        mod_name, factory_name = full_name.rsplit('.', 1)
2125
        try:
5436.2.1 by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__.
2126
            factory = pyutils.get_named_object(mod_name, factory_name)
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
2127
        except ImportError, e:
2128
            raise ImportError('failed to load %s: %s' % (full_name, e))
2129
        except AttributeError:
2130
            raise AttributeError('no factory %s in module %r'
5436.2.1 by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__.
2131
                % (full_name, sys.modules[mod_name]))
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
2132
        return factory()
2133
2134
    def helper():
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
2135
        bd = bzrdir_format()
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
2136
        if branch_format is not None:
2137
            bd.set_branch_format(_load(branch_format))
2138
        if tree_format is not None:
2139
            bd.workingtree_format = _load(tree_format)
2140
        if repository_format is not None:
2141
            bd.repository_format = _load(repository_format)
2142
        return bd
5363.2.9 by Jelmer Vernooij
Fix some tests.
2143
    registry.register(key, helper, help, native, deprecated, hidden,
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
2144
        experimental, alias)
2145
5363.2.20 by Jelmer Vernooij
use controldir.X
2146
register_metadir(controldir.format_registry, 'knit',
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2147
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2148
    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
2149
    branch_format='bzrlib.branch.BzrBranchFormat5',
5816.5.1 by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3.
2150
    tree_format='bzrlib.workingtree_3.WorkingTreeFormat3',
4976.2.1 by Ian Clatworthy
Hide most storage formats
2151
    hidden=True,
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2152
    deprecated=True)
5363.2.20 by Jelmer Vernooij
use controldir.X
2153
register_metadir(controldir.format_registry, 'dirstate',
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2154
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2155
    help='Format using dirstate for working trees. '
2156
        'Compatible with bzr 0.8 and '
2157
        'above when accessed over the network. Introduced in bzr 0.15.',
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2158
    branch_format='bzrlib.branch.BzrBranchFormat5',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2159
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
2160
    hidden=True,
3892.1.1 by Ian Clatworthy
improve help on storage formats
2161
    deprecated=True)
5363.2.20 by Jelmer Vernooij
use controldir.X
2162
register_metadir(controldir.format_registry, 'dirstate-tags',
1551.13.1 by Aaron Bentley
Introduce dirstate-tags format
2163
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2164
    help='Variant of dirstate with support for tags. '
2165
        'Introduced in bzr 0.15.',
1551.13.1 by Aaron Bentley
Introduce dirstate-tags format
2166
    branch_format='bzrlib.branch.BzrBranchFormat6',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2167
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
2168
    hidden=True,
3892.1.1 by Ian Clatworthy
improve help on storage formats
2169
    deprecated=True)
5363.2.20 by Jelmer Vernooij
use controldir.X
2170
register_metadir(controldir.format_registry, 'rich-root',
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
2171
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit4',
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2172
    help='Variant of dirstate with better handling of tree roots. '
2173
        'Introduced in bzr 1.0',
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
2174
    branch_format='bzrlib.branch.BzrBranchFormat6',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2175
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
2176
    hidden=True,
3892.1.1 by Ian Clatworthy
improve help on storage formats
2177
    deprecated=True)
5363.2.20 by Jelmer Vernooij
use controldir.X
2178
register_metadir(controldir.format_registry, 'dirstate-with-subtree',
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2179
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2180
    help='Variant of dirstate with support for nested trees. '
2181
         'Introduced in 0.15.',
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2182
    branch_format='bzrlib.branch.BzrBranchFormat6',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2183
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3170.4.3 by Adeodato Simó
Mark the subtree formats as experimental instead of hidden, and remove hidden=True from the rich-root ones.
2184
    experimental=True,
3170.4.4 by Adeodato Simó
Keep the hidden flag for subtree formats after review from Aaron.
2185
    hidden=True,
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2186
    )
5363.2.20 by Jelmer Vernooij
use controldir.X
2187
register_metadir(controldir.format_registry, 'pack-0.92',
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2188
    'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack1',
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2189
    help='Pack-based format used in 1.x series. Introduced in 0.92. '
2190
        'Interoperates with bzr repositories before 0.92 but cannot be '
2191
        'read by bzr < 0.92. '
4988.4.2 by Martin Pool
Change url to canonical.com or wiki, plus some doc improvements in passing
2192
        ,
2592.3.22 by Robert Collins
Add new experimental repository formats.
2193
    branch_format='bzrlib.branch.BzrBranchFormat6',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2194
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2195
    deprecated=True,
2592.3.22 by Robert Collins
Add new experimental repository formats.
2196
    )
5363.2.20 by Jelmer Vernooij
use controldir.X
2197
register_metadir(controldir.format_registry, 'pack-0.92-subtree',
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2198
    'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack3',
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2199
    help='Pack-based format used in 1.x series, with subtree support. '
2200
        'Introduced in 0.92. Interoperates with '
2939.2.6 by Ian Clatworthy
more review feedback from lifeless and poolie
2201
        'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
4988.4.2 by Martin Pool
Change url to canonical.com or wiki, plus some doc improvements in passing
2202
        ,
2592.3.22 by Robert Collins
Add new experimental repository formats.
2203
    branch_format='bzrlib.branch.BzrBranchFormat6',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2204
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3190.1.2 by Aaron Bentley
Undo spurious change
2205
    hidden=True,
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2206
    deprecated=True,
3170.4.3 by Adeodato Simó
Mark the subtree formats as experimental instead of hidden, and remove hidden=True from the rich-root ones.
2207
    experimental=True,
2592.3.22 by Robert Collins
Add new experimental repository formats.
2208
    )
5363.2.20 by Jelmer Vernooij
use controldir.X
2209
register_metadir(controldir.format_registry, 'rich-root-pack',
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2210
    'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack4',
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2211
    help='A variant of pack-0.92 that supports rich-root data '
2212
         '(needed for bzr-svn and bzr-git). Introduced in 1.0.',
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
2213
    branch_format='bzrlib.branch.BzrBranchFormat6',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2214
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
2215
    hidden=True,
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2216
    deprecated=True,
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
2217
    )
5363.2.20 by Jelmer Vernooij
use controldir.X
2218
register_metadir(controldir.format_registry, '1.6',
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2219
    'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack5',
3892.1.6 by Ian Clatworthy
include feedback from poolie
2220
    help='A format that allows a branch to indicate that there is another '
2221
         '(stacked) repository that should be used to access data that is '
2222
         'not present locally.',
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2223
    branch_format='bzrlib.branch.BzrBranchFormat7',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2224
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
2225
    hidden=True,
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2226
    deprecated=True,
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2227
    )
5363.2.20 by Jelmer Vernooij
use controldir.X
2228
register_metadir(controldir.format_registry, '1.6.1-rich-root',
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2229
    'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack5RichRoot',
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2230
    help='A variant of 1.6 that supports rich-root data '
4119.6.2 by Jelmer Vernooij
Use existing alias mechanism for default-rich-root.
2231
         '(needed for bzr-svn and bzr-git).',
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2232
    branch_format='bzrlib.branch.BzrBranchFormat7',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2233
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
2234
    hidden=True,
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2235
    deprecated=True,
3549.1.5 by Martin Pool
Add stable format names for stacked branches
2236
    )
5363.2.20 by Jelmer Vernooij
use controldir.X
2237
register_metadir(controldir.format_registry, '1.9',
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2238
    'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6',
3892.1.6 by Ian Clatworthy
include feedback from poolie
2239
    help='A repository format using B+tree indexes. These indexes '
3892.1.4 by Ian Clatworthy
rich-root explanation and improved help for 1.6 and 1.9 formats
2240
         'are smaller in size, have smarter caching and provide faster '
2241
         'performance for most operations.',
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2242
    branch_format='bzrlib.branch.BzrBranchFormat7',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2243
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
2244
    hidden=True,
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2245
    deprecated=True,
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2246
    )
5363.2.20 by Jelmer Vernooij
use controldir.X
2247
register_metadir(controldir.format_registry, '1.9-rich-root',
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2248
    'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2249
    help='A variant of 1.9 that supports rich-root data '
4119.6.2 by Jelmer Vernooij
Use existing alias mechanism for default-rich-root.
2250
         '(needed for bzr-svn and bzr-git).',
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2251
    branch_format='bzrlib.branch.BzrBranchFormat7',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2252
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
2253
    hidden=True,
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2254
    deprecated=True,
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
2255
    )
5363.2.20 by Jelmer Vernooij
use controldir.X
2256
register_metadir(controldir.format_registry, '1.14',
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2257
    'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6',
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
2258
    help='A working-tree format that supports content filtering.',
3586.2.6 by Ian Clatworthy
add 1.7 and 1.7-rich-root formats
2259
    branch_format='bzrlib.branch.BzrBranchFormat7',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2260
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
6294.1.2 by Jelmer Vernooij
Hide 1.14 too.
2261
    hidden=True,
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2262
    deprecated=True,
3586.2.6 by Ian Clatworthy
add 1.7 and 1.7-rich-root formats
2263
    )
5363.2.20 by Jelmer Vernooij
use controldir.X
2264
register_metadir(controldir.format_registry, '1.14-rich-root',
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2265
    'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
4210.4.1 by Ian Clatworthy
replace experimental development-wt5 formats with 1.14 formats
2266
    help='A variant of 1.14 that supports rich-root data '
4119.6.2 by Jelmer Vernooij
Use existing alias mechanism for default-rich-root.
2267
         '(needed for bzr-svn and bzr-git).',
3586.2.6 by Ian Clatworthy
add 1.7 and 1.7-rich-root formats
2268
    branch_format='bzrlib.branch.BzrBranchFormat7',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2269
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
6294.1.1 by Jelmer Vernooij
Mark development-colo as experimental and 1.14-rich-root as hidden.
2270
    hidden=True,
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2271
    deprecated=True,
3586.2.6 by Ian Clatworthy
add 1.7 and 1.7-rich-root formats
2272
    )
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
2273
# The following un-numbered 'development' formats should always just be aliases.
5363.2.20 by Jelmer Vernooij
use controldir.X
2274
register_metadir(controldir.format_registry, 'development-subtree',
5389.1.1 by Jelmer Vernooij
Add development8-subtree.
2275
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2aSubtree',
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
2276
    help='Current development format, subtree variant. Can convert data to and '
3221.11.7 by Robert Collins
Merge in real stacked repository work.
2277
        'from pack-0.92-subtree (and anything compatible with '
2278
        'pack-0.92-subtree) format repositories. Repositories and branches in '
2279
        'this format can only be read by bzr.dev. Please read '
4988.4.2 by Martin Pool
Change url to canonical.com or wiki, plus some doc improvements in passing
2280
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
2281
        'before use.',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2282
    branch_format='bzrlib.branch.BzrBranchFormat7',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2283
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
2284
    experimental=True,
4976.2.1 by Ian Clatworthy
Hide most storage formats
2285
    hidden=True,
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
2286
    alias=False, # Restore to being an alias when an actual development subtree format is added
2287
                 # This current non-alias status is simply because we did not introduce a
2288
                 # chk based subtree format.
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
2289
    )
5546.1.1 by Andrew Bennetts
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2.
2290
register_metadir(controldir.format_registry, 'development5-subtree',
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2291
    'bzrlib.repofmt.knitpack_repo.RepositoryFormatPackDevelopment2Subtree',
5546.1.1 by Andrew Bennetts
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2.
2292
    help='Development format, subtree variant. Can convert data to and '
2293
        'from pack-0.92-subtree (and anything compatible with '
2294
        'pack-0.92-subtree) format repositories. Repositories and branches in '
2295
        'this format can only be read by bzr.dev. Please read '
2296
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
2297
        'before use.',
2298
    branch_format='bzrlib.branch.BzrBranchFormat7',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2299
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
5546.1.1 by Andrew Bennetts
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2.
2300
    experimental=True,
2301
    hidden=True,
2302
    alias=False,
2303
    )
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
2304
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
2305
register_metadir(controldir.format_registry, 'development-colo',
2306
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
2307
    help='The 2a format with experimental support for colocated branches.\n',
2308
    branch_format='bzrlib.branch.BzrBranchFormat7',
2309
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
6294.1.1 by Jelmer Vernooij
Mark development-colo as experimental and 1.14-rich-root as hidden.
2310
    experimental=True,
6083.2.9 by Jelmer Vernooij
Add development-colo as a separate format.
2311
    bzrdir_format=BzrDirMetaFormat1Colo,
2312
    )
2313
2314
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
2315
# And the development formats above will have aliased one of the following:
5546.1.1 by Andrew Bennetts
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2.
2316
2317
# Finally, the current format.
5363.2.20 by Jelmer Vernooij
use controldir.X
2318
register_metadir(controldir.format_registry, '2a',
4428.2.1 by Martin Pool
Add 2a format
2319
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
6294.1.3 by Jelmer Vernooij
Improve descriptions.
2320
    help='Format for the bzr 2.0 series.\n'
4428.2.5 by Martin Pool
Mark 2a experimental and tweak its help per lifeless's review
2321
        'Uses group-compress storage.\n'
4428.2.6 by Martin Pool
Stupid typo fix
2322
        'Provides rich roots which are a one-way transition.\n',
4428.2.5 by Martin Pool
Mark 2a experimental and tweak its help per lifeless's review
2323
        # 'storage in packs, 255-way hashed CHK inventory, bencode revision, group compress, '
2324
        # 'rich roots. Supported by bzr 1.16 and later.',
4428.2.1 by Martin Pool
Add 2a format
2325
    branch_format='bzrlib.branch.BzrBranchFormat7',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2326
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
5389.1.1 by Jelmer Vernooij
Add development8-subtree.
2327
    experimental=False,
4428.2.1 by Martin Pool
Add 2a format
2328
    )
4428.2.2 by Martin Pool
Format 2a should not be hidden
2329
4119.6.2 by Jelmer Vernooij
Use existing alias mechanism for default-rich-root.
2330
# The following format should be an alias for the rich root equivalent 
2331
# of the default format
5363.2.20 by Jelmer Vernooij
use controldir.X
2332
register_metadir(controldir.format_registry, 'default-rich-root',
4599.4.37 by Robert Collins
Fix registration of default-rich-root as 2a.
2333
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
2334
    branch_format='bzrlib.branch.BzrBranchFormat7',
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
2335
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
4599.4.23 by Robert Collins
default-rich-root should be an alias still.
2336
    alias=True,
4976.2.1 by Ian Clatworthy
Hide most storage formats
2337
    hidden=True,
4599.4.22 by mbp at sourcefrog
Don't forget to set default-rich-root to 2a too.
2338
    help='Same as 2a.')
2339
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2340
# The current format that is made on 'bzr init'.
6056.2.2 by Vincent Ladeuil
Migrate default_format.
2341
format_name = config.GlobalStack().get('default_format')
2342
controldir.format_registry.set_default(format_name)
5363.2.22 by Jelmer Vernooij
Provide bzrlib.bzrdir.format_registry.
2343
2344
# XXX 2010-08-20 JRV: There is still a lot of code relying on
2345
# bzrlib.bzrdir.format_registry existing. When BzrDir.create/BzrDir.open/etc
2346
# get changed to ControlDir.create/ControlDir.open/etc this should be removed.
2347
format_registry = controldir.format_registry