/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,
3983.1.7 by Daniel Watkins
Review comments from jam.
1064
               source_branch=None, create_tree_if_local=True):
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.
3983.1.7 by Daniel Watkins
Review comments from jam.
1085
        :param create_tree_if_local: If true, a working-tree will be created
1086
            when working locally.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1087
        """
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
1088
        target_transport = get_transport(url, possible_transports)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
1089
        target_transport.ensure_base()
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
1090
        cloning_format = self.cloning_metadir(stacked)
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
1091
        # Create/update the result branch
2475.3.1 by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
1092
        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.
1093
        # if a stacked branch wasn't requested, we don't create one
1094
        # even if the origin was stacked
1095
        stacked_branch_url = None
1096
        if source_branch is not None:
3221.18.4 by Ian Clatworthy
shallow -> stacked
1097
            if stacked:
1098
                stacked_branch_url = self.root_transport.base
3823.5.1 by John Arbash Meinel
Allow the source branch to pass itself into BzrDir.sprout.
1099
            source_repository = source_branch.repository
1100
        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.
1101
            try:
3823.5.1 by John Arbash Meinel
Allow the source branch to pass itself into BzrDir.sprout.
1102
                source_branch = self.open_branch()
1103
                source_repository = source_branch.repository
1104
                if stacked:
1105
                    stacked_branch_url = self.root_transport.base
1106
            except errors.NotBranchError:
1107
                source_branch = None
1108
                try:
1109
                    source_repository = self.open_repository()
1110
                except errors.NoRepositoryPresent:
1111
                    source_repository = None
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
1112
        repository_policy = result.determine_repository_policy(
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
1113
            force_new_repo, stacked_branch_url, require_stacking=stacked)
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
1114
        result_repo = repository_policy.acquire_repository()
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
1115
        if source_repository is not None:
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
1116
            # Fetch while stacked to prevent unstacked fetch from
1117
            # Branch.sprout.
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
1118
            result_repo.fetch(source_repository, revision_id=revision_id)
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
1119
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
1120
        if source_branch is None:
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1121
            # this is for sprouting a bzrdir without a branch; is that
1122
            # actually useful?
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
1123
            # Not especially, but it's part of the contract.
3221.11.20 by Robert Collins
Support --shallow on branch.
1124
            result_branch = result.create_branch()
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1125
        else:
3650.3.11 by Aaron Bentley
Update docs
1126
            # Force NULL revision to avoid using repository before stacking
1127
            # is configured.
3583.1.1 by Andrew Bennetts
Use source_branch.sprout in BzrDir.sprout when possible.
1128
            result_branch = source_branch.sprout(
3650.3.3 by Aaron Bentley
fix sprout
1129
                result, revision_id=_mod_revision.NULL_REVISION)
3650.3.5 by Aaron Bentley
Fix parent location when copying content
1130
            parent_location = result_branch.get_parent()
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1131
        mutter("created new branch %r" % (result_branch,))
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
1132
        repository_policy.configure_branch(result_branch)
3650.3.4 by Aaron Bentley
Update test to permit calling copy_content_into
1133
        if source_branch is not None:
1134
            source_branch.copy_content_into(result_branch, revision_id)
3650.3.11 by Aaron Bentley
Update docs
1135
            # Override copy_content_into
3650.3.5 by Aaron Bentley
Fix parent location when copying content
1136
            result_branch.set_parent(parent_location)
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
1137
1138
        # Create/update the result working tree
3983.1.7 by Daniel Watkins
Review comments from jam.
1139
        if (create_tree_if_local and
1140
            isinstance(target_transport, local.LocalTransport) and
1141
            (result_repo is None or result_repo.make_working_trees())):
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1142
            wt = result.create_workingtree(accelerator_tree=accelerator_tree,
1143
                hardlink=hardlink)
2255.2.77 by Robert Collins
Tune working inventory generation more: walk the blocks, skipping deleted rows.
1144
            wt.lock_write()
1145
            try:
1146
                if wt.path2id('') is None:
3123.5.10 by Aaron Bentley
Restore old handling of set_root_id
1147
                    try:
1148
                        wt.set_root_id(self.open_workingtree.get_root_id())
1149
                    except errors.NoWorkingTree:
1150
                        pass
2255.2.77 by Robert Collins
Tune working inventory generation more: walk the blocks, skipping deleted rows.
1151
            finally:
1152
                wt.unlock()
2100.3.28 by Aaron Bentley
Make sprout recursive
1153
        else:
1154
            wt = None
1155
        if recurse == 'down':
1156
            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.
1157
                basis = wt.basis_tree()
1158
                basis.lock_read()
1159
                subtrees = basis.iter_references()
3744.1.1 by John Arbash Meinel
When branching into a tree-less repository, use the target branch
1160
            elif result_branch is not None:
1161
                basis = result_branch.basis_tree()
1162
                basis.lock_read()
1163
                subtrees = basis.iter_references()
2100.3.28 by Aaron Bentley
Make sprout recursive
1164
            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.
1165
                basis = source_branch.basis_tree()
1166
                basis.lock_read()
1167
                subtrees = basis.iter_references()
2100.3.28 by Aaron Bentley
Make sprout recursive
1168
            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.
1169
                subtrees = []
1170
                basis = None
1171
            try:
1172
                for path, file_id in subtrees:
1173
                    target = urlutils.join(url, urlutils.escape(path))
1174
                    sublocation = source_branch.reference_parent(file_id, path)
1175
                    sublocation.bzrdir.sprout(target,
1176
                        basis.get_reference_revision(file_id, path),
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
1177
                        force_new_repo=force_new_repo, recurse=recurse,
3221.18.4 by Ian Clatworthy
shallow -> stacked
1178
                        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.
1179
            finally:
1180
                if basis is not None:
1181
                    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.
1182
        return result
1183
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1184
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1185
class BzrDirPreSplitOut(BzrDir):
1186
    """A common class for the all-in-one formats."""
1187
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
1188
    def __init__(self, _transport, _format):
1189
        """See BzrDir.__init__."""
1190
        super(BzrDirPreSplitOut, self).__init__(_transport, _format)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1191
        self._control_files = lockable_files.LockableFiles(
1192
                                            self.get_branch_transport(None),
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1193
                                            self._format._lock_file_name,
1194
                                            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.
1195
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
1196
    def break_lock(self):
1197
        """Pre-splitout bzrdirs do not suffer from stale locks."""
1198
        raise NotImplementedError(self.break_lock)
1199
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
1200
    def cloning_metadir(self, require_stacking=False):
3242.2.12 by Aaron Bentley
Get cloning_metadir working properly for old formats
1201
        """Produce a metadir suitable for cloning with."""
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
1202
        if require_stacking:
1203
            return format_registry.make_bzrdir('1.6')
3242.2.12 by Aaron Bentley
Get cloning_metadir working properly for old formats
1204
        return self._format.__class__()
1205
3242.3.37 by Aaron Bentley
Updates from reviews
1206
    def clone(self, url, revision_id=None, force_new_repo=False,
1207
              preserve_stacking=False):
1208
        """See BzrDir.clone().
1209
1210
        force_new_repo has no effect, since this family of formats always
1211
        require a new repository.
1212
        preserve_stacking has no effect, since no source branch using this
1213
        family of formats can be stacked, so there is no stacking to preserve.
1214
        """
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.
1215
        self._make_tail(url)
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1216
        result = self._format._initialize_for_clone(url)
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
1217
        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)
1218
        from_branch = self.open_branch()
1219
        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.
1220
        try:
3650.5.7 by Aaron Bentley
Fix working tree initialization
1221
            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.
1222
        except errors.NotLocalUrl:
1223
            # make a new one, this format always has to have one.
3650.5.7 by Aaron Bentley
Fix working tree initialization
1224
            result._init_workingtree()
1225
        else:
1226
            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.
1227
        return result
1228
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1229
    def create_branch(self):
1230
        """See BzrDir.create_branch."""
3650.2.2 by Aaron Bentley
Implement get_branch_format, to unify branch creation code
1231
        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.
1232
2796.2.6 by Aaron Bentley
Implement destroy_branch
1233
    def destroy_branch(self):
2796.2.16 by Aaron Bentley
Documentation updates from review
1234
        """See BzrDir.destroy_branch."""
2796.2.6 by Aaron Bentley
Implement destroy_branch
1235
        raise errors.UnsupportedOperation(self.destroy_branch, self)
1236
1534.6.1 by Robert Collins
allow API creation of shared repositories
1237
    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.
1238
        """See BzrDir.create_repository."""
1534.6.1 by Robert Collins
allow API creation of shared repositories
1239
        if shared:
1240
            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.
1241
        return self.open_repository()
1242
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
1243
    def destroy_repository(self):
1244
        """See BzrDir.destroy_repository."""
1245
        raise errors.UnsupportedOperation(self.destroy_repository, self)
1246
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1247
    def create_workingtree(self, revision_id=None, from_branch=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1248
                           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.
1249
        """See BzrDir.create_workingtree."""
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
1250
        # The workingtree is sometimes created when the bzrdir is created,
1251
        # but not when cloning.
1252
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1253
        # this looks buggy but is not -really-
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1254
        # because this format creates the workingtree when the bzrdir is
1255
        # created
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1256
        # clone and sprout will have set the revision_id
1257
        # and that will have set it for us, its only
1258
        # specific uses of create_workingtree in isolation
1259
        # that can do wonky stuff here, and that only
1260
        # happens for creating checkouts, which cannot be 
1261
        # done on this format anyway. So - acceptable wart.
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
1262
        try:
1263
            result = self.open_workingtree(recommend_upgrade=False)
1264
        except errors.NoSuchFile:
1265
            result = self._init_workingtree()
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1266
        if revision_id is not None:
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
1267
            if revision_id == _mod_revision.NULL_REVISION:
1551.8.20 by Aaron Bentley
Fix BzrDir.create_workingtree for NULL_REVISION
1268
                result.set_parent_ids([])
1269
            else:
1270
                result.set_parent_ids([revision_id])
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1271
        return result
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1272
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
1273
    def _init_workingtree(self):
1274
        from bzrlib.workingtree import WorkingTreeFormat2
1275
        try:
1276
            return WorkingTreeFormat2().initialize(self)
1277
        except errors.NotLocalUrl:
1278
            # Even though we can't access the working tree, we need to
1279
            # create its control files.
3650.5.7 by Aaron Bentley
Fix working tree initialization
1280
            return WorkingTreeFormat2()._stub_initialize_on_transport(
1281
                self.transport, self._control_files._file_mode)
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
1282
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1283
    def destroy_workingtree(self):
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
1284
        """See BzrDir.destroy_workingtree."""
1285
        raise errors.UnsupportedOperation(self.destroy_workingtree, self)
1286
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1287
    def destroy_workingtree_metadata(self):
1288
        """See BzrDir.destroy_workingtree_metadata."""
1289
        raise errors.UnsupportedOperation(self.destroy_workingtree_metadata, 
1290
                                          self)
1291
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1292
    def get_branch_transport(self, branch_format):
1293
        """See BzrDir.get_branch_transport()."""
1294
        if branch_format is None:
1295
            return self.transport
1296
        try:
1297
            branch_format.get_format_string()
1298
        except NotImplementedError:
1299
            return self.transport
1300
        raise errors.IncompatibleFormat(branch_format, self._format)
1301
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1302
    def get_repository_transport(self, repository_format):
1303
        """See BzrDir.get_repository_transport()."""
1304
        if repository_format is None:
1305
            return self.transport
1306
        try:
1307
            repository_format.get_format_string()
1308
        except NotImplementedError:
1309
            return self.transport
1310
        raise errors.IncompatibleFormat(repository_format, self._format)
1311
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1312
    def get_workingtree_transport(self, workingtree_format):
1313
        """See BzrDir.get_workingtree_transport()."""
1314
        if workingtree_format is None:
1315
            return self.transport
1316
        try:
1317
            workingtree_format.get_format_string()
1318
        except NotImplementedError:
1319
            return self.transport
1320
        raise errors.IncompatibleFormat(workingtree_format, self._format)
1321
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.
1322
    def needs_format_conversion(self, format=None):
1323
        """See BzrDir.needs_format_conversion()."""
1324
        # if the format is not the same as the system default,
1325
        # an upgrade is needed.
1326
        if format is None:
3943.2.5 by Martin Pool
deprecate needs_format_conversion(format=None)
1327
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1328
                % '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.
1329
            format = BzrDirFormat.get_default_format()
1330
        return not isinstance(self._format, format.__class__)
1331
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1332
    def open_branch(self, unsupported=False):
1333
        """See BzrDir.open_branch."""
1334
        from bzrlib.branch import BzrBranchFormat4
1335
        format = BzrBranchFormat4()
1336
        self._check_supported(format, unsupported)
1337
        return format.open(self, _found=True)
1338
2485.8.56 by Vincent Ladeuil
Fix bug #112173 and bzr branch multiple connections.
1339
    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
1340
               possible_transports=None, accelerator_tree=None,
3983.1.7 by Daniel Watkins
Review comments from jam.
1341
               hardlink=False, stacked=False, create_tree_if_local=True):
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.
1342
        """See BzrDir.sprout()."""
3221.18.4 by Ian Clatworthy
shallow -> stacked
1343
        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.
1344
            raise errors.UnstackableBranchFormat(
1345
                self._format, self.root_transport.base)
3983.1.11 by Daniel Watkins
Old BzrDirs which must have working trees are now allowed for in the test.
1346
        if not create_tree_if_local:
1347
            raise errors.MustHaveWorkingTree(
1348
                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.
1349
        from bzrlib.workingtree import WorkingTreeFormat2
1350
        self._make_tail(url)
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1351
        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.
1352
        try:
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
1353
            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.
1354
        except errors.NoRepositoryPresent:
1355
            pass
1356
        try:
1357
            self.open_branch().sprout(result, revision_id=revision_id)
1358
        except errors.NotBranchError:
1359
            pass
3983.1.4 by Daniel Watkins
Added 'no_tree' parameter to BzrDirPreSplitOut.
1360
3983.1.7 by Daniel Watkins
Review comments from jam.
1361
        # we always want a working tree
1362
        WorkingTreeFormat2().initialize(result,
1363
                                        accelerator_tree=accelerator_tree,
1364
                                        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.
1365
        return result
1366
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1367
1368
class BzrDir4(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
1369
    """A .bzr version 4 control object.
