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