/brz/remove-bazaar

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