1370
    
1371
    This is a deprecated format and may be removed after sept 2006.
1372
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1373
1534.6.1 by Robert Collins
allow API creation of shared repositories
1374
    def create_repository(self, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1375
        """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.
1376
        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.
1377
1534.5.16 by Robert Collins
Review feedback.
1378
    def needs_format_conversion(self, format=None):
1379
        """Format 4 dirs are always in need of conversion."""
3943.2.5 by Martin Pool
deprecate needs_format_conversion(format=None)
1380
        if format is None:
1381
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1382
                % 'needs_format_conversion(format=None)')
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1383
        return True
1384
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1385
    def open_repository(self):
1386
        """See BzrDir.open_repository."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1387
        from bzrlib.repofmt.weaverepo import RepositoryFormat4
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1388
        return RepositoryFormat4().open(self, _found=True)
1389
1390
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1391
class BzrDir5(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
1392
    """A .bzr version 5 control object.
1393
1394
    This is a deprecated format and may be removed after sept 2006.
1395
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1396
1397
    def open_repository(self):
1398
        """See BzrDir.open_repository."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1399
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1400
        return RepositoryFormat5().open(self, _found=True)
1401
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1402
    def open_workingtree(self, _unsupported=False,
1403
            recommend_upgrade=True):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1404
        """See BzrDir.create_workingtree."""
1405
        from bzrlib.workingtree import WorkingTreeFormat2
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1406
        wt_format = WorkingTreeFormat2()
1407
        # we don't warn here about upgrades; that ought to be handled for the
1408
        # bzrdir as a whole
1409
        return wt_format.open(self, _found=True)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1410
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1411
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1412
class BzrDir6(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
1413
    """A .bzr version 6 control object.
1414
1415
    This is a deprecated format and may be removed after sept 2006.
1416
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1417
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1418
    def open_repository(self):
1419
        """See BzrDir.open_repository."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1420
        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.
1421
        return RepositoryFormat6().open(self, _found=True)
1422
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1423
    def open_workingtree(self, _unsupported=False,
1424
        recommend_upgrade=True):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1425
        """See BzrDir.create_workingtree."""
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1426
        # we don't warn here about upgrades; that ought to be handled for the
1427
        # 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.
1428
        from bzrlib.workingtree import WorkingTreeFormat2
1429
        return WorkingTreeFormat2().open(self, _found=True)
1430
1431
1432
class BzrDirMeta1(BzrDir):
1433
    """A .bzr meta version 1 control object.
1434
    
1435
    This is the first control object where the 
1553.5.67 by Martin Pool
doc
1436
    individual aspects are really split out: there are separate repository,
1437
    workingtree and branch subdirectories and any subset of the three can be
1438
    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.
1439
    """
1440
1534.5.16 by Robert Collins
Review feedback.
1441
    def can_convert_format(self):
1442
        """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.
1443
        return True
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1444
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1445
    def create_branch(self):
1446
        """See BzrDir.create_branch."""
2230.3.55 by Aaron Bentley
Updates from review
1447
        return self._format.get_branch_format().initialize(self)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1448
2796.2.6 by Aaron Bentley
Implement destroy_branch
1449
    def destroy_branch(self):
1450
        """See BzrDir.create_branch."""
1451
        self.transport.delete_tree('branch')
1452
1534.6.1 by Robert Collins
allow API creation of shared repositories
1453
    def create_repository(self, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1454
        """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.
1455
        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.
1456
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
1457
    def destroy_repository(self):
1458
        """See BzrDir.destroy_repository."""
1459
        self.transport.delete_tree('repository')
1460
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1461
    def create_workingtree(self, revision_id=None, from_branch=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1462
                           accelerator_tree=None, hardlink=False):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1463
        """See BzrDir.create_workingtree."""
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
1464
        return self._format.workingtree_format.initialize(
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1465
            self, revision_id, from_branch=from_branch,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1466
            accelerator_tree=accelerator_tree, hardlink=hardlink)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1467
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1468
    def destroy_workingtree(self):
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
1469
        """See BzrDir.destroy_workingtree."""
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1470
        wt = self.open_workingtree(recommend_upgrade=False)
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1471
        repository = wt.branch.repository
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
1472
        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'
1473
        wt.revert(old_tree=empty)
1551.8.37 by Aaron Bentley
Cleaner implementation of destroy_working_tree
1474
        self.destroy_workingtree_metadata()
1475
1476
    def destroy_workingtree_metadata(self):
1477
        self.transport.delete_tree('checkout')
1551.8.36 by Aaron Bentley
Introduce BzrDir.destroy_workingtree
1478
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1479
    def find_branch_format(self):
1480
        """Find the branch 'format' for this bzrdir.
1481
1482
        This might be a synthetic object for e.g. RemoteBranch and SVN.
1483
        """
1484
        from bzrlib.branch import BranchFormat
1485
        return BranchFormat.find_format(self)
1486
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1487
    def _get_mkdir_mode(self):
1488
        """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
1489
        temp_control = lockable_files.LockableFiles(self.transport, '',
1490
                                     lockable_files.TransportLock)
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1491
        return temp_control._dir_mode
1492
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1493
    def get_branch_reference(self):
1494
        """See BzrDir.get_branch_reference()."""
1495
        from bzrlib.branch import BranchFormat
1496
        format = BranchFormat.find_format(self)
1497
        return format.get_reference(self)
1498
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1499
    def get_branch_transport(self, branch_format):
1500
        """See BzrDir.get_branch_transport()."""
1501
        if branch_format is None:
1502
            return self.transport.clone('branch')
1503
        try:
1504
            branch_format.get_format_string()
1505
        except NotImplementedError:
1506
            raise errors.IncompatibleFormat(branch_format, self._format)
1507
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1508
            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.
1509
        except errors.FileExists:
1510
            pass
1511
        return self.transport.clone('branch')
1512
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1513
    def get_repository_transport(self, repository_format):
1514
        """See BzrDir.get_repository_transport()."""
1515
        if repository_format is None:
1516
            return self.transport.clone('repository')
1517
        try:
1518
            repository_format.get_format_string()
1519
        except NotImplementedError:
1520
            raise errors.IncompatibleFormat(repository_format, self._format)
1521
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1522
            self.transport.mkdir('repository', mode=self._get_mkdir_mode())
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1523
        except errors.FileExists:
1524
            pass
1525
        return self.transport.clone('repository')
1526
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1527
    def get_workingtree_transport(self, workingtree_format):
1528
        """See BzrDir.get_workingtree_transport()."""
1529
        if workingtree_format is None:
1530
            return self.transport.clone('checkout')
1531
        try:
1532
            workingtree_format.get_format_string()
1533
        except NotImplementedError:
1534
            raise errors.IncompatibleFormat(workingtree_format, self._format)
1535
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1536
            self.transport.mkdir('checkout', mode=self._get_mkdir_mode())
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1537
        except errors.FileExists:
1538
            pass
1539
        return self.transport.clone('checkout')
1540
1534.5.16 by Robert Collins
Review feedback.
1541
    def needs_format_conversion(self, format=None):
1542
        """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.
1543
        if format is None:
3943.2.5 by Martin Pool
deprecate needs_format_conversion(format=None)
1544
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1545
                % 'needs_format_conversion(format=None)')
1546
        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.
1547
            format = BzrDirFormat.get_default_format()
1548
        if not isinstance(self._format, format.__class__):
1549
            # it is not a meta dir format, conversion is needed.
1550
            return True
1551
        # we might want to push this down to the repository?
1552
        try:
1553
            if not isinstance(self.open_repository()._format,
1554
                              format.repository_format.__class__):
1555
                # the repository needs an upgrade.
1556
                return True
1557
        except errors.NoRepositoryPresent:
1558
            pass
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
1559
        try:
1560
            if not isinstance(self.open_branch()._format,
2230.3.55 by Aaron Bentley
Updates from review
1561
                              format.get_branch_format().__class__):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1562
                # the branch needs an upgrade.
1563
                return True
1564
        except errors.NotBranchError:
1565
            pass
1566
        try:
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1567
            my_wt = self.open_workingtree(recommend_upgrade=False)
1568
            if not isinstance(my_wt._format,
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1569
                              format.workingtree_format.__class__):
1570
                # the workingtree needs an upgrade.
1571
                return True
2255.2.196 by Robert Collins
Fix test_upgrade defects related to non local or absent working trees.
1572
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1573
            pass
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1574
        return False
1575
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1576
    def open_branch(self, unsupported=False):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1577
        """See BzrDir.open_branch."""
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1578
        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.
1579
        self._check_supported(format, unsupported)
1580
        return format.open(self, _found=True)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1581
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1582
    def open_repository(self, unsupported=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1583
        """See BzrDir.open_repository."""
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1584
        from bzrlib.repository import RepositoryFormat
1585
        format = RepositoryFormat.find_format(self)
1586
        self._check_supported(format, unsupported)
1587
        return format.open(self, _found=True)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1588
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1589
    def open_workingtree(self, unsupported=False,
1590
            recommend_upgrade=True):
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1591
        """See BzrDir.open_workingtree."""
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1592
        from bzrlib.workingtree import WorkingTreeFormat
1593
        format = WorkingTreeFormat.find_format(self)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
1594
        self._check_supported(format, unsupported,
1595
            recommend_upgrade,
2323.6.5 by Martin Pool
Recommended-upgrade message should give base dir not the control dir url
1596
            basedir=self.root_transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1597
        return format.open(self, _found=True)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1598
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1599
    def _get_config(self):
3242.3.14 by Aaron Bentley
Make BzrDirConfig use TransportConfig
1600
        return config.BzrDirConfig(self.transport)
3242.1.1 by Aaron Bentley
Implement BzrDir configuration
1601
1534.4.39 by Robert Collins
Basic BzrDir support.
1602
1603
class BzrDirFormat(object):
1604
    """An encapsulation of the initialization and open routines for a format.
1605
1606
    Formats provide three things:
1607
     * An initialization routine,
1608
     * a format string,
1609
     * an open routine.
1610
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
1611
    Formats are placed in a dict by their format string for reference 
1534.4.39 by Robert Collins
Basic BzrDir support.
1612
    during bzrdir opening. These should be subclasses of BzrDirFormat
1613
    for consistency.
1614
1615
    Once a format is deprecated, just deprecate the initialize and open
1616
    methods on the format class. Do not deprecate the object, as the 
1617
    object will be created every system load.
1618
    """
1619
1620
    _default_format = None
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1621
    """The default format used for new .bzr dirs."""
1534.4.39 by Robert Collins
Basic BzrDir support.
1622
1623
    _formats = {}
1624
    """The known formats."""
1625
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
1626
    _control_formats = []
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1627
    """The registered control formats - .bzr, ....
1628
    
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
1629
    This is a list of BzrDirFormat objects.
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1630
    """
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1631
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.
1632
    _control_server_formats = []
1633
    """The registered control server formats, e.g. RemoteBzrDirs.
1634
1635
    This is a list of BzrDirFormat objects.
1636
    """
1637
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1638
    _lock_file_name = 'branch-lock'
1639
1640
    # _lock_class must be set in subclasses to the lock type, typ.
1641
    # TransportLock or LockDir
1642
1534.4.39 by Robert Collins
Basic BzrDir support.
1643
    @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.
1644
    def find_format(klass, transport, _server_formats=True):
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1645
        """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.
1646
        if _server_formats:
1647
            formats = klass._control_server_formats + klass._control_formats
1648
        else:
1649
            formats = klass._control_formats
1650
        for format in formats:
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1651
            try:
1652
                return format.probe_transport(transport)
1653
            except errors.NotBranchError:
1654
                # this format does not find a control dir here.
1655
                pass
1656
        raise errors.NotBranchError(path=transport.base)
1657
1658
    @classmethod
1659
    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.
1660
        """Return the .bzrdir style format present in a directory."""
1534.4.39 by Robert Collins
Basic BzrDir support.
1661
        try:
2164.2.18 by Vincent Ladeuil
Take Aaron comments into account.
1662
            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.
1663
        except errors.NoSuchFile:
1664
            raise errors.NotBranchError(path=transport.base)
1665
1666
        try:
1534.4.39 by Robert Collins
Basic BzrDir support.
1667
            return klass._formats[format_string]
1668
        except KeyError:
3246.3.2 by Daniel Watkins
Modified uses of errors.UnknownFormatError.
1669
            raise errors.UnknownFormatError(format=format_string, kind='bzrdir')
1534.4.39 by Robert Collins
Basic BzrDir support.
1670
1671
    @classmethod
1672
    def get_default_format(klass):
1673
        """Return the current default format."""
1674
        return klass._default_format
1675
1676
    def get_format_string(self):
1677
        """Return the ASCII format string that identifies this format."""
1678
        raise NotImplementedError(self.get_format_string)
1679
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1680
    def get_format_description(self):
1681
        """Return the short description for this format."""
1682
        raise NotImplementedError(self.get_format_description)
1683
1534.5.16 by Robert Collins
Review feedback.
1684
    def get_converter(self, format=None):
1685
        """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.
1686
1687
        This returns a bzrlib.bzrdir.Converter object.
1688
1689
        This should return the best upgrader to step this format towards the
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1690
        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.
1691
        some means for them to extend the range of returnable converters.
1534.5.13 by Robert Collins
Correct buggy test.
1692
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1693
        :param format: Optional format to override the default format of the 
1534.5.13 by Robert Collins
Correct buggy test.
1694
                       library.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1695
        """
1534.5.16 by Robert Collins
Review feedback.
1696
        raise NotImplementedError(self.get_converter)
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1697
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
1698
    def initialize(self, url, possible_transports=None):
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1699
        """Create a bzr control dir at this url and return an opened copy.
1700
        
1701
        Subclasses should typically override initialize_on_transport
1702
        instead of this method.
1703
        """
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
1704
        return self.initialize_on_transport(get_transport(url,
1705
                                                          possible_transports))
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1706
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1707
    def initialize_on_transport(self, transport):
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1708
        """Initialize a new bzrdir in the base directory of a Transport."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1709
        # Since we don't have a .bzr directory, inherit the
1534.4.39 by Robert Collins
Basic BzrDir support.
1710
        # mode from the root directory
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1711
        temp_control = lockable_files.LockableFiles(transport,
1712
                            '', lockable_files.TransportLock)
1534.4.39 by Robert Collins
Basic BzrDir support.
1713
        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.
1714
                                      # FIXME: RBC 20060121 don't peek under
1534.4.39 by Robert Collins
Basic BzrDir support.
1715
                                      # the covers
1716
                                      mode=temp_control._dir_mode)
3224.5.24 by Andrew Bennetts
More minor import tidying suggested by pyflakes.
1717
        if sys.platform == 'win32' and isinstance(transport, local.LocalTransport):
3023.1.2 by Alexander Belchenko
Martin's review.
1718
            win32utils.set_file_attr_hidden(transport._abspath('.bzr'))
1534.4.39 by Robert Collins
Basic BzrDir support.
1719
        file_mode = temp_control._file_mode
1720
        del temp_control
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1721
        bzrdir_transport = transport.clone('.bzr')
1722
        utf8_files = [('README',
3250.2.1 by Marius Kruger
update .bzr/README to not refer to Bazaar-NG, and add link to website.
1723
                       "This is a Bazaar control directory.\n"
1724
                       "Do not change any files in this directory.\n"
1725
                       "See http://bazaar-vcs.org/ for more information about Bazaar.\n"),
1534.4.39 by Robert Collins
Basic BzrDir support.
1726
                      ('branch-format', self.get_format_string()),
1727
                      ]
1728
        # NB: no need to escape relative paths that are url safe.
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1729
        control_files = lockable_files.LockableFiles(bzrdir_transport,
1730
            self._lock_file_name, self._lock_class)
1553.5.60 by Martin Pool
New LockableFiles.create_lock() method
1731
        control_files.create_lock()
1534.4.39 by Robert Collins
Basic BzrDir support.
1732
        control_files.lock_write()
1733
        try:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1734
            for (filename, content) in utf8_files:
3407.2.12 by Martin Pool
Fix creation mode of control files
1735
                bzrdir_transport.put_bytes(filename, content,
1736
                    mode=file_mode)
1534.4.39 by Robert Collins
Basic BzrDir support.
1737
        finally:
1738
            control_files.unlock()
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1739
        return self.open(transport, _found=True)
1534.4.39 by Robert Collins
Basic BzrDir support.
1740
1741
    def is_supported(self):
1742
        """Is this format supported?
1743
1744
        Supported formats must be initializable and openable.
1745
        Unsupported formats may not support initialization or committing or 
1746
        some other features depending on the reason for not being supported.
1747
        """
1748
        return True
1749
1910.2.14 by Aaron Bentley
Fail when trying to use interrepository on Knit2 and Knit1
1750
    def same_model(self, target_format):
1751
        return (self.repository_format.rich_root_data == 
1752
            target_format.rich_root_data)
1753
1733.1.3 by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
1754
    @classmethod
1755
    def known_formats(klass):
1756
        """Return all the known formats.
1757
        
1758
        Concrete formats should override _known_formats.
1759
        """
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1760
        # There is double indirection here to make sure that control 
1761
        # formats used by more than one dir format will only be probed 
1762
        # 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.
1763
        result = set()
1764
        for format in klass._control_formats:
1765
            result.update(format._known_formats())
1766
        return result
1767
    
1768
    @classmethod
1769
    def _known_formats(klass):
1770
        """Return the known format instances for this control format."""
1771
        return set(klass._formats.values())
1772
1534.4.39 by Robert Collins
Basic BzrDir support.
1773
    def open(self, transport, _found=False):
1774
        """Return an instance of this format for the dir transport points at.
1775
        
1776
        _found is a private parameter, do not use it.
1777
        """
1778
        if not _found:
2090.2.2 by Martin Pool
Fix an assertion with side effects
1779
            found_format = BzrDirFormat.find_format(transport)
1780
            if not isinstance(found_format, self.__class__):
1781
                raise AssertionError("%s was asked to open %s, but it seems to need "
1782
                        "format %s" 
1783
                        % (self, transport, found_format))
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1784
        return self._open(transport)
1785
1786
    def _open(self, transport):
1787
        """Template method helper for opening BzrDirectories.
1788
1789
        This performs the actual open and any additional logic or parameter
1790
        passing.
1791
        """
1792
        raise NotImplementedError(self._open)
1534.4.39 by Robert Collins
Basic BzrDir support.
1793
1794
    @classmethod
1795
    def register_format(klass, format):
1796
        klass._formats[format.get_format_string()] = format
1797
1798
    @classmethod
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1799
    def register_control_format(klass, format):
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
1800
        """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.
1801
1802
        TODO: This should be pulled up into a 'ControlDirFormat' base class
1803
        which BzrDirFormat can inherit from, and renamed to register_format 
1804
        there. It has been done without that for now for simplicity of
1805
        implementation.
1806
        """
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
1807
        klass._control_formats.append(format)
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1808
1809
    @classmethod
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1810
    def register_control_server_format(klass, format):
1811
        """Register a control format for client-server environments.
1812
1813
        These formats will be tried before ones registered with
1814
        register_control_format.  This gives implementations that decide to the
1815
        chance to grab it before anything looks at the contents of the format
1816
        file.
1817
        """
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.
1818
        klass._control_server_formats.append(format)
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
1819
1820
    @classmethod
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
1821
    def _set_default_format(klass, format):
1822
        """Set default format (for testing behavior of defaults only)"""
1823
        klass._default_format = format
1824
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
1825
    def __str__(self):
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
1826
        # Trim the newline
1827
        return self.get_format_string().rstrip()
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
1828
1534.4.39 by Robert Collins
Basic BzrDir support.
1829
    @classmethod
1830
    def unregister_format(klass, format):
1831
        del klass._formats[format.get_format_string()]
1832
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1833
    @classmethod
1834
    def unregister_control_format(klass, format):
1835
        klass._control_formats.remove(format)
1836
1837
1534.4.39 by Robert Collins
Basic BzrDir support.
1838
class BzrDirFormat4(BzrDirFormat):
1839
    """Bzr dir format 4.
1840
1841
    This format is a combined format for working tree, branch and repository.
1842
    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.
1843
     - Format 1 working trees [always]
1844
     - Format 4 branches [always]
1845
     - Format 4 repositories [always]
1534.4.39 by Robert Collins
Basic BzrDir support.
1846
1847
    This format is deprecated: it indexes texts using a text it which is
1848
    removed in format 5; write support for this format has been removed.
1849
    """
1850
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1851
    _lock_class = lockable_files.TransportLock
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1852
1534.4.39 by Robert Collins
Basic BzrDir support.
1853
    def get_format_string(self):
1854
        """See BzrDirFormat.get_format_string()."""
1855
        return "Bazaar-NG branch, format 0.0.4\n"
1856
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1857
    def get_format_description(self):
1858
        """See BzrDirFormat.get_format_description()."""
1859
        return "All-in-one format 4"
1860
1534.5.16 by Robert Collins
Review feedback.
1861
    def get_converter(self, format=None):
1862
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
1863
        # 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.
1864
        return ConvertBzrDir4To5()
1865
        
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1866
    def initialize_on_transport(self, transport):
1534.4.39 by Robert Collins
Basic BzrDir support.
1867
        """Format 4 branches cannot be created."""
1868
        raise errors.UninitializableFormat(self)
1869
1870
    def is_supported(self):
1871
        """Format 4 is not supported.
1872
1873
        It is not supported because the model changed from 4 to 5 and the
1874
        conversion logic is expensive - so doing it on the fly was not 
1875
        feasible.
1876
        """
1877
        return False
1878
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1879
    def _open(self, transport):
1880
        """See BzrDirFormat._open."""
1881
        return BzrDir4(transport, self)
1882
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.
1883
    def __return_repository_format(self):
1884
        """Circular import protection."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1885
        from bzrlib.repofmt.weaverepo import RepositoryFormat4
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1886
        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.
1887
    repository_format = property(__return_repository_format)
1888
1534.4.39 by Robert Collins
Basic BzrDir support.
1889
1890
class BzrDirFormat5(BzrDirFormat):
1891
    """Bzr control format 5.
1892
1893
    This format is a combined format for working tree, branch and repository.
1894
    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.
1895
     - Format 2 working trees [always] 
1896
     - Format 4 branches [always] 
1534.4.53 by Robert Collins
Review feedback from John Meinel.
1897
     - 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.
1898
       Unhashed stores in the repository.
1534.4.39 by Robert Collins
Basic BzrDir support.
1899
    """
1900
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1901
    _lock_class = lockable_files.TransportLock
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1902
1534.4.39 by Robert Collins
Basic BzrDir support.
1903
    def get_format_string(self):
1904
        """See BzrDirFormat.get_format_string()."""
1905
        return "Bazaar-NG branch, format 5\n"
1906
3650.2.2 by Aaron Bentley
Implement get_branch_format, to unify branch creation code
1907
    def get_branch_format(self):
1908
        from bzrlib import branch
1909
        return branch.BzrBranchFormat4()
1910
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1911
    def get_format_description(self):
1912
        """See BzrDirFormat.get_format_description()."""
1913
        return "All-in-one format 5"
1914
1534.5.16 by Robert Collins
Review feedback.
1915
    def get_converter(self, format=None):
1916
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
1917
        # 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.
1918
        return ConvertBzrDir5To6()
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1919
1920
    def _initialize_for_clone(self, url):
1921
        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.
1922
        
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1923
    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.
1924
        """Format 5 dirs always have working tree, branch and repository.
1925
        
1926
        Except when they are being cloned.
1927
        """
1928
        from bzrlib.branch import BzrBranchFormat4
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1929
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1930
        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.
1931
        RepositoryFormat5().initialize(result, _internal=True)
1932
        if not _cloning:
1910.5.1 by Andrew Bennetts
Make some old formats create at least a stub working tree rather than incomplete bzrdirs, and change some tests to use the test suite transport rather than hard-coded to local-only.
1933
            branch = BzrBranchFormat4().initialize(result)
3650.5.6 by Aaron Bentley
Fix cloning problems by creating missing working tree files
1934
            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.
1935
        return result
1936
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1937
    def _open(self, transport):
1938
        """See BzrDirFormat._open."""
1939
        return BzrDir5(transport, self)
1940
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.
1941
    def __return_repository_format(self):
1942
        """Circular import protection."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1943
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1910.2.12 by Aaron Bentley
Implement knit repo format 2
1944
        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.
1945
    repository_format = property(__return_repository_format)
1946
1534.4.39 by Robert Collins
Basic BzrDir support.
1947
1948
class BzrDirFormat6(BzrDirFormat):
1949
    """Bzr control format 6.
1950
1951
    This format is a combined format for working tree, branch and repository.
1952
    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.
1953
     - Format 2 working trees [always] 
1954
     - Format 4 branches [always] 
1955
     - Format 6 repositories [always]
1534.4.39 by Robert Collins
Basic BzrDir support.
1956
    """
1957
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1958
    _lock_class = lockable_files.TransportLock
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1959
1534.4.39 by Robert Collins
Basic BzrDir support.
1960
    def get_format_string(self):
1961
        """See BzrDirFormat.get_format_string()."""
1962
        return "Bazaar-NG branch, format 6\n"
1963
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1964
    def get_format_description(self):
1965
        """See BzrDirFormat.get_format_description()."""
1966
        return "All-in-one format 6"
1967
3650.2.2 by Aaron Bentley
Implement get_branch_format, to unify branch creation code
1968
    def get_branch_format(self):
1969
        from bzrlib import branch
1970
        return branch.BzrBranchFormat4()
1971
1534.5.16 by Robert Collins
Review feedback.
1972
    def get_converter(self, format=None):
1973
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
1974
        # 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.
1975
        return ConvertBzrDir6ToMeta()
1976
        
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1977
    def _initialize_for_clone(self, url):
1978
        return self.initialize_on_transport(get_transport(url), _cloning=True)
1979
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1980
    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.
1981
        """Format 6 dirs always have working tree, branch and repository.
1982
        
1983
        Except when they are being cloned.
1984
        """
1985
        from bzrlib.branch import BzrBranchFormat4
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1986
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1987
        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.
1988
        RepositoryFormat6().initialize(result, _internal=True)
1989
        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.
1990
            branch = BzrBranchFormat4().initialize(result)
3650.5.7 by Aaron Bentley
Fix working tree initialization
1991
            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.
1992
        return result
1993
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1994
    def _open(self, transport):
1995
        """See BzrDirFormat._open."""
1996
        return BzrDir6(transport, self)
1997
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.
1998
    def __return_repository_format(self):
1999
        """Circular import protection."""
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2000
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1910.2.12 by Aaron Bentley
Implement knit repo format 2
2001
        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.
2002
    repository_format = property(__return_repository_format)
2003
1534.4.39 by Robert Collins
Basic BzrDir support.
2004
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2005
class BzrDirMetaFormat1(BzrDirFormat):
2006
    """Bzr meta control format 1
2007
2008
    This is the first format with split out working tree, branch and repository
2009
    disk storage.
2010
    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.
2011
     - Format 3 working trees [optional]
2012
     - Format 5 branches [optional]
2013
     - 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.
2014
    """
2015
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
2016
    _lock_class = lockdir.LockDir
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
2017
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
2018
    def __init__(self):
2019
        self._workingtree_format = None
2230.3.1 by Aaron Bentley
Get branch6 creation working
2020
        self._branch_format = None
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
2021
2100.3.15 by Aaron Bentley
get test suite passing
2022
    def __eq__(self, other):
2023
        if other.__class__ is not self.__class__:
2024
            return False
2025
        if other.repository_format != self.repository_format:
2026
            return False
2027
        if other.workingtree_format != self.workingtree_format:
2028
            return False
2029
        return True
2030
2100.3.35 by Aaron Bentley
equality operations on bzrdir
2031
    def __ne__(self, other):
2032
        return not self == other
2033
2230.3.55 by Aaron Bentley
Updates from review
2034
    def get_branch_format(self):
2230.3.1 by Aaron Bentley
Get branch6 creation working
2035
        if self._branch_format is None:
2036
            from bzrlib.branch import BranchFormat
2037
            self._branch_format = BranchFormat.get_default_format()
2038
        return self._branch_format
2039
2230.3.55 by Aaron Bentley
Updates from review
2040
    def set_branch_format(self, format):
2230.3.1 by Aaron Bentley
Get branch6 creation working
2041
        self._branch_format = format
2042
3904.3.1 by Andrew Bennetts
Probable fix for GaryvdM's bug when pushing a stacked qbzr branch to Launchpad.
2043
    def require_stacking(self):
2044
        if not self.get_branch_format().supports_stacking():
2045
            # We need to make a stacked branch, but the default format for the
2046
            # target doesn't support stacking.  So force a branch that *can*
2047
            # support stacking.
2048
            from bzrlib.branch import BzrBranchFormat7
2049
            self._branch_format = BzrBranchFormat7()
2050
            mutter("using %r for stacking" % (self._branch_format,))
2051
            from bzrlib.repofmt import pack_repo
2052
            if self.repository_format.rich_root_data:
2053
                bzrdir_format_name = '1.6.1-rich-root'
2054
                repo_format = pack_repo.RepositoryFormatKnitPack5RichRoot()
2055
            else:
2056
                bzrdir_format_name = '1.6'
2057
                repo_format = pack_repo.RepositoryFormatKnitPack5()
2058
            note('Source format does not support stacking, using format:'
2059
                 ' \'%s\'\n  %s\n',
2060
                 bzrdir_format_name, repo_format.get_format_description())
2061
            self.repository_format = repo_format
2062
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.
2063
    def get_converter(self, format=None):
2064
        """See BzrDirFormat.get_converter()."""
2065
        if format is None:
2066
            format = BzrDirFormat.get_default_format()
2067
        if not isinstance(self, format.__class__):
2068
            # converting away from metadir is not implemented
2069
            raise NotImplementedError(self.get_converter)
2070
        return ConvertMetaToMeta(format)
2071
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2072
    def get_format_string(self):
2073
        """See BzrDirFormat.get_format_string()."""
2074
        return "Bazaar-NG meta directory, format 1\n"
2075
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2076
    def get_format_description(self):
2077
        """See BzrDirFormat.get_format_description()."""
2078
        return "Meta directory format 1"
2079
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2080
    def _open(self, transport):
2081
        """See BzrDirFormat._open."""
2230.3.24 by Aaron Bentley
Remove format-on-open code
2082
        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.
2083
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.
2084
    def __return_repository_format(self):
2085
        """Circular import protection."""
2086
        if getattr(self, '_repository_format', None):
2087
            return self._repository_format
2088
        from bzrlib.repository import RepositoryFormat
2089
        return RepositoryFormat.get_default_format()
2090
2091
    def __set_repository_format(self, value):
3015.2.8 by Robert Collins
Typo in __set_repository_format's docstring.
2092
        """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.
2093
        self._repository_format = value
1553.5.72 by Martin Pool
Clean up test for Branch5 lockdirs
2094
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.
2095
    repository_format = property(__return_repository_format, __set_repository_format)
2096
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
2097
    def __get_workingtree_format(self):
2098
        if self._workingtree_format is None:
2099
            from bzrlib.workingtree import WorkingTreeFormat
2100
            self._workingtree_format = WorkingTreeFormat.get_default_format()
2101
        return self._workingtree_format
2102
2103
    def __set_workingtree_format(self, wt_format):
2104
        self._workingtree_format = wt_format
2105
2106
    workingtree_format = property(__get_workingtree_format,
2107
                                  __set_workingtree_format)
2108
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2109
2164.2.19 by Vincent Ladeuil
Revert BzrDirFormat1 registering.
2110
# Register bzr control format
2111
BzrDirFormat.register_control_format(BzrDirFormat)
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
2112
2113
# Register bzr formats
1534.4.39 by Robert Collins
Basic BzrDir support.
2114
BzrDirFormat.register_format(BzrDirFormat4())
2115
BzrDirFormat.register_format(BzrDirFormat5())
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
2116
BzrDirFormat.register_format(BzrDirFormat6())
2117
__default_format = BzrDirMetaFormat1()
1534.4.39 by Robert Collins
Basic BzrDir support.
2118
BzrDirFormat.register_format(__default_format)
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
2119
BzrDirFormat._default_format = __default_format
1534.4.39 by Robert Collins
Basic BzrDir support.
2120
2121
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2122
class Converter(object):
2123
    """Converts a disk format object from one format to another."""
2124
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2125
    def convert(self, to_convert, pb):
2126
        """Perform the conversion of to_convert, giving feedback via pb.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2127
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2128
        :param to_convert: The disk object to convert.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2129
        :param pb: a progress bar to use for progress information.
2130
        """
2131
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.
2132
    def step(self, message):
2133
        """Update the pb by a step."""
2134
        self.count +=1
2135
        self.pb.update(message, self.count, self.total)
2136
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2137
2138
class ConvertBzrDir4To5(Converter):
2139
    """Converts format 4 bzr dirs to format 5."""
2140
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2141
    def __init__(self):
2142
        super(ConvertBzrDir4To5, self).__init__()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2143
        self.converted_revs = set()
2144
        self.absent_revisions = set()
2145
        self.text_count = 0
2146
        self.revisions = {}
2147
        
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2148
    def convert(self, to_convert, pb):
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2149
        """See Converter.convert()."""
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2150
        self.bzrdir = to_convert
2151
        self.pb = pb
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2152
        self.pb.note('starting upgrade from format 4 to 5')
3224.5.24 by Andrew Bennetts
More minor import tidying suggested by pyflakes.
2153
        if isinstance(self.bzrdir.transport, local.LocalTransport):
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2154
            self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
2155
        self._convert_to_weaves()
2156
        return BzrDir.open(self.bzrdir.root_transport.base)
2157
2158
    def _convert_to_weaves(self):
2159
        self.pb.note('note: upgrade may be faster if all store files are ungzipped first')
2160
        try:
2161
            # TODO permissions
2162
            stat = self.bzrdir.transport.stat('weaves')
2163
            if not S_ISDIR(stat.st_mode):
2164
                self.bzrdir.transport.delete('weaves')
2165
                self.bzrdir.transport.mkdir('weaves')
2166
        except errors.NoSuchFile:
2167
            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.
2168
        # 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.
2169
        self.inv_weave = Weave('inventory')
2170
        # holds in-memory weaves for all files
2171
        self.text_weaves = {}
2172
        self.bzrdir.transport.delete('branch-format')
2173
        self.branch = self.bzrdir.open_branch()
2174
        self._convert_working_inv()
2175
        rev_history = self.branch.revision_history()
2176
        # to_read is a stack holding the revisions we still need to process;
2177
        # appending to it adds new highest-priority revisions
2178
        self.known_revisions = set(rev_history)
2179
        self.to_read = rev_history[-1:]
2180
        while self.to_read:
2181
            rev_id = self.to_read.pop()
2182
            if (rev_id not in self.revisions
2183
                and rev_id not in self.absent_revisions):
2184
                self._load_one_rev(rev_id)
2185
        self.pb.clear()
2186
        to_import = self._make_order()
2187
        for i, rev_id in enumerate(to_import):
2188
            self.pb.update('converting revision', i, len(to_import))
2189
            self._convert_one_rev(rev_id)
2190
        self.pb.clear()
2191
        self._write_all_weaves()
2192
        self._write_all_revs()
2193
        self.pb.note('upgraded to weaves:')
2194
        self.pb.note('  %6d revisions and inventories', len(self.revisions))
2195
        self.pb.note('  %6d revisions not present', len(self.absent_revisions))
2196
        self.pb.note('  %6d texts', self.text_count)
2197
        self._cleanup_spare_files_after_format4()
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2198
        self.branch._transport.put_bytes(
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2199
            'branch-format',
2200
            BzrDirFormat5().get_format_string(),
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2201
            mode=self.bzrdir._get_file_mode())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2202
2203
    def _cleanup_spare_files_after_format4(self):
2204
        # FIXME working tree upgrade foo.
2205
        for n in 'merged-patches', 'pending-merged-patches':
2206
            try:
2207
                ## assert os.path.getsize(p) == 0
2208
                self.bzrdir.transport.delete(n)
2209
            except errors.NoSuchFile:
2210
                pass
2211
        self.bzrdir.transport.delete_tree('inventory-store')
2212
        self.bzrdir.transport.delete_tree('text-store')
2213
2214
    def _convert_working_inv(self):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2215
        inv = xml4.serializer_v4.read_inventory(
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2216
                self.branch._transport.get('inventory'))
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
2217
        new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv, working=True)
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2218
        self.branch._transport.put_bytes('inventory', new_inv_xml,
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2219
            mode=self.bzrdir._get_file_mode())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2220
2221
    def _write_all_weaves(self):
2222
        controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)
2223
        weave_transport = self.bzrdir.transport.clone('weaves')
2224
        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
2225
        transaction = WriteTransaction()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2226
2227
        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.
2228
            i = 0
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2229
            for file_id, file_weave in self.text_weaves.items():
2230
                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.
2231
                weaves._put_weave(file_id, file_weave, transaction)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2232
                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.
2233
            self.pb.update('inventory', 0, 1)
2234
            controlweaves._put_weave('inventory', self.inv_weave, transaction)
2235
            self.pb.update('inventory', 1, 1)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2236
        finally:
2237
            self.pb.clear()
2238
2239
    def _write_all_revs(self):
2240
        """Write all revisions out in new form."""
2241
        self.bzrdir.transport.delete_tree('revision-store')
2242
        self.bzrdir.transport.mkdir('revision-store')
2243
        revision_transport = self.bzrdir.transport.clone('revision-store')
2244
        # 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.
2245
        from bzrlib.xml5 import serializer_v5
3350.6.10 by Martin Pool
VersionedFiles review cleanups
2246
        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.
2247
        revision_store = RevisionTextStore(revision_transport,
2248
            serializer_v5, False, versionedfile.PrefixMapper(),
2249
            lambda:True, lambda:True)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2250
        try:
2251
            for i, rev_id in enumerate(self.converted_revs):
2252
                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.
2253
                text = serializer_v5.write_revision_to_string(
2254
                    self.revisions[rev_id])
2255
                key = (rev_id,)
2256
                revision_store.add_lines(key, None, osutils.split_lines(text))
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2257
        finally:
2258
            self.pb.clear()
2259
            
2260
    def _load_one_rev(self, rev_id):
2261
        """Load a revision object into memory.
2262
2263
        Any parents not either loaded or abandoned get queued to be
2264
        loaded."""
2265
        self.pb.update('loading revision',
2266
                       len(self.revisions),
2267
                       len(self.known_revisions))
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
2268
        if not self.branch.repository.has_revision(rev_id):
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2269
            self.pb.clear()
2270
            self.pb.note('revision {%s} not present in branch; '
2271
                         'will be converted as a ghost',
2272
                         rev_id)
2273
            self.absent_revisions.add(rev_id)
2274
        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.
2275
            rev = self.branch.repository.get_revision(rev_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2276
            for parent_id in rev.parent_ids:
2277
                self.known_revisions.add(parent_id)
2278
                self.to_read.append(parent_id)
2279
            self.revisions[rev_id] = rev
2280
2281
    def _load_old_inventory(self, rev_id):
2282
        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.
2283
        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
2284
        inv.revision_id = rev_id
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2285
        rev = self.revisions[rev_id]
2286
        return inv
2287
2288
    def _load_updated_inventory(self, rev_id):
2289
        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.
2290
        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.
2291
        return inv
2292
2293
    def _convert_one_rev(self, rev_id):
2294
        """Convert revision and all referenced objects to new format."""
2295
        rev = self.revisions[rev_id]
2296
        inv = self._load_old_inventory(rev_id)
2297
        present_parents = [p for p in rev.parent_ids
2298
                           if p not in self.absent_revisions]
2299
        self._convert_revision_contents(rev, inv, present_parents)
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
2300
        self._store_new_inv(rev, inv, present_parents)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2301
        self.converted_revs.add(rev_id)
2302
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
2303
    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.
2304
        new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2305
        new_inv_sha1 = sha_string(new_inv_xml)
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
2306
        self.inv_weave.add_lines(rev.revision_id,
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
2307
                                 present_parents,
2308
                                 new_inv_xml.splitlines(True))
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2309
        rev.inventory_sha1 = new_inv_sha1
2310
2311
    def _convert_revision_contents(self, rev, inv, present_parents):
2312
        """Convert all the files within a revision.
2313
2314
        Also upgrade the inventory to refer to the text revision ids."""
2315
        rev_id = rev.revision_id
2316
        mutter('converting texts of revision {%s}',
2317
               rev_id)
2318
        parent_invs = map(self._load_updated_inventory, present_parents)
1731.1.62 by Aaron Bentley
Changes from review comments
2319
        entries = inv.iter_entries()
2320
        entries.next()
2321
        for path, ie in entries:
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2322
            self._convert_file_version(rev, ie, parent_invs)
2323
2324
    def _convert_file_version(self, rev, ie, parent_invs):
2325
        """Convert one version of one file.
2326
2327
        The file needs to be added into the weave if it is a merge
2328
        of >=2 parents or if it's changed from its parent.
2329
        """
2330
        file_id = ie.file_id
2331
        rev_id = rev.revision_id
2332
        w = self.text_weaves.get(file_id)
2333
        if w is None:
2334
            w = Weave(file_id)
2335
            self.text_weaves[file_id] = w
2336
        text_changed = False
2776.1.5 by Robert Collins
Add reasonably comprehensive tests for path last modified and per file graph behaviour.
2337
        parent_candiate_entries = ie.parent_candidates(parent_invs)
2338
        heads = graph.Graph(self).heads(parent_candiate_entries.keys())
2339
        # XXX: Note that this is unordered - and this is tolerable because 
2340
        # the previous code was also unordered.
2341
        previous_entries = dict((head, parent_candiate_entries[head]) for head
2342
            in heads)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2343
        self.snapshot_ie(previous_entries, ie, w, rev_id)
2344
        del ie.text_id
2345
3099.3.7 by John Arbash Meinel
Another parent provider I didn't realize existed.
2346
    @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.
2347
    def get_parents(self, revision_ids):
2348
        for revision_id in revision_ids:
2349
            yield self.revisions[revision_id].parent_ids
2350
3099.3.7 by John Arbash Meinel
Another parent provider I didn't realize existed.
2351
    def get_parent_map(self, revision_ids):
2352
        """See graph._StackedParentsProvider.get_parent_map"""
2353
        return dict((revision_id, self.revisions[revision_id])
2354
                    for revision_id in revision_ids
2355
                     if revision_id in self.revisions)
2356
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2357
    def snapshot_ie(self, previous_revisions, ie, w, rev_id):
2358
        # TODO: convert this logic, which is ~= snapshot to
2359
        # a call to:. This needs the path figured out. rather than a work_tree
2360
        # a v4 revision_tree can be given, or something that looks enough like
2361
        # one to give the file content to the entry if it needs it.
2362
        # and we need something that looks like a weave store for snapshot to 
2363
        # save against.
2364
        #ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
2365
        if len(previous_revisions) == 1:
2366
            previous_ie = previous_revisions.values()[0]
2367
            if ie._unchanged(previous_ie):
2368
                ie.revision = previous_ie.revision
2369
                return
2370
        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.
2371
            text = self.branch.repository._text_store.get(ie.text_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2372
            file_lines = text.readlines()
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
2373
            w.add_lines(rev_id, previous_revisions, file_lines)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2374
            self.text_count += 1
2375
        else:
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
2376
            w.add_lines(rev_id, previous_revisions, [])
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2377
        ie.revision = rev_id
2378
2379
    def _make_order(self):
2380
        """Return a suitable order for importing revisions.
2381
2382
        The order must be such that an revision is imported after all
2383
        its (present) parents.
2384
        """
2385
        todo = set(self.revisions.keys())
2386
        done = self.absent_revisions.copy()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2387
        order = []
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2388
        while todo:
2389
            # scan through looking for a revision whose parents
2390
            # are all done
2391
            for rev_id in sorted(list(todo)):
2392
                rev = self.revisions[rev_id]
2393
                parent_ids = set(rev.parent_ids)
2394
                if parent_ids.issubset(done):
2395
                    # can take this one now
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2396
                    order.append(rev_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2397
                    todo.remove(rev_id)
2398
                    done.add(rev_id)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2399
        return order
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2400
2401
2402
class ConvertBzrDir5To6(Converter):
2403
    """Converts format 5 bzr dirs to format 6."""
2404
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2405
    def convert(self, to_convert, pb):
2406
        """See Converter.convert()."""
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2407
        self.bzrdir = to_convert
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2408
        self.pb = pb
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2409
        self.pb.note('starting upgrade from format 5 to 6')
2410
        self._convert_to_prefixed()
2411
        return BzrDir.open(self.bzrdir.root_transport.base)
2412
2413
    def _convert_to_prefixed(self):
1608.2.1 by Martin Pool
[merge] Storage filename escaping
2414
        from bzrlib.store import TransportStore
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2415
        self.bzrdir.transport.delete('branch-format')
2416
        for store_name in ["weaves", "revision-store"]:
1608.2.1 by Martin Pool
[merge] Storage filename escaping
2417
            self.pb.note("adding prefixes to %s" % store_name)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2418
            store_transport = self.bzrdir.transport.clone(store_name)
1608.2.1 by Martin Pool
[merge] Storage filename escaping
2419
            store = TransportStore(store_transport, prefixed=True)
1608.1.1 by Martin Pool
[patch] LocalTransport.list_dir should return url-quoted strings (ddaa)
2420
            for urlfilename in store_transport.list_dir('.'):
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
2421
                filename = urlutils.unescape(urlfilename)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2422
                if (filename.endswith(".weave") or
2423
                    filename.endswith(".gz") or
2424
                    filename.endswith(".sig")):
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
2425
                    file_id, suffix = os.path.splitext(filename)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2426
                else:
2427
                    file_id = filename
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
2428
                    suffix = ''
2429
                new_name = store._mapper.map((file_id,)) + suffix
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2430
                # FIXME keep track of the dirs made RBC 20060121
2431
                try:
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
2432
                    store_transport.move(filename, new_name)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2433
                except errors.NoSuchFile: # catches missing dirs strangely enough
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
2434
                    store_transport.mkdir(osutils.dirname(new_name))
2435
                    store_transport.move(filename, new_name)
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2436
        self.bzrdir.transport.put_bytes(
2437
            'branch-format',
2438
            BzrDirFormat6().get_format_string(),
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2439
            mode=self.bzrdir._get_file_mode())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
2440
2441
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2442
class ConvertBzrDir6ToMeta(Converter):
2443
    """Converts format 6 bzr dirs to metadirs."""
2444
2445
    def convert(self, to_convert, pb):
2446
        """See Converter.convert()."""
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
2447
        from bzrlib.repofmt.weaverepo import RepositoryFormat7
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
2448
        from bzrlib.branch import BzrBranchFormat5
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2449
        self.bzrdir = to_convert
2450
        self.pb = pb
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2451
        self.count = 0
2452
        self.total = 20 # the steps we know about
2453
        self.garbage_inventories = []
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2454
        self.dir_mode = self.bzrdir._get_dir_mode()
2455
        self.file_mode = self.bzrdir._get_file_mode()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2456
1534.5.13 by Robert Collins
Correct buggy test.
2457
        self.pb.note('starting upgrade from format 6 to metadir')
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2458
        self.bzrdir.transport.put_bytes(
2459
                'branch-format',
2460
                "Converting to format 6",
2461
                mode=self.file_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2462
        # its faster to move specific files around than to open and use the apis...
2463
        # first off, nuke ancestry.weave, it was never used.
2464
        try:
2465
            self.step('Removing ancestry.weave')
2466
            self.bzrdir.transport.delete('ancestry.weave')
2467
        except errors.NoSuchFile:
2468
            pass
2469
        # find out whats there
2470
        self.step('Finding branch files')
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
2471
        last_revision = self.bzrdir.open_branch().last_revision()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2472
        bzrcontents = self.bzrdir.transport.list_dir('.')
2473
        for name in bzrcontents:
2474
            if name.startswith('basis-inventory.'):
2475
                self.garbage_inventories.append(name)
2476
        # create new directories for repository, working tree and branch
2477
        repository_names = [('inventory.weave', True),
2478
                            ('revision-store', True),
2479
                            ('weaves', True)]
2480
        self.step('Upgrading repository  ')
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
2481
        self.bzrdir.transport.mkdir('repository', mode=self.dir_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2482
        self.make_lock('repository')
2483
        # we hard code the formats here because we are converting into
2484
        # the meta format. The meta format upgrader can take this to a 
2485
        # future format within each component.
2241.1.11 by Martin Pool
Get rid of RepositoryFormat*_instance objects. Instead the format
2486
        self.put_format('repository', RepositoryFormat7())
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2487
        for entry in repository_names:
2488
            self.move_entry('repository', entry)
2489
2490
        self.step('Upgrading branch      ')
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
2491
        self.bzrdir.transport.mkdir('branch', mode=self.dir_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2492
        self.make_lock('branch')
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
2493
        self.put_format('branch', BzrBranchFormat5())
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2494
        branch_files = [('revision-history', True),
2495
                        ('branch-name', True),
2496
                        ('parent', False)]
2497
        for entry in branch_files:
2498
            self.move_entry('branch', entry)
2499
2500
        checkout_files = [('pending-merges', True),
2501
                          ('inventory', True),
2502
                          ('stat-cache', False)]
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
2503
        # If a mandatory checkout file is not present, the branch does not have
2504
        # a functional checkout. Do not create a checkout in the converted
2505
        # branch.
2506
        for name, mandatory in checkout_files:
2507
            if mandatory and name not in bzrcontents:
2508
                has_checkout = False
2509
                break
2510
        else:
2511
            has_checkout = True
2512
        if not has_checkout:
2513
            self.pb.note('No working tree.')
2514
            # If some checkout files are there, we may as well get rid of them.
2515
            for name, mandatory in checkout_files:
2516
                if name in bzrcontents:
2517
                    self.bzrdir.transport.delete(name)
2518
        else:
2123.2.1 by John Arbash Meinel
Fix bug #70716, make bzrlib.bzrdir directly import bzrlib.workingtree
2519
            from bzrlib.workingtree import WorkingTreeFormat3
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
2520
            self.step('Upgrading working tree')
2521
            self.bzrdir.transport.mkdir('checkout', mode=self.dir_mode)
2522
            self.make_lock('checkout')
2523
            self.put_format(
2123.2.1 by John Arbash Meinel
Fix bug #70716, make bzrlib.bzrdir directly import bzrlib.workingtree
2524
                'checkout', WorkingTreeFormat3())
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
2525
            self.bzrdir.transport.delete_multi(
2526
                self.garbage_inventories, self.pb)
2527
            for entry in checkout_files:
2528
                self.move_entry('checkout', entry)
2529
            if last_revision is not None:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2530
                self.bzrdir.transport.put_bytes(
1959.3.1 by John Arbash Meinel
David Allouche: bzr upgrade should work if there is no working tree
2531
                    'checkout/last-revision', last_revision)
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2532
        self.bzrdir.transport.put_bytes(
2533
            'branch-format',
2534
            BzrDirMetaFormat1().get_format_string(),
2535
            mode=self.file_mode)
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
2536
        return BzrDir.open(self.bzrdir.root_transport.base)
2537
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2538
    def make_lock(self, name):
2539
        """Make a lock for the new control dir name."""
2540
        self.step('Make %s lock' % name)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
2541
        ld = lockdir.LockDir(self.bzrdir.transport,
2542
                             '%s/lock' % name,
2543
                             file_modebits=self.file_mode,
2544
                             dir_modebits=self.dir_mode)
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
2545
        ld.create()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2546
2547
    def move_entry(self, new_dir, entry):
2548
        """Move then entry name into new_dir."""
2549
        name = entry[0]
2550
        mandatory = entry[1]
2551
        self.step('Moving %s' % name)
2552
        try:
2553
            self.bzrdir.transport.move(name, '%s/%s' % (new_dir, name))
2554
        except errors.NoSuchFile:
2555
            if mandatory:
2556
                raise
2557
2558
    def put_format(self, dirname, format):
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2559
        self.bzrdir.transport.put_bytes('%s/format' % dirname,
2560
            format.get_format_string(),
2561
            self.file_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
2562
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.
2563
2564
class ConvertMetaToMeta(Converter):
2565
    """Converts the components of metadirs."""
2566
2567
    def __init__(self, target_format):
2568
        """Create a metadir to metadir converter.
2569
2570
        :param target_format: The final metadir format that is desired.
2571
        """
2572
        self.target_format = target_format
2573
2574
    def convert(self, to_convert, pb):
2575
        """See Converter.convert()."""
2576
        self.bzrdir = to_convert
2577
        self.pb = pb
2578
        self.count = 0
2579
        self.total = 1
2580
        self.step('checking repository format')
2581
        try:
2582
            repo = self.bzrdir.open_repository()
2583
        except errors.NoRepositoryPresent:
2584
            pass
2585
        else:
2586
            if not isinstance(repo._format, self.target_format.repository_format.__class__):
2587
                from bzrlib.repository import CopyConverter
2588
                self.pb.note('starting repository conversion')
2589
                converter = CopyConverter(self.target_format.repository_format)
2590
                converter.convert(repo, pb)
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2591
        try:
2592
            branch = self.bzrdir.open_branch()
2593
        except errors.NotBranchError:
2594
            pass
2595
        else:
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2596
            # TODO: conversions of Branch and Tree should be done by
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
2597
            # InterXFormat lookups/some sort of registry.
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2598
            # Avoid circular imports
2599
            from bzrlib import branch as _mod_branch
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
2600
            old = branch._format.__class__
2601
            new = self.target_format.get_branch_format().__class__
2602
            while old != new:
2603
                if (old == _mod_branch.BzrBranchFormat5 and
2604
                    new in (_mod_branch.BzrBranchFormat6,
2605
                        _mod_branch.BzrBranchFormat7)):
2606
                    branch_converter = _mod_branch.Converter5to6()
2607
                elif (old == _mod_branch.BzrBranchFormat6 and
2608
                    new == _mod_branch.BzrBranchFormat7):
2609
                    branch_converter = _mod_branch.Converter6to7()
2610
                else:
2611
                    raise errors.BadConversionTarget("No converter", new)
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2612
                branch_converter.convert(branch)
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
2613
                branch = self.bzrdir.open_branch()
2614
                old = branch._format.__class__
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2615
        try:
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2616
            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.
2617
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2618
            pass
2619
        else:
2620
            # TODO: conversions of Branch and Tree should be done by
2621
            # InterXFormat lookups
2622
            if (isinstance(tree, workingtree.WorkingTree3) and
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
2623
                not isinstance(tree, workingtree_4.DirStateWorkingTree) and
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2624
                isinstance(self.target_format.workingtree_format,
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
2625
                    workingtree_4.DirStateWorkingTreeFormat)):
2255.12.1 by Robert Collins
Implement upgrade for working trees.
2626
                workingtree_4.Converter3to4().convert(tree)
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
2627
            if (isinstance(tree, workingtree_4.DirStateWorkingTree) and
2628
                not isinstance(tree, workingtree_4.WorkingTree5) and
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
2629
                isinstance(self.target_format.workingtree_format,
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
2630
                    workingtree_4.WorkingTreeFormat5)):
2631
                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.
2632
        return to_convert
1731.2.18 by Aaron Bentley
Get extract in repository under test
2633
2634
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2635
# This is not in remote.py because it's small, and needs to be registered.
2636
# Putting it in remote.py creates a circular import problem.
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
2637
# we can make it a lazy object if the control formats is turned into something
2638
# like a registry.
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2639
class RemoteBzrDirFormat(BzrDirMetaFormat1):
2640
    """Format representing bzrdirs accessed via a smart server"""
2641
2642
    def get_format_description(self):
2643
        return 'bzr remote bzrdir'
2644
    
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
2645
    @classmethod
2646
    def probe_transport(klass, transport):
2647
        """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).
2648
        try:
3241.1.4 by Andrew Bennetts
Use get_smart_medium as suggested by Robert, and deal with the fallout.
2649
            medium = transport.get_smart_medium()
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2650
        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).
2651
                errors.TransportNotPossible, errors.NoSmartMedium,
2652
                errors.SmartProtocolError):
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
2653
            # no smart server, so not a branch for this format type.
