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