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