2654
            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).
2655
        else:
3241.1.2 by Andrew Bennetts
Tidy comments.
2656
            # 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).
2657
            # 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).
2658
            if medium.should_probe():
2659
                try:
2660
                    server_version = medium.protocol_version()
2661
                except errors.SmartProtocolError:
2662
                    # Apparently there's no usable smart server there, even though
2663
                    # the medium supports the smart protocol.
2664
                    raise errors.NotBranchError(path=transport.base)
2665
                if server_version != '2':
2666
                    raise errors.NotBranchError(path=transport.base)
2018.5.28 by Robert Collins
Fix RemoteBzrDirFormat probe api usage.
2667
            return klass()
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2668
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
2669
    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.
2670
        try:
2671
            # 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.
2672
            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.
2673
        except errors.NoSmartMedium:
2674
            # TODO: lookup the local format from a server hint.
2675
            local_dir_format = BzrDirMetaFormat1()
2676
            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.
2677
        client = _SmartClient(client_medium)
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
2678
        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.
2679
        response = client.call('BzrDirFormat.initialize', path)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2680
        if response[0] != 'ok':
2681
            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 :).
2682
        return remote.RemoteBzrDir(transport)
2683
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2684
    def _open(self, transport):
2685
        return remote.RemoteBzrDir(transport)
