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