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