2686
2687
    def __eq__(self, other):
2688
        if not isinstance(other, RemoteBzrDirFormat):
2689
            return False
2690
        return self.get_format_description() == other.get_format_description()
2691
3845.1.1 by John Arbash Meinel
Ensure that RepositoryFormat._matchingbzrdir.repository_format matches.
2692
    @property
2693
    def repository_format(self):
2694
        # Using a property to avoid early loading of remote
2695
        return remote.RemoteRepositoryFormat()
2696
2018.5.25 by Andrew Bennetts
Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
2697
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
2698
BzrDirFormat.register_control_server_format(RemoteBzrDirFormat)
2018.5.45 by Andrew Bennetts
Merge from bzr.dev
2699
2700
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2701
class BzrDirFormatInfo(object):
2702
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
2703
    def __init__(self, native, deprecated, hidden, experimental):
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2704
        self.deprecated = deprecated
2705
        self.native = native
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2706
        self.hidden = hidden
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
2707
        self.experimental = experimental
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2708
2709
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2710
class BzrDirFormatRegistry(registry.Registry):
2711
    """Registry of user-selectable BzrDir subformats.
2712
    
2713
    Differs from BzrDirFormat._control_formats in that it provides sub-formats,
2714
    e.g. BzrDirMeta1 with weave repository.  Also, it's more user-oriented.
2715
    """
