/brz/remove-bazaar

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