/brz/remove-bazaar

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