/brz/remove-bazaar

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