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