2716
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
2717
    def __init__(self):
2718
        """Create a BzrDirFormatRegistry."""
2719
        self._aliases = set()
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2720
        self._registration_order = list()
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
2721
        super(BzrDirFormatRegistry, self).__init__()
2722
2723
    def aliases(self):
2724
        """Return a set of the format names which are aliases."""
2725
        return frozenset(self._aliases)
2726
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2727
    def register_metadir(self, key,
2728
             repository_format, help, native=True, deprecated=False,
2729
             branch_format=None,
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2730
             tree_format=None,
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
2731
             hidden=False,
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
2732
             experimental=False,
2733
             alias=False):
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2734
        """Register a metadir subformat.
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2735
2736
        These all use a BzrDirMetaFormat1 bzrdir, but can be parameterized
2737
        by the Repository format.
2738
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2739
        :param repository_format: The fully-qualified repository format class
2740
            name as a string.
2741
        :param branch_format: Fully-qualified branch format class name as
2742
            a string.
2743
        :param tree_format: Fully-qualified tree format class name as
2744
            a string.
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2745
        """
2746
        # This should be expanded to support setting WorkingTree and Branch
2747
        # formats, once BzrDirMetaFormat1 supports that.
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2748
        def _load(full_name):
2749
            mod_name, factory_name = full_name.rsplit('.', 1)
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
2750
            try:
