/brz/remove-bazaar

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