/brz/remove-bazaar

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