2751
                mod = __import__(mod_name, globals(), locals(),
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2752
                        [factory_name])
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
2753
            except ImportError, e:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2754
                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.
2755
            try:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2756
                factory = getattr(mod, factory_name)
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2757
            except AttributeError:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2758
                raise AttributeError('no factory %s in module %r'
2759
                    % (full_name, mod))
2760
            return factory()
2761
2762
        def helper():
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2763
            bd = BzrDirMetaFormat1()
2230.3.1 by Aaron Bentley
Get branch6 creation working
2764
            if branch_format is not None:
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
2765
                bd.set_branch_format(_load(branch_format))
2766
            if tree_format is not None:
2767
                bd.workingtree_format = _load(tree_format)
2768
            if repository_format is not None:
2769
                bd.repository_format = _load(repository_format)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2770
            return bd
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
2771
        self.register(key, helper, help, native, deprecated, hidden,
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
2772
            experimental, alias)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2773
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2774
    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
2775
                 hidden=False, experimental=False, alias=False):
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2776
        """Register a BzrDirFormat factory.
2777
        
2778
        The factory must be a callable that takes one parameter: the key.
2779
        It must produce an instance of the BzrDirFormat when called.
2780
2781
        This function mainly exists to prevent the info object from being
2782
        supplied directly.
2783
        """
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
2784
        registry.Registry.register(self, key, factory, help,
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
2785
            BzrDirFormatInfo(native, deprecated, hidden, experimental))
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
2786
        if alias:
