/brz/remove-bazaar

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