/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4988.10.3 by John Arbash Meinel
Merge bzr.dev 5007, resolve conflict, update NEWS
1
# Copyright (C) 2006-2010 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
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
28
# TODO: Move old formats into a plugin to make this file smaller.
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
29
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
30
import os
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
31
import sys
4961.2.14 by Martin Pool
Further pb cleanups
32
import warnings
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
33
34
from bzrlib.lazy_import import lazy_import
35
lazy_import(globals(), """
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
36
from stat import S_ISDIR
2711.2.1 by Martin Pool
Deprecate BzrDir.create_repository
37
import textwrap
1534.4.39 by Robert Collins
Basic BzrDir support.
38
39
import bzrlib
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
40
from bzrlib import (
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
41
    branch,
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
42
    config,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
43
    errors,
2776.1.5 by Robert Collins
Add reasonably comprehensive tests for path last modified and per file graph behaviour.
44
    graph,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
45
    lockable_files,
46
    lockdir,
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
47
    osutils,
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
48
    remote,
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
49
    repository,
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
50
    revision as _mod_revision,
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
51
    ui,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
52
    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.
53
    versionedfile,
3023.1.2 by Alexander Belchenko
Martin's review.
54
    win32utils,
55
    workingtree,
56
    workingtree_4,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
57
    xml4,
58
    xml5,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
59
    )
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
60
from bzrlib.osutils import (
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
61
    sha_string,
62
    )
3978.3.14 by Jelmer Vernooij
Move BranchBzrDirInter.push() to BzrDir.push().
63
from bzrlib.push import (
64
    PushResult,
65
    )
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
66
from bzrlib.repofmt import pack_repo
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
67
from bzrlib.smart.client import _SmartClient
1563.2.25 by Robert Collins
Merge in upstream.
68
from bzrlib.store.versioned import WeaveStore
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
69
from bzrlib.transactions import WriteTransaction
2164.2.21 by Vincent Ladeuil
Take bundles into account.
70
from bzrlib.transport import (
71
    do_catching_redirections,
72
    get_transport,
3224.5.24 by Andrew Bennetts
More minor import tidying suggested by pyflakes.
73
    local,
2164.2.21 by Vincent Ladeuil
Take bundles into account.
74
    )
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
75
from bzrlib.weave import Weave
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
76
""")
77
2164.2.1 by v.ladeuil+lp at free
First rough http branch redirection implementation.
78
from bzrlib.trace import (
79
    mutter,
80
    note,
4580.4.1 by Martin Pool
Give a warning if --hardlink can't be supported
81
    warning,
2164.2.1 by v.ladeuil+lp at free
First rough http branch redirection implementation.
82
    )
3224.5.24 by Andrew Bennetts
More minor import tidying suggested by pyflakes.
83
84
from bzrlib import (
4160.1.1 by Robert Collins
Add a BzrDir.pre_open hook for use by the smart server gaol.
85
    hooks,
3224.5.24 by Andrew Bennetts
More minor import tidying suggested by pyflakes.
86
    registry,
87
    symbol_versioning,
2711.2.1 by Martin Pool
Deprecate BzrDir.create_repository
88
    )
1534.4.39 by Robert Collins
Basic BzrDir support.
89
90
91
class BzrDir(object):
92
    """A .bzr control diretory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
93
1534.4.39 by Robert Collins
Basic BzrDir support.
94
    BzrDir instances let you create or open any of the things that can be
95
    found within .bzr - checkouts, branches and repositories.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
96
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
97
    :ivar transport:
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
98
        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
99
    :ivar root_transport:
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
100
        a transport connected to the directory this bzr was opened from
101
        (i.e. the parent directory holding the .bzr directory).
3416.2.1 by Martin Pool
Add BzrDir._get_file_mode and _get_dir_mode
102
103
    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.
104
105
    :cvar hooks: An instance of BzrDirHooks.
1534.4.39 by Robert Collins
Basic BzrDir support.
106
    """
107
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
108
    def break_lock(self):
109
        """Invoke break_lock on the first object in the bzrdir.
110
111
        If there is a tree, the tree is opened and break_lock() called.
112
        Otherwise, branch is tried, and finally repository.
113
        """
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
114
        # XXX: This seems more like a UI function than something that really
115
        # belongs in this class.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
116
        try:
117
            thing_to_unlock = self.open_workingtree()
118
        except (errors.NotLocalUrl, errors.NoWorkingTree):
119
            try:
120
                thing_to_unlock = self.open_branch()
121
            except errors.NotBranchError:
122
                try:
123
                    thing_to_unlock = self.open_repository()
124
                except errors.NoRepositoryPresent:
125
                    return
126
        thing_to_unlock.break_lock()
127
1534.5.16 by Robert Collins
Review feedback.
128
    def can_convert_format(self):
129
        """Return true if this bzrdir is one whose format we can convert from."""
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
130
        return True
131
1910.2.12 by Aaron Bentley
Implement knit repo format 2
132
    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.
133
        """Check that a bzrdir as a whole can be converted to a new format."""
134
        # The only current restriction is that the repository content can be 
135
        # fetched compatibly with the target.
1910.2.12 by Aaron Bentley
Implement knit repo format 2
136
        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.
137
        try:
138
            self.open_repository()._format.check_conversion_target(
139
                target_repo_format)
140
        except errors.NoRepositoryPresent:
141
            # No repo, no problem.
142
            pass
1910.2.12 by Aaron Bentley
Implement knit repo format 2
143
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
144
    @staticmethod
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
145
    def _check_supported(format, allow_unsupported,
146
        recommend_upgrade=True,
147
        basedir=None):
148
        """Give an error or warning on old formats.
149
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
150
        :param format: may be any kind of format - workingtree, branch,
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
151
        or repository.
152
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
153
        :param allow_unsupported: If true, allow opening
154
        formats that are strongly deprecated, and which may
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
155
        have limited functionality.
156
157
        :param recommend_upgrade: If true (default), warn
158
        the user through the ui object that they may wish
159
        to upgrade the object.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
160
        """
2323.5.19 by Martin Pool
No upgrade recommendation on source when cloning
161
        # TODO: perhaps move this into a base Format class; it's not BzrDir
162
        # specific. mbp 20070323
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
163
        if not allow_unsupported and not format.is_supported():
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
164
            # see open_downlevel to open legacy branches.
1740.5.6 by Martin Pool
Clean up many exception classes.
165
            raise errors.UnsupportedFormatError(format=format)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
166
        if recommend_upgrade \
167
            and getattr(format, 'upgrade_recommended', False):
168
            ui.ui_factory.recommend_upgrade(
169
                format.get_format_description(),
170
                basedir)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
171
3242.3.24 by Aaron Bentley
Fix test failures
172
    def clone(self, url, revision_id=None, force_new_repo=False,
173
              preserve_stacking=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
174
        """Clone this bzrdir and its contents to url verbatim.
175
3242.3.36 by Aaron Bentley
Updates from review comments
176
        :param url: The url create the clone at.  If url's last component does
177
            not exist, it will be created.
178
        :param revision_id: The tip revision-id to use for any branch or
179
            working tree.  If not None, then the clone operation may tune
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.
180
            itself to download less data.
3242.3.36 by Aaron Bentley
Updates from review comments
181
        :param force_new_repo: Do not use a shared repository for the target
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.
182
                               even if one is available.
3242.3.36 by Aaron Bentley
Updates from review comments
183
        :param preserve_stacking: When cloning a stacked branch, stack the
184
            new branch on top of the other branch's stacked-on branch.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
185
        """
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
186
        return self.clone_on_transport(get_transport(url),
187
                                       revision_id=revision_id,
3242.3.24 by Aaron Bentley
Fix test failures
188
                                       force_new_repo=force_new_repo,
189
                                       preserve_stacking=preserve_stacking)
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
190
191
    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.
192
        force_new_repo=False, preserve_stacking=False, stacked_on=None,
4294.2.6 by Robert Collins
Report errors back in the UI layer for push, to use the url the user gave us.
193
        create_prefix=False, use_existing_dir=True):
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
194
        """Clone this bzrdir and its contents to transport verbatim.
195
3242.3.36 by Aaron Bentley
Updates from review comments
196
        :param transport: The transport for the location to produce the clone
197
            at.  If the target directory does not exist, it will be created.
198
        :param revision_id: The tip revision-id to use for any branch or
199
            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()
200
            itself to download less data.
3242.3.35 by Aaron Bentley
Cleanups and documentation
201
        :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()
202
                               even if one is available.
3242.3.22 by Aaron Bentley
Make clone stacking optional
203
        :param preserve_stacking: When cloning a stacked branch, stack the
204
            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.
205
        :param create_prefix: Create any missing directories leading up to
206
            to_transport.
207
        :param use_existing_dir: Use an existing directory if one exists.
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
208
        """
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
209
        # Overview: put together a broad description of what we want to end up
210
        # with; then make as few api calls as possible to do it.
211
        
212
        # We may want to create a repo/branch/tree, if we do so what format
213
        # would we want for each:
3650.5.1 by Aaron Bentley
Fix push to use clone all the time.
214
        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.
215
        format = self.cloning_metadir(require_stacking)
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
216
        
217
        # 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.
218
        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.
219
            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.
220
        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.
221
            local_repo = None
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
222
        try:
223
            local_branch = self.open_branch()
224
        except errors.NotBranchError:
225
            local_branch = None
226
        else:
227
            # enable fallbacks when branch is not a branch reference
228
            if local_branch.repository.has_same_location(local_repo):
229
                local_repo = local_branch.repository
230
            if preserve_stacking:
231
                try:
3650.5.1 by Aaron Bentley
Fix push to use clone all the time.
232
                    stacked_on = local_branch.get_stacked_on_url()
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
233
                except (errors.UnstackableBranchFormat,
234
                        errors.UnstackableRepositoryFormat,
235
                        errors.NotStacked):
236
                    pass
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
237
        # Bug: We create a metadir without knowing if it can support stacking,
238
        # we should look up the policy needs first, or just use it as a hint,
239
        # 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.
240
        if local_repo:
3242.2.14 by Aaron Bentley
Update from review comments
241
            make_working_trees = local_repo.make_working_trees()
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
242
            want_shared = local_repo.is_shared()
243
            repo_format_name = format.repository_format.network_name()
244
        else:
245
            make_working_trees = False
246
            want_shared = False
247
            repo_format_name = None
248
249
        result_repo, result, require_stacking, repository_policy = \
250
            format.initialize_on_transport_ex(transport,
251
            use_existing_dir=use_existing_dir, create_prefix=create_prefix,
252
            force_new_repo=force_new_repo, stacked_on=stacked_on,
253
            stack_on_pwd=self.root_transport.base,
254
            repo_format_name=repo_format_name,
255
            make_working_trees=make_working_trees, shared_repo=want_shared)
256
        if repo_format_name:
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
257
            try:
258
                # If the result repository is in the same place as the
259
                # resulting bzr dir, it will have no content, further if the
260
                # result is not stacked then we know all content should be
261
                # copied, and finally if we are copying up to a specific
262
                # revision_id then we can use the pending-ancestry-result which
263
                # does not require traversing all of history to describe it.
264
                if (result_repo.bzrdir.root_transport.base ==
265
                    result.root_transport.base and not require_stacking and
266
                    revision_id is not None):
267
                    fetch_spec = graph.PendingAncestryResult(
268
                        [revision_id], local_repo)
269
                    result_repo.fetch(local_repo, fetch_spec=fetch_spec)
270
                else:
271
                    result_repo.fetch(local_repo, revision_id=revision_id)
272
            finally:
273
                result_repo.unlock()
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
274
        else:
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
275
            if result_repo is not None:
276
                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.
277
        # 1 if there is a branch present
278
        #   make sure its content is available in the target repository
279
        #   clone it.
3242.3.37 by Aaron Bentley
Updates from reviews
280
        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.
