/brz/remove-bazaar

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