2787
            self._aliases.add(key)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2788
        self._registration_order.append(key)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2789
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
2790
    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
2791
        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
2792
        registry.Registry.register_lazy(self, key, module_name, member_name,
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
2793
            help, BzrDirFormatInfo(native, deprecated, hidden, experimental))
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
2794
        if alias:
2795
            self._aliases.add(key)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2796
        self._registration_order.append(key)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2797
2798
    def set_default(self, key):
2799
        """Set the 'default' key to be a clone of the supplied key.
2800
        
2801
        This method must be called once and only once.
2802
        """
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
2803
        registry.Registry.register(self, 'default', self.get(key),
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2804
            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
2805
        self._aliases.add('default')
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2806
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
2807
    def set_default_repository(self, key):
2808
        """Set the FormatRegistry default and Repository default.
2809
        
2810
        This is a transitional method while Repository.set_default_format
2811
        is deprecated.
2812
        """
2813
        if 'default' in self:
2814
            self.remove('default')
2815
        self.set_default(key)
2816
        format = self.get('default')()
2817
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2818
    def make_bzrdir(self, key):
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
2819
        return self.get(key)()
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2820
2821
    def help_topic(self, topic):
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2822
        output = ""
2711.2.4 by Martin Pool
Fix unbound variable error in BzrDirFormatRegistry.get_help (test order dependent)
2823
        default_realkey = None
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2824
        default_help = self.get_help('default')
2825
        help_pairs = []
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2826
        for key in self._registration_order:
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2827
            if key == 'default':
2828
                continue
2829
            help = self.get_help(key)
2830
            if help == default_help:
2831
                default_realkey = key
2832
            else:
2833
                help_pairs.append((key, help))
2834
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2835
        def wrapped(key, help, info):
2836
            if info.native:
2837
                help = '(native) ' + help
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2838
            return ':%s:\n%s\n\n' % (key, 
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2839
                    textwrap.fill(help, initial_indent='    ', 
2840
                    subsequent_indent='    '))
2711.2.4 by Martin Pool
Fix unbound variable error in BzrDirFormatRegistry.get_help (test order dependent)
2841
        if default_realkey is not None:
2842
            output += wrapped(default_realkey, '(default) %s' % default_help,
2843
                              self.get_info('default'))
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2844
        deprecated_pairs = []
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
2845
        experimental_pairs = []
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2846
        for key, help in help_pairs:
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2847
            info = self.get_info(key)
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
2848
            if info.hidden:
2849
                continue
2850
            elif info.deprecated:
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2851
                deprecated_pairs.append((key, help))
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
2852
            elif info.experimental:
2853
                experimental_pairs.append((key, help))
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2854
            else:
2855
                output += wrapped(key, help, info)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2856
        output += "\nSee ``bzr help formats`` for more about storage formats."
2857
        other_output = ""
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
2858
        if len(experimental_pairs) > 0:
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2859
            other_output += "Experimental formats are shown below.\n\n"
2939.2.2 by Ian Clatworthy
allow bzrdir formats to be registered as experimental
2860
            for key, help in experimental_pairs:
2861
                info = self.get_info(key)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2862
                other_output += wrapped(key, help, info)
2863
        else:
2864
            other_output += \
2865
                "No experimental formats are available.\n\n"
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2866
        if len(deprecated_pairs) > 0:
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2867
            other_output += "\nDeprecated formats are shown below.\n\n"
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2868
            for key, help in deprecated_pairs:
2869
                info = self.get_info(key)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2870
                other_output += wrapped(key, help, info)
2871
        else:
2872
            other_output += \
2873
                "\nNo deprecated formats are available.\n\n"
2874
        other_output += \
2875
            "\nSee ``bzr help formats`` for more about storage formats."
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
2876
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
2877
        if topic == 'other-formats':
2878
            return other_output
2879
        else:
2880
            return output
2204.4.1 by Aaron Bentley
Add 'formats' help topic
2881
2882
3242.2.14 by Aaron Bentley
Update from review comments
2883
class RepositoryAcquisitionPolicy(object):
2884
    """Abstract base class for repository acquisition policies.
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
2885
3242.2.14 by Aaron Bentley
Update from review comments
2886
    A repository acquisition policy decides how a BzrDir acquires a repository
2887
    for a branch that is being created.  The most basic policy decision is
2888
    whether to create a new repository or use an existing one.
2889
    """
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2890
    def __init__(self, stack_on, stack_on_pwd, require_stacking):
3242.3.35 by Aaron Bentley
Cleanups and documentation
2891
        """Constructor.
2892
2893
        :param stack_on: A location to stack on
2894
        :param stack_on_pwd: If stack_on is relative, the location it is
2895
            relative to.
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2896
        :param require_stacking: If True, it is a failure to not stack.
3242.3.35 by Aaron Bentley
Cleanups and documentation
2897
        """
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
2898
        self._stack_on = stack_on
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
2899
        self._stack_on_pwd = stack_on_pwd
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2900
        self._require_stacking = require_stacking
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
2901
2902
    def configure_branch(self, branch):
3242.2.13 by Aaron Bentley
Update docs
2903
        """Apply any configuration data from this policy to the branch.
2904
3242.3.18 by Aaron Bentley
Clean up repository-policy work
2905
        Default implementation sets repository stacking.
3242.2.13 by Aaron Bentley
Update docs
2906
        """
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
2907
        if self._stack_on is None:
2908
            return
2909
        if self._stack_on_pwd is None:
2910
            stack_on = self._stack_on
2911
        else:
2912
            try:
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
2913
                stack_on = urlutils.rebase_url(self._stack_on,
2914
                    self._stack_on_pwd,
2915
                    branch.bzrdir.root_transport.base)
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
2916
            except errors.InvalidRebaseURLs:
2917
                stack_on = self._get_full_stack_on()
3242.3.37 by Aaron Bentley
Updates from reviews
2918
        try:
3537.3.5 by Martin Pool
merge trunk including stacking policy
2919
            branch.set_stacked_on_url(stack_on)
3242.3.37 by Aaron Bentley
Updates from reviews
2920
        except errors.UnstackableBranchFormat:
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2921
            if self._require_stacking:
2922
                raise
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
2923
2924
    def _get_full_stack_on(self):
3242.3.35 by Aaron Bentley
Cleanups and documentation
2925
        """Get a fully-qualified URL for the stack_on location."""
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
2926
        if self._stack_on is None:
2927
            return None
2928
        if self._stack_on_pwd is None:
2929
            return self._stack_on
2930
        else:
2931
            return urlutils.join(self._stack_on_pwd, self._stack_on)
3242.3.7 by Aaron Bentley
Delegate stacking to configure_branch
2932
3928.3.2 by John Arbash Meinel
Track down the other cause of us connecting multiple times.
2933
    def _add_fallback(self, repository, possible_transports=None):
3242.3.35 by Aaron Bentley
Cleanups and documentation
2934
        """Add a fallback to the supplied repository, if stacking is set."""
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
2935
        stack_on = self._get_full_stack_on()
2936
        if stack_on is None:
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
2937
            return
3928.3.2 by John Arbash Meinel
Track down the other cause of us connecting multiple times.
2938
        stacked_dir = BzrDir.open(stack_on,
2939
                                  possible_transports=possible_transports)
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
2940
        try:
2941
            stacked_repo = stacked_dir.open_branch().repository
2942
        except errors.NotBranchError:
2943
            stacked_repo = stacked_dir.open_repository()
3242.3.37 by Aaron Bentley
Updates from reviews
2944
        try:
2945
            repository.add_fallback_repository(stacked_repo)
2946
        except errors.UnstackableRepositoryFormat:
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2947
            if self._require_stacking:
2948
                raise
3904.3.1 by Andrew Bennetts
Probable fix for GaryvdM's bug when pushing a stacked qbzr branch to Launchpad.
2949
        else:
2950
            self._require_stacking = True
3242.3.30 by Aaron Bentley
Handle adding fallback repositories in acquire_repository
2951
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
2952
    def acquire_repository(self, make_working_trees=None, shared=False):
3242.2.14 by Aaron Bentley
Update from review comments
2953
        """Acquire a repository for this bzrdir.
2954
2955
        Implementations may create a new repository or use a pre-exising
2956
        repository.
2957
        :param make_working_trees: If creating a repository, set
2958
            make_working_trees to this value (if non-None)
2959
        :param shared: If creating a repository, make it shared if True
2960
        :return: A repository
2961
        """
2962
        raise NotImplemented(RepositoryAcquisitionPolicy.acquire_repository)
2963
2964
2965
class CreateRepository(RepositoryAcquisitionPolicy):
3242.2.13 by Aaron Bentley
Update docs
2966
    """A policy of creating a new repository"""
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
2967
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2968
    def __init__(self, bzrdir, stack_on=None, stack_on_pwd=None,
2969
                 require_stacking=False):
3242.3.35 by Aaron Bentley
Cleanups and documentation
2970
        """
2971
        Constructor.
2972
        :param bzrdir: The bzrdir to create the repository on.
2973
        :param stack_on: A location to stack on
2974
        :param stack_on_pwd: If stack_on is relative, the location it is
2975
            relative to.
2976
        """
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2977
        RepositoryAcquisitionPolicy.__init__(self, stack_on, stack_on_pwd,
2978
                                             require_stacking)
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
2979
        self._bzrdir = bzrdir
2980
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
2981
    def acquire_repository(self, make_working_trees=None, shared=False):
3242.2.14 by Aaron Bentley
Update from review comments
2982
        """Implementation of RepositoryAcquisitionPolicy.acquire_repository
3242.2.13 by Aaron Bentley
Update docs
2983
3242.2.14 by Aaron Bentley
Update from review comments
2984
        Creates the desired repository in the bzrdir we already have.
3242.2.13 by Aaron Bentley
Update docs
2985
        """
3650.3.9 by Aaron Bentley
Move responsibility for stackable repo format to _get_metadir
2986
        repository = self._bzrdir.create_repository(shared=shared)
3928.3.2 by John Arbash Meinel
Track down the other cause of us connecting multiple times.
2987
        self._add_fallback(repository,
2988
                           possible_transports=[self._bzrdir.transport])
3242.2.4 by Aaron Bentley
Only set working tree policty when specified
2989
        if make_working_trees is not None:
3242.3.6 by Aaron Bentley
Work around strange test failure
2990
            repository.set_make_working_trees(make_working_trees)
3242.3.5 by Aaron Bentley
Implement stacking for clone_on_transport
2991
        return repository
3242.2.2 by Aaron Bentley
Merge policy updates from stacked-policy thread
2992
2993
3242.2.14 by Aaron Bentley
Update from review comments
2994
class UseExistingRepository(RepositoryAcquisitionPolicy):
3242.2.13 by Aaron Bentley
Update docs
2995
    """A policy of reusing an existing repository"""
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
2996
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
2997
    def __init__(self, repository, stack_on=None, stack_on_pwd=None,
2998
                 require_stacking=False):
3242.3.35 by Aaron Bentley
Cleanups and documentation
2999
        """Constructor.
3000
3001
        :param repository: The repository to use.
3002
        :param stack_on: A location to stack on
3003
        :param stack_on_pwd: If stack_on is relative, the location it is
3004
            relative to.
3005
        """
3242.3.40 by Aaron Bentley
Turn failing test into KnownFailure
3006
        RepositoryAcquisitionPolicy.__init__(self, stack_on, stack_on_pwd,
3007
                                             require_stacking)
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
3008
        self._repository = repository
3009
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
3010
    def acquire_repository(self, make_working_trees=None, shared=False):
3242.2.14 by Aaron Bentley
Update from review comments
3011
        """Implementation of RepositoryAcquisitionPolicy.acquire_repository
3242.2.13 by Aaron Bentley
Update docs
3012
3013
        Returns an existing repository to use
3014
        """
3928.3.2 by John Arbash Meinel
Track down the other cause of us connecting multiple times.
3015
        self._add_fallback(self._repository,
3016
                       possible_transports=[self._repository.bzrdir.transport])
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
3017
        return self._repository
3018
3019
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3020
# Please register new formats after old formats so that formats
3021
# appear in chronological order and format descriptions can build
3022
# on previous ones.
2204.4.1 by Aaron Bentley
Add 'formats' help topic
3023
format_registry = BzrDirFormatRegistry()
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
3024
format_registry.register('weave', BzrDirFormat6,
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3025
    '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
3026
    ' support checkouts or shared repositories.',
3027
    deprecated=True)
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
3028
format_registry.register_metadir('metaweave',
3029
    'bzrlib.repofmt.weaverepo.RepositoryFormat7',
2230.3.30 by Aaron Bentley
Fix whitespace issues
3030
    'Transitional format in 0.8.  Slower than knit.',
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3031
    branch_format='bzrlib.branch.BzrBranchFormat5',
2255.2.209 by Robert Collins
Remove circular imports in bzrdir format definitions.
3032
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
3033
    deprecated=True)
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3034
format_registry.register_metadir('knit',
3035
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3036
    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
3037
    branch_format='bzrlib.branch.BzrBranchFormat5',
3038
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
3039
    deprecated=True)
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3040
format_registry.register_metadir('dirstate',
3041
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3042
    help='New in 0.15: Fast local operations. Compatible with bzr 0.8 and '
3043
        'above when accessed over the network.',
3044
    branch_format='bzrlib.branch.BzrBranchFormat5',
2255.2.209 by Robert Collins
Remove circular imports in bzrdir format definitions.
3045
    # this uses bzrlib.workingtree.WorkingTreeFormat4 because importing
3046
    # directly from workingtree_4 triggers a circular import.
3047
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3892.1.1 by Ian Clatworthy
improve help on storage formats
3048
    deprecated=True)
1551.13.1 by Aaron Bentley
Introduce dirstate-tags format
3049
format_registry.register_metadir('dirstate-tags',
3050
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3051
    help='New in 0.15: Fast local operations and improved scaling for '
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
3052
        'network operations. Additionally adds support for tags.'
3053
        ' Incompatible with bzr < 0.15.',
1551.13.1 by Aaron Bentley
Introduce dirstate-tags format
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)
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
3057
format_registry.register_metadir('rich-root',
3058
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit4',
3059
    help='New in 1.0.  Better handling of tree roots.  Incompatible with'
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3060
        ' bzr < 1.0.',
2996.2.1 by Aaron Bentley
Add KnitRepositoryFormat4
3061
    branch_format='bzrlib.branch.BzrBranchFormat6',
3062
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3892.1.1 by Ian Clatworthy
improve help on storage formats
3063
    deprecated=True)
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3064
format_registry.register_metadir('dirstate-with-subtree',
3065
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
3066
    help='New in 0.15: Fast local operations and improved scaling for '
3067
        'network operations. Additionally adds support for versioning nested '
3068
        'bzr branches. Incompatible with bzr < 0.15.',
3069
    branch_format='bzrlib.branch.BzrBranchFormat6',
2255.2.209 by Robert Collins
Remove circular imports in bzrdir format definitions.
3070
    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.
3071
    experimental=True,
3170.4.4 by Adeodato Simó
Keep the hidden flag for subtree formats after review from Aaron.
3072
    hidden=True,
2255.12.1 by Robert Collins
Implement upgrade for working trees.
3073
    )
3010.3.2 by Martin Pool
Rename pack0.92 to pack-0.92
3074
format_registry.register_metadir('pack-0.92',
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
3075
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack1',
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
3076
    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
3077
        'dirstate-tags format repositories. Interoperates with '
3078
        '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)
3079
        'Previously called knitpack-experimental.  '
3080
        'For more information, see '
3081
        'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
2592.3.22 by Robert Collins
Add new experimental repository formats.
3082
    branch_format='bzrlib.branch.BzrBranchFormat6',
3083
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3084
    )
3010.3.2 by Martin Pool
Rename pack0.92 to pack-0.92
3085
format_registry.register_metadir('pack-0.92-subtree',
2592.3.224 by Martin Pool
Rename GraphKnitRepository etc to KnitPackRepository
3086
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack3',
2939.2.1 by Ian Clatworthy
use 'knitpack' naming instead of 'experimental' for pack formats
3087
    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
3088
        'dirstate-with-subtree format repositories. Interoperates with '
3089
        '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)
3090
        'Previously called knitpack-experimental.  '
3091
        'For more information, see '
3092
        'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
2592.3.22 by Robert Collins
Add new experimental repository formats.
3093
    branch_format='bzrlib.branch.BzrBranchFormat6',
3094
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3190.1.2 by Aaron Bentley
Undo spurious change
3095
    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.
3096
    experimental=True,
2592.3.22 by Robert Collins
Add new experimental repository formats.
3097
    )
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
3098
format_registry.register_metadir('rich-root-pack',
3099
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack4',
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3100
    help='New in 1.0: A variant of pack-0.92 that supports rich-root data '
3101
         '(needed for bzr-svn).',
2996.2.11 by Aaron Bentley
Implement rich-root-pack format ( #164639)
3102
    branch_format='bzrlib.branch.BzrBranchFormat6',
3103
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3104
    )
3575.2.1 by Martin Pool
Rename stacked format to 1.6
3105
format_registry.register_metadir('1.6',
3549.1.5 by Martin Pool
Add stable format names for stacked branches
3106
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5',
3892.1.6 by Ian Clatworthy
include feedback from poolie
3107
    help='A format that allows a branch to indicate that there is another '
3108
         '(stacked) repository that should be used to access data that is '
3109
         'not present locally.',
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
    )
3606.10.2 by John Arbash Meinel
Name the new format 1.6.1-rich-root, and NEWS for fixing bug #262333
3113
format_registry.register_metadir('1.6.1-rich-root',
3549.1.6 by Martin Pool
Change stacked-subtree to stacked-rich-root
3114
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5RichRoot',
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3115
    help='A variant of 1.6 that supports rich-root data '
3116
         '(needed for bzr-svn).',
3549.1.5 by Martin Pool
Add stable format names for stacked branches
3117
    branch_format='bzrlib.branch.BzrBranchFormat7',
3118
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3119
    )
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
3120
format_registry.register_metadir('1.9',
3121
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3892.1.6 by Ian Clatworthy
include feedback from poolie
3122
    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
3123
         'are smaller in size, have smarter caching and provide faster '
3124
         'performance for most operations.',
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
    )
3128
format_registry.register_metadir('1.9-rich-root',
3129
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
3892.1.2 by Ian Clatworthy
split formats topic into multiple topics
3130
    help='A variant of 1.9 that supports rich-root data '
3131
         '(needed for bzr-svn).',
3805.3.1 by John Arbash Meinel
Add repository 1.9 format, and update the documentation.
3132
    branch_format='bzrlib.branch.BzrBranchFormat7',
3133
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3134
    )
3986.2.1 by Ian Clatworthy
rename 1.12-preview formats as development-wt5 formats
3135
format_registry.register_metadir('development-wt5',
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
3136
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3137
    help='A working-tree format that supports views and content filtering.',
3138
    branch_format='bzrlib.branch.BzrBranchFormat7',
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
3139
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
3140
    experimental=True,
3141
    )
3986.2.1 by Ian Clatworthy
rename 1.12-preview formats as development-wt5 formats
3142
format_registry.register_metadir('development-wt5-rich-root',
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
3143
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
3986.2.1 by Ian Clatworthy
rename 1.12-preview formats as development-wt5 formats
3144
    help='A variant of development-wt5 that supports rich-root data '
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
3145
         '(needed for bzr-svn).',
3146
    branch_format='bzrlib.branch.BzrBranchFormat7',
3907.2.3 by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced
3147
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
3148
    experimental=True,
3149
    )
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3150
# 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
3151
format_registry.register_metadir('development',
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
3152
    'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment2',
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3153
    help='Current development format. Can convert data to and from pack-0.92 '
3154
        '(and anything compatible with pack-0.92) format repositories. '
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3155
        '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
3156
        'Please read '
3157
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
3158
        'before use.',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3159
    branch_format='bzrlib.branch.BzrBranchFormat7',
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3160
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3161
    experimental=True,
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3162
    alias=True,
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3163
    )
3164
format_registry.register_metadir('development-subtree',
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
3165
    'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment2Subtree',
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3166
    help='Current development format, subtree variant. Can convert data to and '
3221.11.7 by Robert Collins
Merge in real stacked repository work.
3167
        'from pack-0.92-subtree (and anything compatible with '
3168
        'pack-0.92-subtree) format repositories. Repositories and branches in '
3169
        '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
3170
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
3171
        'before use.',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3172
    branch_format='bzrlib.branch.BzrBranchFormat7',
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3173
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3174
    experimental=True,
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
3175
    alias=True,
3152.2.1 by Robert Collins
* A new repository format 'development' has been added. This format will
3176
    )
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
3177
# And the development formats above will have aliased one of the following:
3178
format_registry.register_metadir('development2',
3179
    'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment2',
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
3180
    help='1.6.1 with B+Tree based index. '
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
3181
        'Please read '
3182
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
3183
        'before use.',
3184
    branch_format='bzrlib.branch.BzrBranchFormat7',
3185
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3186
    hidden=True,
3187
    experimental=True,
3188
    )
3189
format_registry.register_metadir('development2-subtree',
3190
    'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment2Subtree',
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
3191
    help='1.6.1-subtree with B+Tree based index. '
3735.1.1 by Robert Collins
Add development2 formats using BTree indices.
3192
        'Please read '
3193
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
3194
        'before use.',
3195
    branch_format='bzrlib.branch.BzrBranchFormat7',
3196
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3197
    hidden=True,
3198
    experimental=True,
3199
    )
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3200
# The current format that is made on 'bzr init'.
3044.1.3 by Martin Pool
Set the default format to pack-0.92
3201
format_registry.set_default('pack-0.92')