281
            result_branch = local_branch.clone(result, revision_id=revision_id,
282
                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.
283
        try:
284
            # Cheaper to check if the target is not local, than to try making
285
            # the tree and fail.
286
            result.root_transport.local_abspath('.')
287
            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.
288
                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.
289
        except (errors.NoWorkingTree, errors.NotLocalUrl):
290
            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.
291
        return result
292
1685.1.61 by Martin Pool
[broken] Change BzrDir._make_tail to use urlutils.split
293
    # TODO: This should be given a Transport, and should chdir up; otherwise
294
    # 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.
295
    def _make_tail(self, url):
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
296
        t = get_transport(url)
297
        t.ensure_base()
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
298
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
299
    @classmethod
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
300
    def create(cls, base, format=None, possible_transports=None):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
301
        """Create a new BzrDir at the url 'base'.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
302
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
303
        :param format: If supplied, the format of branch to create.  If not
304
            supplied, the default is used.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
305
        :param possible_transports: If supplied, a list of transports that
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
306
            can be reused to share a remote connection.
1534.4.39 by Robert Collins
Basic BzrDir support.
307
        """
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
308
        if cls is not BzrDir:
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
309
            raise AssertionError("BzrDir.create always creates the default"
310
                " format, not one of %r" % cls)
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
311
        t = get_transport(base, possible_transports)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
312
        t.ensure_base()
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
313
        if format is None:
314
            format = BzrDirFormat.get_default_format()
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
315
        return format.initialize_on_transport(t)
1534.4.39 by Robert Collins
Basic BzrDir support.
316
3140.1.1 by Aaron Bentley
Implement find_bzrdir functionality
317
    @staticmethod
318
    def find_bzrdirs(transport, evaluate=None, list_current=None):
319
        """Find bzrdirs recursively from current location.
320
321
        This is intended primarily as a building block for more sophisticated
322
        functionality, like finding trees under a directory, or finding
323
        branches that use a given repository.
324
        :param evaluate: An optional callable that yields recurse, value,
325
            where recurse controls whether this bzrdir is recursed into
326
            and value is the value to yield.  By default, all bzrdirs
327
            are recursed into, and the return value is the bzrdir.
328
        :param list_current: if supplied, use this function to list the current
329
            directory, instead of Transport.list_dir
330
        :return: a generator of found bzrdirs, or whatever evaluate returns.
331
        """
332
        if list_current is None:
333
            def list_current(transport):
334
                return transport.list_dir('')
335
        if evaluate is None:
336
            def evaluate(bzrdir):
337
                return True, bzrdir
338
339
        pending = [transport]
340
        while len(pending) > 0:
341
            current_transport = pending.pop()
342
            recurse = True
343
            try:
344
                bzrdir = BzrDir.open_from_transport(current_transport)
345
            except errors.NotBranchError:
346
                pass
347
            else:
348
                recurse, value = evaluate(bzrdir)
349
                yield value
350
            try:
351
                subdirs = list_current(current_transport)
352
            except errors.NoSuchFile:
353
                continue
354
            if recurse:
355
                for subdir in sorted(subdirs, reverse=True):
356
                    pending.append(current_transport.clone(subdir))
357
4997.1.1 by Jelmer Vernooij
Add BzrDir.list_branches().
358
    def list_branches(self):
4997.1.3 by Jelmer Vernooij
Use list_branches during upgrades.
359
        """Return a sequence of all branches local to this control directory.
4997.1.1 by Jelmer Vernooij
Add BzrDir.list_branches().
360
361
        """
362
        try:
363
            return [self.open_branch()]
364
        except errors.NotBranchError:
365
            return []
366
3140.1.3 by Aaron Bentley
Add support for finding branches to BzrDir
367
    @staticmethod
368
    def find_branches(transport):
3140.1.7 by Aaron Bentley
Update docs
369
        """Find all branches under a transport.
370
371
        This will find all branches below the transport, including branches
372
        inside other branches.  Where possible, it will use
373
        Repository.find_branches.
374
375
        To list all the branches that use a particular Repository, see
376
        Repository.find_branches
377
        """
3140.1.3 by Aaron Bentley
Add support for finding branches to BzrDir
378
        def evaluate(bzrdir):
379
            try:
380
                repository = bzrdir.open_repository()
381
            except errors.NoRepositoryPresent:
382
                pass
383
            else:
4997.1.2 by Jelmer Vernooij
Use list_branches rather than open_branch in find_branches.
384
                return False, ([], repository)
385
            return True, (bzrdir.list_branches(), None)
386
        ret = []
387
        for branches, repo in BzrDir.find_bzrdirs(transport,
388
                                                  evaluate=evaluate):
3140.1.3 by Aaron Bentley
Add support for finding branches to BzrDir
389
            if repo is not None:
4997.1.2 by Jelmer Vernooij
Use list_branches rather than open_branch in find_branches.
390
                ret.extend(repo.find_branches())
391
            if branches is not None:
392
                ret.extend(branches)
393
        return ret
3140.1.3 by Aaron Bentley
Add support for finding branches to BzrDir
394
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
395
    def destroy_repository(self):
396
        """Destroy the repository in this BzrDir"""
397
        raise NotImplementedError(self.destroy_repository)
398
5051.3.2 by Jelmer Vernooij
Add name argument to BzrDir.create_branch().
399
    def create_branch(self, name=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
400
        """Create a branch in this BzrDir.
401
5051.3.2 by Jelmer Vernooij
Add name argument to BzrDir.create_branch().
402
        :param name: Name of the colocated branch to create, None for
403
            the default branch.
404
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
405
        The bzrdir's format will control what branch format is created.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
406
        For more control see BranchFormatXX.create(a_bzrdir).
407
        """
408
        raise NotImplementedError(self.create_branch)
409
5051.3.1 by Jelmer Vernooij
Add optional name argument to BzrDir.destroy_branch.
410
    def destroy_branch(self, name=None):
5051.3.2 by Jelmer Vernooij
Add name argument to BzrDir.create_branch().
411
        """Destroy a branch in this BzrDir.
412
        
413
        :param name: Name of the branch to destroy, None for the default 
414
            branch.
415
        """
2796.2.6 by Aaron Bentley
Implement destroy_branch
416
        raise NotImplementedError(self.destroy_branch)
417
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
418
    @staticmethod
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
419
    def create_branch_and_repo(base, force_new_repo=False, format=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
420
        """Create a new BzrDir, Branch and Repository at the url 'base'.
421
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
422
        This will use the current default BzrDirFormat unless one is
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
423
        specified, and use whatever
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
424
        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.
425
        create_repository. If a shared repository is available that is used
426
        preferentially.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
427
428
        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.
429
430
        :param base: The URL to create the branch at.
431
        :param force_new_repo: If True a new repository is always created.
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
432
        :param format: If supplied, the format of branch to create.  If not
433
            supplied, the default is used.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
434
        """
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
435
        bzrdir = BzrDir.create(base, format)
1534.6.11 by Robert Collins
Review feedback.
436
        bzrdir._find_or_create_repository(force_new_repo)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
437
        return bzrdir.create_branch()
1534.6.11 by Robert Collins
Review feedback.
438
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
439
    def determine_repository_policy(self, force_new_repo=False, stack_on=None,
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
440
                                    stack_on_pwd=None, require_stacking=False):
3242.2.13 by Aaron Bentley
Update docs
441
        """Return an object representing a policy to use.
442
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.
443
        This controls whether a new repository is created, and the format of
444
        that repository, or some existing shared repository used instead.
3242.3.35 by Aaron Bentley
Cleanups and documentation
445
446
        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
447
3242.3.35 by Aaron Bentley
Cleanups and documentation
448
        :param force_new_repo: If True, require a new repository to be created.
449
        :param stack_on: If supplied, the location to stack on.  If not
450
            supplied, a default_stack_on location may be used.
451
        :param stack_on_pwd: If stack_on is relative, the location it is
452
            relative to.
3242.2.13 by Aaron Bentley
Update docs
453
        """
3242.3.3 by Aaron Bentley
Use _find_containing to determine repository policy
454
        def repository_policy(found_bzrdir):
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
455
            stack_on = None
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
456
            stack_on_pwd = None
3641.1.1 by John Arbash Meinel
Merge in 1.6rc5 and revert disabling default stack on policy
457
            config = found_bzrdir.get_config()
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
458
            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.
459
            stack_on = config.get_default_stack_on()
460
            if stack_on is not None:
461
                stack_on_pwd = found_bzrdir.root_transport.base
462
                stop = True
3242.3.3 by Aaron Bentley
Use _find_containing to determine repository policy
463
            # does it have a repository ?
464
            try:
465
                repository = found_bzrdir.open_repository()
466
            except errors.NoRepositoryPresent:
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
467
                repository = None
468
            else:
469
                if ((found_bzrdir.root_transport.base !=
470
                     self.root_transport.base) 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.
471
                    # Don't look higher, can't use a higher shared repo.
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
472
                    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.
473
                    stop = True
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
474
                else:
475
                    stop = True
476
            if not stop:
3242.3.3 by Aaron Bentley
Use _find_containing to determine repository policy
477
                return None, False
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
478
            if repository:
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
479
                return UseExistingRepository(repository, stack_on,
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
480
                    stack_on_pwd, require_stacking=require_stacking), True
3242.3.3 by Aaron Bentley
Use _find_containing to determine repository policy
481
            else:
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
482
                return CreateRepository(self, stack_on, stack_on_pwd,
483
                    require_stacking=require_stacking), True
3242.3.3 by Aaron Bentley
Use _find_containing to determine repository policy
484
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
485
        if not force_new_repo:
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
486
            if stack_on is None:
487
                policy = self._find_containing(repository_policy)
488
                if policy is not None:
489
                    return policy
490
            else:
491
                try:
492
                    return UseExistingRepository(self.open_repository(),
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
493
                        stack_on, stack_on_pwd,
494
                        require_stacking=require_stacking)
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
495
                except errors.NoRepositoryPresent:
496
                    pass
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
497
        return CreateRepository(self, stack_on, stack_on_pwd,
498
                                require_stacking=require_stacking)
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
499
1534.6.11 by Robert Collins
Review feedback.
500
    def _find_or_create_repository(self, force_new_repo):
501
        """Create a new repository if needed, returning the repository."""
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
502
        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.
503
        return policy.acquire_repository()[0]
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
504
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
505
    @staticmethod
2476.3.6 by Vincent Ladeuil
Fix the 'init connects multiple times' in a different way.
506
    def create_branch_convenience(base, force_new_repo=False,
507
                                  force_new_tree=None, format=None,
2476.3.11 by Vincent Ladeuil
Cosmetic changes.
508
                                  possible_transports=None):
1534.6.10 by Robert Collins
Finish use of repositories support.
509
        """Create a new BzrDir, Branch and Repository at the url 'base'.
510
511
        This is a convenience function - it will use an existing repository
512
        if possible, can be told explicitly whether to create a working tree or
1534.6.12 by Robert Collins
Typo found by John Meinel.
513
        not.
1534.6.10 by Robert Collins
Finish use of repositories support.
514
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
515
        This will use the current default BzrDirFormat unless one is
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
516
        specified, and use whatever
1534.6.10 by Robert Collins
Finish use of repositories support.
517
        repository format that that uses via bzrdir.create_branch and
518
        create_repository. If a shared repository is available that is used
519
        preferentially. Whatever repository is used, its tree creation policy
520
        is followed.
521
522
        The created Branch object is returned.
523
        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
524
        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.
525
        data is created on disk and NotLocalUrl is raised.
1534.6.10 by Robert Collins
Finish use of repositories support.
526
527
        :param base: The URL to create the branch at.
528
        :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
529
        :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.
530
                               prevent such creation respectively.
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
531
        :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
532
        :param possible_transports: An optional reusable transports list.
1534.6.10 by Robert Collins
Finish use of repositories support.
533
        """
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.
534
        if force_new_tree:
535
            # check for non local urls
2485.8.45 by Vincent Ladeuil
Take jam's remarks into account.
536
            t = get_transport(base, possible_transports)
3224.5.24 by Andrew Bennetts
More minor import tidying suggested by pyflakes.
537
            if not isinstance(t, local.LocalTransport):
2476.3.6 by Vincent Ladeuil
Fix the 'init connects multiple times' in a different way.
538
                raise errors.NotLocalUrl(base)
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
539
        bzrdir = BzrDir.create(base, format, possible_transports)
1534.6.11 by Robert Collins
Review feedback.
540
        repo = bzrdir._find_or_create_repository(force_new_repo)
1534.6.10 by Robert Collins
Finish use of repositories support.
541
        result = bzrdir.create_branch()
2476.3.4 by Vincent Ladeuil
Add tests.
542
        if force_new_tree or (repo.make_working_trees() and
1534.6.10 by Robert Collins
Finish use of repositories support.
543
                              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.
544
            try:
545
                bzrdir.create_workingtree()
546
            except errors.NotLocalUrl:
547
                pass
1534.6.10 by Robert Collins
Finish use of repositories support.
548
        return result
2476.3.4 by Vincent Ladeuil
Add tests.
549
1551.8.2 by Aaron Bentley
Add create_checkout_convenience
550
    @staticmethod
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
551
    def create_standalone_workingtree(base, format=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
552
        """Create a new BzrDir, WorkingTree, Branch and Repository at 'base'.
553
554
        'base' must be a local path or a file:// url.
555
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
556
        This will use the current default BzrDirFormat unless one is
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
557
        specified, and use whatever
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
558
        repository format that that uses for bzrdirformat.create_workingtree,
559
        create_branch and create_repository.
560
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
561
        :param format: Override for the bzrdir format to create.
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
562
        :return: The WorkingTree object.
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
563
        """
2485.8.45 by Vincent Ladeuil
Take jam's remarks into account.
564
        t = get_transport(base)
3224.5.24 by Andrew Bennetts
More minor import tidying suggested by pyflakes.
565
        if not isinstance(t, local.LocalTransport):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
566
            raise errors.NotLocalUrl(base)
2485.8.45 by Vincent Ladeuil
Take jam's remarks into account.
567
        bzrdir = BzrDir.create_branch_and_repo(base,
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
568
                                               force_new_repo=True,
569
                                               format=format).bzrdir
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
570
        return bzrdir.create_workingtree()
571
3123.5.17 by Aaron Bentley
Update docs
572
    def create_workingtree(self, revision_id=None, from_branch=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
573
        accelerator_tree=None, hardlink=False):
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
574
        """Create a working tree at this BzrDir.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
575
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
576
        :param revision_id: create it as of this revision id.
577
        :param from_branch: override bzrdir branch (for lightweight checkouts)
3123.5.17 by Aaron Bentley
Update docs
578
        :param accelerator_tree: A tree which can be used for retrieving file
579
            contents more quickly than the revision tree, i.e. a workingtree.
580
            The revision tree will be used for cases where accelerator_tree's
581
            content is different.
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
582
        """
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
583
        raise NotImplementedError(self.create_workingtree)
584
3872.3.2 by Jelmer Vernooij
make backup_bzrdir determine the name for the backup files.
585
    def backup_bzrdir(self):
3872.3.1 by Jelmer Vernooij
Allow BzrDir implementation to implement backing up of control directory.
586
        """Backup this bzr control directory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
587
3872.3.2 by Jelmer Vernooij
make backup_bzrdir determine the name for the backup files.
588
        :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.
589
        """
5035.4.1 by Parth Malwankar
fixes 335033.
590
        def name_gen(base='backup.bzr'):
591
            counter = 1
592
            name = "%s.~%d~" % (base, counter)
5035.4.2 by Parth Malwankar
name_gen now works with all transports.
593
            while self.root_transport.has(name):
5035.4.1 by Parth Malwankar
fixes 335033.
594
                counter += 1
595
                name = "%s.~%d~" % (base, counter)
596
            return name
597
5035.4.2 by Parth Malwankar
name_gen now works with all transports.
598
        backup_dir=name_gen()
3943.2.4 by Martin Pool
Move backup progress indicators from upgrade.py into backup_bzrdir, and tweak text
599
        pb = ui.ui_factory.nested_progress_bar()
600
        try:
601
            # FIXME: bug 300001 -- the backup fails if the backup directory
602
            # already exists, but it should instead either remove it or make
603
            # a new backup directory.
604
            #
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
605
            # FIXME: bug 262450 -- the backup directory should have the same
3943.2.4 by Martin Pool
Move backup progress indicators from upgrade.py into backup_bzrdir, and tweak text
606
            # permissions as the .bzr directory (probably a bug in copy_tree)
607
            old_path = self.root_transport.abspath('.bzr')
5035.4.2 by Parth Malwankar
name_gen now works with all transports.
608
            new_path = self.root_transport.abspath(backup_dir)
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
609
            ui.ui_factory.note('making backup of %s\n  to %s' % (old_path, new_path,))
5035.4.2 by Parth Malwankar
name_gen now works with all transports.
610
            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
611
            return (old_path, new_path)
612
        finally:
613
            pb.finished()
3872.3.1 by Jelmer Vernooij
Allow BzrDir implementation to implement backing up of control directory.
614
2830.1.2 by Ian Clatworthy
Incorporate feedback from poolie's review
615
    def retire_bzrdir(self, limit=10000):
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
616
        """Permanently disable the bzrdir.
617
618
        This is done by renaming it to give the user some ability to recover
619
        if there was a problem.
620
621
        This will have horrible consequences if anyone has anything locked or
622
        in use.
2830.1.2 by Ian Clatworthy
Incorporate feedback from poolie's review
623
        :param limit: number of times to retry
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
624
        """
2830.1.2 by Ian Clatworthy
Incorporate feedback from poolie's review
625
        i  = 0
626
        while True:
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
627
            try:
628
                to_path = '.bzr.retired.%d' % i
629
                self.root_transport.rename('.bzr', to_path)
630
                note("renamed %s to %s"
631
                    % (self.root_transport.abspath('.bzr'), to_path))
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
632
                return
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
633
            except (errors.TransportError, IOError, errors.PathError):
2830.1.2 by Ian Clatworthy
Incorporate feedback from poolie's review
634
                i += 1
635
                if i > limit:
636
                    raise
637
                else:
638
                    pass
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
639
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
640
    def destroy_workingtree(self):
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
641
        """Destroy the working tree at this BzrDir.
642
643
        Formats that do not support this may raise UnsupportedOperation.
644
        """
645
        raise NotImplementedError(self.destroy_workingtree)
646
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
647
    def destroy_workingtree_metadata(self):
648
        """Destroy the control files for the working tree at this BzrDir.
649
650
        The contents of working tree files are not affected.
651
        Formats that do not support this may raise UnsupportedOperation.
652
        """
653
        raise NotImplementedError(self.destroy_workingtree_metadata)
654
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
655
    def _find_containing(self, evaluate):
3242.2.13 by Aaron Bentley
Update docs
656
        """Find something in a containing control directory.
657
658
        This method will scan containing control dirs, until it finds what
659
        it is looking for, decides that it will never find it, or runs out
660
        of containing control directories to check.
661
662
        It is used to implement find_repository and
663
        determine_repository_policy.
664
665
        :param evaluate: A function returning (value, stop).  If stop is True,
666
            the value will be returned.
667
        """
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
668
        found_bzrdir = self
669
        while True:
670
            result, stop = evaluate(found_bzrdir)
671
            if stop:
672
                return result
673
            next_transport = found_bzrdir.root_transport.clone('..')
674
            if (found_bzrdir.root_transport.base == next_transport.base):
675
                # top of the file system
676
                return None
677
            # find the next containing bzrdir
678
            try:
679
                found_bzrdir = BzrDir.open_containing_from_transport(
680
                    next_transport)[0]
681
            except errors.NotBranchError:
682
                return None
683
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.
684
    def find_repository(self):
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
685
        """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.
686
687
        This does not require a branch as we use it to find the repo for
688
        new branches as well as to hook existing branches up to their
689
        repository.
690
        """
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
691
        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
692
            # 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.
693
            try:
694
                repository = found_bzrdir.open_repository()
695
            except errors.NoRepositoryPresent:
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
696
                return None, False
3242.2.5 by Aaron Bentley
Avoid unnecessary is_shared check
697
            if found_bzrdir.root_transport.base == self.root_transport.base:
698
                return repository, True
699
            elif repository.is_shared():
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
700
                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.
701
            else:
3242.2.5 by Aaron Bentley
Avoid unnecessary is_shared check
702
                return None, True
3242.3.2 by Aaron Bentley
Split _find_containing out of find_repository
703
704
        found_repo = self._find_containing(usable_repository)
705
        if found_repo is None:
706
            raise errors.NoRepositoryPresent(self)
707
        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.
708
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
709
    def get_branch_reference(self):
710
        """Return the referenced URL for the branch in this bzrdir.
711
712
        :raises NotBranchError: If there is no Branch.
713
        :return: The URL the branch in this bzrdir references if it is a
714
            reference branch, or None for regular branches.
715
        """
716
        return None
717
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
718
    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.
719
        """Get the transport for use by branch format in this BzrDir.
720
721
        Note that bzr dirs that do not support format strings will raise
722
        IncompatibleFormat if the branch format they are given has
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
723
        a format string, and vice versa.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
724
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
725
        If branch_format is None, the transport is returned with no
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
726
        checking. If it is not None, then the returned transport is
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
727
        guaranteed to point to an existing directory ready for use.
728
        """
729
        raise NotImplementedError(self.get_branch_transport)
3416.2.1 by Martin Pool
Add BzrDir._get_file_mode and _get_dir_mode
730
731
    def _find_creation_modes(self):
732
        """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
733
3416.2.1 by Martin Pool
Add BzrDir._get_file_mode and _get_dir_mode
734
        They're always set to be consistent with the base directory,
735
        assuming that this transport allows setting modes.
736
        """
737
        # TODO: Do we need or want an option (maybe a config setting) to turn
738
        # this off or override it for particular locations? -- mbp 20080512
739
        if self._mode_check_done:
740
            return
741
        self._mode_check_done = True
742
        try:
743
            st = self.transport.stat('.')
744
        except errors.TransportNotPossible:
745
            self._dir_mode = None
746
            self._file_mode = None
747
        else:
748
            # Check the directory mode, but also make sure the created
749
            # directories and files are read-write for this user. This is
750
            # mostly a workaround for filesystems which lie about being able to
751
            # 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
752
            if (st.st_mode & 07777 == 00000):
753
                # FTP allows stat but does not return dir/file modes
754
                self._dir_mode = None
755
                self._file_mode = None
756
            else:
757
                self._dir_mode = (st.st_mode & 07777) | 00700
758
                # Remove the sticky and execute bits for files
759
                self._file_mode = self._dir_mode & ~07111
3416.2.1 by Martin Pool
Add BzrDir._get_file_mode and _get_dir_mode
760
761
    def _get_file_mode(self):
762
        """Return Unix mode for newly created files, or None.
763
        """
764
        if not self._mode_check_done:
765
            self._find_creation_modes()
766
        return self._file_mode
767
768
    def _get_dir_mode(self):
769
        """Return Unix mode for newly created directories, or None.
770
        """
771
        if not self._mode_check_done:
772
            self._find_creation_modes()
773
        return self._dir_mode
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
774
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
775
    def get_repository_transport(self, repository_format):
776
        """Get the transport for use by repository format in this BzrDir.
777
778
        Note that bzr dirs that do not support format strings will raise
779
        IncompatibleFormat if the repository format they are given has
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
780
        a format string, and vice versa.
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
781
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
782
        If repository_format is None, the transport is returned with no
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
783
        checking. If it is not None, then the returned transport is
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
784
        guaranteed to point to an existing directory ready for use.
785
        """
786
        raise NotImplementedError(self.get_repository_transport)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
787
1534.4.53 by Robert Collins
Review feedback from John Meinel.
788
    def get_workingtree_transport(self, tree_format):
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
789
        """Get the transport for use by workingtree format in this BzrDir.
790
791
        Note that bzr dirs that do not support format strings will raise
2100.3.11 by Aaron Bentley
Add join --reference support
792
        IncompatibleFormat if the workingtree format they are given has a
793
        format string, and vice versa.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
794
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
795
        If workingtree_format is None, the transport is returned with no
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
796
        checking. If it is not None, then the returned transport is
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
797
        guaranteed to point to an existing directory ready for use.
798
        """
799
        raise NotImplementedError(self.get_workingtree_transport)
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
800
801
    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.
802
        """Get configuration for this BzrDir."""
803
        return config.BzrDirConfig(self)
804
805
    def _get_config(self):
806
        """By default, no configuration is available."""
807
        return None
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
808
1534.4.39 by Robert Collins
Basic BzrDir support.
809
    def __init__(self, _transport, _format):
810
        """Initialize a Bzr control dir object.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
811
1534.4.39 by Robert Collins
Basic BzrDir support.
812
        Only really common logic should reside here, concrete classes should be
813
        made with varying behaviours.
814
1534.4.53 by Robert Collins
Review feedback from John Meinel.
815
        :param _format: the format that is creating this BzrDir instance.
816
        :param _transport: the transport this dir is based at.
1534.4.39 by Robert Collins
Basic BzrDir support.
817
        """
818
        self._format = _format
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
819
        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.
820
        self.root_transport = _transport
3416.2.1 by Martin Pool
Add BzrDir._get_file_mode and _get_dir_mode
821
        self._mode_check_done = False
1534.4.39 by Robert Collins
Basic BzrDir support.
822
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
823
    def is_control_filename(self, filename):
824
        """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
825
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
826
        :param filename: A filename within the root transport of this bzrdir.
827
828
        This is true IF and ONLY IF the filename is part of the namespace reserved
829
        for bzr control dirs. Currently this is the '.bzr' directory in the root
830
        of the root_transport. it is expected that plugins will need to extend
831
        this in the future - for instance to make bzr talk with svn working
832
        trees.
833
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
834
        # this might be better on the BzrDirFormat class because it refers to
835
        # all the possible bzrdir disk formats.
836
        # This method is tested via the workingtree is_control_filename tests-
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
837
        # it was extracted from WorkingTree.is_control_filename. If the method's
838
        # 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).
839
        # add new tests for it to the appropriate place.
840
        return filename == '.bzr' or filename.startswith('.bzr/')
841
1534.5.16 by Robert Collins
Review feedback.
842
    def needs_format_conversion(self, format=None):
843
        """Return true if this bzrdir needs convert_format run on it.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
844
845
        For instance, if the repository format is out of date but the
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
846
        branch and working tree are not, this should return True.
1534.5.13 by Robert Collins
Correct buggy test.
847
848
        :param format: Optional parameter indicating a specific desired
1534.5.16 by Robert Collins
Review feedback.
849
                       format we plan to arrive at.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
850
        """
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.
851
        raise NotImplementedError(self.needs_format_conversion)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
852
1534.4.39 by Robert Collins
Basic BzrDir support.
853
    @staticmethod
854
    def open_unsupported(base):
855
        """Open a branch which is not supported."""
856
        return BzrDir.open(base, _unsupported=True)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
857
1534.4.39 by Robert Collins
Basic BzrDir support.
858
    @staticmethod
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
859
    def open(base, _unsupported=False, possible_transports=None):
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
860
        """Open an existing bzrdir, rooted at 'base' (url).
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
861
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
862
        :param _unsupported: a private parameter to the BzrDir class.
1534.4.39 by Robert Collins
Basic BzrDir support.
863
        """
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
864
        t = get_transport(base, possible_transports=possible_transports)
1910.11.1 by Andrew Bennetts
Add BzrDir.open_from_transport, refactored from duplicate code, no explicit tests.
865
        return BzrDir.open_from_transport(t, _unsupported=_unsupported)
866
867
    @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.
868
    def open_from_transport(transport, _unsupported=False,
869
                            _server_formats=True):
1910.11.1 by Andrew Bennetts
Add BzrDir.open_from_transport, refactored from duplicate code, no explicit tests.
870
        """Open a bzrdir within a particular directory.
871
872
        :param transport: Transport containing the bzrdir.
873
        :param _unsupported: private.
874
        """
4160.1.1 by Robert Collins
Add a BzrDir.pre_open hook for use by the smart server gaol.
875
        for hook in BzrDir.hooks['pre_open']:
876
            hook(transport)
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
877
        # Keep initial base since 'transport' may be modified while following
878
        # the redirections.
2164.2.21 by Vincent Ladeuil
Take bundles into account.
879
        base = transport.base
880
        def find_format(transport):
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
881
            return transport, BzrDirFormat.find_format(
882
                transport, _server_formats=_server_formats)
2164.2.21 by Vincent Ladeuil
Take bundles into account.
883
884
        def redirected(transport, e, redirection_notice):
3878.4.5 by Vincent Ladeuil
Don't use the exception as a parameter for _redirected_to.
885
            redirected_transport = transport._redirected_to(e.source, e.target)
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
886
            if redirected_transport is None:
887
                raise errors.NotBranchError(base)
2164.2.21 by Vincent Ladeuil
Take bundles into account.
888
            note('%s is%s redirected to %s',
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
889
                 transport.base, e.permanently, redirected_transport.base)
890
            return redirected_transport
2164.2.21 by Vincent Ladeuil
Take bundles into account.
891
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
892
        try:
2164.2.28 by Vincent Ladeuil
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions.
893
            transport, format = do_catching_redirections(find_format,
894
                                                         transport,
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
895
                                                         redirected)
896
        except errors.TooManyRedirections:
897
            raise errors.NotBranchError(base)
2164.2.21 by Vincent Ladeuil
Take bundles into account.
898
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
899
        BzrDir._check_supported(format, _unsupported)
1910.11.1 by Andrew Bennetts
Add BzrDir.open_from_transport, refactored from duplicate code, no explicit tests.
900
        return format.open(transport, _found=True)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
901
5051.3.4 by Jelmer Vernooij
Support name to BzrDir.open_branch.
902
    def open_branch(self, name=None, unsupported=False,
903
                    ignore_fallbacks=False):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
904
        """Open the branch object at this BzrDir if one is present.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
905
906
        If unsupported is True, then no longer supported branch formats can
907
        still be opened.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
908
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
909
        TODO: static convenience version of this?
910
        """
911
        raise NotImplementedError(self.open_branch)
1534.4.39 by Robert Collins
Basic BzrDir support.
912
913
    @staticmethod
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
914
    def open_containing(url, possible_transports=None):
1534.4.39 by Robert Collins
Basic BzrDir support.
915
        """Open an existing branch which contains url.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
916
1534.6.3 by Robert Collins
find_repository sufficiently robust.
917
        :param url: url to search from.
1534.6.11 by Robert Collins
Review feedback.
918
        See open_containing_from_transport for more detail.
1534.6.3 by Robert Collins
find_repository sufficiently robust.
919
        """
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
920
        transport = get_transport(url, possible_transports)
921
        return BzrDir.open_containing_from_transport(transport)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
922
1534.6.3 by Robert Collins
find_repository sufficiently robust.
923
    @staticmethod
1534.6.11 by Robert Collins
Review feedback.
924
    def open_containing_from_transport(a_transport):
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
925
        """Open an existing branch which contains a_transport.base.
1534.6.3 by Robert Collins
find_repository sufficiently robust.
926
927
        This probes for a branch at a_transport, and searches upwards from there.
1534.4.39 by Robert Collins
Basic BzrDir support.
928
929
        Basically we keep looking up until we find the control directory or
930
        run into the root.  If there isn't one, raises NotBranchError.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
931
        If there is one and it is either an unrecognised format or an unsupported
1534.4.39 by Robert Collins
Basic BzrDir support.
932
        format, UnknownFormatError or UnsupportedFormatError are raised.
933
        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
934
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
935
        :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.
936
                for the rest of the URL.
1534.4.39 by Robert Collins
Basic BzrDir support.
937
        """
938
        # this gets the normalised url back. I.e. '.' -> the full path.
1534.6.3 by Robert Collins
find_repository sufficiently robust.
939
        url = a_transport.base
1534.4.39 by Robert Collins
Basic BzrDir support.
940
        while True:
941
            try:
1910.11.1 by Andrew Bennetts
Add BzrDir.open_from_transport, refactored from duplicate code, no explicit tests.
942
                result = BzrDir.open_from_transport(a_transport)
943
                return result, urlutils.unescape(a_transport.relpath(url))
1534.4.39 by Robert Collins
Basic BzrDir support.
944
            except errors.NotBranchError, e:
1685.1.60 by Martin Pool
[broken] NotBranchError should unescape the url if possible
945
                pass
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
946
            try:
947
                new_t = a_transport.clone('..')
948
            except errors.InvalidURLJoin:
949
                # reached the root, whatever that may be
950
                raise errors.NotBranchError(path=url)
1534.6.3 by Robert Collins
find_repository sufficiently robust.
951
            if new_t.base == a_transport.base:
1534.4.39 by Robert Collins
Basic BzrDir support.
952
                # reached the root, whatever that may be
953
                raise errors.NotBranchError(path=url)
1534.6.3 by Robert Collins
find_repository sufficiently robust.
954
            a_transport = new_t
1534.4.39 by Robert Collins
Basic BzrDir support.
955
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
956
    def _get_tree_branch(self):
957
        """Return the branch and tree, if any, for this bzrdir.
958
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
959
        Return None for tree if not present or inaccessible.
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
960
        Raise NotBranchError if no branch is present.
961
        :return: (tree, branch)
962
        """
963
        try:
964
            tree = self.open_workingtree()
965
        except (errors.NoWorkingTree, errors.NotLocalUrl):
966
            tree = None
967
            branch = self.open_branch()
968
        else:
969
            branch = tree.branch
970
        return tree, branch
971
972
    @classmethod
973
    def open_tree_or_branch(klass, location):
974
        """Return the branch and working tree at a location.
975
976
        If there is no tree at the location, tree will be None.
977
        If there is no branch at the location, an exception will be
978
        raised
979
        :return: (tree, branch)
980
        """
981
        bzrdir = klass.open(location)
982
        return bzrdir._get_tree_branch()
983
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
984
    @classmethod
985
    def open_containing_tree_or_branch(klass, location):
986
        """Return the branch and working tree contained by a location.
987
988
        Returns (tree, branch, relpath).
989
        If there is no tree at containing the location, tree will be None.
990
        If there is no branch containing the location, an exception will be
991
        raised
992
        relpath is the portion of the path that is contained by the branch.
993
        """
994
        bzrdir, relpath = klass.open_containing(location)
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
995
        tree, branch = bzrdir._get_tree_branch()
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
996
        return tree, branch, relpath
997
3015.3.39 by Daniel Watkins
Added classmethod bzrlib.bzrdir.BzrDir.open_containing_tree_branch_or_repository.
998
    @classmethod
999
    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.
1000
        """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.
1001
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
1002
        Returns (tree, branch, repository, relpath).
3015.3.39 by Daniel Watkins
Added classmethod bzrlib.bzrdir.BzrDir.open_containing_tree_branch_or_repository.
1003
        If there is no tree containing the location, tree will be None.
1004
        If there is no branch containing the location, branch will be None.
1005
        If there is no repository containing the location, repository will be
1006
        None.
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
1007
        relpath is the portion of the path that is contained by the innermost
1008
        BzrDir.
3015.3.39 by Daniel Watkins
Added classmethod bzrlib.bzrdir.BzrDir.open_containing_tree_branch_or_repository.
1009
3015.3.59 by Daniel Watkins
Further tweaks as requested on-list.
1010
        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.
1011
        """
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
1012
        bzrdir, relpath = klass.open_containing(location)
3015.3.39 by Daniel Watkins
Added classmethod bzrlib.bzrdir.BzrDir.open_containing_tree_branch_or_repository.
1013
        try:
3015.3.51 by Daniel Watkins
Modified open_containing_tree_branch_or_repository as per Aaron's suggestion.
1014
            tree, branch = bzrdir._get_tree_branch()
3015.3.39 by Daniel Watkins
Added classmethod bzrlib.bzrdir.BzrDir.open_containing_tree_branch_or_repository.
1015
        except errors.NotBranchError:
1016
            try:
3015.3.59 by Daniel Watkins
Further tweaks as requested on-list.
1017
                repo = bzrdir.find_repository()
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
1018
                return None, None, repo, relpath
1019
            except (errors.NoRepositoryPresent):
1020
                raise errors.NotBranchError(location)
1021
        return tree, branch, branch.repository, relpath
3015.3.39 by Daniel Watkins
Added classmethod bzrlib.bzrdir.BzrDir.open_containing_tree_branch_or_repository.
1022
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1023
    def open_repository(self, _unsupported=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1024
        """Open the repository object at this BzrDir if one is present.
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1025
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
1026
        This will not follow the Branch object pointer - it's strictly a direct
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1027
        open facility. Most client code should use open_branch().repository to
1028
        get at a repository.
1029
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
1030
        :param _unsupported: a private parameter, not part of the api.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1031
        TODO: static convenience version of this?
1032
        """
1033
        raise NotImplementedError(self.open_repository)
1034
2400.2.2 by Robert Collins
Document BzrDir.open_workingtree's new recommend_upgrade parameter.
1035
    def open_workingtree(self, _unsupported=False,
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
1036
                         recommend_upgrade=True, from_branch=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1037
        """Open the workingtree object at this BzrDir if one is present.
2400.2.2 by Robert Collins
Document BzrDir.open_workingtree's new recommend_upgrade parameter.
1038
1039
        :param recommend_upgrade: Optional keyword parameter, when True (the
1040
            default), emit through the ui module a recommendation that the user
1041
            upgrade the working tree when the workingtree being opened is old
1042
            (but still fully supported).
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
1043
        :param from_branch: override bzrdir branch (for lightweight checkouts)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1044
        """
1045
        raise NotImplementedError(self.open_workingtree)
1046
5051.3.4 by Jelmer Vernooij
Support name to BzrDir.open_branch.
1047
    def has_branch(self, name=None):
1662.1.19 by Martin Pool
Better error message when initting existing tree
1048
        """Tell if this bzrdir contains a branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1049
1662.1.19 by Martin Pool
Better error message when initting existing tree
1050
        Note: if you're going to open the branch, you should just go ahead
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1051
        and try, and not ask permission first.  (This method just opens the
1052
        branch and discards it, and that's somewhat expensive.)
1662.1.19 by Martin Pool
Better error message when initting existing tree
1053
        """
1054
        try:
5051.3.4 by Jelmer Vernooij
Support name to BzrDir.open_branch.
1055
            self.open_branch(name)
1662.1.19 by Martin Pool
Better error message when initting existing tree
1056
            return True
1057
        except errors.NotBranchError:
1058
            return False
1059
1060
    def has_workingtree(self):
1061
        """Tell if this bzrdir contains a working tree.
1062
1063
        This will still raise an exception if the bzrdir has a workingtree that
1064
        is remote & inaccessible.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1065
1662.1.19 by Martin Pool
Better error message when initting existing tree
1066
        Note: if you're going to open the working tree, you should just go ahead
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1067
        and try, and not ask permission first.  (This method just opens the
1068
        workingtree and discards it, and that's somewhat expensive.)
1662.1.19 by Martin Pool
Better error message when initting existing tree
1069
        """
1070
        try:
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1071
            self.open_workingtree(recommend_upgrade=False)
1662.1.19 by Martin Pool
Better error message when initting existing tree
1072
            return True
1073
        except errors.NoWorkingTree:
1074
            return False
1075
2018.5.96 by Andrew Bennetts
Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
1076
    def _cloning_metadir(self):
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1077
        """Produce a metadir suitable for cloning with.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1078
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1079
        :returns: (destination_bzrdir_format, source_repository)
1080
        """
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
1081
        result_format = self._format.__class__()
1082
        try:
1910.2.41 by Aaron Bentley
Clean up clone format creation
1083
            try:
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
1084
                branch = self.open_branch(ignore_fallbacks=True)
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
1085
                source_repository = branch.repository
3650.2.5 by Aaron Bentley
Stop creating a new instance
1086
                result_format._branch_format = branch._format
1910.2.41 by Aaron Bentley
Clean up clone format creation
1087
            except errors.NotBranchError:
1088
                source_branch = None
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
1089
                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.
1090
        except errors.NoRepositoryPresent:
2100.3.24 by Aaron Bentley
Get all tests passing again
1091
            source_repository = None
2305.3.1 by Andrew Bennetts
Tidy up BzrDir.cloning_metadir: bogus try/except, and basis argument isn't actually used.
1092
        else:
2018.5.138 by Robert Collins
Merge bzr.dev.
1093
            # XXX TODO: This isinstance is here because we have not implemented
1094
            # the fix recommended in bug # 103195 - to delegate this choice the
1095
            # repository itself.
2018.5.94 by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test).
1096
            repo_format = source_repository._format
3705.2.1 by Andrew Bennetts
Possible fix for bug 269214
1097
            if isinstance(repo_format, remote.RemoteRepositoryFormat):
1098
                source_repository._ensure_real()
1099
                repo_format = source_repository._real_repository._format
1100
            result_format.repository_format = repo_format
2100.3.28 by Aaron Bentley
Make sprout recursive
1101
        try:
2323.5.19 by Martin Pool
No upgrade recommendation on source when cloning
1102
            # TODO: Couldn't we just probe for the format in these cases,
1103
            # rather than opening the whole tree?  It would be a little
1104
            # faster. mbp 20070401
1105
            tree = self.open_workingtree(recommend_upgrade=False)
2100.3.28 by Aaron Bentley
Make sprout recursive
1106
        except (errors.NoWorkingTree, errors.NotLocalUrl):
1107
            result_format.workingtree_format = None
1108
        else:
1109
            result_format.workingtree_format = tree._format.__class__()
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1110
        return result_format, source_repository
1111
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
1112
    def cloning_metadir(self, require_stacking=False):
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
1113
        """Produce a metadir suitable for cloning or sprouting with.
1910.2.41 by Aaron Bentley
Clean up clone format creation
1114
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
1115
        These operations may produce workingtrees (yes, even though they're
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
1116
        "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
1117
        format must be selected.
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1118
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
1119
        :require_stacking: If True, non-stackable formats will be upgraded
1120
            to similar stackable formats.
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1121
        :returns: a BzrDirFormat with all component formats either set
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
1122
            appropriately or set to None if that component should not be
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1123
            created.
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
1124
        """
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1125
        format, repository = self._cloning_metadir()
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
1126
        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.
1127
            # No tree in self.
2100.3.34 by Aaron Bentley
Fix BzrDir.cloning_metadir with no format
1128
            if repository is None:
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1129
                # No repository either
2100.3.34 by Aaron Bentley
Fix BzrDir.cloning_metadir with no format
1130
                return format
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1131
            # We have a repository, so set a working tree? (Why? This seems to
1132
            # contradict the stated return value in the docstring).
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1133
            tree_format = repository._format._matchingbzrdir.workingtree_format
2100.3.28 by Aaron Bentley
Make sprout recursive
1134
            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.
1135
        if require_stacking:
1136
            format.require_stacking()
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
1137
        return format
1138
1139
    def checkout_metadir(self):
1140
        return self.cloning_metadir()
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
1141
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
1142
    def sprout(self, url, revision_id=None, force_new_repo=False,
3123.5.8 by Aaron Bentley
Work around double-opening lock issue
1143
               recurse='down', possible_transports=None,
3823.5.1 by John Arbash Meinel
Allow the source branch to pass itself into BzrDir.sprout.
1144
               accelerator_tree=None, hardlink=False, stacked=False,
3983.1.7 by Daniel Watkins
Review comments from jam.
1145
               source_branch=None, create_tree_if_local=True):
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.
1146
        """Create a copy of this bzrdir prepared for use as a new line of
1147
        development.
1148
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
1149
        If url's last component does not exist, it will be created.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1150
1151
        Attributes related to the identity of the source branch like
1152
        branch nickname will be cleaned, a working tree is created
1153
        whether one existed before or not; and a local branch is always
1154
        created.
1155
1156
        if revision_id is not None, then the clone operation may tune
1157
            itself to download less data.
3123.5.17 by Aaron Bentley
Update docs
1158
        :param accelerator_tree: A tree which can be used for retrieving file
1159
            contents more quickly than the revision tree, i.e. a workingtree.
1160
            The revision tree will be used for cases where accelerator_tree's
1161
            content is different.
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1162
        :param hardlink: If true, hard-link files from accelerator_tree,
1163
            where possible.
3221.18.4 by Ian Clatworthy
shallow -> stacked
1164
        :param stacked: If true, create a stacked branch referring to the
3221.13.2 by Robert Collins
Add a shallow parameter to bzrdir.sprout, which involved fixing a lateny bug in pack to pack fetching with ghost discovery.
1165
            location of this control directory.
3983.1.7 by Daniel Watkins
Review comments from jam.
1166
        :param create_tree_if_local: If true, a working-tree will be created
1167
            when working locally.
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.
1168
        """
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
1169
        target_transport = get_transport(url, possible_transports)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
1170
        target_transport.ensure_base()
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
1171
        cloning_format = self.cloning_metadir(stacked)
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
1172
        # Create/update the result branch
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
1173
        result = cloning_format.initialize_on_transport(target_transport)
3823.5.1 by John Arbash Meinel
Allow the source branch to pass itself into BzrDir.sprout.
1174
        # if a stacked branch wasn't requested, we don't create one
1175
        # even if the origin was stacked
1176
        stacked_branch_url = None
1177
        if source_branch is not None:
3221.18.4 by Ian Clatworthy
shallow -> stacked
1178
            if stacked:
1179
                stacked_branch_url = self.root_transport.base
3823.5.1 by John Arbash Meinel
Allow the source branch to pass itself into BzrDir.sprout.
1180
            source_repository = source_branch.repository
1181
        else:
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.
1182
            try:
3823.5.1 by John Arbash Meinel
Allow the source branch to pass itself into BzrDir.sprout.
1183
                source_branch = self.open_branch()
1184
                source_repository = source_branch.repository
1185
                if stacked:
1186
                    stacked_branch_url = self.root_transport.base
1187
            except errors.NotBranchError:
1188
                source_branch = None
1189
                try:
1190
                    source_repository = self.open_repository()
1191
                except errors.NoRepositoryPresent:
1192
                    source_repository = None
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
1193
        repository_policy = result.determine_repository_policy(
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
1194
            force_new_repo, stacked_branch_url, require_stacking=stacked)
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
1195
        result_repo, is_new_repo = repository_policy.acquire_repository()
4070.9.17 by Andrew Bennetts
Don't use PendingAncestrySearch when creating a stacked branch.
1196
        if is_new_repo and revision_id is not None and not stacked:
4070.9.14 by Andrew Bennetts
Tweaks requested by Robert's review.
1197
            fetch_spec = graph.PendingAncestryResult(
1198
                [revision_id], source_repository)
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
1199
        else:
1200
            fetch_spec = None
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
1201
        if source_repository is not None:
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
1202
            # Fetch while stacked to prevent unstacked fetch from
1203
            # Branch.sprout.
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
1204
            if fetch_spec is None:
1205
                result_repo.fetch(source_repository, revision_id=revision_id)
1206
            else:
1207
                result_repo.fetch(source_repository, fetch_spec=fetch_spec)
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
1208
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
1209
        if source_branch is None:
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1210
            # this is for sprouting a bzrdir without a branch; is that
1211
            # actually useful?
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
1212
            # Not especially, but it's part of the contract.
3221.11.20 by Robert Collins
Support --shallow on branch.
1213
            result_branch = result.create_branch()
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1214
        else:
4070.3.1 by Robert Collins
Alter branch sprouting with an alternate fix for stacked branches that does not require multiple copy_content_into and set_parent calls, reducing IO and round trips.
1215
            result_branch = source_branch.sprout(result,
1216
                revision_id=revision_id, repository_policy=repository_policy)
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1217
        mutter("created new branch %r" % (result_branch,))
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
1218
1219
        # Create/update the result working tree
3983.1.7 by Daniel Watkins
Review comments from jam.
1220
        if (create_tree_if_local and
1221
            isinstance(target_transport, local.LocalTransport) and
1222
            (result_repo is None or result_repo.make_working_trees())):
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1223
            wt = result.create_workingtree(accelerator_tree=accelerator_tree,
1224
                hardlink=hardlink)
2255.2.77 by Robert Collins
Tune working inventory generation more: walk the blocks, skipping deleted rows.
1225
            wt.lock_write()
1226
            try:
1227
                if wt.path2id('') is None:
3123.5.10 by Aaron Bentley
Restore old handling of set_root_id
1228
                    try:
1229
                        wt.set_root_id(self.open_workingtree.get_root_id())
1230
                    except errors.NoWorkingTree:
1231
                        pass
2255.2.77 by Robert Collins
Tune working inventory generation more: walk the blocks, skipping deleted rows.
1232
            finally:
1233
                wt.unlock()
2100.3.28 by Aaron Bentley
Make sprout recursive
1234
        else:
1235
            wt = None
4370.3.2 by Ian Clatworthy
apply jam's review feedback
1236
        if recurse == 'down':
2100.3.28 by Aaron Bentley
Make sprout recursive
1237
            if wt is not None:
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
1238
                basis = wt.basis_tree()
1239
                basis.lock_read()
1240
                subtrees = basis.iter_references()
3744.1.1 by John Arbash Meinel
When branching into a tree-less repository, use the target branch
1241
            elif result_branch is not None:
1242
                basis = result_branch.basis_tree()
1243
                basis.lock_read()
1244
                subtrees = basis.iter_references()
2100.3.28 by Aaron Bentley
Make sprout recursive
1245
            elif source_branch is not None:
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
1246
                basis = source_branch.basis_tree()
1247
                basis.lock_read()
1248
                subtrees = basis.iter_references()
2100.3.28 by Aaron Bentley
Make sprout recursive
1249
            else:
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
1250
                subtrees = []
1251
                basis = None
1252
            try:
1253
                for path, file_id in subtrees:
1254
                    target = urlutils.join(url, urlutils.escape(path))
1255
                    sublocation = source_branch.reference_parent(file_id, path)
1256
                    sublocation.bzrdir.sprout(target,
1257
                        basis.get_reference_revision(file_id, path),
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
1258
                        force_new_repo=force_new_repo, recurse=recurse,
3221.18.4 by Ian Clatworthy
shallow -> stacked
1259
                        stacked=stacked)
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
1260
            finally:
1261
                if basis is not None:
1262
                    basis.unlock()
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1263
        return result
1264
3978.3.15 by Jelmer Vernooij
Rename BzrDir.push() to BzrDir.push_branch().
1265
    def push_branch(self, source, revision_id=None, overwrite=False, 
4416.8.1 by Jelmer Vernooij
Pass create_prefix paremeter to BzrDir.push_branch.
1266
        remember=False, create_prefix=False):
3978.3.14 by Jelmer Vernooij
Move BranchBzrDirInter.push() to BzrDir.push().
1267
        """Push the source branch into this BzrDir."""
1268
        br_to = None
1269
        # If we can open a branch, use its direct repository, otherwise see
1270
        # if there is a repository without a branch.
1271
        try:
1272
            br_to = self.open_branch()
1273
        except errors.NotBranchError:
1274
            # Didn't find a branch, can we find a repository?
1275
            repository_to = self.find_repository()
1276
        else:
1277
            # Found a branch, so we must have found a repository
1278
            repository_to = br_to.repository
1279
1280
        push_result = PushResult()
3978.3.16 by Jelmer Vernooij
Add some smoke tests for BzrDir.push_branch().
1281
        push_result.source_branch = source
3978.3.14 by Jelmer Vernooij
Move BranchBzrDirInter.push() to BzrDir.push().
1282
        if br_to is None:
1283
            # We have a repository but no branch, copy the revisions, and then
1284
            # create a branch.
1285
            repository_to.fetch(source.repository, revision_id=revision_id)
1286
            br_to = source.clone(self, revision_id=revision_id)
1287
            if source.get_push_location() is None or remember:
1288
                source.set_push_location(br_to.base)
1289
            push_result.stacked_on = None
1290
            push_result.branch_push_result = None
1291
            push_result.old_revno = None
1292
            push_result.old_revid = _mod_revision.NULL_REVISION
1293
            push_result.target_branch = br_to
1294
            push_result.master_branch = None
1295
            push_result.workingtree_updated = False
1296
        else:
1297
            # We have successfully opened the branch, remember if necessary:
1298
            if source.get_push_location() is None or remember:
1299
                source.set_push_location(br_to.base)
1300
            try:
1301
                tree_to = self.open_workingtree()
1302
            except errors.NotLocalUrl:
1303
                push_result.branch_push_result = source.push(br_to, 
1304
                    overwrite, stop_revision=revision_id)
1305
                push_result.workingtree_updated = False
1306
            except errors.NoWorkingTree:
1307
                push_result.branch_push_result = source.push(br_to,
1308
                    overwrite, stop_revision=revision_id)
1309
                push_result.workingtree_updated = None # Not applicable
1310
            else:
1311
                tree_to.lock_write()
1312
                try:
1313
                    push_result.branch_push_result = source.push(
1314
                        tree_to.branch, overwrite, stop_revision=revision_id)
1315
                    tree_to.update()
1316
                finally:
1317
                    tree_to.unlock()
1318
                push_result.workingtree_updated = True
1319
            push_result.old_revno = push_result.branch_push_result.old_revno
1320
            push_result.old_revid = push_result.branch_push_result.old_revid
3978.3.15 by Jelmer Vernooij
Rename BzrDir.push() to BzrDir.push_branch().
1321
            push_result.target_branch = \
1322
                push_result.branch_push_result.target_branch
3978.3.14 by Jelmer Vernooij
Move BranchBzrDirInter.push() to BzrDir.push().
1323
        return push_result
1324
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1325
4160.1.1 by Robert Collins
Add a BzrDir.pre_open hook for use by the smart server gaol.
1326
class BzrDirHooks(hooks.Hooks):
1327
    """Hooks for BzrDir operations."""
1328
1329
    def __init__(self):
1330
        """Create the default hooks."""
1331
        hooks.Hooks.__init__(self)
1332
        self.create_hook(hooks.HookPoint('pre_open',
1333
            "Invoked before attempting to open a BzrDir with the transport "
1334
            "that the open will use.", (1, 14), None))
1335
1336
# install the default hooks
1337
BzrDir.hooks = BzrDirHooks()
1338
1339
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1340
class BzrDirPreSplitOut(BzrDir):
1341
    """A common class for the all-in-one formats."""
1342
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
1343
    def __init__(self, _transport, _format):
1344
        """See BzrDir.__init__."""
1345
        super(BzrDirPreSplitOut, self).__init__(_transport, _format)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1346
        self._control_files = lockable_files.LockableFiles(
1347
                                            self.get_branch_transport(None),
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1348
                                            self._format._lock_file_name,
1349
                                            self._format._lock_class)
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
1350
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
1351
    def break_lock(self):
1352
        """Pre-splitout bzrdirs do not suffer from stale locks."""
1353
        raise NotImplementedError(self.break_lock)
1354
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
1355
    def cloning_metadir(self, require_stacking=False):
3242.2.12 by Aaron Bentley
Get cloning_metadir working properly for old formats
1356
        """Produce a metadir suitable for cloning with."""
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
1357
        if require_stacking:
1358
            return format_registry.make_bzrdir('1.6')
3242.2.12 by Aaron Bentley
Get cloning_metadir working properly for old formats
1359
        return self._format.__class__()
1360
3242.3.37 by Aaron Bentley
Updates from reviews
1361
    def clone(self, url, revision_id=None, force_new_repo=False,
1362
              preserve_stacking=False):
1363
        """See BzrDir.clone().
1364
1365
        force_new_repo has no effect, since this family of formats always
1366
        require a new repository.
1367
        preserve_stacking has no effect, since no source branch using this
1368
        family of formats can be stacked, so there is no stacking to preserve.
1369
        """
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.
1370
        self._make_tail(url)
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1371
        result = self._format._initialize_for_clone(url)
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
1372
        self.open_repository().clone(result, revision_id=revision_id)
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
1373
        from_branch = self.open_branch()
1374
        from_branch.clone(result, revision_id=revision_id)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1375
        try:
3650.5.7 by Aaron Bentley
Fix working tree initialization
1376
            tree = self.open_workingtree()
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.
1377
        except errors.NotLocalUrl:
1378
            # make a new one, this format always has to have one.
3650.5.7 by Aaron Bentley
Fix working tree initialization
1379
            result._init_workingtree()
1380
        else:
1381
            tree.clone(result)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1382
        return result
1383
5051.3.2 by Jelmer Vernooij
Add name argument to BzrDir.create_branch().
1384
    def create_branch(self, name=None):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1385
        """See BzrDir.create_branch."""
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1386
        return self._format.get_branch_format().initialize(self, name=name)
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.
1387
5051.3.1 by Jelmer Vernooij
Add optional name argument to BzrDir.destroy_branch.
1388
    def destroy_branch(self, name=None):
2796.2.16 by Aaron Bentley
Documentation updates from review
1389
        """See BzrDir.destroy_branch."""
2796.2.6 by Aaron Bentley
Implement destroy_branch
1390
        raise errors.UnsupportedOperation(self.destroy_branch, self)
1391
1534.6.1 by Robert Collins
allow API creation of shared repositories
1392
    def create_repository(self, shared=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1393
        """See BzrDir.create_repository."""
1534.6.1 by Robert Collins
allow API creation of shared repositories
1394
        if shared:
1395
            raise errors.IncompatibleFormat('shared repository', self._format)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1396
        return self.open_repository()
1397
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
1398
    def destroy_repository(self):
1399
        """See BzrDir.destroy_repository."""
1400
        raise errors.UnsupportedOperation(self.destroy_repository, self)
1401
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1402
    def create_workingtree(self, revision_id=None, from_branch=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1403
                           accelerator_tree=None, hardlink=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1404
        """See BzrDir.create_workingtree."""
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
1405
        # The workingtree is sometimes created when the bzrdir is created,
1406
        # but not when cloning.
1407
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1408
        # this looks buggy but is not -really-
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1409
        # because this format creates the workingtree when the bzrdir is
1410
        # created
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1411
        # clone and sprout will have set the revision_id
1412
        # and that will have set it for us, its only
1413
        # specific uses of create_workingtree in isolation
1414
        # that can do wonky stuff here, and that only
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1415
        # happens for creating checkouts, which cannot be
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1416
        # done on this format anyway. So - acceptable wart.
4580.4.1 by Martin Pool
Give a warning if --hardlink can't be supported
1417
        if hardlink:
1418
            warning("can't support hardlinked working trees in %r"
1419
                % (self,))
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
1420
        try:
1421
            result = self.open_workingtree(recommend_upgrade=False)
1422
        except errors.NoSuchFile:
1423
            result = self._init_workingtree()
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1424
        if revision_id is not None:
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
1425
            if revision_id == _mod_revision.NULL_REVISION:
1551.8.20 by Aaron Bentley
Fix BzrDir.create_workingtree for NULL_REVISION
1426
                result.set_parent_ids([])
1427
            else:
1428
                result.set_parent_ids([revision_id])
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1429
        return result
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1430
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
1431
    def _init_workingtree(self):
1432
        from bzrlib.workingtree import WorkingTreeFormat2
1433
        try:
1434
            return WorkingTreeFormat2().initialize(self)
1435
        except errors.NotLocalUrl:
1436
            # Even though we can't access the working tree, we need to
1437
            # create its control files.
3650.5.7 by Aaron Bentley
Fix working tree initialization
1438
            return WorkingTreeFormat2()._stub_initialize_on_transport(
1439
                self.transport, self._control_files._file_mode)
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
1440
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1441
    def destroy_workingtree(self):
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
1442
        """See BzrDir.destroy_workingtree."""
1443
        raise errors.UnsupportedOperation(self.destroy_workingtree, self)
1444
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1445
    def destroy_workingtree_metadata(self):
1446
        """See BzrDir.destroy_workingtree_metadata."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1447
        raise errors.UnsupportedOperation(self.destroy_workingtree_metadata,
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1448
                                          self)
1449
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1450
    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.
1451
        """See BzrDir.get_branch_transport()."""
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1452
        if name is not None:
1453
            raise errors.NoColocatedBranchSupport(self)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1454
        if branch_format is None:
1455
            return self.transport
1456
        try:
1457
            branch_format.get_format_string()
1458
        except NotImplementedError:
1459
            return self.transport
1460
        raise errors.IncompatibleFormat(branch_format, self._format)
1461
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1462
    def get_repository_transport(self, repository_format):
1463
        """See BzrDir.get_repository_transport()."""
1464
        if repository_format is None:
1465
            return self.transport
1466
        try:
1467
            repository_format.get_format_string()
1468
        except NotImplementedError:
1469
            return self.transport
1470
        raise errors.IncompatibleFormat(repository_format, self._format)
1471
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1472
    def get_workingtree_transport(self, workingtree_format):
1473
        """See BzrDir.get_workingtree_transport()."""
1474
        if workingtree_format is None:
1475
            return self.transport
1476
        try:
1477
            workingtree_format.get_format_string()
1478
        except NotImplementedError:
1479
            return self.transport
1480
        raise errors.IncompatibleFormat(workingtree_format, self._format)
1481
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.
1482
    def needs_format_conversion(self, format=None):
1483
        """See BzrDir.needs_format_conversion()."""
1484
        # if the format is not the same as the system default,
1485
        # an upgrade is needed.
1486
        if format is None:
3943.2.5 by Martin Pool
deprecate needs_format_conversion(format=None)
1487
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1488
                % 'needs_format_conversion(format=None)')
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.
1489
            format = BzrDirFormat.get_default_format()
1490
        return not isinstance(self._format, format.__class__)
1491
5051.3.4 by Jelmer Vernooij
Support name to BzrDir.open_branch.
1492
    def open_branch(self, name=None, unsupported=False,
1493
                    ignore_fallbacks=False):
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)
1494
        """See BzrDir.open_branch."""
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1495
        from bzrlib.branch import BzrBranchFormat4
1496
        format = BzrBranchFormat4()
1497
        self._check_supported(format, unsupported)
5051.3.13 by Jelmer Vernooij
Pass colocated branch name around rather than raising an exception directly.
1498
        return format.open(self, name, _found=True)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1499
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
1500
    def sprout(self, url, revision_id=None, force_new_repo=False,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1501
               possible_transports=None, accelerator_tree=None,
4054.3.1 by Martin Pool
BzrDirPreSplitOut.sprout should accept source_branch parameter
1502
               hardlink=False, stacked=False, create_tree_if_local=True,
1503
               source_branch=None):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1504
        """See BzrDir.sprout()."""
4054.3.1 by Martin Pool
BzrDirPreSplitOut.sprout should accept source_branch parameter
1505
        if source_branch is not None:
1506
            my_branch = self.open_branch()
1507
            if source_branch.base != my_branch.base:
1508
                raise AssertionError(
1509
                    "source branch %r is not within %r with branch %r" %
1510
                    (source_branch, self, my_branch))
3221.18.4 by Ian Clatworthy
shallow -> stacked
1511
        if stacked:
3221.13.2 by Robert Collins
Add a shallow parameter to bzrdir.sprout, which involved fixing a lateny bug in pack to pack fetching with ghost discovery.
1512
            raise errors.UnstackableBranchFormat(
1513
                self._format, self.root_transport.base)
3983.1.11 by Daniel Watkins
Old BzrDirs which must have working trees are now allowed for in the test.
1514
        if not create_tree_if_local:
1515
            raise errors.MustHaveWorkingTree(
1516
                self._format, self.root_transport.base)
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.
1517
        from bzrlib.workingtree import WorkingTreeFormat2
1518
        self._make_tail(url)
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1519
        result = self._format._initialize_for_clone(url)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1520
        try:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
1521
            self.open_repository().clone(result, revision_id=revision_id)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1522
        except errors.NoRepositoryPresent:
1523
            pass
1524
        try:
1525
            self.open_branch().sprout(result, revision_id=revision_id)
1526
        except errors.NotBranchError:
1527
            pass
3983.1.4 by Daniel Watkins
Added 'no_tree' parameter to BzrDirPreSplitOut.
1528
3983.1.7 by Daniel Watkins
Review comments from jam.
1529
        # we always want a working tree
1530
        WorkingTreeFormat2().initialize(result,
1531
                                        accelerator_tree=accelerator_tree,
1532
                                        hardlink=hardlink)
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.
1533
        return result
1534
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1535
1536
class BzrDir4(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
1537
    """A .bzr version 4 control object.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1538
1508.1.25 by Robert Collins
Update per review comments.
1539
    This is a deprecated format and may be removed after sept 2006.
1540
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1541
1534.6.1 by Robert Collins
allow API creation of shared repositories
1542
    def create_repository(self, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1543
        """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.
1544
        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.
1545
1534.5.16 by Robert Collins
Review feedback.
1546
    def needs_format_conversion(self, format=None):
1547
        """Format 4 dirs are always in need of conversion."""
3943.2.5 by Martin Pool
deprecate needs_format_conversion(format=None)
1548
        if format is None:
1549
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1550
                % 'needs_format_conversion(format=None)')
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1551
        return True
1552
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1553
    def open_repository(self):
1554
        """See BzrDir.open_repository."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1555
        from bzrlib.repofmt.weaverepo import RepositoryFormat4
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1556
        return RepositoryFormat4().open(self, _found=True)
1557
1558
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1559
class BzrDir5(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
1560
    """A .bzr version 5 control object.
1561
1562
    This is a deprecated format and may be removed after sept 2006.
1563
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1564
4634.47.9 by Andrew Bennetts
has_workingtree is always true for BzrDirFormat5 and BzrDirFormat6.
1565
    def has_workingtree(self):
1566
        """See BzrDir.has_workingtree."""
1567
        return True
1568
    
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1569
    def open_repository(self):
1570
        """See BzrDir.open_repository."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1571
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1572
        return RepositoryFormat5().open(self, _found=True)
1573
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1574
    def open_workingtree(self, _unsupported=False,
1575
            recommend_upgrade=True):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1576
        """See BzrDir.create_workingtree."""
1577
        from bzrlib.workingtree import WorkingTreeFormat2
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1578
        wt_format = WorkingTreeFormat2()
1579
        # we don't warn here about upgrades; that ought to be handled for the
1580
        # bzrdir as a whole
1581
        return wt_format.open(self, _found=True)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1582
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1583
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1584
class BzrDir6(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
1585
    """A .bzr version 6 control object.
1586
1587
    This is a deprecated format and may be removed after sept 2006.
1588
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1589
4634.47.9 by Andrew Bennetts
has_workingtree is always true for BzrDirFormat5 and BzrDirFormat6.
1590
    def has_workingtree(self):
1591
        """See BzrDir.has_workingtree."""
1592
        return True
1593
    
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1594
    def open_repository(self):
1595
        """See BzrDir.open_repository."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1596
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1597
        return RepositoryFormat6().open(self, _found=True)
1598
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1599
    def open_workingtree(self, _unsupported=False,
1600
        recommend_upgrade=True):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1601
        """See BzrDir.create_workingtree."""
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1602
        # we don't warn here about upgrades; that ought to be handled for the
1603
        # bzrdir as a whole
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1604
        from bzrlib.workingtree import WorkingTreeFormat2
1605
        return WorkingTreeFormat2().open(self, _found=True)
1606
1607
1608
class BzrDirMeta1(BzrDir):
1609
    """A .bzr meta version 1 control object.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1610
1611
    This is the first control object where the
1553.5.67 by Martin Pool
doc
1612
    individual aspects are really split out: there are separate repository,
1613
    workingtree and branch subdirectories and any subset of the three can be
1614
    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.
1615
    """
1616
1534.5.16 by Robert Collins
Review feedback.
1617
    def can_convert_format(self):
1618
        """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.
1619
        return True
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1620
5051.3.2 by Jelmer Vernooij
Add name argument to BzrDir.create_branch().
1621
    def create_branch(self, name=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1622
        """See BzrDir.create_branch."""
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1623
        return self._format.get_branch_format().initialize(self, name=name)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1624
5051.3.1 by Jelmer Vernooij
Add optional name argument to BzrDir.destroy_branch.
1625
    def destroy_branch(self, name=None):
2796.2.6 by Aaron Bentley
Implement destroy_branch
1626
        """See BzrDir.create_branch."""
5051.3.1 by Jelmer Vernooij
Add optional name argument to BzrDir.destroy_branch.
1627
        if name is not None:
1628
            raise errors.NoColocatedBranchSupport(self)
2796.2.6 by Aaron Bentley
Implement destroy_branch
1629
        self.transport.delete_tree('branch')
1630
1534.6.1 by Robert Collins
allow API creation of shared repositories
1631
    def create_repository(self, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1632
        """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.
1633
        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.
1634
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
1635
    def destroy_repository(self):
1636
        """See BzrDir.destroy_repository."""
1637
        self.transport.delete_tree('repository')
1638
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1639
    def create_workingtree(self, revision_id=None, from_branch=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1640
                           accelerator_tree=None, hardlink=False):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1641
        """See BzrDir.create_workingtree."""
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
1642
        return self._format.workingtree_format.initialize(
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1643
            self, revision_id, from_branch=from_branch,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1644
            accelerator_tree=accelerator_tree, hardlink=hardlink)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1645
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1646
    def destroy_workingtree(self):
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
1647
        """See BzrDir.destroy_workingtree."""
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1648
        wt = self.open_workingtree(recommend_upgrade=False)
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1649
        repository = wt.branch.repository
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
1650
        empty = repository.revision_tree(_mod_revision.NULL_REVISION)
2748.3.2 by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified'
1651
        wt.revert(old_tree=empty)
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1652
        self.destroy_workingtree_metadata()
1653
1654
    def destroy_workingtree_metadata(self):
1655
        self.transport.delete_tree('checkout')
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
1656
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1657
    def find_branch_format(self):
1658
        """Find the branch 'format' for this bzrdir.
1659
1660
        This might be a synthetic object for e.g. RemoteBranch and SVN.
1661
        """
1662
        from bzrlib.branch import BranchFormat
1663
        return BranchFormat.find_format(self)
1664
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1665
    def _get_mkdir_mode(self):
1666
        """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
1667
        temp_control = lockable_files.LockableFiles(self.transport, '',
1668
                                     lockable_files.TransportLock)
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1669
        return temp_control._dir_mode
1670
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1671
    def get_branch_reference(self):
1672
        """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)
1673
        from bzrlib.branch import BranchFormat
1674
        format = BranchFormat.find_format(self)
1675
        return format.get_reference(self)
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1676
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1677
    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.
1678
        """See BzrDir.get_branch_transport()."""
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1679
        if name is not None:
1680
            raise errors.NoColocatedBranchSupport(self)
4570.3.6 by Martin Pool
doc
1681
        # XXX: this shouldn't implicitly create the directory if it's just
1682
        # 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.
1683
        if branch_format is None:
1684
            return self.transport.clone('branch')
1685
        try:
1686
            branch_format.get_format_string()
1687
        except NotImplementedError:
1688
            raise errors.IncompatibleFormat(branch_format, self._format)
1689
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1690
            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.
1691
        except errors.FileExists:
1692
            pass
1693
        return self.transport.clone('branch')
1694
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1695
    def get_repository_transport(self, repository_format):
1696
        """See BzrDir.get_repository_transport()."""
1697
        if repository_format is None:
1698
            return self.transport.clone('repository')
1699
        try:
1700
            repository_format.get_format_string()
1701
        except NotImplementedError:
1702
            raise errors.IncompatibleFormat(repository_format, self._format)
1703
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1704
            self.transport.mkdir('repository', mode=self._get_mkdir_mode())
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1705
        except errors.FileExists:
1706
            pass
1707
        return self.transport.clone('repository')
1708
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1709
    def get_workingtree_transport(self, workingtree_format):
1710
        """See BzrDir.get_workingtree_transport()."""
1711
        if workingtree_format is None:
1712
            return self.transport.clone('checkout')
1713
        try:
1714
            workingtree_format.get_format_string()
1715
        except NotImplementedError:
1716
            raise errors.IncompatibleFormat(workingtree_format, self._format)
1717
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1718
            self.transport.mkdir('checkout', mode=self._get_mkdir_mode())
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1719
        except errors.FileExists:
1720
            pass
1721
        return self.transport.clone('checkout')
1722
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.
1723
    def has_workingtree(self):
1724
        """Tell if this bzrdir contains a working tree.
1725
1726
        This will still raise an exception if the bzrdir has a workingtree that
1727
        is remote & inaccessible.
1728
1729
        Note: if you're going to open the working tree, you should just go
1730
        ahead and try, and not ask permission first.
1731
        """
1732
        from bzrlib.workingtree import WorkingTreeFormat
1733
        try:
1734
            WorkingTreeFormat.find_format(self)
1735
        except errors.NoWorkingTree:
1736
            return False
1737
        return True
1738
1534.5.16 by Robert Collins
Review feedback.
1739
    def needs_format_conversion(self, format=None):
1740
        """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.
1741
        if format is None:
3943.2.5 by Martin Pool
deprecate needs_format_conversion(format=None)
1742
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1743
                % 'needs_format_conversion(format=None)')
1744
        if format is None:
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.
1745
            format = BzrDirFormat.get_default_format()
1746
        if not isinstance(self._format, format.__class__):
1747
            # it is not a meta dir format, conversion is needed.
1748
            return True
1749
        # we might want to push this down to the repository?
1750
        try:
1751
            if not isinstance(self.open_repository()._format,
1752
                              format.repository_format.__class__):
1753
                # the repository needs an upgrade.
1754
                return True
1755
        except errors.NoRepositoryPresent:
1756
            pass
5051.3.4 by Jelmer Vernooij
Support name to BzrDir.open_branch.
1757
        for branch in self.list_branches():
1758
            if not isinstance(branch._format,
2230.3.55 by Aaron Bentley
Updates from review
1759
                              format.get_branch_format().__class__):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1760
                # the branch needs an upgrade.
1761
                return True
1762
        try:
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1763
            my_wt = self.open_workingtree(recommend_upgrade=False)
1764
            if not isinstance(my_wt._format,
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1765
                              format.workingtree_format.__class__):
1766
                # the workingtree needs an upgrade.
1767
                return True
2255.2.196 by Robert Collins
Fix test_upgrade defects related to non local or absent working trees.
1768
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1769
            pass
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1770
        return False
1771
5051.3.4 by Jelmer Vernooij
Support name to BzrDir.open_branch.
1772
    def open_branch(self, name=None, unsupported=False,
1773
                    ignore_fallbacks=False):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1774
        """See BzrDir.open_branch."""
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)
1775
        format = self.find_branch_format()
1776
        self._check_supported(format, unsupported)
5051.3.13 by Jelmer Vernooij
Pass colocated branch name around rather than raising an exception directly.
1777
        return format.open(self, name=name,
1778
            _found=True, ignore_fallbacks=ignore_fallbacks)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1779
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1780
    def open_repository(self, unsupported=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1781
        """See BzrDir.open_repository."""
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1782
        from bzrlib.repository import RepositoryFormat
1783
        format = RepositoryFormat.find_format(self)
1784
        self._check_supported(format, unsupported)
1785
        return format.open(self, _found=True)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1786
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1787
    def open_workingtree(self, unsupported=False,
1788
            recommend_upgrade=True):
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1789
        """See BzrDir.open_workingtree."""
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1790
        from bzrlib.workingtree import WorkingTreeFormat
1791
        format = WorkingTreeFormat.find_format(self)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1792
        self._check_supported(format, unsupported,
1793
            recommend_upgrade,
2323.6.5 by Martin Pool
Recommended-upgrade message should give base dir not the control dir url
1794
            basedir=self.root_transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1795
        return format.open(self, _found=True)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1796
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1797
    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.
1798
        return config.TransportConfig(self.transport, 'control.conf')
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1799
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1800
1534.4.39 by Robert Collins
Basic BzrDir support.
1801
class BzrDirFormat(object):
1802
    """An encapsulation of the initialization and open routines for a format.
1803
1804
    Formats provide three things:
1805
     * An initialization routine,
1806
     * a format string,
1807
     * an open routine.
1808
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1809
    Formats are placed in a dict by their format string for reference
1534.4.39 by Robert Collins
Basic BzrDir support.
1810
    during bzrdir opening. These should be subclasses of BzrDirFormat
1811
    for consistency.
1812
1813
    Once a format is deprecated, just deprecate the initialize and open
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1814
    methods on the format class. Do not deprecate the object, as the
1534.4.39 by Robert Collins
Basic BzrDir support.
1815
    object will be created every system load.
5075.1.1 by Jelmer Vernooij
Document that BzrDirFormat.colocated_branches is a cvar.
1816
1817
    :cvar colocated_branches: Whether this formats supports colocated branches.
1534.4.39 by Robert Collins
Basic BzrDir support.
1818
    """
1819
1820
    _default_format = None
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1821
    """The default format used for new .bzr dirs."""
1534.4.39 by Robert Collins
Basic BzrDir support.
1822
1823
    _formats = {}
1824
    """The known formats."""
1825
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
1826
    _control_formats = []
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1827
    """The registered control formats - .bzr, ....
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1828
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
1829
    This is a list of BzrDirFormat objects.
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1830
    """
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1831
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.
1832
    _control_server_formats = []
1833
    """The registered control server formats, e.g. RemoteBzrDirs.
1834
1835
    This is a list of BzrDirFormat objects.
1836
    """
1837
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1838
    _lock_file_name = 'branch-lock'
1839
5051.3.3 by Jelmer Vernooij
Add tests for colo branches.
1840
    colocated_branches = False
1841
    """Whether co-located branches are supported for this control dir format.
1842
    """
1843
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1844
    # _lock_class must be set in subclasses to the lock type, typ.
1845
    # TransportLock or LockDir
1846
1534.4.39 by Robert Collins
Basic BzrDir support.
1847
    @classmethod
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
1848
    def find_format(klass, transport, _server_formats=True):
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1849
        """Return the format present at transport."""
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
1850
        if _server_formats:
1851
            formats = klass._control_server_formats + klass._control_formats
1852
        else:
1853
            formats = klass._control_formats
1854
        for format in formats:
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1855
            try:
1856
                return format.probe_transport(transport)
1857
            except errors.NotBranchError:
1858
                # this format does not find a control dir here.
1859
                pass
1860
        raise errors.NotBranchError(path=transport.base)
1861
1862
    @classmethod
1863
    def probe_transport(klass, transport):
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1864
        """Return the .bzrdir style format present in a directory."""
1534.4.39 by Robert Collins
Basic BzrDir support.
1865
        try:
4852.1.3 by John Arbash Meinel
Read .bzr/branch-format via get_bytes()
1866
            format_string = transport.get_bytes(".bzr/branch-format")
1733.2.3 by Michael Ellerman
Don't coallesce try blocks, it can lead to confusing exceptions.
1867
        except errors.NoSuchFile:
1868
            raise errors.NotBranchError(path=transport.base)
1869
1870
        try:
1534.4.39 by Robert Collins
Basic BzrDir support.
1871
            return klass._formats[format_string]
1872
        except KeyError:
3246.3.2 by Daniel Watkins
Modified uses of errors.UnknownFormatError.
1873
            raise errors.UnknownFormatError(format=format_string, kind='bzrdir')
1534.4.39 by Robert Collins
Basic BzrDir support.
1874
1875
    @classmethod
1876
    def get_default_format(klass):
1877
        """Return the current default format."""
1878
        return klass._default_format
1879
1880
    def get_format_string(self):
1881
        """Return the ASCII format string that identifies this format."""
1882
        raise NotImplementedError(self.get_format_string)
1883
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1884
    def get_format_description(self):
1885
        """Return the short description for this format."""
1886
        raise NotImplementedError(self.get_format_description)
1887
1534.5.16 by Robert Collins
Review feedback.
1888
    def get_converter(self, format=None):
1889
        """Return the converter to use to convert bzrdirs needing converts.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1890
1891
        This returns a bzrlib.bzrdir.Converter object.
1892
1893
        This should return the best upgrader to step this format towards the
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1894
        current default format. In the case of plugins we can/should provide
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1895
        some means for them to extend the range of returnable converters.
1534.5.13 by Robert Collins
Correct buggy test.
1896
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1897
        :param format: Optional format to override the default format of the
1534.5.13 by Robert Collins
Correct buggy test.
1898
                       library.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1899
        """
1534.5.16 by Robert Collins
Review feedback.
1900
        raise NotImplementedError(self.get_converter)
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1901
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
1902
    def initialize(self, url, possible_transports=None):
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1903
        """Create a bzr control dir at this url and return an opened copy.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1904
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
1905
        While not deprecated, this method is very specific and its use will
1906
        lead to many round trips to setup a working environment. See
1907
        initialize_on_transport_ex for a [nearly] all-in-one method.
1908
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1909
        Subclasses should typically override initialize_on_transport
1910
        instead of this method.
1911
        """
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
1912
        return self.initialize_on_transport(get_transport(url,
1913
                                                          possible_transports))
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1914
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1915
    def initialize_on_transport(self, transport):
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1916
        """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)
1917
        try:
1918
            # can we hand off the request to the smart server rather than using
1919
            # vfs calls?
1920
            client_medium = transport.get_smart_medium()
1921
        except errors.NoSmartMedium:
1922
            return self._initialize_on_transport_vfs(transport)
1923
        else:
1924
            # Current RPC's only know how to create bzr metadir1 instances, so
1925
            # we still delegate to vfs methods if the requested format is not a
1926
            # metadir1
1927
            if type(self) != BzrDirMetaFormat1:
1928
                return self._initialize_on_transport_vfs(transport)
1929
            remote_format = RemoteBzrDirFormat()
1930
            self._supply_sub_formats_to(remote_format)
1931
            return remote_format.initialize_on_transport(transport)
1932
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1933
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
1934
        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.
1935
        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.
1936
        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.
1937
        """Create this format on transport.
1938
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
1939
        The directory to initialize will be created.
1940
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1941
        :param force_new_repo: Do not use a shared repository for the target,
1942
                               even if one is available.
1943
        :param create_prefix: Create any missing directories leading up to
1944
            to_transport.
1945
        :param use_existing_dir: Use an existing directory if one exists.
1946
        :param stacked_on: A url to stack any created branch on, None to follow
1947
            any target stacking policy.
1948
        :param stack_on_pwd: If stack_on is relative, the location it is
1949
            relative to.
1950
        :param repo_format_name: If non-None, a repository will be
1951
            made-or-found. Should none be found, or if force_new_repo is True
1952
            the repo_format_name is used to select the format of repository to
1953
            create.
1954
        :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.
1955
            for a new shared repository when one is made. None to use whatever
1956
            default the format has.
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
1957
        :param shared_repo: Control whether made repositories are shared or
1958
            not.
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
1959
        :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.
1960
        :return: repo, bzrdir, require_stacking, repository_policy. repo is
1961
            None if none was created or found, bzrdir is always valid.
1962
            require_stacking is the result of examining the stacked_on
1963
            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.
1964
        """
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
1965
        if not vfs_only:
1966
            # Try to hand off to a smart server 
1967
            try:
1968
                client_medium = transport.get_smart_medium()
1969
            except errors.NoSmartMedium:
1970
                pass
1971
            else:
1972
                # TODO: lookup the local format from a server hint.
1973
                remote_dir_format = RemoteBzrDirFormat()
1974
                remote_dir_format._network_name = self.network_name()
1975
                self._supply_sub_formats_to(remote_dir_format)
1976
                return remote_dir_format.initialize_on_transport_ex(transport,
1977
                    use_existing_dir=use_existing_dir, create_prefix=create_prefix,
1978
                    force_new_repo=force_new_repo, stacked_on=stacked_on,
1979
                    stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
1980
                    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.
1981
        # XXX: Refactor the create_prefix/no_create_prefix code into a
1982
        #      common helper function
1983
        # The destination may not exist - if so make it according to policy.
1984
        def make_directory(transport):
1985
            transport.mkdir('.')
1986
            return transport
1987
        def redirected(transport, e, redirection_notice):
1988
            note(redirection_notice)
1989
            return transport._redirected_to(e.source, e.target)
1990
        try:
1991
            transport = do_catching_redirections(make_directory, transport,
1992
                redirected)
1993
        except errors.FileExists:
1994
            if not use_existing_dir:
1995
                raise
1996
        except errors.NoSuchFile:
1997
            if not create_prefix:
1998
                raise
1999
            transport.create_prefix()
2000
2001
        require_stacking = (stacked_on is not None)
2002
        # Now the target directory exists, but doesn't have a .bzr
2003
        # directory. So we need to create it, along with any work to create
2004
        # all of the dependent branches, etc.
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
2005
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
2006
        result = self.initialize_on_transport(transport)
2007
        if repo_format_name:
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
2008
            try:
2009
                # use a custom format
2010
                result._format.repository_format = \
2011
                    repository.network_format_registry.get(repo_format_name)
2012
            except AttributeError:
2013
                # The format didn't permit it to be set.
2014
                pass
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
2015
            # A repository is desired, either in-place or shared.
2016
            repository_policy = result.determine_repository_policy(
2017
                force_new_repo, stacked_on, stack_on_pwd,
2018
                require_stacking=require_stacking)
2019
            result_repo, is_new_repo = repository_policy.acquire_repository(
2020
                make_working_trees, shared_repo)
2021
            if not require_stacking and repository_policy._require_stacking:
2022
                require_stacking = True
2023
                result._format.require_stacking()
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
2024
            result_repo.lock_write()
4294.2.4 by Robert Collins
Move dir, bzrdir and repo acquisition into a single method on bzrdir format.
2025
        else:
2026
            result_repo = None
2027
            repository_policy = None
2028
        return result_repo, result, require_stacking, repository_policy
2029
4017.2.2 by Robert Collins
Perform creation of BzrDirMetaFormat1 control directories using an RPC where possible. (Robert Collins)
2030
    def _initialize_on_transport_vfs(self, transport):
2031
        """Initialize a new bzrdir using VFS calls.
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
2032
4017.2.2 by Robert Collins
Perform creation of BzrDirMetaFormat1 control directories using an RPC where possible. (Robert Collins)
2033
        :param transport: The transport to create the .bzr directory in.
2034
        :return: A
2035
        """
2036
        # Since we are creating a .bzr directory, inherit the
1534.4.39 by Robert Collins
Basic BzrDir support.
2037
        # mode from the root directory
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
2038
        temp_control = lockable_files.LockableFiles(transport,
2039
                            '', lockable_files.TransportLock)
1534.4.39 by Robert Collins
Basic BzrDir support.
2040
        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.
2041
                                      # FIXME: RBC 20060121 don't peek under
1534.4.39 by Robert Collins
Basic BzrDir support.
2042
                                      # the covers
2043
                                      mode=temp_control._dir_mode)
3224.5.24 by Andrew Bennetts
More minor import tidying suggested by pyflakes.
2044
        if sys.platform == 'win32' and isinstance(transport, local.LocalTransport):
3023.1.2 by Alexander Belchenko
Martin's review.
2045
            win32utils.set_file_attr_hidden(transport._abspath('.bzr'))
1534.4.39 by Robert Collins
Basic BzrDir support.
2046
        file_mode = temp_control._file_mode
2047
        del temp_control
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2048
        bzrdir_transport = transport.clone('.bzr')
2049
        utf8_files = [('README',
3250.2.1 by Marius Kruger
update .bzr/README to not refer to Bazaar-NG, and add link to website.
2050
                       "This is a Bazaar control directory.\n"
2051
                       "Do not change any files in this directory.\n"
2052
                       "See http://bazaar-vcs.org/ for more information about Bazaar.\n"),
1534.4.39 by Robert Collins
Basic BzrDir support.
2053
                      ('branch-format', self.get_format_string()),
2054
                      ]
2055
        # NB: no need to escape relative paths that are url safe.
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2056
        control_files = lockable_files.LockableFiles(bzrdir_transport,
2057
            self._lock_file_name, self._lock_class)
1553.5.60 by Martin Pool
New LockableFiles.create_lock() method
2058
        control_files.create_lock()
1534.4.39 by Robert Collins
Basic BzrDir support.
2059
        control_files.lock_write()
2060
        try:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2061
            for (filename, content) in utf8_files:
3407.2.12 by Martin Pool
Fix creation mode of control files
2062
                bzrdir_transport.put_bytes(filename, content,
2063
                    mode=file_mode)
1534.4.39 by Robert Collins
Basic BzrDir support.
2064
        finally:
2065
            control_files.unlock()
4017.2.2 by Robert Collins
Perform creation of BzrDirMetaFormat1 control directories using an RPC where possible. (Robert Collins)
2066
        return self.open(transport, _found=True)
1534.4.39 by Robert Collins
Basic BzrDir support.
2067
2068
    def is_supported(self):
2069
        """Is this format supported?
2070
2071
        Supported formats must be initializable and openable.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2072
        Unsupported formats may not support initialization or committing or
1534.4.39 by Robert Collins
Basic BzrDir support.
2073
        some other features depending on the reason for not being supported.
2074
        """
2075
        return True
2076
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
2077
    def network_name(self):
2078
        """A simple byte string uniquely identifying this format for RPC calls.
2079
2080
        Bzr control formats use thir disk format string to identify the format
2081
        over the wire. Its possible that other control formats have more
2082
        complex detection requirements, so we permit them to use any unique and
2083
        immutable string they desire.
2084
        """
2085
        raise NotImplementedError(self.network_name)
2086
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
2087
    def same_model(self, target_format):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2088
        return (self.repository_format.rich_root_data ==
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
2089
            target_format.rich_root_data)
2090
1733.1.3 by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
2091
    @classmethod
2092
    def known_formats(klass):
2093
        """Return all the known formats.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2094
1733.1.3 by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
2095
        Concrete formats should override _known_formats.
2096
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2097
        # There is double indirection here to make sure that control
2098
        # formats used by more than one dir format will only be probed
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
2099
        # once. This can otherwise be quite expensive for remote connections.
1733.1.3 by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
2100
        result = set()
2101
        for format in klass._control_formats:
2102
            result.update(format._known_formats())
2103
        return result
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2104
1733.1.3 by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
2105
    @classmethod
2106
    def _known_formats(klass):
2107
        """Return the known format instances for this control format."""
2108
        return set(klass._formats.values())
2109
1534.4.39 by Robert Collins
Basic BzrDir support.
2110
    def open(self, transport, _found=False):
2111
        """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
2112
1534.4.39 by Robert Collins
Basic BzrDir support.
2113
        _found is a private parameter, do not use it.
2114
        """
2115
        if not _found:
2090.2.2 by Martin Pool
Fix an assertion with side effects
2116
            found_format = BzrDirFormat.find_format(transport)
2117
            if not isinstance(found_format, self.__class__):
2118
                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
2119
                        "format %s"
2090.2.2 by Martin Pool
Fix an assertion with side effects
2120
                        % (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.
2121
            # Allow subclasses - use the found format.
2122
            self._supply_sub_formats_to(found_format)
2123
            return found_format._open(transport)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2124
        return self._open(transport)
2125
2126
    def _open(self, transport):
2127
        """Template method helper for opening BzrDirectories.
2128
2129
        This performs the actual open and any additional logic or parameter
2130
        passing.
2131
        """
2132
        raise NotImplementedError(self._open)
1534.4.39 by Robert Collins
Basic BzrDir support.
2133
2134
    @classmethod
2135
    def register_format(klass, format):
2136
        klass._formats[format.get_format_string()] = format
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
2137
        # bzr native formats have a network name of their format string.
4075.2.1 by Robert Collins
Audit and make sure we are registering network_name's as factories, not instances.
2138
        network_format_registry.register(format.get_format_string(), format.__class__)
1534.4.39 by Robert Collins
Basic BzrDir support.
2139
2140
    @classmethod
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
2141
    def register_control_format(klass, format):
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
2142
        """Register a format that does not use '.bzr' for its control dir.
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
2143
2144
        TODO: This should be pulled up into a 'ControlDirFormat' base class
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2145
        which BzrDirFormat can inherit from, and renamed to register_format
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
2146
        there. It has been done without that for now for simplicity of
2147
        implementation.
2148
        """
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
2149
        klass._control_formats.append(format)
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
2150
2151
    @classmethod
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
2152
    def register_control_server_format(klass, format):
2153
        """Register a control format for client-server environments.
2154
2155
        These formats will be tried before ones registered with
2156
        register_control_format.  This gives implementations that decide to the
2157
        chance to grab it before anything looks at the contents of the format
2158
        file.
2159
        """
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.
2160
        klass._control_server_formats.append(format)
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
2161
2162
    @classmethod
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
2163
    def _set_default_format(klass, format):
2164
        """Set default format (for testing behavior of defaults only)"""
2165
        klass._default_format = format
2166
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
2167
    def __str__(self):
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
2168
        # Trim the newline
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
2169
        return self.get_format_description().rstrip()
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
2170
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.
2171
    def _supply_sub_formats_to(self, other_format):
2172
        """Give other_format the same values for sub formats as this has.
2173
2174
        This method is expected to be used when parameterising a
2175
        RemoteBzrDirFormat instance with the parameters from a
2176
        BzrDirMetaFormat1 instance.
2177
2178
        :param other_format: other_format is a format which should be
2179
            compatible with whatever sub formats are supported by self.
2180
        :return: None.
2181
        """
2182
1534.4.39 by Robert Collins
Basic BzrDir support.
2183
    @classmethod
2184
    def unregister_format(klass, format):
2185
        del klass._formats[format.get_format_string()]
2186
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
2187
    @classmethod
2188
    def unregister_control_format(klass, format):
2189
        klass._control_formats.remove(format)
2190
2191
1534.4.39 by Robert Collins
Basic BzrDir support.
2192
class BzrDirFormat4(BzrDirFormat):
2193
    """Bzr dir format 4.
2194
2195
    This format is a combined format for working tree, branch and repository.
2196
    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.
2197
     - Format 1 working trees [always]
2198
     - Format 4 branches [always]
2199
     - Format 4 repositories [always]
1534.4.39 by Robert Collins
Basic BzrDir support.
2200
2201
    This format is deprecated: it indexes texts using a text it which is
2202
    removed in format 5; write support for this format has been removed.
2203
    """
2204
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
2205
    _lock_class = lockable_files.TransportLock
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
2206
1534.4.39 by Robert Collins
Basic BzrDir support.
2207
    def get_format_string(self):
2208
        """See BzrDirFormat.get_format_string()."""
2209
        return "Bazaar-NG branch, format 0.0.4\n"
2210
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2211
    def get_format_description(self):
2212
        """See BzrDirFormat.get_format_description()."""
2213
        return "All-in-one format 4"
2214
1534.5.16 by Robert Collins
Review feedback.
2215
    def get_converter(self, format=None):
2216
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
2217
        # there is one and only one upgrade path here.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2218
        return ConvertBzrDir4To5()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2219
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
2220
    def initialize_on_transport(self, transport):
1534.4.39 by Robert Collins
Basic BzrDir support.
2221
        """Format 4 branches cannot be created."""
2222
        raise errors.UninitializableFormat(self)
2223
2224
    def is_supported(self):
2225
        """Format 4 is not supported.
2226
2227
        It is not supported because the model changed from 4 to 5 and the
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2228
        conversion logic is expensive - so doing it on the fly was not
1534.4.39 by Robert Collins
Basic BzrDir support.
2229
        feasible.
2230
        """
2231
        return False
2232
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
2233
    def network_name(self):
2234
        return self.get_format_string()
2235
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2236
    def _open(self, transport):
2237
        """See BzrDirFormat._open."""
2238
        return BzrDir4(transport, self)
2239
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.
2240
    def __return_repository_format(self):
2241
        """Circular import protection."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2242
        from bzrlib.repofmt.weaverepo import RepositoryFormat4
1910.2.12 by Aaron Bentley
Implement knit repo format 2
2243
        return RepositoryFormat4()
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
2244
    repository_format = property(__return_repository_format)
2245
1534.4.39 by Robert Collins
Basic BzrDir support.
2246
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
2247
class BzrDirFormatAllInOne(BzrDirFormat):
2248
    """Common class for formats before meta-dirs."""
2249
2250
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
2251
        create_prefix=False, force_new_repo=False, stacked_on=None,
2252
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
2253
        shared_repo=False):
2254
        """See BzrDirFormat.initialize_on_transport_ex."""
2255
        require_stacking = (stacked_on is not None)
4294.2.10 by Robert Collins
Review feedback.
2256
        # Format 5 cannot stack, but we've been asked to - actually init
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
2257
        # a Meta1Dir
2258
        if require_stacking:
2259
            format = BzrDirMetaFormat1()
2260
            return format.initialize_on_transport_ex(transport,
2261
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
2262
                force_new_repo=force_new_repo, stacked_on=stacked_on,
2263
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
2264
                make_working_trees=make_working_trees, shared_repo=shared_repo)
2265
        return BzrDirFormat.initialize_on_transport_ex(self, transport,
2266
            use_existing_dir=use_existing_dir, create_prefix=create_prefix,
2267
            force_new_repo=force_new_repo, stacked_on=stacked_on,
2268
            stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
2269
            make_working_trees=make_working_trees, shared_repo=shared_repo)
2270
2271
2272
class BzrDirFormat5(BzrDirFormatAllInOne):
1534.4.39 by Robert Collins
Basic BzrDir support.
2273
    """Bzr control format 5.
2274
2275
    This format is a combined format for working tree, branch and repository.
2276
    It has:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2277
     - Format 2 working trees [always]
2278
     - Format 4 branches [always]
1534.4.53 by Robert Collins
Review feedback from John Meinel.
2279
     - Format 5 repositories [always]
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
2280
       Unhashed stores in the repository.
1534.4.39 by Robert Collins
Basic BzrDir support.
2281
    """
2282
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
2283
    _lock_class = lockable_files.TransportLock
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
2284
1534.4.39 by Robert Collins
Basic BzrDir support.
2285
    def get_format_string(self):
2286
        """See BzrDirFormat.get_format_string()."""
2287
        return "Bazaar-NG branch, format 5\n"
2288
3650.2.2 by Aaron Bentley
Implement get_branch_format, to unify branch creation code
2289
    def get_branch_format(self):
2290
        from bzrlib import branch
2291
        return branch.BzrBranchFormat4()
2292
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2293
    def get_format_description(self):
2294
        """See BzrDirFormat.get_format_description()."""
2295
        return "All-in-one format 5"
2296
1534.5.16 by Robert Collins
Review feedback.
2297
    def get_converter(self, format=None):
2298
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
2299
        # there is one and only one upgrade path here.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2300
        return ConvertBzrDir5To6()
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
2301
2302
    def _initialize_for_clone(self, url):
2303
        return self.initialize_on_transport(get_transport(url), _cloning=True)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2304
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
2305
    def initialize_on_transport(self, transport, _cloning=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
2306
        """Format 5 dirs always have working tree, branch and repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2307
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.
2308
        Except when they are being cloned.
2309
        """
2310
        from bzrlib.branch import BzrBranchFormat4
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2311
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
2312
        result = (super(BzrDirFormat5, self).initialize_on_transport(transport))
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
2313
        RepositoryFormat5().initialize(result, _internal=True)
2314
        if not _cloning:
1910.5.1 by Andrew Bennetts
Make some old formats create at least a stub working tree rather than incomplete bzrdirs, and change some tests to use the test suite transport rather than hard-coded to local-only.
2315
            branch = BzrBranchFormat4().initialize(result)
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
2316
            result._init_workingtree()
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.
2317
        return result
2318
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
2319
    def network_name(self):
2320
        return self.get_format_string()
2321
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2322
    def _open(self, transport):
2323
        """See BzrDirFormat._open."""
2324
        return BzrDir5(transport, self)
2325
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.
2326
    def __return_repository_format(self):
2327
        """Circular import protection."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2328
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1910.2.12 by Aaron Bentley
Implement knit repo format 2
2329
        return RepositoryFormat5()
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
2330
    repository_format = property(__return_repository_format)
2331
1534.4.39 by Robert Collins
Basic BzrDir support.
2332
4294.2.5 by Robert Collins
Reasonable unit test coverage for initialize_on_transport_ex.
2333
class BzrDirFormat6(BzrDirFormatAllInOne):
1534.4.39 by Robert Collins
Basic BzrDir support.
2334
    """Bzr control format 6.
2335
2336
    This format is a combined format for working tree, branch and repository.
2337
    It has:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2338
     - Format 2 working trees [always]
2339
     - Format 4 branches [always]
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
2340
     - Format 6 repositories [always]
1534.4.39 by Robert Collins
Basic BzrDir support.
2341
    """
2342
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
2343
    _lock_class = lockable_files.TransportLock
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
2344
1534.4.39 by Robert Collins
Basic BzrDir support.
2345
    def get_format_string(self):
2346
        """See BzrDirFormat.get_format_string()."""
2347
        return "Bazaar-NG branch, format 6\n"
2348
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2349
    def get_format_description(self):
2350
        """See BzrDirFormat.get_format_description()."""
2351
        return "All-in-one format 6"
2352
3650.2.2 by Aaron Bentley
Implement get_branch_format, to unify branch creation code
2353
    def get_branch_format(self):
2354
        from bzrlib import branch
2355
        return branch.BzrBranchFormat4()
2356
1534.5.16 by Robert Collins
Review feedback.
2357
    def get_converter(self, format=None):
2358
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
2359
        # there is one and only one upgrade path here.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2360
        return ConvertBzrDir6ToMeta()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2361
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
2362
    def _initialize_for_clone(self, url):
2363
        return self.initialize_on_transport(get_transport(url), _cloning=True)
2364
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
2365
    def initialize_on_transport(self, transport, _cloning=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
2366
        """Format 6 dirs always have working tree, branch and repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2367
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.
2368
        Except when they are being cloned.
2369
        """
2370
        from bzrlib.branch import BzrBranchFormat4
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2371
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
2372
        result = super(BzrDirFormat6, self).initialize_on_transport(transport)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
2373
        RepositoryFormat6().initialize(result, _internal=True)
2374
        if not _cloning:
1910.5.1 by Andrew Bennetts
Make some old formats create at least a stub working tree rather than incomplete bzrdirs, and change some tests to use the test suite transport rather than hard-coded to local-only.
2375
            branch = BzrBranchFormat4().initialize(result)
3650.5.7 by Aaron Bentley
Fix working tree initialization
2376
            result._init_workingtree()
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.
2377
        return result
2378
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
2379
    def network_name(self):
2380
        return self.get_format_string()
2381
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
2382
    def _open(self, transport):
2383
        """See BzrDirFormat._open."""
2384
        return BzrDir6(transport, self)
2385
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.
2386
    def __return_repository_format(self):
2387
        """Circular import protection."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2388
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1910.2.12 by Aaron Bentley
Implement knit repo format 2
2389
        return RepositoryFormat6()
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
2390
    repository_format = property(__return_repository_format)
2391
1534.4.39 by Robert Collins
Basic BzrDir support.
2392
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2393
class BzrDirMetaFormat1(BzrDirFormat):
2394
    """Bzr meta control format 1
2395
2396
    This is the first format with split out working tree, branch and repository
2397
    disk storage.
2398
    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.
2399
     - Format 3 working trees [optional]
2400
     - Format 5 branches [optional]
2401
     - 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.
2402
    """
2403
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
2404
    _lock_class = lockdir.LockDir
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
2405
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
2406
    def __init__(self):
2407
        self._workingtree_format = None
2230.3.1 by Aaron Bentley
Get branch6 creation working
2408
        self._branch_format = None
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
2409
        self._repository_format = None
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
2410
2100.3.15 by Aaron Bentley
get test suite passing
2411
    def __eq__(self, other):
2412
        if other.__class__ is not self.__class__:
2413
            return False
2414
        if other.repository_format != self.repository_format:
2415
            return False
2416
        if other.workingtree_format != self.workingtree_format:
2417
            return False
2418
        return True
2419
2100.3.35 by Aaron Bentley
equality operations on bzrdir
2420
    def __ne__(self, other):
2421
        return not self == other
2422
2230.3.55 by Aaron Bentley
Updates from review
2423
    def get_branch_format(self):
2230.3.1 by Aaron Bentley
Get branch6 creation working
2424
        if self._branch_format is None:
2425
            from bzrlib.branch import BranchFormat
2426
            self._branch_format = BranchFormat.get_default_format()
2427
        return self._branch_format
2428
2230.3.55 by Aaron Bentley
Updates from review
2429
    def set_branch_format(self, format):
2230.3.1 by Aaron Bentley
Get branch6 creation working
2430
        self._branch_format = format
2431
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.
2432
    def require_stacking(self, stack_on=None, possible_transports=None,
2433
            _skip_repo=False):
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
2434
        """We have a request to stack, try to ensure the formats support it.
2435
2436
        :param stack_on: If supplied, it is the URL to a branch that we want to
2437
            stack on. Check to see if that format supports stacking before
2438
            forcing an upgrade.
2439
        """
2440
        # Stacking is desired. requested by the target, but does the place it
2441
        # points at support stacking? If it doesn't then we should
2442
        # not implicitly upgrade. We check this here.
2443
        new_repo_format = None
2444
        new_branch_format = None
2445
2446
        # a bit of state for get_target_branch so that we don't try to open it
2447
        # 2 times, for both repo *and* branch
2448
        target = [None, False, None] # target_branch, checked, upgrade anyway
2449
        def get_target_branch():
2450
            if target[1]:
2451
                # We've checked, don't check again
2452
                return target
2453
            if stack_on is None:
2454
                # No target format, that means we want to force upgrading
2455
                target[:] = [None, True, True]
2456
                return target
2457
            try:
2458
                target_dir = BzrDir.open(stack_on,
2459
                    possible_transports=possible_transports)
2460
            except errors.NotBranchError:
2461
                # Nothing there, don't change formats
2462
                target[:] = [None, True, False]
2463
                return target
2464
            except errors.JailBreak:
2465
                # JailBreak, JFDI and upgrade anyway
2466
                target[:] = [None, True, True]
2467
                return target
2468
            try:
2469
                target_branch = target_dir.open_branch()
2470
            except errors.NotBranchError:
2471
                # No branch, don't upgrade formats
2472
                target[:] = [None, True, False]
2473
                return target
2474
            target[:] = [target_branch, True, False]
2475
            return target
2476
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.
2477
        if (not _skip_repo and
2478
                 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.
2479
            # We need to upgrade the Repository.
2480
            target_branch, _, do_upgrade = get_target_branch()
2481
            if target_branch is None:
2482
                # We don't have a target branch, should we upgrade anyway?
2483
                if do_upgrade:
2484
                    # stack_on is inaccessible, JFDI.
2485
                    # TODO: bad monkey, hard-coded formats...
2486
                    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.
2487
                        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.
2488
                    else:
4401.1.3 by John Arbash Meinel
Change back to defaulting to --1.6 format, and update the blackbox tests.
2489
                        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.
2490
            else:
2491
                # If the target already supports stacking, then we know the
2492
                # project is already able to use stacking, so auto-upgrade
2493
                # for them
2494
                new_repo_format = target_branch.repository._format
2495
                if not new_repo_format.supports_external_lookups:
2496
                    # target doesn't, source doesn't, so don't auto upgrade
2497
                    # repo
2498
                    new_repo_format = None
2499
            if new_repo_format is not None:
2500
                self.repository_format = new_repo_format
2501
                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.
2502
                     ' 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.
2503
                     new_repo_format.get_format_description())
2504
3904.3.1 by Andrew Bennetts
Probable fix for GaryvdM's bug when pushing a stacked qbzr branch to Launchpad.
2505
        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.
2506
            # We just checked the repo, now lets check if we need to
2507
            # upgrade the branch format
2508
            target_branch, _, do_upgrade = get_target_branch()
2509
            if target_branch is None:
2510
                if do_upgrade:
2511
                    # TODO: bad monkey, hard-coded formats...
2512
                    new_branch_format = branch.BzrBranchFormat7()
3904.3.1 by Andrew Bennetts
Probable fix for GaryvdM's bug when pushing a stacked qbzr branch to Launchpad.
2513
            else:
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
2514
                new_branch_format = target_branch._format
2515
                if not new_branch_format.supports_stacking():
2516
                    new_branch_format = None
2517
            if new_branch_format is not None:
2518
                # Does support stacking, use its format.
2519
                self.set_branch_format(new_branch_format)
2520
                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.
2521
                     ' 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.
2522
                     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.
2523
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.
2524
    def get_converter(self, format=None):
2525
        """See BzrDirFormat.get_converter()."""
2526
        if format is None:
2527
            format = BzrDirFormat.get_default_format()
2528
        if not isinstance(self, format.__class__):
2529
            # converting away from metadir is not implemented
2530
            raise NotImplementedError(self.get_converter)
2531
        return ConvertMetaToMeta(format)
2532
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2533
    def get_format_string(self):
2534
        """See BzrDirFormat.get_format_string()."""
2535
        return "Bazaar-NG meta directory, format 1\n"
2536
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2537
    def get_format_description(self):
2538
        """See BzrDirFormat.get_format_description()."""
2539
        return "Meta directory format 1"
2540
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
2541
    def network_name(self):
2542
        return self.get_format_string()
2543
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2544
    def _open(self, transport):
2545
        """See BzrDirFormat._open."""
4294.2.12 by Robert Collins
Prevent aliasing issues with BzrDirMetaFormat1 by making a new format object in _open.
2546
        # Create a new format instance because otherwise initialisation of new
2547
        # metadirs share the global default format object leading to alias
2548
        # problems.
2549
        format = BzrDirMetaFormat1()
2550
        self._supply_sub_formats_to(format)
2551
        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.
2552
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.
2553
    def __return_repository_format(self):
2554
        """Circular import protection."""
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
2555
        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.
2556
            return self._repository_format
2557
        from bzrlib.repository import RepositoryFormat
2558
        return RepositoryFormat.get_default_format()
2559
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.
2560
    def _set_repository_format(self, value):
3015.2.8 by Robert Collins
Typo in __set_repository_format's docstring.
2561
        """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.
2562
        self._repository_format = value
1553.5.72 by Martin Pool
Clean up test for Branch5 lockdirs
2563
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.
2564
    repository_format = property(__return_repository_format,
2565
        _set_repository_format)
2566
2567
    def _supply_sub_formats_to(self, other_format):
2568
        """Give other_format the same values for sub formats as this has.
2569
2570
        This method is expected to be used when parameterising a
2571
        RemoteBzrDirFormat instance with the parameters from a
2572
        BzrDirMetaFormat1 instance.
2573
2574
        :param other_format: other_format is a format which should be
2575
            compatible with whatever sub formats are supported by self.
2576
        :return: None.
2577
        """
2578
        if getattr(self, '_repository_format', None) is not None:
2579
            other_format.repository_format = self.repository_format
2580
        if self._branch_format is not None:
2581
            other_format._branch_format = self._branch_format
2582
        if self._workingtree_format is not None:
2583
            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.
2584
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
2585
    def __get_workingtree_format(self):
2586
        if self._workingtree_format is None:
2587
            from bzrlib.workingtree import WorkingTreeFormat
2588
            self._workingtree_format = WorkingTreeFormat.get_default_format()
2589
        return self._workingtree_format
2590
2591
    def __set_workingtree_format(self, wt_format):
2592
        self._workingtree_format = wt_format
2593
2594
    workingtree_format = property(__get_workingtree_format,
2595
                                  __set_workingtree_format)
2596
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2597
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
2598
network_format_registry = registry.FormatRegistry()
2599
"""Registry of formats indexed by their network name.
2600
2601
The network name for a BzrDirFormat is an identifier that can be used when
2602
referring to formats with smart server operations. See
2603
BzrDirFormat.network_name() for more detail.
2604
"""
2605
2606
2164.2.19 by Vincent Ladeuil
Revert BzrDirFormat1 registering.
2607
# Register bzr control format
2608
BzrDirFormat.register_control_format(BzrDirFormat)
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
2609
2610
# Register bzr formats
1534.4.39 by Robert Collins
Basic BzrDir support.
2611
BzrDirFormat.register_format(BzrDirFormat4())
2612
BzrDirFormat.register_format(BzrDirFormat5())
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
2613
BzrDirFormat.register_format(BzrDirFormat6())
2614
__default_format = BzrDirMetaFormat1()
1534.4.39 by Robert Collins
Basic BzrDir support.
2615
BzrDirFormat.register_format(__default_format)
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
2616
BzrDirFormat._default_format = __default_format
1534.4.39 by Robert Collins
Basic BzrDir support.
2617
2618
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2619
class Converter(object):
2620
    """Converts a disk format object from one format to another."""
2621
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2622
    def convert(self, to_convert, pb):
2623
        """Perform the conversion of to_convert, giving feedback via pb.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2624
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2625
        :param to_convert: The disk object to convert.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2626
        :param pb: a progress bar to use for progress information.
2627
        """
2628
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.
2629
    def step(self, message):
2630
        """Update the pb by a step."""
2631
        self.count +=1
2632
        self.pb.update(message, self.count, self.total)
2633
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2634
2635
class ConvertBzrDir4To5(Converter):
2636
    """Converts format 4 bzr dirs to format 5."""
2637
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2638
    def __init__(self):
2639
        super(ConvertBzrDir4To5, self).__init__()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2640
        self.converted_revs = set()
2641
        self.absent_revisions = set()
2642
        self.text_count = 0
2643
        self.revisions = {}
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2644
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2645
    def convert(self, to_convert, pb):
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2646
        """See Converter.convert()."""
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2647
        self.bzrdir = to_convert
4961.2.14 by Martin Pool
Further pb cleanups
2648
        if pb is not None:
2649
            warnings.warn("pb parameter to convert() is deprecated")
2650
        self.pb = ui.ui_factory.nested_progress_bar()
2651
        try:
2652
            ui.ui_factory.note('starting upgrade from format 4 to 5')
2653
            if isinstance(self.bzrdir.transport, local.LocalTransport):
2654
                self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
2655
            self._convert_to_weaves()
2656
            return BzrDir.open(self.bzrdir.root_transport.base)
2657
        finally:
2658
            self.pb.finished()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2659
2660
    def _convert_to_weaves(self):
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
2661
        ui.ui_factory.note('note: upgrade may be faster if all store files are ungzipped first')
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2662
        try:
2663
            # TODO permissions
2664
            stat = self.bzrdir.transport.stat('weaves')
2665
            if not S_ISDIR(stat.st_mode):
2666
                self.bzrdir.transport.delete('weaves')
2667
                self.bzrdir.transport.mkdir('weaves')
2668
        except errors.NoSuchFile:
2669
            self.bzrdir.transport.mkdir('weaves')
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
2670
        # deliberately not a WeaveFile as we want to build it up slowly.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2671
        self.inv_weave = Weave('inventory')
2672
        # holds in-memory weaves for all files
2673
        self.text_weaves = {}
2674
        self.bzrdir.transport.delete('branch-format')
2675
        self.branch = self.bzrdir.open_branch()
2676
        self._convert_working_inv()
2677
        rev_history = self.branch.revision_history()
2678
        # to_read is a stack holding the revisions we still need to process;
2679
        # appending to it adds new highest-priority revisions
2680
        self.known_revisions = set(rev_history)
2681
        self.to_read = rev_history[-1:]
2682
        while self.to_read:
2683
            rev_id = self.to_read.pop()
2684
            if (rev_id not in self.revisions
2685
                and rev_id not in self.absent_revisions):
2686
                self._load_one_rev(rev_id)
2687
        self.pb.clear()
2688
        to_import = self._make_order()
2689
        for i, rev_id in enumerate(to_import):
2690
            self.pb.update('converting revision', i, len(to_import))
2691
            self._convert_one_rev(rev_id)
2692
        self.pb.clear()
2693
        self._write_all_weaves()
2694
        self._write_all_revs()
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
2695
        ui.ui_factory.note('upgraded to weaves:')
2696
        ui.ui_factory.note('  %6d revisions and inventories' % len(self.revisions))
2697
        ui.ui_factory.note('  %6d revisions not present' % len(self.absent_revisions))
2698
        ui.ui_factory.note('  %6d texts' % self.text_count)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2699
        self._cleanup_spare_files_after_format4()
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2700
        self.branch._transport.put_bytes(
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2701
            'branch-format',
2702
            BzrDirFormat5().get_format_string(),
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2703
            mode=self.bzrdir._get_file_mode())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2704
2705
    def _cleanup_spare_files_after_format4(self):
2706
        # FIXME working tree upgrade foo.
2707
        for n in 'merged-patches', 'pending-merged-patches':
2708
            try:
2709
                ## assert os.path.getsize(p) == 0
2710
                self.bzrdir.transport.delete(n)
2711
            except errors.NoSuchFile:
2712
                pass
2713
        self.bzrdir.transport.delete_tree('inventory-store')
2714
        self.bzrdir.transport.delete_tree('text-store')
2715
2716
    def _convert_working_inv(self):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2717
        inv = xml4.serializer_v4.read_inventory(
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2718
                self.branch._transport.get('inventory'))
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
2719
        new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv, working=True)
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2720
        self.branch._transport.put_bytes('inventory', new_inv_xml,
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2721
            mode=self.bzrdir._get_file_mode())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2722
2723
    def _write_all_weaves(self):
2724
        controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)
2725
        weave_transport = self.bzrdir.transport.clone('weaves')
2726
        weaves = WeaveStore(weave_transport, prefixed=False)
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
2727
        transaction = WriteTransaction()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2728
2729
        try:
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
2730
            i = 0
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2731
            for file_id, file_weave in self.text_weaves.items():
2732
                self.pb.update('writing weave', i, len(self.text_weaves))
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
2733
                weaves._put_weave(file_id, file_weave, transaction)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2734
                i += 1
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
2735
            self.pb.update('inventory', 0, 1)
2736
            controlweaves._put_weave('inventory', self.inv_weave, transaction)
2737
            self.pb.update('inventory', 1, 1)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2738
        finally:
2739
            self.pb.clear()
2740
2741
    def _write_all_revs(self):
2742
        """Write all revisions out in new form."""
2743
        self.bzrdir.transport.delete_tree('revision-store')
2744
        self.bzrdir.transport.mkdir('revision-store')
2745
        revision_transport = self.bzrdir.transport.clone('revision-store')
2746
        # TODO permissions
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.
2747
        from bzrlib.xml5 import serializer_v5
3350.6.10 by Martin Pool
VersionedFiles review cleanups
2748
        from bzrlib.repofmt.weaverepo import RevisionTextStore
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.
2749
        revision_store = RevisionTextStore(revision_transport,
2750
            serializer_v5, False, versionedfile.PrefixMapper(),
2751
            lambda:True, lambda:True)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2752
        try:
2753
            for i, rev_id in enumerate(self.converted_revs):
2754
                self.pb.update('write revision', i, len(self.converted_revs))
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.
2755
                text = serializer_v5.write_revision_to_string(
2756
                    self.revisions[rev_id])
2757
                key = (rev_id,)
2758
                revision_store.add_lines(key, None, osutils.split_lines(text))
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2759
        finally:
2760
            self.pb.clear()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2761
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2762
    def _load_one_rev(self, rev_id):
2763
        """Load a revision object into memory.
2764
2765
        Any parents not either loaded or abandoned get queued to be
2766
        loaded."""
2767
        self.pb.update('loading revision',
2768
                       len(self.revisions),
2769
                       len(self.known_revisions))
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
2770
        if not self.branch.repository.has_revision(rev_id):
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2771
            self.pb.clear()
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
2772
            ui.ui_factory.note('revision {%s} not present in branch; '
2773
                         'will be converted as a ghost' %
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2774
                         rev_id)
2775
            self.absent_revisions.add(rev_id)
2776
        else:
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.
2777
            rev = self.branch.repository.get_revision(rev_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2778
            for parent_id in rev.parent_ids:
2779
                self.known_revisions.add(parent_id)
2780
                self.to_read.append(parent_id)
2781
            self.revisions[rev_id] = rev
2782
2783
    def _load_old_inventory(self, rev_id):
2784
        old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2785
        inv = xml4.serializer_v4.read_inventory_from_string(old_inv_xml)
1910.2.36 by Aaron Bentley
Get upgrade from format4 under test and fixed for all formats
2786
        inv.revision_id = rev_id
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2787
        rev = self.revisions[rev_id]
2788
        return inv
2789
2790
    def _load_updated_inventory(self, rev_id):
2791
        inv_xml = self.inv_weave.get_text(rev_id)
3169.2.2 by Robert Collins
Add a test to Repository.deserialise_inventory that the resulting ivnentory is the one asked for, and update relevant tests. Also tweak the model 1 to 2 regenerate inventories logic to use the revision trees parent marker which is more accurate in some cases.
2792
        inv = xml5.serializer_v5.read_inventory_from_string(inv_xml, rev_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2793
        return inv
2794
2795
    def _convert_one_rev(self, rev_id):
2796
        """Convert revision and all referenced objects to new format."""
2797
        rev = self.revisions[rev_id]
2798
        inv = self._load_old_inventory(rev_id)
2799
        present_parents = [p for p in rev.parent_ids
2800
                           if p not in self.absent_revisions]
2801
        self._convert_revision_contents(rev, inv, present_parents)
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
2802
        self._store_new_inv(rev, inv, present_parents)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2803
        self.converted_revs.add(rev_id)
2804
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
2805
    def _store_new_inv(self, rev, inv, present_parents):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2806
        new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2807
        new_inv_sha1 = sha_string(new_inv_xml)
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
2808
        self.inv_weave.add_lines(rev.revision_id,
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
2809
                                 present_parents,
2810
                                 new_inv_xml.splitlines(True))
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2811
        rev.inventory_sha1 = new_inv_sha1
2812
2813
    def _convert_revision_contents(self, rev, inv, present_parents):
2814
        """Convert all the files within a revision.
2815
2816
        Also upgrade the inventory to refer to the text revision ids."""
2817
        rev_id = rev.revision_id
2818
        mutter('converting texts of revision {%s}',
2819
               rev_id)
2820
        parent_invs = map(self._load_updated_inventory, present_parents)
1731.1.62 by Aaron Bentley
Changes from review comments
2821
        entries = inv.iter_entries()
2822
        entries.next()
2823
        for path, ie in entries:
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2824
            self._convert_file_version(rev, ie, parent_invs)
2825
2826
    def _convert_file_version(self, rev, ie, parent_invs):
2827
        """Convert one version of one file.
2828
2829
        The file needs to be added into the weave if it is a merge
2830
        of >=2 parents or if it's changed from its parent.
2831
        """
2832
        file_id = ie.file_id
2833
        rev_id = rev.revision_id
2834
        w = self.text_weaves.get(file_id)
2835
        if w is None:
2836
            w = Weave(file_id)
2837
            self.text_weaves[file_id] = w
2838
        text_changed = False
2776.1.5 by Robert Collins
Add reasonably comprehensive tests for path last modified and per file graph behaviour.
2839
        parent_candiate_entries = ie.parent_candidates(parent_invs)
2840
        heads = graph.Graph(self).heads(parent_candiate_entries.keys())
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2841
        # XXX: Note that this is unordered - and this is tolerable because
2776.1.5 by Robert Collins
Add reasonably comprehensive tests for path last modified and per file graph behaviour.
2842
        # the previous code was also unordered.
2843
        previous_entries = dict((head, parent_candiate_entries[head]) for head
2844
            in heads)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2845
        self.snapshot_ie(previous_entries, ie, w, rev_id)
2846
        del ie.text_id
2847
3099.3.7 by John Arbash Meinel
Another parent provider I didn't realize existed.
2848
    def get_parent_map(self, revision_ids):
4379.3.3 by Gary van der Merwe
Rename and add doc string for StackedParentsProvider.
2849
        """See graph.StackedParentsProvider.get_parent_map"""
3099.3.7 by John Arbash Meinel
Another parent provider I didn't realize existed.
2850
        return dict((revision_id, self.revisions[revision_id])
2851
                    for revision_id in revision_ids
2852
                     if revision_id in self.revisions)
2853
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2854
    def snapshot_ie(self, previous_revisions, ie, w, rev_id):
2855
        # TODO: convert this logic, which is ~= snapshot to
2856
        # a call to:. This needs the path figured out. rather than a work_tree
2857
        # a v4 revision_tree can be given, or something that looks enough like
2858
        # one to give the file content to the entry if it needs it.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2859
        # and we need something that looks like a weave store for snapshot to
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2860
        # save against.
2861
        #ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
2862
        if len(previous_revisions) == 1:
2863
            previous_ie = previous_revisions.values()[0]
2864
            if ie._unchanged(previous_ie):
2865
                ie.revision = previous_ie.revision
2866
                return
2867
        if ie.has_text():
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.
2868
            text = self.branch.repository._text_store.get(ie.text_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2869
            file_lines = text.readlines()
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
2870
            w.add_lines(rev_id, previous_revisions, file_lines)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2871
            self.text_count += 1
2872
        else:
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
2873
            w.add_lines(rev_id, previous_revisions, [])
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2874
        ie.revision = rev_id
2875
2876
    def _make_order(self):
2877
        """Return a suitable order for importing revisions.
2878
2879
        The order must be such that an revision is imported after all
2880
        its (present) parents.
2881
        """
2882
        todo = set(self.revisions.keys())
2883
        done = self.absent_revisions.copy()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2884
        order = []
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2885
        while todo:
2886
            # scan through looking for a revision whose parents
2887
            # are all done
2888
            for rev_id in sorted(list(todo)):
2889
                rev = self.revisions[rev_id]
2890
                parent_ids = set(rev.parent_ids)
2891
                if parent_ids.issubset(done):
2892
                    # can take this one now
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2893
                    order.append(rev_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2894
                    todo.remove(rev_id)
2895
                    done.add(rev_id)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2896
        return order
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2897
2898
2899
class ConvertBzrDir5To6(Converter):
2900
    """Converts format 5 bzr dirs to format 6."""
2901
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2902
    def convert(self, to_convert, pb):
2903
        """See Converter.convert()."""
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2904
        self.bzrdir = to_convert
4961.2.18 by Martin Pool
Remove more pb-passing
2905
        pb = ui.ui_factory.nested_progress_bar()
4961.2.14 by Martin Pool
Further pb cleanups
2906
        try:
2907
            ui.ui_factory.note('starting upgrade from format 5 to 6')
2908
            self._convert_to_prefixed()
2909
            return BzrDir.open(self.bzrdir.root_transport.base)
2910
        finally:
2911
            pb.finished()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2912
2913
    def _convert_to_prefixed(self):
1608.2.1 by Martin Pool
[merge] Storage filename escaping
2914
        from bzrlib.store import TransportStore
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2915
        self.bzrdir.transport.delete('branch-format')
2916
        for store_name in ["weaves", "revision-store"]:
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
2917
            ui.ui_factory.note("adding prefixes to %s" % store_name)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2918
            store_transport = self.bzrdir.transport.clone(store_name)
1608.2.1 by Martin Pool
[merge] Storage filename escaping
2919
            store = TransportStore(store_transport, prefixed=True)
1608.1.1 by Martin Pool
[patch] LocalTransport.list_dir should return url-quoted strings (ddaa)
2920
            for urlfilename in store_transport.list_dir('.'):
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
2921
                filename = urlutils.unescape(urlfilename)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2922
                if (filename.endswith(".weave") or
2923
                    filename.endswith(".gz") or
2924
                    filename.endswith(".sig")):
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
2925
                    file_id, suffix = os.path.splitext(filename)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2926
                else:
2927
                    file_id = filename
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
2928
                    suffix = ''
2929
                new_name = store._mapper.map((file_id,)) + suffix
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2930
                # FIXME keep track of the dirs made RBC 20060121
2931
                try:
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
2932
                    store_transport.move(filename, new_name)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2933
                except errors.NoSuchFile: # catches missing dirs strangely enough
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
2934
                    store_transport.mkdir(osutils.dirname(new_name))
2935
                    store_transport.move(filename, new_name)
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2936
        self.bzrdir.transport.put_bytes(
2937
            'branch-format',
2938
            BzrDirFormat6().get_format_string(),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2939
            mode=self.bzrdir._get_file_mode())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2940
2941
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2942
class ConvertBzrDir6ToMeta(Converter):
2943
    """Converts format 6 bzr dirs to metadirs."""
2944
2945
    def convert(self, to_convert, pb):
2946
        """See Converter.convert()."""
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
2947
        from bzrlib.repofmt.weaverepo import RepositoryFormat7
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
2948
        from bzrlib.branch import BzrBranchFormat5
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2949
        self.bzrdir = to_convert
4961.2.14 by Martin Pool
Further pb cleanups
2950
        self.pb = ui.ui_factory.nested_progress_bar()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2951
        self.count = 0
2952
        self.total = 20 # the steps we know about
2953
        self.garbage_inventories = []
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2954
        self.dir_mode = self.bzrdir._get_dir_mode()
2955
        self.file_mode = self.bzrdir._get_file_mode()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2956
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
2957
        ui.ui_factory.note('starting upgrade from format 6 to metadir')
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2958
        self.bzrdir.transport.put_bytes(
2959
                'branch-format',
2960
                "Converting to format 6",
2961
                mode=self.file_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2962
        # its faster to move specific files around than to open and use the apis...
2963
        # first off, nuke ancestry.weave, it was never used.
2964
        try:
2965
            self.step('Removing ancestry.weave')
2966
            self.bzrdir.transport.delete('ancestry.weave')
2967
        except errors.NoSuchFile:
2968
            pass
2969
        # find out whats there
2970
        self.step('Finding branch files')
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
2971
        last_revision = self.bzrdir.open_branch().last_revision()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2972
        bzrcontents = self.bzrdir.transport.list_dir('.')
2973
        for name in bzrcontents:
2974
            if name.startswith('basis-inventory.'):
2975
                self.garbage_inventories.append(name)
2976
        # create new directories for repository, working tree and branch
2977
        repository_names = [('inventory.weave', True),
2978
                            ('revision-store', True),
2979
                            ('weaves', True)]
2980
        self.step('Upgrading repository  ')
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
2981
        self.bzrdir.transport.mkdir('repository', mode=self.dir_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2982
        self.make_lock('repository')
2983
        # we hard code the formats here because we are converting into
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2984
        # the meta format. The meta format upgrader can take this to a
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2985
        # future format within each component.
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
2986
        self.put_format('repository', RepositoryFormat7())
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2987
        for entry in repository_names:
2988
            self.move_entry('repository', entry)
2989
2990
        self.step('Upgrading branch      ')
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
2991
        self.bzrdir.transport.mkdir('branch', mode=self.dir_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2992
        self.make_lock('branch')
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
2993
        self.put_format('branch', BzrBranchFormat5())
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2994
        branch_files = [('revision-history', True),
2995
                        ('branch-name', True),
2996
                        ('parent', False)]
2997
        for entry in branch_files:
2998
            self.move_entry('branch', entry)
2999
3000
        checkout_files = [('pending-merges', True),
3001
                          ('inventory', True),
3002
                          ('stat-cache', False)]
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
3003
        # If a mandatory checkout file is not present, the branch does not have
3004
        # a functional checkout. Do not create a checkout in the converted
3005
        # branch.
3006
        for name, mandatory in checkout_files:
3007
            if mandatory and name not in bzrcontents:
3008
                has_checkout = False
3009
                break
3010
        else:
3011
            has_checkout = True
3012
        if not has_checkout:
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
3013
            ui.ui_factory.note('No working tree.')
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
3014
            # If some checkout files are there, we may as well get rid of them.
3015
            for name, mandatory in checkout_files:
3016
                if name in bzrcontents:
3017
                    self.bzrdir.transport.delete(name)
3018
        else:
2123.2.1 by John Arbash Meinel
Fix bug #70716, make bzrlib.bzrdir directly import bzrlib.workingtree
3019
            from bzrlib.workingtree import WorkingTreeFormat3
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
3020
            self.step('Upgrading working tree')
3021
            self.bzrdir.transport.mkdir('checkout', mode=self.dir_mode)
3022
            self.make_lock('checkout')
3023
            self.put_format(
2123.2.1 by John Arbash Meinel
Fix bug #70716, make bzrlib.bzrdir directly import bzrlib.workingtree
3024
                'checkout', WorkingTreeFormat3())
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
3025
            self.bzrdir.transport.delete_multi(
3026
                self.garbage_inventories, self.pb)
3027
            for entry in checkout_files:
3028
                self.move_entry('checkout', entry)
3029
            if last_revision is not None:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
3030
                self.bzrdir.transport.put_bytes(
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
3031
                    'checkout/last-revision', last_revision)
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
3032
        self.bzrdir.transport.put_bytes(
3033
            'branch-format',
3034
            BzrDirMetaFormat1().get_format_string(),
3035
            mode=self.file_mode)
4961.2.14 by Martin Pool
Further pb cleanups
3036
        self.pb.finished()
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
3037
        return BzrDir.open(self.bzrdir.root_transport.base)
3038
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
3039
    def make_lock(self, name):
3040
        """Make a lock for the new control dir name."""
3041
        self.step('Make %s lock' % name)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
3042
        ld = lockdir.LockDir(self.bzrdir.transport,
3043
                             '%s/lock' % name,
3044
                             file_modebits=self.file_mode,
3045
                             dir_modebits=self.dir_mode)
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
3046
        ld.create()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
3047
3048
    def move_entry(self, new_dir, entry):
3049
        """Move then entry name into new_dir."""
3050
        name = entry[0]
3051
        mandatory = entry[1]
3052
        self.step('Moving %s' % name)
3053
        try:
3054
            self.bzrdir.transport.move(name, '%s/%s' % (new_dir, name))
3055
        except errors.NoSuchFile:
3056
            if mandatory:
3057
                raise
3058
3059
    def put_format(self, dirname, format):
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
3060
        self.bzrdir.transport.put_bytes('%s/format' % dirname,
3061
            format.get_format_string(),
3062
            self.file_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
3063
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.
3064
3065
class ConvertMetaToMeta(Converter):
3066
    """Converts the components of metadirs."""
3067
3068
    def __init__(self, target_format):
3069
        """Create a metadir to metadir converter.
3070
3071
        :param target_format: The final metadir format that is desired.
3072
        """
3073
        self.target_format = target_format
3074
3075
    def convert(self, to_convert, pb):
3076
        """See Converter.convert()."""
3077
        self.bzrdir = to_convert
4961.2.14 by Martin Pool
Further pb cleanups
3078
        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.
3079
        self.count = 0
3080
        self.total = 1
3081
        self.step('checking repository format')
3082
        try:
3083
            repo = self.bzrdir.open_repository()
3084
        except errors.NoRepositoryPresent:
3085
            pass
3086
        else:
3087
            if not isinstance(repo._format, self.target_format.repository_format.__class__):
3088
                from bzrlib.repository import CopyConverter
4471.2.2 by Martin Pool
Deprecate ProgressTask.note
3089
                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.
3090
                converter = CopyConverter(self.target_format.repository_format)
3091
                converter.convert(repo, pb)
4997.1.3 by Jelmer Vernooij
Use list_branches during upgrades.
3092
        for branch in self.bzrdir.list_branches():
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3093
            # TODO: conversions of Branch and Tree should be done by
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
3094
            # InterXFormat lookups/some sort of registry.
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3095
            # Avoid circular imports
3096
            from bzrlib import branch as _mod_branch
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
3097
            old = branch._format.__class__
3098
            new = self.target_format.get_branch_format().__class__
3099
            while old != new:
3100
                if (old == _mod_branch.BzrBranchFormat5 and
3101
                    new in (_mod_branch.BzrBranchFormat6,
4273.1.13 by Aaron Bentley
Implement upgrade from branch format 7 to 8.
3102
                        _mod_branch.BzrBranchFormat7,
3103
                        _mod_branch.BzrBranchFormat8)):
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
3104
                    branch_converter = _mod_branch.Converter5to6()
3105
                elif (old == _mod_branch.BzrBranchFormat6 and
4273.1.13 by Aaron Bentley
Implement upgrade from branch format 7 to 8.
3106
                    new in (_mod_branch.BzrBranchFormat7,
3107
                            _mod_branch.BzrBranchFormat8)):
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
3108
                    branch_converter = _mod_branch.Converter6to7()
4273.1.13 by Aaron Bentley
Implement upgrade from branch format 7 to 8.
3109
                elif (old == _mod_branch.BzrBranchFormat7 and
3110
                      new is _mod_branch.BzrBranchFormat8):
3111
                    branch_converter = _mod_branch.Converter7to8()
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
3112
                else:
4608.1.3 by Martin Pool
BadConversionTarget error includes source format
3113
                    raise errors.BadConversionTarget("No converter", new,
3114
                        branch._format)
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3115
                branch_converter.convert(branch)
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
3116
                branch = self.bzrdir.open_branch()
3117
                old = branch._format.__class__
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3118
        try:
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
3119
            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.
3120
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3121
            pass
3122
        else:
3123
            # TODO: conversions of Branch and Tree should be done by
3124
            # InterXFormat lookups
3125
            if (isinstance(tree, workingtree.WorkingTree3) and
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
3126
                not isinstance(tree, workingtree_4.DirStateWorkingTree) and
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3127
                isinstance(self.target_format.workingtree_format,
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
3128
                    workingtree_4.DirStateWorkingTreeFormat)):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3129
                workingtree_4.Converter3to4().convert(tree)
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
3130
            if (isinstance(tree, workingtree_4.DirStateWorkingTree) and
3131
                not isinstance(tree, workingtree_4.WorkingTree5) and
3586.1.8 by Ian Clatworthy
add workingtree_5 and initial upgrade code
3132
                isinstance(self.target_format.workingtree_format,
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
3133
                    workingtree_4.WorkingTreeFormat5)):
3134
                workingtree_4.Converter4to5().convert(tree)
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
3135
            if (isinstance(tree, workingtree_4.DirStateWorkingTree) and
3136
                not isinstance(tree, workingtree_4.WorkingTree6) and
3137
                isinstance(self.target_format.workingtree_format,
3138
                    workingtree_4.WorkingTreeFormat6)):
3139
                workingtree_4.Converter4or5to6().convert(tree)
4961.2.14 by Martin Pool
Further pb cleanups
3140
        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.
3141
        return to_convert
1731.2.18 by Aaron Bentley
Get extract in repository under test
3142
3143
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
3144
# This is not in remote.py because it's relatively small, and needs to be
3145
# registered. Putting it in remote.py creates a circular import problem.
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
3146
# we can make it a lazy object if the control formats is turned into something
3147
# like a registry.
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
3148
class RemoteBzrDirFormat(BzrDirMetaFormat1):
3149
    """Format representing bzrdirs accessed via a smart server"""
3150
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
3151
    def __init__(self):
3152
        BzrDirMetaFormat1.__init__(self)
4934.4.3 by Martin Pool
Initializing a bzrdir shouldn't mutate the RemoteBzrDirFormat
3153
        # XXX: It's a bit ugly that the network name is here, because we'd
3154
        # like to believe that format objects are stateless or at least
3155
        # immutable,  However, we do at least avoid mutating the name after
3156
        # it's returned.  See <https://bugs.edge.launchpad.net/bzr/+bug/504102>
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
3157
        self._network_name = None
3158
4934.3.2 by Martin Pool
Add RemoteBzrDirFormat repr
3159
    def __repr__(self):
3160
        return "%s(_network_name=%r)" % (self.__class__.__name__,
3161
            self._network_name)
3162
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
3163
    def get_format_description(self):
4792.1.1 by Andrew Bennetts
Show real branch/repo format description in 'info -v' over HPSS.
3164
        if self._network_name:
3165
            real_format = network_format_registry.get(self._network_name)
4792.3.1 by Matt Nordhoff
Fix missing space in the description for remote bzrdirs
3166
            return 'Remote: ' + real_format.get_format_description()
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
3167
        return 'bzr remote bzrdir'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3168
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3169
    def get_format_string(self):
3170
        raise NotImplementedError(self.get_format_string)
4032.3.6 by Robert Collins
Fix test_source errors.
3171
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
3172
    def network_name(self):
3173
        if self._network_name:
3174
            return self._network_name
3175
        else:
3176
            raise AssertionError("No network name set.")
3177
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
3178
    @classmethod
3179
    def probe_transport(klass, transport):
3180
        """Return a RemoteBzrDirFormat object if it looks possible."""
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
3181
        try:
3241.1.4 by Andrew Bennetts
Use get_smart_medium as suggested by Robert, and deal with the fallout.
3182
            medium = transport.get_smart_medium()
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
3183
        except (NotImplementedError, AttributeError,
3245.4.47 by Andrew Bennetts
Don't automatically send 'hello' requests from RemoteBzrDirFormat.probe_transport unless we have to (i.e. the transport is HTTP).
3184
                errors.TransportNotPossible, errors.NoSmartMedium,
3185
                errors.SmartProtocolError):
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
3186
            # no smart server, so not a branch for this format type.
3187
            raise errors.NotBranchError(path=transport.base)
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
3188
        else:
3241.1.2 by Andrew Bennetts
Tidy comments.
3189
            # Decline to open it if the server doesn't support our required
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
3190
            # version (3) so that the VFS-based transport will do it.
3245.4.47 by Andrew Bennetts
Don't automatically send 'hello' requests from RemoteBzrDirFormat.probe_transport unless we have to (i.e. the transport is HTTP).
3191
            if medium.should_probe():
3192
                try:
3193
                    server_version = medium.protocol_version()
3194
                except errors.SmartProtocolError:
3195
                    # Apparently there's no usable smart server there, even though
3196
                    # the medium supports the smart protocol.
3197
                    raise errors.NotBranchError(path=transport.base)
3198
                if server_version != '2':
3199
                    raise errors.NotBranchError(path=transport.base)
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
3200
            return klass()
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
3201
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
3202
    def initialize_on_transport(self, transport):
2018.5.128 by Robert Collins
Have RemoteBzrDirFormat create a local format object when it is asked to initialize something on a non-smart transport - allowing sprout to work cleanly.
3203
        try:
3204
            # hand off the request to the smart server
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
3205
            client_medium = transport.get_smart_medium()
2018.5.128 by Robert Collins
Have RemoteBzrDirFormat create a local format object when it is asked to initialize something on a non-smart transport - allowing sprout to work cleanly.
3206
        except errors.NoSmartMedium:
3207
            # TODO: lookup the local format from a server hint.
3208
            local_dir_format = BzrDirMetaFormat1()
3209
            return local_dir_format.initialize_on_transport(transport)
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
3210
        client = _SmartClient(client_medium)
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
3211
        path = client.remote_path_from_transport(transport)
4384.1.1 by Andrew Bennetts
Translate ErrorFromSmartServer in RemoteBzrDirFormat.
3212
        try:
3213
            response = client.call('BzrDirFormat.initialize', path)
3214
        except errors.ErrorFromSmartServer, err:
3215
            remote._translate_error(err, path=path)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
3216
        if response[0] != 'ok':
3217
            raise errors.SmartProtocolError('unexpected response code %s' % (response,))
4005.2.3 by Robert Collins
Fix test failure due to shared format objects being returned from initialize_on_transport.
3218
        format = RemoteBzrDirFormat()
3219
        self._supply_sub_formats_to(format)
3220
        return remote.RemoteBzrDir(transport, format)
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
3221
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3222
    def parse_NoneTrueFalse(self, arg):
3223
        if not arg:
3224
            return None
3225
        if arg == 'False':
3226
            return False
3227
        if arg == 'True':
3228
            return True
3229
        raise AssertionError("invalid arg %r" % arg)
3230
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
3231
    def _serialize_NoneTrueFalse(self, arg):
3232
        if arg is False:
3233
            return 'False'
3234
        if arg:
3235
            return 'True'
3236
        return ''
3237
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3238
    def _serialize_NoneString(self, arg):
3239
        return arg or ''
3240
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
3241
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
3242
        create_prefix=False, force_new_repo=False, stacked_on=None,
3243
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
3244
        shared_repo=False):
3245
        try:
3246
            # hand off the request to the smart server
3247
            client_medium = transport.get_smart_medium()
3248
        except errors.NoSmartMedium:
4294.2.9 by Robert Collins
Fixup tests broken by cleaning up the layering.
3249
            do_vfs = True
3250
        else:
3251
            # Decline to open it if the server doesn't support our required
3252
            # version (3) so that the VFS-based transport will do it.
3253
            if client_medium.should_probe():
3254
                try:
3255
                    server_version = client_medium.protocol_version()
3256
                    if server_version != '2':
3257
                        do_vfs = True
3258
                    else:
3259
                        do_vfs = False
3260
                except errors.SmartProtocolError:
3261
                    # Apparently there's no usable smart server there, even though
3262
                    # the medium supports the smart protocol.
3263
                    do_vfs = True
3264
            else:
3265
                do_vfs = False
3266
        if not do_vfs:
3267
            client = _SmartClient(client_medium)
3268
            path = client.remote_path_from_transport(transport)
4436.1.1 by Andrew Bennetts
Rename BzrDirFormat.initialize_ex verb to BzrDirFormat.initialize_ex_1.16.
3269
            if client_medium._is_remote_before((1, 16)):
4294.2.9 by Robert Collins
Fixup tests broken by cleaning up the layering.
3270
                do_vfs = True
3271
        if do_vfs:
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
3272
            # TODO: lookup the local format from a server hint.
3273
            local_dir_format = BzrDirMetaFormat1()
3274
            self._supply_sub_formats_to(local_dir_format)
3275
            return local_dir_format.initialize_on_transport_ex(transport,
3276
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
3277
                force_new_repo=force_new_repo, stacked_on=stacked_on,
3278
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3279
                make_working_trees=make_working_trees, shared_repo=shared_repo,
3280
                vfs_only=True)
4384.1.1 by Andrew Bennetts
Translate ErrorFromSmartServer in RemoteBzrDirFormat.
3281
        return self._initialize_on_transport_ex_rpc(client, path, transport,
3282
            use_existing_dir, create_prefix, force_new_repo, stacked_on,
3283
            stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
3284
3285
    def _initialize_on_transport_ex_rpc(self, client, path, transport,
3286
        use_existing_dir, create_prefix, force_new_repo, stacked_on,
3287
        stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
3288
        args = []
3289
        args.append(self._serialize_NoneTrueFalse(use_existing_dir))
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3290
        args.append(self._serialize_NoneTrueFalse(create_prefix))
3291
        args.append(self._serialize_NoneTrueFalse(force_new_repo))
3292
        args.append(self._serialize_NoneString(stacked_on))
3293
        # stack_on_pwd is often/usually our transport
3294
        if stack_on_pwd:
3295
            try:
3296
                stack_on_pwd = transport.relpath(stack_on_pwd)
3297
                if not stack_on_pwd:
3298
                    stack_on_pwd = '.'
3299
            except errors.PathNotChild:
3300
                pass
3301
        args.append(self._serialize_NoneString(stack_on_pwd))
3302
        args.append(self._serialize_NoneString(repo_format_name))
3303
        args.append(self._serialize_NoneTrueFalse(make_working_trees))
3304
        args.append(self._serialize_NoneTrueFalse(shared_repo))
4934.4.3 by Martin Pool
Initializing a bzrdir shouldn't mutate the RemoteBzrDirFormat
3305
        request_network_name = self._network_name or \
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3306
            BzrDirFormat.get_default_format().network_name()
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
3307
        try:
4436.1.1 by Andrew Bennetts
Rename BzrDirFormat.initialize_ex verb to BzrDirFormat.initialize_ex_1.16.
3308
            response = client.call('BzrDirFormat.initialize_ex_1.16',
4934.4.3 by Martin Pool
Initializing a bzrdir shouldn't mutate the RemoteBzrDirFormat
3309
                request_network_name, path, *args)
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
3310
        except errors.UnknownSmartMethod:
4436.1.1 by Andrew Bennetts
Rename BzrDirFormat.initialize_ex verb to BzrDirFormat.initialize_ex_1.16.
3311
            client._medium._remember_remote_is_before((1,16))
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
3312
            local_dir_format = BzrDirMetaFormat1()
3313
            self._supply_sub_formats_to(local_dir_format)
3314
            return local_dir_format.initialize_on_transport_ex(transport,
3315
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
3316
                force_new_repo=force_new_repo, stacked_on=stacked_on,
3317
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3318
                make_working_trees=make_working_trees, shared_repo=shared_repo,
3319
                vfs_only=True)
4384.1.1 by Andrew Bennetts
Translate ErrorFromSmartServer in RemoteBzrDirFormat.
3320
        except errors.ErrorFromSmartServer, err:
3321
            remote._translate_error(err, path=path)
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3322
        repo_path = response[0]
3323
        bzrdir_name = response[6]
3324
        require_stacking = response[7]
3325
        require_stacking = self.parse_NoneTrueFalse(require_stacking)
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
3326
        format = RemoteBzrDirFormat()
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3327
        format._network_name = bzrdir_name
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
3328
        self._supply_sub_formats_to(format)
4307.2.1 by Robert Collins
Don't probe for bzrdir objects we just created via the smart server.
3329
        bzrdir = remote.RemoteBzrDir(transport, format, _client=client)
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3330
        if repo_path:
3331
            repo_format = remote.response_tuple_to_repo_format(response[1:])
3332
            if repo_path == '.':
3333
                repo_path = ''
3334
            if repo_path:
3335
                repo_bzrdir_format = RemoteBzrDirFormat()
3336
                repo_bzrdir_format._network_name = response[5]
3337
                repo_bzr = remote.RemoteBzrDir(transport.clone(repo_path),
3338
                    repo_bzrdir_format)
3339
            else:
3340
                repo_bzr = bzrdir
3341
            final_stack = response[8] or None
3342
            final_stack_pwd = response[9] or None
4416.3.8 by Jonathan Lange
This makes the unit test & one of the acceptance tests pass.
3343
            if final_stack_pwd:
4416.3.15 by Jonathan Lange
Use a URL joiner that works.
3344
                final_stack_pwd = urlutils.join(
3345
                    transport.base, final_stack_pwd)
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3346
            remote_repo = remote.RemoteRepository(repo_bzr, repo_format)
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
3347
            if len(response) > 10:
3348
                # Updated server verb that locks remotely.
3349
                repo_lock_token = response[10] or None
3350
                remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
4307.2.6 by Robert Collins
Handle repositories that mutex on writes (rather than transactions).
3351
                if repo_lock_token:
3352
                    remote_repo.dont_leave_lock_in_place()
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
3353
            else:
4307.2.6 by Robert Collins
Handle repositories that mutex on writes (rather than transactions).
3354
                remote_repo.lock_write()
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3355
            policy = UseExistingRepository(remote_repo, final_stack,
3356
                final_stack_pwd, require_stacking)
3357
            policy.acquire_repository()
3358
        else:
3359
            remote_repo = None
3360
            policy = None
4466.1.1 by Andrew Bennetts
Quick fix 388908: set branch format on the result of initialize_ex before calling require_stacking.
3361
        bzrdir._format.set_branch_format(self.get_branch_format())
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.
3362
        if require_stacking:
3363
            # The repo has already been created, but we need to make sure that
3364
            # we'll make a stackable branch.
3365
            bzrdir._format.require_stacking(_skip_repo=True)
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3366
        return remote_repo, bzrdir, require_stacking, policy
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
3367
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
3368
    def _open(self, transport):
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.
3369
        return remote.RemoteBzrDir(transport, self)
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
3370
3371
    def __eq__(self, other):
3372
        if not isinstance(other, RemoteBzrDirFormat):
3373
            return False
3374
        return self.get_format_description() == other.get_format_description()
3375
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.
3376
    def __return_repository_format(self):
3377
        # Always return a RemoteRepositoryFormat object, but if a specific bzr
3378
        # repository format has been asked for, tell the RemoteRepositoryFormat
3379
        # that it should use that for init() etc.
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.
3380
        result = remote.RemoteRepositoryFormat()
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.
3381
        custom_format = getattr(self, '_repository_format', None)
3382
        if custom_format:
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
3383
            if isinstance(custom_format, remote.RemoteRepositoryFormat):
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.
3384
                return custom_format
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
3385
            else:
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.
3386
                # We will use the custom format to create repositories over the
3387
                # wire; expose its details like rich_root_data for code to
3388
                # query
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
3389
                result._custom_format = custom_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.
3390
        return result
3391
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
3392
    def get_branch_format(self):
3393
        result = BzrDirMetaFormat1.get_branch_format(self)
3394
        if not isinstance(result, remote.RemoteBranchFormat):
3395
            new_result = remote.RemoteBranchFormat()
3396
            new_result._custom_format = result
3397
            # cache the result
3398
            self.set_branch_format(new_result)
3399
            result = new_result
3400
        return result
3401
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.
3402
    repository_format = property(__return_repository_format,
3403
        BzrDirMetaFormat1._set_repository_format) #.im_func)
3845.1.1 by John Arbash Meinel
Ensure that RepositoryFormat._matchingbzrdir.repository_format matches.
3404
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
3405
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
3406
BzrDirFormat.register_control_server_format(RemoteBzrDirFormat)
2018.5.45 by Andrew Bennetts
Merge from bzr.dev
3407
3408
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3409
class BzrDirFormatInfo(object):
3410
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
3411
    def __init__(self, native, deprecated, hidden, experimental):
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3412
        self.deprecated = deprecated
3413
        self.native = native
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
3414
        self.hidden = hidden
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
3415
        self.experimental = experimental
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3416
3417
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3418
class BzrDirFormatRegistry(registry.Registry):
3419
    """Registry of user-selectable BzrDir subformats.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3420
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3421
    Differs from BzrDirFormat._control_formats in that it provides sub-formats,
3422
    e.g. BzrDirMeta1 with weave repository.  Also, it's more user-oriented.
3423
    """
3424
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3425
    def __init__(self):
3426
        """Create a BzrDirFormatRegistry."""
3427
        self._aliases = set()
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3428
        self._registration_order = list()
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3429
        super(BzrDirFormatRegistry, self).__init__()
3430
3431
    def aliases(self):
3432
        """Return a set of the format names which are aliases."""
3433
        return frozenset(self._aliases)
3434
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
3435
    def register_metadir(self, key,
3436
             repository_format, help, native=True, deprecated=False,
3437
             branch_format=None,
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
3438
             tree_format=None,
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
3439
             hidden=False,
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3440
             experimental=False,
3441
             alias=False):
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3442
        """Register a metadir subformat.
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
3443
3444
        These all use a BzrDirMetaFormat1 bzrdir, but can be parameterized
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
3445
        by the Repository/Branch/WorkingTreeformats.
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
3446
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
3447
        :param repository_format: The fully-qualified repository format class
3448
            name as a string.
3449
        :param branch_format: Fully-qualified branch format class name as
3450
            a string.
3451
        :param tree_format: Fully-qualified tree format class name as
3452
            a string.
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3453
        """
3454
        # This should be expanded to support setting WorkingTree and Branch
3455
        # formats, once BzrDirMetaFormat1 supports that.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
3456
        def _load(full_name):
3457
            mod_name, factory_name = full_name.rsplit('.', 1)
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
3458
            try:
3459
                mod = __import__(mod_name, globals(), locals(),
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
3460
                        [factory_name])
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
3461
            except ImportError, e:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
3462
                raise ImportError('failed to load %s: %s' % (full_name, e))
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
3463
            try:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
3464
                factory = getattr(mod, factory_name)
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
3465
            except AttributeError:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
3466
                raise AttributeError('no factory %s in module %r'
3467
                    % (full_name, mod))
3468
            return factory()
3469
3470
        def helper():
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3471
            bd = BzrDirMetaFormat1()
2230.3.1 by Aaron Bentley
Get branch6 creation working
3472
            if branch_format is not None:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
3473
                bd.set_branch_format(_load(branch_format))
3474
            if tree_format is not None:
3475
                bd.workingtree_format = _load(tree_format)
3476
            if repository_format is not None:
3477
                bd.repository_format = _load(repository_format)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3478
            return bd
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
3479
        self.register(key, helper, help, native, deprecated, hidden,
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3480
            experimental, alias)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3481
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
3482
    def register(self, key, factory, help, native=True, deprecated=False,
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3483
                 hidden=False, experimental=False, alias=False):
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3484
        """Register a BzrDirFormat factory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3485
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3486
        The factory must be a callable that takes one parameter: the key.
3487
        It must produce an instance of the BzrDirFormat when called.
3488
3489
        This function mainly exists to prevent the info object from being
3490
        supplied directly.
3491
        """
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3492
        registry.Registry.register(self, key, factory, help,
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
3493
            BzrDirFormatInfo(native, deprecated, hidden, experimental))
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3494
        if alias:
3495
            self._aliases.add(key)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3496
        self._registration_order.append(key)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3497
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
3498
    def register_lazy(self, key, module_name, member_name, help, native=True,
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3499
        deprecated=False, hidden=False, experimental=False, alias=False):
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3500
        registry.Registry.register_lazy(self, key, module_name, member_name,
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
3501
            help, BzrDirFormatInfo(native, deprecated, hidden, experimental))
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3502
        if alias:
3503
            self._aliases.add(key)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3504
        self._registration_order.append(key)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3505
3506
    def set_default(self, key):
3507
        """Set the 'default' key to be a clone of the supplied key.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3508
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3509
        This method must be called once and only once.
3510
        """
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3511
        registry.Registry.register(self, 'default', self.get(key),
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3512
            self.get_help(key), info=self.get_info(key))
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3513
        self._aliases.add('default')
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3514
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
3515
    def set_default_repository(self, key):
3516
        """Set the FormatRegistry default and Repository default.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3517
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
3518
        This is a transitional method while Repository.set_default_format
3519
        is deprecated.
3520
        """
3521
        if 'default' in self:
3522
            self.remove('default')
3523
        self.set_default(key)
3524
        format = self.get('default')()
3525
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3526
    def make_bzrdir(self, key):
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
3527
        return self.get(key)()
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3528
3529
    def help_topic(self, topic):
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3530
        output = ""
2711.2.4 by Martin Pool
Fix unbound variable error in BzrDirFormatRegistry.get_help (test order dependent)
3531
        default_realkey = None
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3532
        default_help = self.get_help('default')
3533
        help_pairs = []
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3534
        for key in self._registration_order:
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3535
            if key == 'default':
3536
                continue
3537
            help = self.get_help(key)
3538
            if help == default_help:
3539
                default_realkey = key
3540
            else:
3541
                help_pairs.append((key, help))
3542
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3543
        def wrapped(key, help, info):
3544
            if info.native:
3545
                help = '(native) ' + help
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3546
            return ':%s:\n%s\n\n' % (key,
4070.11.2 by Martin Pool
Ask textwrap not to break long words or on hyphens
3547
                textwrap.fill(help, initial_indent='    ',
3548
                    subsequent_indent='    ',
4070.11.5 by Martin Pool
textwrap break_on_hyphens option is not available in python2.5
3549
                    break_long_words=False))
2711.2.4 by Martin Pool
Fix unbound variable error in BzrDirFormatRegistry.get_help (test order dependent)
3550
        if default_realkey is not None:
3551
            output += wrapped(default_realkey, '(default) %s' % default_help,
3552
                              self.get_info('default'))
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3553
        deprecated_pairs = []
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
3554
        experimental_pairs = []
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3555
        for key, help in help_pairs:
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3556
            info = self.get_info(key)
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
3557
            if info.hidden:
3558
                continue
3559
            elif info.deprecated:
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3560
                deprecated_pairs.append((key, help))
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
3561
            elif info.experimental:
3562
                experimental_pairs.append((key, help))
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3563
            else:
3564
                output += wrapped(key, help, info)
4927.2.4 by Ian Clatworthy
improve linking in other-formats and current-formats
3565
        output += "\nSee :doc:`formats-help` for more about storage formats."
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3566
        other_output = ""
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
3567
        if len(experimental_pairs) > 0:
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3568
            other_output += "Experimental formats are shown below.\n\n"
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
3569
            for key, help in experimental_pairs:
3570
                info = self.get_info(key)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3571
                other_output += wrapped(key, help, info)
3572
        else:
3573
            other_output += \
3574
                "No experimental formats are available.\n\n"
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3575
        if len(deprecated_pairs) > 0:
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3576
            other_output += "\nDeprecated formats are shown below.\n\n"
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3577
            for key, help in deprecated_pairs:
3578
                info = self.get_info(key)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3579
                other_output += wrapped(key, help, info)
3580
        else:
3581
            other_output += \
3582
                "\nNo deprecated formats are available.\n\n"
3583
        other_output += \
4927.2.4 by Ian Clatworthy
improve linking in other-formats and current-formats
3584
                "\nSee :doc:`formats-help` for more about storage formats."
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3585
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3586
        if topic == 'other-formats':
3587
            return other_output
3588
        else:
3589
            return output
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3590
3591
3242.2.14 by Aaron Bentley
Update from review comments
3592
class RepositoryAcquisitionPolicy(object):
3593
    """Abstract base class for repository acquisition policies.
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
3594
3242.2.14 by Aaron Bentley
Update from review comments
3595
    A repository acquisition policy decides how a BzrDir acquires a repository
3596
    for a branch that is being created.  The most basic policy decision is
3597
    whether to create a new repository or use an existing one.
3598
    """
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
3599
    def __init__(self, stack_on, stack_on_pwd, require_stacking):
3242.3.35 by Aaron Bentley
Cleanups and documentation
3600
        """Constructor.
3601
3602
        :param stack_on: A location to stack on
3603
        :param stack_on_pwd: If stack_on is relative, the location it is
3604
            relative to.
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
3605
        :param require_stacking: If True, it is a failure to not stack.
3242.3.35 by Aaron Bentley
Cleanups and documentation
3606
        """
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
3607
        self._stack_on = stack_on
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
3608
        self._stack_on_pwd = stack_on_pwd
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
3609
        self._require_stacking = require_stacking
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
3610
3611
    def configure_branch(self, branch):
3242.2.13 by Aaron Bentley
Update docs
3612
        """Apply any configuration data from this policy to the branch.
3613
3242.3.18 by Aaron Bentley
Clean up repository-policy work
3614
        Default implementation sets repository stacking.
3242.2.13 by Aaron Bentley
Update docs
3615
        """
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
3616
        if self._stack_on is None:
3617
            return
3618
        if self._stack_on_pwd is None:
3619
            stack_on = self._stack_on
3620
        else:
3621
            try:
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
3622
                stack_on = urlutils.rebase_url(self._stack_on,
3623
                    self._stack_on_pwd,
3624
                    branch.bzrdir.root_transport.base)
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
3625
            except errors.InvalidRebaseURLs:
3626
                stack_on = self._get_full_stack_on()
3242.3.37 by Aaron Bentley
Updates from reviews
3627
        try:
3537.3.5 by Martin Pool
merge trunk including stacking policy
3628
            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.
3629
        except (errors.UnstackableBranchFormat,
3630
                errors.UnstackableRepositoryFormat):
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
3631
            if self._require_stacking:
3632
                raise
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
3633
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.
3634
    def requires_stacking(self):
3635
        """Return True if this policy requires stacking."""
3636
        return self._stack_on is not None and self._require_stacking
3637
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
3638
    def _get_full_stack_on(self):
3242.3.35 by Aaron Bentley
Cleanups and documentation
3639
        """Get a fully-qualified URL for the stack_on location."""
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
3640
        if self._stack_on is None:
3641
            return None
3642
        if self._stack_on_pwd is None:
3643
            return self._stack_on
3644
        else:
3645
            return urlutils.join(self._stack_on_pwd, self._stack_on)
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
3646
3928.3.2 by John Arbash Meinel
Track down the other cause of us connecting multiple times.
3647
    def _add_fallback(self, repository, possible_transports=None):
3242.3.35 by Aaron Bentley
Cleanups and documentation
3648
        """Add a fallback to the supplied repository, if stacking is set."""
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
3649
        stack_on = self._get_full_stack_on()
3650
        if stack_on is None:
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
3651
            return
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
3652
        try:
3653
            stacked_dir = BzrDir.open(stack_on,
3654
                                      possible_transports=possible_transports)
3655
        except errors.JailBreak:
3656
            # We keep the stacking details, but we are in the server code so
3657
            # actually stacking is not needed.
3658
            return
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
3659
        try:
3660
            stacked_repo = stacked_dir.open_branch().repository
3661
        except errors.NotBranchError:
3662
            stacked_repo = stacked_dir.open_repository()
3242.3.37 by Aaron Bentley
Updates from reviews
3663
        try:
3664
            repository.add_fallback_repository(stacked_repo)
3665
        except errors.UnstackableRepositoryFormat:
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
3666
            if self._require_stacking:
3667
                raise
3904.3.1 by Andrew Bennetts
Probable fix for GaryvdM's bug when pushing a stacked qbzr branch to Launchpad.
3668
        else:
3669
            self._require_stacking = True
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
3670
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
3671
    def acquire_repository(self, make_working_trees=None, shared=False):
3242.2.14 by Aaron Bentley
Update from review comments
3672
        """Acquire a repository for this bzrdir.
3673
3674
        Implementations may create a new repository or use a pre-exising
3675
        repository.
3676
        :param make_working_trees: If creating a repository, set
3677
            make_working_trees to this value (if non-None)
3678
        :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.
3679
        :return: A repository, is_new_flag (True if the repository was
3680
            created).
3242.2.14 by Aaron Bentley
Update from review comments
3681
        """
3682
        raise NotImplemented(RepositoryAcquisitionPolicy.acquire_repository)
3683
3684
3685
class CreateRepository(RepositoryAcquisitionPolicy):
3242.2.13 by Aaron Bentley
Update docs
3686
    """A policy of creating a new repository"""
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
3687
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
3688
    def __init__(self, bzrdir, stack_on=None, stack_on_pwd=None,
3689
                 require_stacking=False):
3242.3.35 by Aaron Bentley
Cleanups and documentation
3690
        """
3691
        Constructor.
3692
        :param bzrdir: The bzrdir to create the repository on.
3693
        :param stack_on: A location to stack on
3694
        :param stack_on_pwd: If stack_on is relative, the location it is
3695
            relative to.
3696
        """
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
3697
        RepositoryAcquisitionPolicy.__init__(self, stack_on, stack_on_pwd,
3698
                                             require_stacking)
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
3699
        self._bzrdir = bzrdir
3700
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
3701
    def acquire_repository(self, make_working_trees=None, shared=False):
3242.2.14 by Aaron Bentley
Update from review comments
3702
        """Implementation of RepositoryAcquisitionPolicy.acquire_repository
3242.2.13 by Aaron Bentley
Update docs
3703
3242.2.14 by Aaron Bentley
Update from review comments
3704
        Creates the desired repository in the bzrdir we already have.
3242.2.13 by Aaron Bentley
Update docs
3705
        """
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.
3706
        stack_on = self._get_full_stack_on()
3707
        if stack_on:
4401.1.2 by John Arbash Meinel
Move the logic back up into BzrDirFormat1.require_stacking, passing in the extra params.
3708
            format = self._bzrdir._format
3709
            format.require_stacking(stack_on=stack_on,
3710
                                    possible_transports=[self._bzrdir.root_transport])
3711
            if not self._require_stacking:
3712
                # We have picked up automatic stacking somewhere.
3713
                note('Using default stacking branch %s at %s', self._stack_on,
3714
                    self._stack_on_pwd)
3650.3.9 by Aaron Bentley
Move responsibility for stackable repo format to _get_metadir
3715
        repository = self._bzrdir.create_repository(shared=shared)
3928.3.2 by John Arbash Meinel
Track down the other cause of us connecting multiple times.
3716
        self._add_fallback(repository,
3717
                           possible_transports=[self._bzrdir.transport])
3242.2.4 by Aaron Bentley
Only set working tree policty when specified
3718
        if make_working_trees is not None:
3242.3.6 by Aaron Bentley
Work around strange test failure
3719
            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.
3720
        return repository, True
3242.2.2 by Aaron Bentley
Merge policy updates from stacked-policy thread
3721
3722
3242.2.14 by Aaron Bentley
Update from review comments
3723
class UseExistingRepository(RepositoryAcquisitionPolicy):
3242.2.13 by Aaron Bentley
Update docs
3724
    """A policy of reusing an existing repository"""
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
3725
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
3726
    def __init__(self, repository, stack_on=None, stack_on_pwd=None,
3727
                 require_stacking=False):
3242.3.35 by Aaron Bentley
Cleanups and documentation
3728
        """Constructor.
3729
3730
        :param repository: The repository to use.
3731
        :param stack_on: A location to stack on
3732
        :param stack_on_pwd: If stack_on is relative, the location it is
3733
            relative to.
3734
        """
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
3735
        RepositoryAcquisitionPolicy.__init__(self, stack_on, stack_on_pwd,
3736
                                             require_stacking)
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
3737
        self._repository = repository
3738
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
3739
    def acquire_repository(self, make_working_trees=None, shared=False):
3242.2.14 by Aaron Bentley
Update from review comments
3740
        """Implementation of RepositoryAcquisitionPolicy.acquire_repository
3242.2.13 by Aaron Bentley
Update docs
3741
4070.9.8 by Andrew Bennetts
Use MiniSearchResult in clone_on_transport down (further tightening the test_push ratchets), and improve acquire_repository docstrings.
3742
        Returns an existing repository to use.
3242.2.13 by Aaron Bentley
Update docs
3743
        """
3928.3.2 by John Arbash Meinel
Track down the other cause of us connecting multiple times.
3744
        self._add_fallback(self._repository,
3745
                       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.
3746
        return self._repository, False
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
3747
3748
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3749
# Please register new formats after old formats so that formats
3750
# appear in chronological order and format descriptions can build
3751
# on previous ones.
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3752
format_registry = BzrDirFormatRegistry()
3990.5.3 by Robert Collins
Docs and polish on RepositoryFormat.network_name.
3753
# The pre-0.8 formats have their repository format network name registered in
3754
# repository.py. MetaDir formats have their repository format network name
3755
# inferred from their disk format string.
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
3756
format_registry.register('weave', BzrDirFormat6,
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3757
    'Pre-0.8 format.  Slower than knit and does not'
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
3758
    ' support checkouts or shared repositories.',
4976.2.1 by Ian Clatworthy
Hide most storage formats
3759
    hidden=True,
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
3760
    deprecated=True)
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
3761
format_registry.register_metadir('metaweave',
3762
    'bzrlib.repofmt.weaverepo.RepositoryFormat7',
2230.3.30 by Aaron Bentley
Fix whitespace issues
3763
    'Transitional format in 0.8.  Slower than knit.',
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3764
    branch_format='bzrlib.branch.BzrBranchFormat5',
2255.2.209 by Robert Collins
Remove circular imports in bzrdir format definitions.
3765
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
4976.2.1 by Ian Clatworthy
Hide most storage formats
3766
    hidden=True,
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3767
    deprecated=True)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3768
format_registry.register_metadir('knit',
3769
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3770
    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
3771
    branch_format='bzrlib.branch.BzrBranchFormat5',
3772
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
4976.2.1 by Ian Clatworthy
Hide most storage formats
3773
    hidden=True,
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3774
    deprecated=True)
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3775
format_registry.register_metadir('dirstate',
3776
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3777
    help='New in 0.15: Fast local operations. Compatible with bzr 0.8 and '
3778
        'above when accessed over the network.',
3779
    branch_format='bzrlib.branch.BzrBranchFormat5',
2255.2.209 by Robert Collins
Remove circular imports in bzrdir format definitions.
3780
    # this uses bzrlib.workingtree.WorkingTreeFormat4 because importing
3781
    # directly from workingtree_4 triggers a circular import.
3782
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
3783
    hidden=True,
3892.1.1 by Ian Clatworthy
improve help on storage formats
3784
    deprecated=True)
1551.13.1 by Aaron Bentley
Introduce dirstate-tags format
3785
format_registry.register_metadir('dirstate-tags',
3786
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3787
    help='New in 0.15: Fast local operations and improved scaling for '
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
3788
        'network operations. Additionally adds support for tags.'
3789
        ' Incompatible with bzr < 0.15.',
1551.13.1 by Aaron Bentley
Introduce dirstate-tags format
3790
    branch_format='bzrlib.branch.BzrBranchFormat6',
3791
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
3792
    hidden=True,
3892.1.1 by Ian Clatworthy
improve help on storage formats
3793
    deprecated=True)
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
3794
format_registry.register_metadir('rich-root',
3795
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit4',
3796
    help='New in 1.0.  Better handling of tree roots.  Incompatible with'
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3797
        ' bzr < 1.0.',
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
3798
    branch_format='bzrlib.branch.BzrBranchFormat6',
3799
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
3800
    hidden=True,
3892.1.1 by Ian Clatworthy
improve help on storage formats
3801
    deprecated=True)
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3802
format_registry.register_metadir('dirstate-with-subtree',
3803
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
3804
    help='New in 0.15: Fast local operations and improved scaling for '
3805
        'network operations. Additionally adds support for versioning nested '
3806
        'bzr branches. Incompatible with bzr < 0.15.',
3807
    branch_format='bzrlib.branch.BzrBranchFormat6',
2255.2.209 by Robert Collins
Remove circular imports in bzrdir format definitions.
3808
    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.
3809
    experimental=True,
3170.4.4 by Adeodato Simó
Keep the hidden flag for subtree formats after review from Aaron.
3810
    hidden=True,
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3811
    )
3010.3.2 by Martin Pool
Rename pack0.92 to pack-0.92
3812
format_registry.register_metadir('pack-0.92',
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
3813
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack1',
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
3814
    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
3815
        'dirstate-tags format repositories. Interoperates with '
3816
        '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
3817
        ,
2592.3.22 by Robert Collins
Add new experimental repository formats.
3818
    branch_format='bzrlib.branch.BzrBranchFormat6',
3819
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3820
    )
3010.3.2 by Martin Pool
Rename pack0.92 to pack-0.92
3821
format_registry.register_metadir('pack-0.92-subtree',
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
3822
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack3',
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
3823
    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
3824
        'dirstate-with-subtree format repositories. Interoperates with '
3825
        '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
3826
        ,
2592.3.22 by Robert Collins
Add new experimental repository formats.
3827
    branch_format='bzrlib.branch.BzrBranchFormat6',
3828
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3190.1.2 by Aaron Bentley
Undo spurious change
3829
    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.
3830
    experimental=True,
2592.3.22 by Robert Collins
Add new experimental repository formats.
3831
    )
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
3832
format_registry.register_metadir('rich-root-pack',
3833
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack4',
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3834
    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.
3835
         '(needed for bzr-svn and bzr-git).',
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
3836
    branch_format='bzrlib.branch.BzrBranchFormat6',
3837
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
3838
    hidden=True,
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3839
    )
3575.2.1 by Martin Pool
Rename stacked format to 1.6
3840
format_registry.register_metadir('1.6',
3549.1.5 by Martin Pool
Add stable format names for stacked branches
3841
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5',
3892.1.6 by Ian Clatworthy
include feedback from poolie
3842
    help='A format that allows a branch to indicate that there is another '
3843
         '(stacked) repository that should be used to access data that is '
3844
         'not present locally.',
3549.1.5 by Martin Pool
Add stable format names for stacked branches
3845
    branch_format='bzrlib.branch.BzrBranchFormat7',
3846
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
3847
    hidden=True,
3549.1.5 by Martin Pool
Add stable format names for stacked branches
3848
    )
3606.10.2 by John Arbash Meinel
Name the new format 1.6.1-rich-root, and NEWS for fixing bug #262333
3849
format_registry.register_metadir('1.6.1-rich-root',
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
3850
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5RichRoot',
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3851
    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.
3852
         '(needed for bzr-svn and bzr-git).',
3549.1.5 by Martin Pool
Add stable format names for stacked branches
3853
    branch_format='bzrlib.branch.BzrBranchFormat7',
3854
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
3855
    hidden=True,
3549.1.5 by Martin Pool
Add stable format names for stacked branches
3856
    )
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
3857
format_registry.register_metadir('1.9',
3858
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3892.1.6 by Ian Clatworthy
include feedback from poolie
3859
    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
3860
         'are smaller in size, have smarter caching and provide faster '
3861
         'performance for most operations.',
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
3862
    branch_format='bzrlib.branch.BzrBranchFormat7',
3863
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
3864
    hidden=True,
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
3865
    )
3866
format_registry.register_metadir('1.9-rich-root',
3867
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3868
    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.
3869
         '(needed for bzr-svn and bzr-git).',
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
3870
    branch_format='bzrlib.branch.BzrBranchFormat7',
3871
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
4976.2.1 by Ian Clatworthy
Hide most storage formats
3872
    hidden=True,
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
3873
    )
4210.4.1 by Ian Clatworthy
replace experimental development-wt5 formats with 1.14 formats
3874
format_registry.register_metadir('1.14',
3586.2.10 by Ian Clatworthy
rename formats from 1.7-* to 1.12-*
3875
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
3876
    help='A working-tree format that supports content filtering.',
3586.2.6 by Ian Clatworthy
add 1.7 and 1.7-rich-root formats
3877
    branch_format='bzrlib.branch.BzrBranchFormat7',
3995.7.1 by John Arbash Meinel
Fix bug #328135.
3878
    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
3586.2.6 by Ian Clatworthy
add 1.7 and 1.7-rich-root formats
3879
    )
4210.4.1 by Ian Clatworthy
replace experimental development-wt5 formats with 1.14 formats
3880
format_registry.register_metadir('1.14-rich-root',
3586.2.10 by Ian Clatworthy
rename formats from 1.7-* to 1.12-*
3881
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
4210.4.1 by Ian Clatworthy
replace experimental development-wt5 formats with 1.14 formats
3882
    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.
3883
         '(needed for bzr-svn and bzr-git).',
3586.2.6 by Ian Clatworthy
add 1.7 and 1.7-rich-root formats
3884
    branch_format='bzrlib.branch.BzrBranchFormat7',
3995.7.1 by John Arbash Meinel
Fix bug #328135.
3885
    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
3586.2.6 by Ian Clatworthy
add 1.7 and 1.7-rich-root formats
3886
    )
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)
3887
# The following un-numbered 'development' formats should always just be aliases.
3888
format_registry.register_metadir('development-rich-root',
3889
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK1',
4241.15.17 by Matt Nordhoff
development-rich-root's help string didn't say it supported rich roots.
3890
    help='Current development format. Supports rich roots. Can convert data '
3891
        'to and from rich-root-pack (and anything compatible with '
3892
        'rich-root-pack) format repositories. Repositories and branches in '
3893
        '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
3894
        '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
3895
        'before use.',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3896
    branch_format='bzrlib.branch.BzrBranchFormat7',
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)
3897
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3898
    experimental=True,
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3899
    alias=True,
4976.2.1 by Ian Clatworthy
Hide most storage formats
3900
    hidden=True,
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3901
    )
3902
format_registry.register_metadir('development-subtree',
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
3903
    'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment2Subtree',
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3904
    help='Current development format, subtree variant. Can convert data to and '
3221.11.7 by Robert Collins
Merge in real stacked repository work.
3905
        'from pack-0.92-subtree (and anything compatible with '
3906
        'pack-0.92-subtree) format repositories. Repositories and branches in '
3907
        '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
3908
        '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
3909
        'before use.',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3910
    branch_format='bzrlib.branch.BzrBranchFormat7',
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)
3911
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3912
    experimental=True,
4976.2.1 by Ian Clatworthy
Hide most storage formats
3913
    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)
3914
    alias=False, # Restore to being an alias when an actual development subtree format is added
3915
                 # This current non-alias status is simply because we did not introduce a
3916
                 # chk based subtree format.
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3917
    )
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)
3918
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
3919
# And the development formats above will have aliased one of the following:
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)
3920
format_registry.register_metadir('development6-rich-root',
3921
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK1',
3922
    help='pack-1.9 with 255-way hashed CHK inv, group compress, rich roots '
3923
        'Please read '
4988.4.2 by Martin Pool
Change url to canonical.com or wiki, plus some doc improvements in passing
3924
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
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)
3925
        'before use.',
3926
    branch_format='bzrlib.branch.BzrBranchFormat7',
3927
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3928
    hidden=True,
3735.31.1 by John Arbash Meinel
Bring the groupcompress plugin into the brisbane-core branch.
3929
    experimental=True,
3930
    )
3931
4290.1.7 by Jelmer Vernooij
Add development7-rich-root format that uses the RIO Serializer.
3932
format_registry.register_metadir('development7-rich-root',
3933
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK2',
4290.1.12 by Jelmer Vernooij
Use bencode rather than rio in the new revision serialiszer.
3934
    help='pack-1.9 with 255-way hashed CHK inv, bencode revision, group compress, '
4290.1.7 by Jelmer Vernooij
Add development7-rich-root format that uses the RIO Serializer.
3935
        'rich roots. Please read '
4988.4.2 by Martin Pool
Change url to canonical.com or wiki, plus some doc improvements in passing
3936
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
4290.1.7 by Jelmer Vernooij
Add development7-rich-root format that uses the RIO Serializer.
3937
        'before use.',
3938
    branch_format='bzrlib.branch.BzrBranchFormat7',
3939
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3940
    hidden=True,
3941
    experimental=True,
3942
    )
3943
4428.2.1 by Martin Pool
Add 2a format
3944
format_registry.register_metadir('2a',
3945
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
3946
    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
3947
        'Uses group-compress storage.\n'
4428.2.6 by Martin Pool
Stupid typo fix
3948
        '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
3949
        # 'storage in packs, 255-way hashed CHK inventory, bencode revision, group compress, '
3950
        # 'rich roots. Supported by bzr 1.16 and later.',
4428.2.1 by Martin Pool
Add 2a format
3951
    branch_format='bzrlib.branch.BzrBranchFormat7',
3952
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
4428.2.5 by Martin Pool
Mark 2a experimental and tweak its help per lifeless's review
3953
    experimental=True,
4428.2.1 by Martin Pool
Add 2a format
3954
    )
4428.2.2 by Martin Pool
Format 2a should not be hidden
3955
4119.6.2 by Jelmer Vernooij
Use existing alias mechanism for default-rich-root.
3956
# The following format should be an alias for the rich root equivalent 
3957
# of the default format
3958
format_registry.register_metadir('default-rich-root',
4599.4.37 by Robert Collins
Fix registration of default-rich-root as 2a.
3959
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
3960
    branch_format='bzrlib.branch.BzrBranchFormat7',
3961
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
4599.4.23 by Robert Collins
default-rich-root should be an alias still.
3962
    alias=True,
4976.2.1 by Ian Clatworthy
Hide most storage formats
3963
    hidden=True,
4599.4.22 by mbp at sourcefrog
Don't forget to set default-rich-root to 2a too.
3964
    help='Same as 2a.')
3965
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3966
# The current format that is made on 'bzr init'.
4599.4.1 by Robert Collins
Change the default format to 2a.
3967
format_registry.set_default('2a')