/brz/remove-bazaar

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