/brz/remove-bazaar

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