/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1553.5.48 by Martin Pool
Fix some LockableFiles deprecation warnings
1
# Copyright (C) 2005, 2006 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1534.4.39 by Robert Collins
Basic BzrDir support.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1534.4.39 by Robert Collins
Basic BzrDir support.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1534.4.39 by Robert Collins
Basic BzrDir support.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""BzrDir logic. The BzrDir is the basic control directory used by bzr.
18
19
At format 7 this was split out into Branch, Repository and Checkout control
20
directories.
21
"""
22
1773.4.3 by Martin Pool
[merge] bzr.dev
23
# TODO: remove unittest dependency; put that stuff inside the test suite
24
1534.4.39 by Robert Collins
Basic BzrDir support.
25
from copy import deepcopy
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
26
from cStringIO import StringIO
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
27
import os
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
28
from stat import S_ISDIR
1534.4.39 by Robert Collins
Basic BzrDir support.
29
from unittest import TestSuite
30
31
import bzrlib
32
import bzrlib.errors as errors
1553.5.48 by Martin Pool
Fix some LockableFiles deprecation warnings
33
from bzrlib.lockable_files import LockableFiles, TransportLock
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
34
from bzrlib.lockdir import LockDir
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
35
from bzrlib.osutils import (
36
                            abspath,
37
                            pathjoin,
38
                            safe_unicode,
39
                            sha_strings,
40
                            sha_string,
41
                            )
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
42
from bzrlib.store.revision.text import TextRevisionStore
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
43
from bzrlib.store.text import TextStore
1563.2.25 by Robert Collins
Merge in upstream.
44
from bzrlib.store.versioned import WeaveStore
1534.4.39 by Robert Collins
Basic BzrDir support.
45
from bzrlib.trace import mutter
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
46
from bzrlib.transactions import WriteTransaction
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
47
from bzrlib.transport import get_transport
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
48
from bzrlib.transport.local import LocalTransport
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
49
import bzrlib.urlutils as urlutils
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
50
from bzrlib.weave import Weave
51
from bzrlib.xml4 import serializer_v4
1732.1.26 by John Arbash Meinel
Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want
52
import bzrlib.xml5
1534.4.39 by Robert Collins
Basic BzrDir support.
53
54
55
class BzrDir(object):
56
    """A .bzr control diretory.
57
    
58
    BzrDir instances let you create or open any of the things that can be
59
    found within .bzr - checkouts, branches and repositories.
60
    
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
61
    transport
62
        the transport which this bzr dir is rooted at (i.e. file:///.../.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.
63
    root_transport
64
        a transport connected to the directory this bzr was opened from.
1534.4.39 by Robert Collins
Basic BzrDir support.
65
    """
66
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
67
    def break_lock(self):
68
        """Invoke break_lock on the first object in the bzrdir.
69
70
        If there is a tree, the tree is opened and break_lock() called.
71
        Otherwise, branch is tried, and finally repository.
72
        """
73
        try:
74
            thing_to_unlock = self.open_workingtree()
75
        except (errors.NotLocalUrl, errors.NoWorkingTree):
76
            try:
77
                thing_to_unlock = self.open_branch()
78
            except errors.NotBranchError:
79
                try:
80
                    thing_to_unlock = self.open_repository()
81
                except errors.NoRepositoryPresent:
82
                    return
83
        thing_to_unlock.break_lock()
84
1534.5.16 by Robert Collins
Review feedback.
85
    def can_convert_format(self):
86
        """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.
87
        return True
88
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
89
    @staticmethod
90
    def _check_supported(format, allow_unsupported):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
91
        """Check whether format is a supported format.
92
93
        If allow_unsupported is True, this is a no-op.
94
        """
95
        if not allow_unsupported and not format.is_supported():
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
96
            # see open_downlevel to open legacy branches.
1740.5.6 by Martin Pool
Clean up many exception classes.
97
            raise errors.UnsupportedFormatError(format=format)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
98
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.
99
    def clone(self, url, revision_id=None, basis=None, force_new_repo=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
100
        """Clone this bzrdir and its contents to url verbatim.
101
102
        If urls last component does not exist, it will be created.
103
104
        if revision_id is not None, then the clone operation may tune
105
            itself to download less data.
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
106
        :param force_new_repo: Do not use a shared repository for the target 
107
                               even if one is available.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
108
        """
109
        self._make_tail(url)
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.
110
        basis_repo, basis_branch, basis_tree = self._get_basis_components(basis)
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.
111
        result = self._format.initialize(url)
112
        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.
113
            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.
114
        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.
115
            local_repo = None
116
        if local_repo:
117
            # may need to copy content in
118
            if force_new_repo:
1707.1.1 by Robert Collins
Bugfixes to bzrdir.sprout and clone. Sprout was failing to reset the
119
                result_repo = local_repo.clone(
120
                    result,
121
                    revision_id=revision_id,
122
                    basis=basis_repo)
123
                result_repo.set_make_working_trees(local_repo.make_working_trees())
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.
124
            else:
125
                try:
126
                    result_repo = result.find_repository()
127
                    # fetch content this dir needs.
128
                    if basis_repo:
129
                        # XXX FIXME RBC 20060214 need tests for this when the basis
130
                        # is incomplete
131
                        result_repo.fetch(basis_repo, revision_id=revision_id)
132
                    result_repo.fetch(local_repo, revision_id=revision_id)
133
                except errors.NoRepositoryPresent:
134
                    # needed to make one anyway.
1707.1.1 by Robert Collins
Bugfixes to bzrdir.sprout and clone. Sprout was failing to reset the
135
                    result_repo = local_repo.clone(
136
                        result,
137
                        revision_id=revision_id,
138
                        basis=basis_repo)
139
                    result_repo.set_make_working_trees(local_repo.make_working_trees())
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.
140
        # 1 if there is a branch present
141
        #   make sure its content is available in the target repository
142
        #   clone it.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
143
        try:
144
            self.open_branch().clone(result, revision_id=revision_id)
145
        except errors.NotBranchError:
146
            pass
147
        try:
148
            self.open_workingtree().clone(result, basis=basis_tree)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
149
        except (errors.NoWorkingTree, errors.NotLocalUrl):
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.
150
            pass
151
        return result
152
153
    def _get_basis_components(self, basis):
154
        """Retrieve the basis components that are available at basis."""
155
        if basis is None:
156
            return None, None, None
157
        try:
158
            basis_tree = basis.open_workingtree()
159
            basis_branch = basis_tree.branch
160
            basis_repo = basis_branch.repository
161
        except (errors.NoWorkingTree, errors.NotLocalUrl):
162
            basis_tree = None
163
            try:
164
                basis_branch = basis.open_branch()
165
                basis_repo = basis_branch.repository
166
            except errors.NotBranchError:
167
                basis_branch = None
168
                try:
169
                    basis_repo = basis.open_repository()
170
                except errors.NoRepositoryPresent:
171
                    basis_repo = None
172
        return basis_repo, basis_branch, basis_tree
173
1685.1.61 by Martin Pool
[broken] Change BzrDir._make_tail to use urlutils.split
174
    # TODO: This should be given a Transport, and should chdir up; otherwise
175
    # 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.
176
    def _make_tail(self, url):
1685.1.61 by Martin Pool
[broken] Change BzrDir._make_tail to use urlutils.split
177
        head, tail = urlutils.split(url)
178
        if tail and tail != '.':
179
            t = bzrlib.transport.get_transport(head)
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.
180
            try:
1685.1.61 by Martin Pool
[broken] Change BzrDir._make_tail to use urlutils.split
181
                t.mkdir(tail)
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.
182
            except errors.FileExists:
183
                pass
184
1685.1.63 by Martin Pool
Small Transport fixups
185
    # TODO: Should take a Transport
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
186
    @classmethod
187
    def create(cls, base):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
188
        """Create a new BzrDir at the url 'base'.
1534.4.39 by Robert Collins
Basic BzrDir support.
189
        
190
        This will call the current default formats initialize with base
191
        as the only parameter.
192
193
        If you need a specific format, consider creating an instance
194
        of that and calling initialize().
195
        """
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
196
        if cls is not BzrDir:
197
            raise AssertionError("BzrDir.create always creates the default format, "
198
                    "not one of %r" % cls)
1685.1.62 by Martin Pool
[broken] Change BzrDir.create to use urlutils.split
199
        head, tail = urlutils.split(base)
200
        if tail and tail != '.':
201
            t = bzrlib.transport.get_transport(head)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
202
            try:
1685.1.62 by Martin Pool
[broken] Change BzrDir.create to use urlutils.split
203
                t.mkdir(tail)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
204
            except errors.FileExists:
205
                pass
1534.4.39 by Robert Collins
Basic BzrDir support.
206
        return BzrDirFormat.get_default_format().initialize(safe_unicode(base))
207
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
208
    def create_branch(self):
209
        """Create a branch in this BzrDir.
210
211
        The bzrdirs format will control what branch format is created.
212
        For more control see BranchFormatXX.create(a_bzrdir).
213
        """
214
        raise NotImplementedError(self.create_branch)
215
216
    @staticmethod
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.
217
    def create_branch_and_repo(base, force_new_repo=False):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
218
        """Create a new BzrDir, Branch and Repository at the url 'base'.
219
220
        This will use the current default BzrDirFormat, and use whatever 
221
        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.
222
        create_repository. If a shared repository is available that is used
223
        preferentially.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
224
225
        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.
226
227
        :param base: The URL to create the branch at.
228
        :param force_new_repo: If True a new repository is always created.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
229
        """
230
        bzrdir = BzrDir.create(base)
1534.6.11 by Robert Collins
Review feedback.
231
        bzrdir._find_or_create_repository(force_new_repo)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
232
        return bzrdir.create_branch()
1534.6.11 by Robert Collins
Review feedback.
233
234
    def _find_or_create_repository(self, force_new_repo):
235
        """Create a new repository if needed, returning the repository."""
236
        if force_new_repo:
237
            return self.create_repository()
238
        try:
239
            return self.find_repository()
240
        except errors.NoRepositoryPresent:
241
            return self.create_repository()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
242
        
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
243
    @staticmethod
1558.5.3 by Aaron Bentley
Init command can produce sharing branches
244
    def create_branch_convenience(base, force_new_repo=False,
245
                                  force_new_tree=None, format=None):
1534.6.10 by Robert Collins
Finish use of repositories support.
246
        """Create a new BzrDir, Branch and Repository at the url 'base'.
247
248
        This is a convenience function - it will use an existing repository
249
        if possible, can be told explicitly whether to create a working tree or
1534.6.12 by Robert Collins
Typo found by John Meinel.
250
        not.
1534.6.10 by Robert Collins
Finish use of repositories support.
251
252
        This will use the current default BzrDirFormat, and use whatever 
253
        repository format that that uses via bzrdir.create_branch and
254
        create_repository. If a shared repository is available that is used
255
        preferentially. Whatever repository is used, its tree creation policy
256
        is followed.
257
258
        The created Branch object is returned.
259
        If a working tree cannot be made due to base not being a file:// url,
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
260
        no error is raised unless force_new_tree is True, in which case no 
261
        data is created on disk and NotLocalUrl is raised.
1534.6.10 by Robert Collins
Finish use of repositories support.
262
263
        :param base: The URL to create the branch at.
264
        :param force_new_repo: If True a new repository is always created.
265
        :param force_new_tree: If True or False force creation of a tree or 
266
                               prevent such creation respectively.
1558.5.3 by Aaron Bentley
Init command can produce sharing branches
267
        :param format: Override for the for the bzrdir format to create
1534.6.10 by Robert Collins
Finish use of repositories support.
268
        """
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.
269
        if force_new_tree:
270
            # check for non local urls
271
            t = get_transport(safe_unicode(base))
272
            if not isinstance(t, LocalTransport):
273
                raise errors.NotLocalUrl(base)
1558.5.3 by Aaron Bentley
Init command can produce sharing branches
274
        if format is None:
275
            bzrdir = BzrDir.create(base)
276
        else:
277
            bzrdir = format.initialize(base)
1534.6.11 by Robert Collins
Review feedback.
278
        repo = bzrdir._find_or_create_repository(force_new_repo)
1534.6.10 by Robert Collins
Finish use of repositories support.
279
        result = bzrdir.create_branch()
280
        if force_new_tree or (repo.make_working_trees() and 
281
                              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.
282
            try:
283
                bzrdir.create_workingtree()
284
            except errors.NotLocalUrl:
285
                pass
1534.6.10 by Robert Collins
Finish use of repositories support.
286
        return result
287
        
288
    @staticmethod
1534.6.1 by Robert Collins
allow API creation of shared repositories
289
    def create_repository(base, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
290
        """Create a new BzrDir and Repository at the url 'base'.
291
292
        This will use the current default BzrDirFormat, and use whatever 
293
        repository format that that uses for bzrdirformat.create_repository.
294
1534.6.1 by Robert Collins
allow API creation of shared repositories
295
        ;param shared: Create a shared repository rather than a standalone
296
                       repository.
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
297
        The Repository object is returned.
298
299
        This must be overridden as an instance method in child classes, where
300
        it should take no parameters and construct whatever repository format
301
        that child class desires.
302
        """
303
        bzrdir = BzrDir.create(base)
1841.2.1 by Jelmer Vernooij
Fix handling of `shared' parameter in BzrDir.create_repository().
304
        return bzrdir.create_repository(shared)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
305
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
306
    @staticmethod
307
    def create_standalone_workingtree(base):
308
        """Create a new BzrDir, WorkingTree, Branch and Repository at 'base'.
309
310
        'base' must be a local path or a file:// url.
311
312
        This will use the current default BzrDirFormat, and use whatever 
313
        repository format that that uses for bzrdirformat.create_workingtree,
314
        create_branch and create_repository.
315
316
        The WorkingTree object is returned.
317
        """
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
318
        t = get_transport(safe_unicode(base))
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
319
        if not isinstance(t, LocalTransport):
320
            raise errors.NotLocalUrl(base)
1534.6.10 by Robert Collins
Finish use of repositories support.
321
        bzrdir = BzrDir.create_branch_and_repo(safe_unicode(base),
322
                                               force_new_repo=True).bzrdir
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
323
        return bzrdir.create_workingtree()
324
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
325
    def create_workingtree(self, revision_id=None):
326
        """Create a working tree at this BzrDir.
327
        
328
        revision_id: create it as of this revision id.
329
        """
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
330
        raise NotImplementedError(self.create_workingtree)
331
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.
332
    def find_repository(self):
333
        """Find the repository that should be used for a_bzrdir.
334
335
        This does not require a branch as we use it to find the repo for
336
        new branches as well as to hook existing branches up to their
337
        repository.
338
        """
339
        try:
340
            return self.open_repository()
341
        except errors.NoRepositoryPresent:
342
            pass
343
        next_transport = self.root_transport.clone('..')
344
        while True:
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
345
            # find the next containing bzrdir
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.
346
            try:
1534.6.11 by Robert Collins
Review feedback.
347
                found_bzrdir = BzrDir.open_containing_from_transport(
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.
348
                    next_transport)[0]
349
            except errors.NotBranchError:
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
350
                # none found
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.
351
                raise errors.NoRepositoryPresent(self)
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
352
            # 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.
353
            try:
354
                repository = found_bzrdir.open_repository()
355
            except errors.NoRepositoryPresent:
356
                next_transport = found_bzrdir.root_transport.clone('..')
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
357
                if (found_bzrdir.root_transport.base == next_transport.base):
358
                    # top of the file system
359
                    break
360
                else:
361
                    continue
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.
362
            if ((found_bzrdir.root_transport.base == 
363
                 self.root_transport.base) or repository.is_shared()):
364
                return repository
365
            else:
366
                raise errors.NoRepositoryPresent(self)
367
        raise errors.NoRepositoryPresent(self)
368
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
369
    def get_branch_transport(self, branch_format):
370
        """Get the transport for use by branch format in this BzrDir.
371
372
        Note that bzr dirs that do not support format strings will raise
373
        IncompatibleFormat if the branch format they are given has
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
374
        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.
375
376
        If branch_format is None, the transport is returned with no 
377
        checking. if it is not None, then the returned transport is
378
        guaranteed to point to an existing directory ready for use.
379
        """
380
        raise NotImplementedError(self.get_branch_transport)
381
        
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
382
    def get_repository_transport(self, repository_format):
383
        """Get the transport for use by repository format in this BzrDir.
384
385
        Note that bzr dirs that do not support format strings will raise
386
        IncompatibleFormat if the repository format they are given has
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
387
        a format string, and vice versa.
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
388
389
        If repository_format is None, the transport is returned with no 
390
        checking. if it is not None, then the returned transport is
391
        guaranteed to point to an existing directory ready for use.
392
        """
393
        raise NotImplementedError(self.get_repository_transport)
394
        
1534.4.53 by Robert Collins
Review feedback from John Meinel.
395
    def get_workingtree_transport(self, tree_format):
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
396
        """Get the transport for use by workingtree format in this BzrDir.
397
398
        Note that bzr dirs that do not support format strings will raise
399
        IncompatibleFormat if the workingtree format they are given has
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
400
        a format string, and vice versa.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
401
402
        If workingtree_format is None, the transport is returned with no 
403
        checking. if it is not None, then the returned transport is
404
        guaranteed to point to an existing directory ready for use.
405
        """
406
        raise NotImplementedError(self.get_workingtree_transport)
407
        
1534.4.39 by Robert Collins
Basic BzrDir support.
408
    def __init__(self, _transport, _format):
409
        """Initialize a Bzr control dir object.
410
        
411
        Only really common logic should reside here, concrete classes should be
412
        made with varying behaviours.
413
1534.4.53 by Robert Collins
Review feedback from John Meinel.
414
        :param _format: the format that is creating this BzrDir instance.
415
        :param _transport: the transport this dir is based at.
1534.4.39 by Robert Collins
Basic BzrDir support.
416
        """
417
        self._format = _format
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
418
        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.
419
        self.root_transport = _transport
1534.4.39 by Robert Collins
Basic BzrDir support.
420
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
421
    def is_control_filename(self, filename):
422
        """True if filename is the name of a path which is reserved for bzrdir's.
423
        
424
        :param filename: A filename within the root transport of this bzrdir.
425
426
        This is true IF and ONLY IF the filename is part of the namespace reserved
427
        for bzr control dirs. Currently this is the '.bzr' directory in the root
428
        of the root_transport. it is expected that plugins will need to extend
429
        this in the future - for instance to make bzr talk with svn working
430
        trees.
431
        """
432
        # this might be better on the BzrDirFormat class because it refers to 
433
        # all the possible bzrdir disk formats. 
434
        # This method is tested via the workingtree is_control_filename tests- 
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
435
        # it was extracted from WorkingTree.is_control_filename. If the methods
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
436
        # contract is extended beyond the current trivial  implementation please
437
        # add new tests for it to the appropriate place.
438
        return filename == '.bzr' or filename.startswith('.bzr/')
439
1534.5.16 by Robert Collins
Review feedback.
440
    def needs_format_conversion(self, format=None):
441
        """Return true if this bzrdir needs convert_format run on it.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
442
        
443
        For instance, if the repository format is out of date but the 
444
        branch and working tree are not, this should return True.
1534.5.13 by Robert Collins
Correct buggy test.
445
446
        :param format: Optional parameter indicating a specific desired
1534.5.16 by Robert Collins
Review feedback.
447
                       format we plan to arrive at.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
448
        """
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.
449
        raise NotImplementedError(self.needs_format_conversion)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
450
1534.4.39 by Robert Collins
Basic BzrDir support.
451
    @staticmethod
452
    def open_unsupported(base):
453
        """Open a branch which is not supported."""
454
        return BzrDir.open(base, _unsupported=True)
455
        
456
    @staticmethod
457
    def open(base, _unsupported=False):
1534.4.53 by Robert Collins
Review feedback from John Meinel.
458
        """Open an existing bzrdir, rooted at 'base' (url)
1534.4.39 by Robert Collins
Basic BzrDir support.
459
        
460
        _unsupported is a private parameter to the BzrDir class.
461
        """
462
        t = get_transport(base)
463
        mutter("trying to open %r with transport %r", base, t)
464
        format = BzrDirFormat.find_format(t)
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
465
        BzrDir._check_supported(format, _unsupported)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
466
        return format.open(t, _found=True)
467
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
468
    def open_branch(self, unsupported=False):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
469
        """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.
470
471
        If unsupported is True, then no longer supported branch formats can
472
        still be opened.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
473
        
474
        TODO: static convenience version of this?
475
        """
476
        raise NotImplementedError(self.open_branch)
1534.4.39 by Robert Collins
Basic BzrDir support.
477
478
    @staticmethod
479
    def open_containing(url):
480
        """Open an existing branch which contains url.
481
        
1534.6.3 by Robert Collins
find_repository sufficiently robust.
482
        :param url: url to search from.
1534.6.11 by Robert Collins
Review feedback.
483
        See open_containing_from_transport for more detail.
1534.6.3 by Robert Collins
find_repository sufficiently robust.
484
        """
1534.6.11 by Robert Collins
Review feedback.
485
        return BzrDir.open_containing_from_transport(get_transport(url))
1534.6.3 by Robert Collins
find_repository sufficiently robust.
486
    
487
    @staticmethod
1534.6.11 by Robert Collins
Review feedback.
488
    def open_containing_from_transport(a_transport):
1534.6.3 by Robert Collins
find_repository sufficiently robust.
489
        """Open an existing branch which contains a_transport.base
490
491
        This probes for a branch at a_transport, and searches upwards from there.
1534.4.39 by Robert Collins
Basic BzrDir support.
492
493
        Basically we keep looking up until we find the control directory or
494
        run into the root.  If there isn't one, raises NotBranchError.
495
        If there is one and it is either an unrecognised format or an unsupported 
496
        format, UnknownFormatError or UnsupportedFormatError are raised.
497
        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
498
1685.1.28 by John Arbash Meinel
Changing open_containing to always return a unicode path.
499
        :return: The BzrDir that contains the path, and a Unicode path 
500
                for the rest of the URL.
1534.4.39 by Robert Collins
Basic BzrDir support.
501
        """
502
        # this gets the normalised url back. I.e. '.' -> the full path.
1534.6.3 by Robert Collins
find_repository sufficiently robust.
503
        url = a_transport.base
1534.4.39 by Robert Collins
Basic BzrDir support.
504
        while True:
505
            try:
1534.6.3 by Robert Collins
find_repository sufficiently robust.
506
                format = BzrDirFormat.find_format(a_transport)
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
507
                BzrDir._check_supported(format, False)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
508
                return format.open(a_transport), urlutils.unescape(a_transport.relpath(url))
1534.4.39 by Robert Collins
Basic BzrDir support.
509
            except errors.NotBranchError, e:
1685.1.60 by Martin Pool
[broken] NotBranchError should unescape the url if possible
510
                ## mutter('not a branch in: %r %s', a_transport.base, e)
511
                pass
1534.6.3 by Robert Collins
find_repository sufficiently robust.
512
            new_t = a_transport.clone('..')
513
            if new_t.base == a_transport.base:
1534.4.39 by Robert Collins
Basic BzrDir support.
514
                # reached the root, whatever that may be
515
                raise errors.NotBranchError(path=url)
1534.6.3 by Robert Collins
find_repository sufficiently robust.
516
            a_transport = new_t
1534.4.39 by Robert Collins
Basic BzrDir support.
517
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
518
    def open_repository(self, _unsupported=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
519
        """Open the repository object at this BzrDir if one is present.
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
520
521
        This will not follow the Branch object pointer - its strictly a direct
522
        open facility. Most client code should use open_branch().repository to
523
        get at a repository.
524
525
        _unsupported is 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.
526
        TODO: static convenience version of this?
527
        """
528
        raise NotImplementedError(self.open_repository)
529
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
530
    def open_workingtree(self, _unsupported=False):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
531
        """Open the workingtree object at this BzrDir if one is present.
532
        
533
        TODO: static convenience version of this?
534
        """
535
        raise NotImplementedError(self.open_workingtree)
536
1662.1.19 by Martin Pool
Better error message when initting existing tree
537
    def has_branch(self):
538
        """Tell if this bzrdir contains a branch.
539
        
540
        Note: if you're going to open the branch, you should just go ahead
541
        and try, and not ask permission first.  (This method just opens the 
542
        branch and discards it, and that's somewhat expensive.) 
543
        """
544
        try:
545
            self.open_branch()
546
            return True
547
        except errors.NotBranchError:
548
            return False
549
550
    def has_workingtree(self):
551
        """Tell if this bzrdir contains a working tree.
552
553
        This will still raise an exception if the bzrdir has a workingtree that
554
        is remote & inaccessible.
555
        
556
        Note: if you're going to open the working tree, you should just go ahead
557
        and try, and not ask permission first.  (This method just opens the 
558
        workingtree and discards it, and that's somewhat expensive.) 
559
        """
560
        try:
561
            self.open_workingtree()
562
            return True
563
        except errors.NoWorkingTree:
564
            return False
565
1534.6.9 by Robert Collins
sprouting into shared repositories
566
    def sprout(self, url, revision_id=None, basis=None, force_new_repo=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
567
        """Create a copy of this bzrdir prepared for use as a new line of
568
        development.
569
570
        If urls last component does not exist, it will be created.
571
572
        Attributes related to the identity of the source branch like
573
        branch nickname will be cleaned, a working tree is created
574
        whether one existed before or not; and a local branch is always
575
        created.
576
577
        if revision_id is not None, then the clone operation may tune
578
            itself to download less data.
579
        """
580
        self._make_tail(url)
581
        result = self._format.initialize(url)
582
        basis_repo, basis_branch, basis_tree = self._get_basis_components(basis)
583
        try:
584
            source_branch = self.open_branch()
585
            source_repository = source_branch.repository
586
        except errors.NotBranchError:
587
            source_branch = None
588
            try:
589
                source_repository = self.open_repository()
590
            except errors.NoRepositoryPresent:
1534.6.9 by Robert Collins
sprouting into shared repositories
591
                # copy the entire basis one if there is one
592
                # but there is no 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.
593
                source_repository = basis_repo
1534.6.9 by Robert Collins
sprouting into shared repositories
594
        if force_new_repo:
595
            result_repo = None
596
        else:
597
            try:
598
                result_repo = result.find_repository()
599
            except errors.NoRepositoryPresent:
600
                result_repo = None
601
        if source_repository is None and result_repo is not None:
602
            pass
603
        elif source_repository is None and result_repo is None:
604
            # no repo available, make a new one
605
            result.create_repository()
606
        elif source_repository is not None and result_repo is None:
1707.1.1 by Robert Collins
Bugfixes to bzrdir.sprout and clone. Sprout was failing to reset the
607
            # have source, and want to make a new target repo
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
608
            # we don't clone the repo because that preserves attributes
1707.1.1 by Robert Collins
Bugfixes to bzrdir.sprout and clone. Sprout was failing to reset the
609
            # like is_shared(), and we have not yet implemented a 
610
            # repository sprout().
611
            result_repo = result.create_repository()
612
        if result_repo is not None:
1534.6.9 by Robert Collins
sprouting into shared repositories
613
            # fetch needed content into target.
614
            if basis_repo:
615
                # XXX FIXME RBC 20060214 need tests for this when the basis
616
                # is incomplete
617
                result_repo.fetch(basis_repo, revision_id=revision_id)
618
            result_repo.fetch(source_repository, revision_id=revision_id)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
619
        if source_branch is not None:
620
            source_branch.sprout(result, revision_id=revision_id)
621
        else:
622
            result.create_branch()
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
623
        # TODO: jam 20060426 we probably need a test in here in the
624
        #       case that the newly sprouted branch is a remote one
1558.5.8 by Aaron Bentley
Bugfix when result_repo is None
625
        if result_repo is None or result_repo.make_working_trees():
1558.5.7 by Aaron Bentley
Don't create unwanted working trees in branch
626
            result.create_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.
627
        return result
628
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
629
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
630
class BzrDirPreSplitOut(BzrDir):
631
    """A common class for the all-in-one formats."""
632
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
633
    def __init__(self, _transport, _format):
634
        """See BzrDir.__init__."""
635
        super(BzrDirPreSplitOut, self).__init__(_transport, _format)
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
636
        assert self._format._lock_class == TransportLock
637
        assert self._format._lock_file_name == 'branch-lock'
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
638
        self._control_files = LockableFiles(self.get_branch_transport(None),
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
639
                                            self._format._lock_file_name,
640
                                            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.
641
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
642
    def break_lock(self):
643
        """Pre-splitout bzrdirs do not suffer from stale locks."""
644
        raise NotImplementedError(self.break_lock)
645
1534.6.8 by Robert Collins
Test the use of clone on empty bzrdir with force_new_repo.
646
    def clone(self, url, revision_id=None, basis=None, force_new_repo=False):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
647
        """See BzrDir.clone()."""
648
        from bzrlib.workingtree import WorkingTreeFormat2
649
        self._make_tail(url)
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
650
        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.
651
        basis_repo, basis_branch, basis_tree = self._get_basis_components(basis)
652
        self.open_repository().clone(result, revision_id=revision_id, basis=basis_repo)
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
653
        from_branch = self.open_branch()
654
        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.
655
        try:
656
            self.open_workingtree().clone(result, basis=basis_tree)
657
        except errors.NotLocalUrl:
658
            # make a new one, this format always has to have one.
1563.2.38 by Robert Collins
make push preserve tree formats.
659
            try:
660
                WorkingTreeFormat2().initialize(result)
661
            except errors.NotLocalUrl:
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
662
                # but we cannot do it for remote trees.
663
                to_branch = result.open_branch()
664
                WorkingTreeFormat2().stub_initialize_remote(to_branch.control_files)
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.
665
        return result
666
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
667
    def create_branch(self):
668
        """See BzrDir.create_branch."""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
669
        return self.open_branch()
670
1534.6.1 by Robert Collins
allow API creation of shared repositories
671
    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.
672
        """See BzrDir.create_repository."""
1534.6.1 by Robert Collins
allow API creation of shared repositories
673
        if shared:
674
            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.
675
        return self.open_repository()
676
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
677
    def create_workingtree(self, revision_id=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.
678
        """See BzrDir.create_workingtree."""
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
679
        # this looks buggy but is not -really-
680
        # clone and sprout will have set the revision_id
681
        # and that will have set it for us, its only
682
        # specific uses of create_workingtree in isolation
683
        # that can do wonky stuff here, and that only
684
        # happens for creating checkouts, which cannot be 
685
        # done on this format anyway. So - acceptable wart.
686
        result = self.open_workingtree()
1508.1.24 by Robert Collins
Add update command for use with checkouts.
687
        if revision_id is not None:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
688
            result.set_parent_trees([(revision_id,
689
                result.branch.repository.revision_tree(revision_id))])
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
690
        return result
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
691
692
    def get_branch_transport(self, branch_format):
693
        """See BzrDir.get_branch_transport()."""
694
        if branch_format is None:
695
            return self.transport
696
        try:
697
            branch_format.get_format_string()
698
        except NotImplementedError:
699
            return self.transport
700
        raise errors.IncompatibleFormat(branch_format, self._format)
701
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
702
    def get_repository_transport(self, repository_format):
703
        """See BzrDir.get_repository_transport()."""
704
        if repository_format is None:
705
            return self.transport
706
        try:
707
            repository_format.get_format_string()
708
        except NotImplementedError:
709
            return self.transport
710
        raise errors.IncompatibleFormat(repository_format, self._format)
711
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
712
    def get_workingtree_transport(self, workingtree_format):
713
        """See BzrDir.get_workingtree_transport()."""
714
        if workingtree_format is None:
715
            return self.transport
716
        try:
717
            workingtree_format.get_format_string()
718
        except NotImplementedError:
719
            return self.transport
720
        raise errors.IncompatibleFormat(workingtree_format, self._format)
721
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.
722
    def needs_format_conversion(self, format=None):
723
        """See BzrDir.needs_format_conversion()."""
724
        # if the format is not the same as the system default,
725
        # an upgrade is needed.
726
        if format is None:
727
            format = BzrDirFormat.get_default_format()
728
        return not isinstance(self._format, format.__class__)
729
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
730
    def open_branch(self, unsupported=False):
731
        """See BzrDir.open_branch."""
732
        from bzrlib.branch import BzrBranchFormat4
733
        format = BzrBranchFormat4()
734
        self._check_supported(format, unsupported)
735
        return format.open(self, _found=True)
736
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.
737
    def sprout(self, url, revision_id=None, basis=None):
738
        """See BzrDir.sprout()."""
739
        from bzrlib.workingtree import WorkingTreeFormat2
740
        self._make_tail(url)
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
741
        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.
742
        basis_repo, basis_branch, basis_tree = self._get_basis_components(basis)
743
        try:
744
            self.open_repository().clone(result, revision_id=revision_id, basis=basis_repo)
745
        except errors.NoRepositoryPresent:
746
            pass
747
        try:
748
            self.open_branch().sprout(result, revision_id=revision_id)
749
        except errors.NotBranchError:
750
            pass
1587.1.5 by Robert Collins
Put bzr branch behaviour back to the 0.7 ignore-working-tree state.
751
        # we always want a working tree
752
        WorkingTreeFormat2().initialize(result)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
753
        return result
754
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
755
756
class BzrDir4(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
757
    """A .bzr version 4 control object.
758
    
759
    This is a deprecated format and may be removed after sept 2006.
760
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
761
1534.6.1 by Robert Collins
allow API creation of shared repositories
762
    def create_repository(self, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
763
        """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.
764
        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.
765
1534.5.16 by Robert Collins
Review feedback.
766
    def needs_format_conversion(self, format=None):
767
        """Format 4 dirs are always in need of conversion."""
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
768
        return True
769
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
770
    def open_repository(self):
771
        """See BzrDir.open_repository."""
772
        from bzrlib.repository import RepositoryFormat4
773
        return RepositoryFormat4().open(self, _found=True)
774
775
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
776
class BzrDir5(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
777
    """A .bzr version 5 control object.
778
779
    This is a deprecated format and may be removed after sept 2006.
780
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
781
782
    def open_repository(self):
783
        """See BzrDir.open_repository."""
784
        from bzrlib.repository import RepositoryFormat5
785
        return RepositoryFormat5().open(self, _found=True)
786
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
787
    def open_workingtree(self, _unsupported=False):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
788
        """See BzrDir.create_workingtree."""
789
        from bzrlib.workingtree import WorkingTreeFormat2
790
        return WorkingTreeFormat2().open(self, _found=True)
791
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
792
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
793
class BzrDir6(BzrDirPreSplitOut):
1508.1.25 by Robert Collins
Update per review comments.
794
    """A .bzr version 6 control object.
795
796
    This is a deprecated format and may be removed after sept 2006.
797
    """
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
798
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
799
    def open_repository(self):
800
        """See BzrDir.open_repository."""
801
        from bzrlib.repository import RepositoryFormat6
802
        return RepositoryFormat6().open(self, _found=True)
803
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
804
    def open_workingtree(self, _unsupported=False):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
805
        """See BzrDir.create_workingtree."""
806
        from bzrlib.workingtree import WorkingTreeFormat2
807
        return WorkingTreeFormat2().open(self, _found=True)
808
809
810
class BzrDirMeta1(BzrDir):
811
    """A .bzr meta version 1 control object.
812
    
813
    This is the first control object where the 
1553.5.67 by Martin Pool
doc
814
    individual aspects are really split out: there are separate repository,
815
    workingtree and branch subdirectories and any subset of the three can be
816
    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.
817
    """
818
1534.5.16 by Robert Collins
Review feedback.
819
    def can_convert_format(self):
820
        """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.
821
        return True
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
822
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
823
    def create_branch(self):
824
        """See BzrDir.create_branch."""
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
825
        from bzrlib.branch import BranchFormat
826
        return BranchFormat.get_default_format().initialize(self)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
827
1534.6.1 by Robert Collins
allow API creation of shared repositories
828
    def create_repository(self, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
829
        """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.
830
        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.
831
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
832
    def create_workingtree(self, revision_id=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
833
        """See BzrDir.create_workingtree."""
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
834
        from bzrlib.workingtree import WorkingTreeFormat
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
835
        return WorkingTreeFormat.get_default_format().initialize(self, revision_id)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
836
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
837
    def _get_mkdir_mode(self):
838
        """Figure out the mode to use when creating a bzrdir subdir."""
839
        temp_control = LockableFiles(self.transport, '', TransportLock)
840
        return temp_control._dir_mode
841
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
842
    def get_branch_transport(self, branch_format):
843
        """See BzrDir.get_branch_transport()."""
844
        if branch_format is None:
845
            return self.transport.clone('branch')
846
        try:
847
            branch_format.get_format_string()
848
        except NotImplementedError:
849
            raise errors.IncompatibleFormat(branch_format, self._format)
850
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
851
            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.
852
        except errors.FileExists:
853
            pass
854
        return self.transport.clone('branch')
855
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
856
    def get_repository_transport(self, repository_format):
857
        """See BzrDir.get_repository_transport()."""
858
        if repository_format is None:
859
            return self.transport.clone('repository')
860
        try:
861
            repository_format.get_format_string()
862
        except NotImplementedError:
863
            raise errors.IncompatibleFormat(repository_format, self._format)
864
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
865
            self.transport.mkdir('repository', mode=self._get_mkdir_mode())
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
866
        except errors.FileExists:
867
            pass
868
        return self.transport.clone('repository')
869
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
870
    def get_workingtree_transport(self, workingtree_format):
871
        """See BzrDir.get_workingtree_transport()."""
872
        if workingtree_format is None:
873
            return self.transport.clone('checkout')
874
        try:
875
            workingtree_format.get_format_string()
876
        except NotImplementedError:
877
            raise errors.IncompatibleFormat(workingtree_format, self._format)
878
        try:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
879
            self.transport.mkdir('checkout', mode=self._get_mkdir_mode())
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
880
        except errors.FileExists:
881
            pass
882
        return self.transport.clone('checkout')
883
1534.5.16 by Robert Collins
Review feedback.
884
    def needs_format_conversion(self, format=None):
885
        """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.
886
        if format is None:
887
            format = BzrDirFormat.get_default_format()
888
        if not isinstance(self._format, format.__class__):
889
            # it is not a meta dir format, conversion is needed.
890
            return True
891
        # we might want to push this down to the repository?
892
        try:
893
            if not isinstance(self.open_repository()._format,
894
                              format.repository_format.__class__):
895
                # the repository needs an upgrade.
896
                return True
897
        except errors.NoRepositoryPresent:
898
            pass
899
        # currently there are no other possible conversions for meta1 formats.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
900
        return False
901
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
902
    def open_branch(self, unsupported=False):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
903
        """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.
904
        from bzrlib.branch import BranchFormat
905
        format = BranchFormat.find_format(self)
906
        self._check_supported(format, unsupported)
907
        return format.open(self, _found=True)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
908
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
909
    def open_repository(self, unsupported=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
910
        """See BzrDir.open_repository."""
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
911
        from bzrlib.repository import RepositoryFormat
912
        format = RepositoryFormat.find_format(self)
913
        self._check_supported(format, unsupported)
914
        return format.open(self, _found=True)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
915
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
916
    def open_workingtree(self, unsupported=False):
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
917
        """See BzrDir.open_workingtree."""
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
918
        from bzrlib.workingtree import WorkingTreeFormat
919
        format = WorkingTreeFormat.find_format(self)
920
        self._check_supported(format, unsupported)
921
        return format.open(self, _found=True)
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
922
1534.4.39 by Robert Collins
Basic BzrDir support.
923
924
class BzrDirFormat(object):
925
    """An encapsulation of the initialization and open routines for a format.
926
927
    Formats provide three things:
928
     * An initialization routine,
929
     * a format string,
930
     * an open routine.
931
932
    Formats are placed in an dict by their format string for reference 
933
    during bzrdir opening. These should be subclasses of BzrDirFormat
934
    for consistency.
935
936
    Once a format is deprecated, just deprecate the initialize and open
937
    methods on the format class. Do not deprecate the object, as the 
938
    object will be created every system load.
939
    """
940
941
    _default_format = None
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
942
    """The default format used for new .bzr dirs."""
1534.4.39 by Robert Collins
Basic BzrDir support.
943
944
    _formats = {}
945
    """The known formats."""
946
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
947
    _control_formats = []
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
948
    """The registered control formats - .bzr, ....
949
    
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
950
    This is a list of BzrDirFormat objects.
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
951
    """
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
952
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
953
    _lock_file_name = 'branch-lock'
954
955
    # _lock_class must be set in subclasses to the lock type, typ.
956
    # TransportLock or LockDir
957
1534.4.39 by Robert Collins
Basic BzrDir support.
958
    @classmethod
959
    def find_format(klass, transport):
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
960
        """Return the format present at transport."""
961
        for format in klass._control_formats:
962
            try:
963
                return format.probe_transport(transport)
964
            except errors.NotBranchError:
965
                # this format does not find a control dir here.
966
                pass
967
        raise errors.NotBranchError(path=transport.base)
968
969
    @classmethod
970
    def probe_transport(klass, transport):
971
        """Return the .bzrdir style transport present at URL."""
1534.4.39 by Robert Collins
Basic BzrDir support.
972
        try:
973
            format_string = transport.get(".bzr/branch-format").read()
1733.2.3 by Michael Ellerman
Don't coallesce try blocks, it can lead to confusing exceptions.
974
        except errors.NoSuchFile:
975
            raise errors.NotBranchError(path=transport.base)
976
977
        try:
1534.4.39 by Robert Collins
Basic BzrDir support.
978
            return klass._formats[format_string]
979
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
980
            raise errors.UnknownFormatError(format=format_string)
1534.4.39 by Robert Collins
Basic BzrDir support.
981
982
    @classmethod
983
    def get_default_format(klass):
984
        """Return the current default format."""
985
        return klass._default_format
986
987
    def get_format_string(self):
988
        """Return the ASCII format string that identifies this format."""
989
        raise NotImplementedError(self.get_format_string)
990
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
991
    def get_format_description(self):
992
        """Return the short description for this format."""
993
        raise NotImplementedError(self.get_format_description)
994
1534.5.16 by Robert Collins
Review feedback.
995
    def get_converter(self, format=None):
996
        """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.
997
998
        This returns a bzrlib.bzrdir.Converter object.
999
1000
        This should return the best upgrader to step this format towards the
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1001
        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.
1002
        some means for them to extend the range of returnable converters.
1534.5.13 by Robert Collins
Correct buggy test.
1003
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1004
        :param format: Optional format to override the default format of the 
1534.5.13 by Robert Collins
Correct buggy test.
1005
                       library.
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1006
        """
1534.5.16 by Robert Collins
Review feedback.
1007
        raise NotImplementedError(self.get_converter)
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1008
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1009
    def initialize(self, url):
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1010
        """Create a bzr control dir at this url and return an opened copy.
1011
        
1012
        Subclasses should typically override initialize_on_transport
1013
        instead of this method.
1014
        """
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1015
        return self.initialize_on_transport(get_transport(url))
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1016
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1017
    def initialize_on_transport(self, transport):
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1018
        """Initialize a new bzrdir in the base directory of a Transport."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1019
        # Since we don't have a .bzr directory, inherit the
1534.4.39 by Robert Collins
Basic BzrDir support.
1020
        # mode from the root directory
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1021
        temp_control = LockableFiles(transport, '', TransportLock)
1534.4.39 by Robert Collins
Basic BzrDir support.
1022
        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.
1023
                                      # FIXME: RBC 20060121 don't peek under
1534.4.39 by Robert Collins
Basic BzrDir support.
1024
                                      # the covers
1025
                                      mode=temp_control._dir_mode)
1026
        file_mode = temp_control._file_mode
1027
        del temp_control
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1028
        mutter('created control directory in ' + transport.base)
1029
        control = transport.clone('.bzr')
1534.4.39 by Robert Collins
Basic BzrDir support.
1030
        utf8_files = [('README', 
1031
                       "This is a Bazaar-NG control directory.\n"
1032
                       "Do not change any files in this directory.\n"),
1033
                      ('branch-format', self.get_format_string()),
1034
                      ]
1035
        # NB: no need to escape relative paths that are url safe.
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1036
        control_files = LockableFiles(control, self._lock_file_name, 
1037
                                      self._lock_class)
1553.5.60 by Martin Pool
New LockableFiles.create_lock() method
1038
        control_files.create_lock()
1534.4.39 by Robert Collins
Basic BzrDir support.
1039
        control_files.lock_write()
1040
        try:
1041
            for file, content in utf8_files:
1042
                control_files.put_utf8(file, content)
1043
        finally:
1044
            control_files.unlock()
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1045
        return self.open(transport, _found=True)
1534.4.39 by Robert Collins
Basic BzrDir support.
1046
1047
    def is_supported(self):
1048
        """Is this format supported?
1049
1050
        Supported formats must be initializable and openable.
1051
        Unsupported formats may not support initialization or committing or 
1052
        some other features depending on the reason for not being supported.
1053
        """
1054
        return True
1055
1733.1.3 by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
1056
    @classmethod
1057
    def known_formats(klass):
1058
        """Return all the known formats.
1059
        
1060
        Concrete formats should override _known_formats.
1061
        """
1733.1.6 by Jelmer Vernooij
Fix a couple of minor issues after review by Martin.
1062
        # There is double indirection here to make sure that control 
1063
        # formats used by more than one dir format will only be probed 
1064
        # 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.
1065
        result = set()
1066
        for format in klass._control_formats:
1067
            result.update(format._known_formats())
1068
        return result
1069
    
1070
    @classmethod
1071
    def _known_formats(klass):
1072
        """Return the known format instances for this control format."""
1073
        return set(klass._formats.values())
1074
1534.4.39 by Robert Collins
Basic BzrDir support.
1075
    def open(self, transport, _found=False):
1076
        """Return an instance of this format for the dir transport points at.
1077
        
1078
        _found is a private parameter, do not use it.
1079
        """
1080
        if not _found:
1081
            assert isinstance(BzrDirFormat.find_format(transport),
1082
                              self.__class__)
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1083
        return self._open(transport)
1084
1085
    def _open(self, transport):
1086
        """Template method helper for opening BzrDirectories.
1087
1088
        This performs the actual open and any additional logic or parameter
1089
        passing.
1090
        """
1091
        raise NotImplementedError(self._open)
1534.4.39 by Robert Collins
Basic BzrDir support.
1092
1093
    @classmethod
1094
    def register_format(klass, format):
1095
        klass._formats[format.get_format_string()] = format
1096
1097
    @classmethod
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1098
    def register_control_format(klass, format):
1099
        """Register a format that does not use '.bzrdir' for its control dir.
1100
1101
        TODO: This should be pulled up into a 'ControlDirFormat' base class
1102
        which BzrDirFormat can inherit from, and renamed to register_format 
1103
        there. It has been done without that for now for simplicity of
1104
        implementation.
1105
        """
1733.1.7 by Jelmer Vernooij
Change set of control dir formats to list.
1106
        klass._control_formats.append(format)
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1107
1108
    @classmethod
1534.4.39 by Robert Collins
Basic BzrDir support.
1109
    def set_default_format(klass, format):
1110
        klass._default_format = format
1111
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
1112
    def __str__(self):
1113
        return self.get_format_string()[:-1]
1114
1534.4.39 by Robert Collins
Basic BzrDir support.
1115
    @classmethod
1116
    def unregister_format(klass, format):
1117
        assert klass._formats[format.get_format_string()] is format
1118
        del klass._formats[format.get_format_string()]
1119
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
1120
    @classmethod
1121
    def unregister_control_format(klass, format):
1122
        klass._control_formats.remove(format)
1123
1124
1125
# register BzrDirFormat as a control format
1126
BzrDirFormat.register_control_format(BzrDirFormat)
1127
1534.4.39 by Robert Collins
Basic BzrDir support.
1128
1129
class BzrDirFormat4(BzrDirFormat):
1130
    """Bzr dir format 4.
1131
1132
    This format is a combined format for working tree, branch and repository.
1133
    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.
1134
     - Format 1 working trees [always]
1135
     - Format 4 branches [always]
1136
     - Format 4 repositories [always]
1534.4.39 by Robert Collins
Basic BzrDir support.
1137
1138
    This format is deprecated: it indexes texts using a text it which is
1139
    removed in format 5; write support for this format has been removed.
1140
    """
1141
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1142
    _lock_class = TransportLock
1143
1534.4.39 by Robert Collins
Basic BzrDir support.
1144
    def get_format_string(self):
1145
        """See BzrDirFormat.get_format_string()."""
1146
        return "Bazaar-NG branch, format 0.0.4\n"
1147
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1148
    def get_format_description(self):
1149
        """See BzrDirFormat.get_format_description()."""
1150
        return "All-in-one format 4"
1151
1534.5.16 by Robert Collins
Review feedback.
1152
    def get_converter(self, format=None):
1153
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
1154
        # 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.
1155
        return ConvertBzrDir4To5()
1156
        
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1157
    def initialize_on_transport(self, transport):
1534.4.39 by Robert Collins
Basic BzrDir support.
1158
        """Format 4 branches cannot be created."""
1159
        raise errors.UninitializableFormat(self)
1160
1161
    def is_supported(self):
1162
        """Format 4 is not supported.
1163
1164
        It is not supported because the model changed from 4 to 5 and the
1165
        conversion logic is expensive - so doing it on the fly was not 
1166
        feasible.
1167
        """
1168
        return False
1169
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1170
    def _open(self, transport):
1171
        """See BzrDirFormat._open."""
1172
        return BzrDir4(transport, self)
1173
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.
1174
    def __return_repository_format(self):
1175
        """Circular import protection."""
1176
        from bzrlib.repository import RepositoryFormat4
1177
        return RepositoryFormat4(self)
1178
    repository_format = property(__return_repository_format)
1179
1534.4.39 by Robert Collins
Basic BzrDir support.
1180
1181
class BzrDirFormat5(BzrDirFormat):
1182
    """Bzr control format 5.
1183
1184
    This format is a combined format for working tree, branch and repository.
1185
    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.
1186
     - Format 2 working trees [always] 
1187
     - Format 4 branches [always] 
1534.4.53 by Robert Collins
Review feedback from John Meinel.
1188
     - 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.
1189
       Unhashed stores in the repository.
1534.4.39 by Robert Collins
Basic BzrDir support.
1190
    """
1191
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1192
    _lock_class = TransportLock
1193
1534.4.39 by Robert Collins
Basic BzrDir support.
1194
    def get_format_string(self):
1195
        """See BzrDirFormat.get_format_string()."""
1196
        return "Bazaar-NG branch, format 5\n"
1197
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1198
    def get_format_description(self):
1199
        """See BzrDirFormat.get_format_description()."""
1200
        return "All-in-one format 5"
1201
1534.5.16 by Robert Collins
Review feedback.
1202
    def get_converter(self, format=None):
1203
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
1204
        # 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.
1205
        return ConvertBzrDir5To6()
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1206
1207
    def _initialize_for_clone(self, url):
1208
        return self.initialize_on_transport(get_transport(url), _cloning=True)
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1209
        
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1210
    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.
1211
        """Format 5 dirs always have working tree, branch and repository.
1212
        
1213
        Except when they are being cloned.
1214
        """
1215
        from bzrlib.branch import BzrBranchFormat4
1216
        from bzrlib.repository import RepositoryFormat5
1217
        from bzrlib.workingtree import WorkingTreeFormat2
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1218
        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.
1219
        RepositoryFormat5().initialize(result, _internal=True)
1220
        if not _cloning:
1221
            BzrBranchFormat4().initialize(result)
1222
            WorkingTreeFormat2().initialize(result)
1223
        return result
1224
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1225
    def _open(self, transport):
1226
        """See BzrDirFormat._open."""
1227
        return BzrDir5(transport, self)
1228
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.
1229
    def __return_repository_format(self):
1230
        """Circular import protection."""
1231
        from bzrlib.repository import RepositoryFormat5
1232
        return RepositoryFormat5(self)
1233
    repository_format = property(__return_repository_format)
1234
1534.4.39 by Robert Collins
Basic BzrDir support.
1235
1236
class BzrDirFormat6(BzrDirFormat):
1237
    """Bzr control format 6.
1238
1239
    This format is a combined format for working tree, branch and repository.
1240
    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.
1241
     - Format 2 working trees [always] 
1242
     - Format 4 branches [always] 
1243
     - Format 6 repositories [always]
1534.4.39 by Robert Collins
Basic BzrDir support.
1244
    """
1245
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1246
    _lock_class = TransportLock
1247
1534.4.39 by Robert Collins
Basic BzrDir support.
1248
    def get_format_string(self):
1249
        """See BzrDirFormat.get_format_string()."""
1250
        return "Bazaar-NG branch, format 6\n"
1251
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1252
    def get_format_description(self):
1253
        """See BzrDirFormat.get_format_description()."""
1254
        return "All-in-one format 6"
1255
1534.5.16 by Robert Collins
Review feedback.
1256
    def get_converter(self, format=None):
1257
        """See BzrDirFormat.get_converter()."""
1534.5.13 by Robert Collins
Correct buggy test.
1258
        # 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.
1259
        return ConvertBzrDir6ToMeta()
1260
        
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1261
    def _initialize_for_clone(self, url):
1262
        return self.initialize_on_transport(get_transport(url), _cloning=True)
1263
1608.2.8 by Martin Pool
Separate out BzrDir.initialize_on_transport so it
1264
    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.
1265
        """Format 6 dirs always have working tree, branch and repository.
1266
        
1267
        Except when they are being cloned.
1268
        """
1269
        from bzrlib.branch import BzrBranchFormat4
1270
        from bzrlib.repository import RepositoryFormat6
1271
        from bzrlib.workingtree import WorkingTreeFormat2
1651.1.6 by Martin Pool
Clean up clone-bzrdir code
1272
        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.
1273
        RepositoryFormat6().initialize(result, _internal=True)
1274
        if not _cloning:
1275
            BzrBranchFormat4().initialize(result)
1276
            try:
1277
                WorkingTreeFormat2().initialize(result)
1278
            except errors.NotLocalUrl:
1279
                # emulate pre-check behaviour for working tree and silently 
1280
                # fail.
1281
                pass
1282
        return result
1283
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1284
    def _open(self, transport):
1285
        """See BzrDirFormat._open."""
1286
        return BzrDir6(transport, self)
1287
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.
1288
    def __return_repository_format(self):
1289
        """Circular import protection."""
1290
        from bzrlib.repository import RepositoryFormat6
1291
        return RepositoryFormat6(self)
1292
    repository_format = property(__return_repository_format)
1293
1534.4.39 by Robert Collins
Basic BzrDir support.
1294
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1295
class BzrDirMetaFormat1(BzrDirFormat):
1296
    """Bzr meta control format 1
1297
1298
    This is the first format with split out working tree, branch and repository
1299
    disk storage.
1300
    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.
1301
     - Format 3 working trees [optional]
1302
     - Format 5 branches [optional]
1303
     - 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.
1304
    """
1305
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1306
    _lock_class = LockDir
1307
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.
1308
    def get_converter(self, format=None):
1309
        """See BzrDirFormat.get_converter()."""
1310
        if format is None:
1311
            format = BzrDirFormat.get_default_format()
1312
        if not isinstance(self, format.__class__):
1313
            # converting away from metadir is not implemented
1314
            raise NotImplementedError(self.get_converter)
1315
        return ConvertMetaToMeta(format)
1316
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1317
    def get_format_string(self):
1318
        """See BzrDirFormat.get_format_string()."""
1319
        return "Bazaar-NG meta directory, format 1\n"
1320
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1321
    def get_format_description(self):
1322
        """See BzrDirFormat.get_format_description()."""
1323
        return "Meta directory format 1"
1324
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1325
    def _open(self, transport):
1326
        """See BzrDirFormat._open."""
1327
        return BzrDirMeta1(transport, self)
1328
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
1329
    def __return_repository_format(self):
1330
        """Circular import protection."""
1331
        if getattr(self, '_repository_format', None):
1332
            return self._repository_format
1333
        from bzrlib.repository import RepositoryFormat
1334
        return RepositoryFormat.get_default_format()
1335
1336
    def __set_repository_format(self, value):
1337
        """Allow changint the repository format for metadir formats."""
1338
        self._repository_format = value
1553.5.72 by Martin Pool
Clean up test for Branch5 lockdirs
1339
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.
1340
    repository_format = property(__return_repository_format, __set_repository_format)
1341
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1342
1534.4.39 by Robert Collins
Basic BzrDir support.
1343
BzrDirFormat.register_format(BzrDirFormat4())
1344
BzrDirFormat.register_format(BzrDirFormat5())
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1345
BzrDirFormat.register_format(BzrDirFormat6())
1346
__default_format = BzrDirMetaFormat1()
1534.4.39 by Robert Collins
Basic BzrDir support.
1347
BzrDirFormat.register_format(__default_format)
1348
BzrDirFormat.set_default_format(__default_format)
1349
1350
1351
class BzrDirTestProviderAdapter(object):
1352
    """A tool to generate a suite testing multiple bzrdir formats at once.
1353
1354
    This is done by copying the test once for each transport and injecting
1355
    the transport_server, transport_readonly_server, and bzrdir_format
1356
    classes into each copy. Each copy is also given a new id() to make it
1357
    easy to identify.
1358
    """
1359
1360
    def __init__(self, transport_server, transport_readonly_server, formats):
1361
        self._transport_server = transport_server
1362
        self._transport_readonly_server = transport_readonly_server
1363
        self._formats = formats
1364
    
1365
    def adapt(self, test):
1366
        result = TestSuite()
1367
        for format in self._formats:
1368
            new_test = deepcopy(test)
1369
            new_test.transport_server = self._transport_server
1370
            new_test.transport_readonly_server = self._transport_readonly_server
1371
            new_test.bzrdir_format = format
1372
            def make_new_test_id():
1373
                new_id = "%s(%s)" % (new_test.id(), format.__class__.__name__)
1374
                return lambda: new_id
1375
            new_test.id = make_new_test_id()
1376
            result.addTest(new_test)
1377
        return result
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1378
1379
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1380
class Converter(object):
1381
    """Converts a disk format object from one format to another."""
1382
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1383
    def convert(self, to_convert, pb):
1384
        """Perform the conversion of to_convert, giving feedback via pb.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1385
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1386
        :param to_convert: The disk object to convert.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1387
        :param pb: a progress bar to use for progress information.
1388
        """
1389
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.
1390
    def step(self, message):
1391
        """Update the pb by a step."""
1392
        self.count +=1
1393
        self.pb.update(message, self.count, self.total)
1394
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1395
1396
class ConvertBzrDir4To5(Converter):
1397
    """Converts format 4 bzr dirs to format 5."""
1398
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1399
    def __init__(self):
1400
        super(ConvertBzrDir4To5, self).__init__()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1401
        self.converted_revs = set()
1402
        self.absent_revisions = set()
1403
        self.text_count = 0
1404
        self.revisions = {}
1405
        
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1406
    def convert(self, to_convert, pb):
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1407
        """See Converter.convert()."""
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1408
        self.bzrdir = to_convert
1409
        self.pb = pb
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1410
        self.pb.note('starting upgrade from format 4 to 5')
1411
        if isinstance(self.bzrdir.transport, LocalTransport):
1412
            self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
1413
        self._convert_to_weaves()
1414
        return BzrDir.open(self.bzrdir.root_transport.base)
1415
1416
    def _convert_to_weaves(self):
1417
        self.pb.note('note: upgrade may be faster if all store files are ungzipped first')
1418
        try:
1419
            # TODO permissions
1420
            stat = self.bzrdir.transport.stat('weaves')
1421
            if not S_ISDIR(stat.st_mode):
1422
                self.bzrdir.transport.delete('weaves')
1423
                self.bzrdir.transport.mkdir('weaves')
1424
        except errors.NoSuchFile:
1425
            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.
1426
        # 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.
1427
        self.inv_weave = Weave('inventory')
1428
        # holds in-memory weaves for all files
1429
        self.text_weaves = {}
1430
        self.bzrdir.transport.delete('branch-format')
1431
        self.branch = self.bzrdir.open_branch()
1432
        self._convert_working_inv()
1433
        rev_history = self.branch.revision_history()
1434
        # to_read is a stack holding the revisions we still need to process;
1435
        # appending to it adds new highest-priority revisions
1436
        self.known_revisions = set(rev_history)
1437
        self.to_read = rev_history[-1:]
1438
        while self.to_read:
1439
            rev_id = self.to_read.pop()
1440
            if (rev_id not in self.revisions
1441
                and rev_id not in self.absent_revisions):
1442
                self._load_one_rev(rev_id)
1443
        self.pb.clear()
1444
        to_import = self._make_order()
1445
        for i, rev_id in enumerate(to_import):
1446
            self.pb.update('converting revision', i, len(to_import))
1447
            self._convert_one_rev(rev_id)
1448
        self.pb.clear()
1449
        self._write_all_weaves()
1450
        self._write_all_revs()
1451
        self.pb.note('upgraded to weaves:')
1452
        self.pb.note('  %6d revisions and inventories', len(self.revisions))
1453
        self.pb.note('  %6d revisions not present', len(self.absent_revisions))
1454
        self.pb.note('  %6d texts', self.text_count)
1455
        self._cleanup_spare_files_after_format4()
1456
        self.branch.control_files.put_utf8('branch-format', BzrDirFormat5().get_format_string())
1457
1458
    def _cleanup_spare_files_after_format4(self):
1459
        # FIXME working tree upgrade foo.
1460
        for n in 'merged-patches', 'pending-merged-patches':
1461
            try:
1462
                ## assert os.path.getsize(p) == 0
1463
                self.bzrdir.transport.delete(n)
1464
            except errors.NoSuchFile:
1465
                pass
1466
        self.bzrdir.transport.delete_tree('inventory-store')
1467
        self.bzrdir.transport.delete_tree('text-store')
1468
1469
    def _convert_working_inv(self):
1470
        inv = serializer_v4.read_inventory(self.branch.control_files.get('inventory'))
1732.1.26 by John Arbash Meinel
Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want
1471
        new_inv_xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1472
        # FIXME inventory is a working tree change.
1473
        self.branch.control_files.put('inventory', new_inv_xml)
1474
1475
    def _write_all_weaves(self):
1476
        controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)
1477
        weave_transport = self.bzrdir.transport.clone('weaves')
1478
        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
1479
        transaction = WriteTransaction()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1480
1481
        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.
1482
            i = 0
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1483
            for file_id, file_weave in self.text_weaves.items():
1484
                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.
1485
                weaves._put_weave(file_id, file_weave, transaction)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1486
                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.
1487
            self.pb.update('inventory', 0, 1)
1488
            controlweaves._put_weave('inventory', self.inv_weave, transaction)
1489
            self.pb.update('inventory', 1, 1)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1490
        finally:
1491
            self.pb.clear()
1492
1493
    def _write_all_revs(self):
1494
        """Write all revisions out in new form."""
1495
        self.bzrdir.transport.delete_tree('revision-store')
1496
        self.bzrdir.transport.mkdir('revision-store')
1497
        revision_transport = self.bzrdir.transport.clone('revision-store')
1498
        # TODO permissions
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1499
        _revision_store = TextRevisionStore(TextStore(revision_transport,
1500
                                                      prefixed=False,
1501
                                                      compressed=True))
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1502
        try:
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
1503
            transaction = bzrlib.transactions.WriteTransaction()
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1504
            for i, rev_id in enumerate(self.converted_revs):
1505
                self.pb.update('write revision', i, len(self.converted_revs))
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1506
                _revision_store.add_revision(self.revisions[rev_id], transaction)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1507
        finally:
1508
            self.pb.clear()
1509
            
1510
    def _load_one_rev(self, rev_id):
1511
        """Load a revision object into memory.
1512
1513
        Any parents not either loaded or abandoned get queued to be
1514
        loaded."""
1515
        self.pb.update('loading revision',
1516
                       len(self.revisions),
1517
                       len(self.known_revisions))
1563.2.22 by Robert Collins
Move responsibility for repository.has_revision into RevisionStore
1518
        if not self.branch.repository.has_revision(rev_id):
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1519
            self.pb.clear()
1520
            self.pb.note('revision {%s} not present in branch; '
1521
                         'will be converted as a ghost',
1522
                         rev_id)
1523
            self.absent_revisions.add(rev_id)
1524
        else:
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1525
            rev = self.branch.repository._revision_store.get_revision(rev_id,
1526
                self.branch.repository.get_transaction())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1527
            for parent_id in rev.parent_ids:
1528
                self.known_revisions.add(parent_id)
1529
                self.to_read.append(parent_id)
1530
            self.revisions[rev_id] = rev
1531
1532
    def _load_old_inventory(self, rev_id):
1533
        assert rev_id not in self.converted_revs
1534
        old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
1535
        inv = serializer_v4.read_inventory_from_string(old_inv_xml)
1536
        rev = self.revisions[rev_id]
1537
        if rev.inventory_sha1:
1538
            assert rev.inventory_sha1 == sha_string(old_inv_xml), \
1539
                'inventory sha mismatch for {%s}' % rev_id
1540
        return inv
1541
1542
    def _load_updated_inventory(self, rev_id):
1543
        assert rev_id in self.converted_revs
1544
        inv_xml = self.inv_weave.get_text(rev_id)
1732.1.26 by John Arbash Meinel
Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want
1545
        inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(inv_xml)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1546
        return inv
1547
1548
    def _convert_one_rev(self, rev_id):
1549
        """Convert revision and all referenced objects to new format."""
1550
        rev = self.revisions[rev_id]
1551
        inv = self._load_old_inventory(rev_id)
1552
        present_parents = [p for p in rev.parent_ids
1553
                           if p not in self.absent_revisions]
1554
        self._convert_revision_contents(rev, inv, present_parents)
1555
        self._store_new_weave(rev, inv, present_parents)
1556
        self.converted_revs.add(rev_id)
1557
1558
    def _store_new_weave(self, rev, inv, present_parents):
1559
        # the XML is now updated with text versions
1560
        if __debug__:
1561
            for file_id in inv:
1562
                ie = inv[file_id]
1563
                if ie.kind == 'root_directory':
1564
                    continue
1565
                assert hasattr(ie, 'revision'), \
1566
                    'no revision on {%s} in {%s}' % \
1567
                    (file_id, rev.revision_id)
1732.1.26 by John Arbash Meinel
Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want
1568
        new_inv_xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1569
        new_inv_sha1 = sha_string(new_inv_xml)
1563.2.28 by Robert Collins
Add total_size to the revision_store api.
1570
        self.inv_weave.add_lines(rev.revision_id, 
1571
                                 present_parents,
1572
                                 new_inv_xml.splitlines(True))
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1573
        rev.inventory_sha1 = new_inv_sha1
1574
1575
    def _convert_revision_contents(self, rev, inv, present_parents):
1576
        """Convert all the files within a revision.
1577
1578
        Also upgrade the inventory to refer to the text revision ids."""
1579
        rev_id = rev.revision_id
1580
        mutter('converting texts of revision {%s}',
1581
               rev_id)
1582
        parent_invs = map(self._load_updated_inventory, present_parents)
1583
        for file_id in inv:
1584
            ie = inv[file_id]
1585
            self._convert_file_version(rev, ie, parent_invs)
1586
1587
    def _convert_file_version(self, rev, ie, parent_invs):
1588
        """Convert one version of one file.
1589
1590
        The file needs to be added into the weave if it is a merge
1591
        of >=2 parents or if it's changed from its parent.
1592
        """
1593
        if ie.kind == 'root_directory':
1594
            return
1595
        file_id = ie.file_id
1596
        rev_id = rev.revision_id
1597
        w = self.text_weaves.get(file_id)
1598
        if w is None:
1599
            w = Weave(file_id)
1600
            self.text_weaves[file_id] = w
1601
        text_changed = False
1596.2.20 by Robert Collins
optimise commit to only access weaves for merged, or altered files during commit.
1602
        previous_entries = ie.find_previous_heads(parent_invs,
1603
                                                  None,
1604
                                                  None,
1605
                                                  entry_vf=w)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1606
        for old_revision in previous_entries:
1607
                # if this fails, its a ghost ?
1608
                assert old_revision in self.converted_revs 
1609
        self.snapshot_ie(previous_entries, ie, w, rev_id)
1610
        del ie.text_id
1611
        assert getattr(ie, 'revision', None) is not None
1612
1613
    def snapshot_ie(self, previous_revisions, ie, w, rev_id):
1614
        # TODO: convert this logic, which is ~= snapshot to
1615
        # a call to:. This needs the path figured out. rather than a work_tree
1616
        # a v4 revision_tree can be given, or something that looks enough like
1617
        # one to give the file content to the entry if it needs it.
1618
        # and we need something that looks like a weave store for snapshot to 
1619
        # save against.
1620
        #ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
1621
        if len(previous_revisions) == 1:
1622
            previous_ie = previous_revisions.values()[0]
1623
            if ie._unchanged(previous_ie):
1624
                ie.revision = previous_ie.revision
1625
                return
1626
        if ie.has_text():
1627
            text = self.branch.repository.text_store.get(ie.text_id)
1628
            file_lines = text.readlines()
1629
            assert sha_strings(file_lines) == ie.text_sha1
1630
            assert sum(map(len, file_lines)) == ie.text_size
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1631
            w.add_lines(rev_id, previous_revisions, file_lines)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1632
            self.text_count += 1
1633
        else:
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1634
            w.add_lines(rev_id, previous_revisions, [])
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1635
        ie.revision = rev_id
1636
1637
    def _make_order(self):
1638
        """Return a suitable order for importing revisions.
1639
1640
        The order must be such that an revision is imported after all
1641
        its (present) parents.
1642
        """
1643
        todo = set(self.revisions.keys())
1644
        done = self.absent_revisions.copy()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1645
        order = []
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1646
        while todo:
1647
            # scan through looking for a revision whose parents
1648
            # are all done
1649
            for rev_id in sorted(list(todo)):
1650
                rev = self.revisions[rev_id]
1651
                parent_ids = set(rev.parent_ids)
1652
                if parent_ids.issubset(done):
1653
                    # can take this one now
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1654
                    order.append(rev_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1655
                    todo.remove(rev_id)
1656
                    done.add(rev_id)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1657
        return order
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1658
1659
1660
class ConvertBzrDir5To6(Converter):
1661
    """Converts format 5 bzr dirs to format 6."""
1662
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1663
    def convert(self, to_convert, pb):
1664
        """See Converter.convert()."""
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1665
        self.bzrdir = to_convert
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1666
        self.pb = pb
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1667
        self.pb.note('starting upgrade from format 5 to 6')
1668
        self._convert_to_prefixed()
1669
        return BzrDir.open(self.bzrdir.root_transport.base)
1670
1671
    def _convert_to_prefixed(self):
1608.2.1 by Martin Pool
[merge] Storage filename escaping
1672
        from bzrlib.store import TransportStore
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1673
        self.bzrdir.transport.delete('branch-format')
1674
        for store_name in ["weaves", "revision-store"]:
1608.2.1 by Martin Pool
[merge] Storage filename escaping
1675
            self.pb.note("adding prefixes to %s" % store_name)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1676
            store_transport = self.bzrdir.transport.clone(store_name)
1608.2.1 by Martin Pool
[merge] Storage filename escaping
1677
            store = TransportStore(store_transport, prefixed=True)
1608.1.1 by Martin Pool
[patch] LocalTransport.list_dir should return url-quoted strings (ddaa)
1678
            for urlfilename in store_transport.list_dir('.'):
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
1679
                filename = urlutils.unescape(urlfilename)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1680
                if (filename.endswith(".weave") or
1681
                    filename.endswith(".gz") or
1682
                    filename.endswith(".sig")):
1683
                    file_id = os.path.splitext(filename)[0]
1684
                else:
1685
                    file_id = filename
1608.2.1 by Martin Pool
[merge] Storage filename escaping
1686
                prefix_dir = store.hash_prefix(file_id)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1687
                # FIXME keep track of the dirs made RBC 20060121
1688
                try:
1689
                    store_transport.move(filename, prefix_dir + '/' + filename)
1690
                except errors.NoSuchFile: # catches missing dirs strangely enough
1691
                    store_transport.mkdir(prefix_dir)
1692
                    store_transport.move(filename, prefix_dir + '/' + filename)
1693
        self.bzrdir._control_files.put_utf8('branch-format', BzrDirFormat6().get_format_string())
1694
1695
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1696
class ConvertBzrDir6ToMeta(Converter):
1697
    """Converts format 6 bzr dirs to metadirs."""
1698
1699
    def convert(self, to_convert, pb):
1700
        """See Converter.convert()."""
1701
        self.bzrdir = to_convert
1702
        self.pb = pb
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1703
        self.count = 0
1704
        self.total = 20 # the steps we know about
1705
        self.garbage_inventories = []
1706
1534.5.13 by Robert Collins
Correct buggy test.
1707
        self.pb.note('starting upgrade from format 6 to metadir')
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1708
        self.bzrdir._control_files.put_utf8('branch-format', "Converting to format 6")
1709
        # its faster to move specific files around than to open and use the apis...
1710
        # first off, nuke ancestry.weave, it was never used.
1711
        try:
1712
            self.step('Removing ancestry.weave')
1713
            self.bzrdir.transport.delete('ancestry.weave')
1714
        except errors.NoSuchFile:
1715
            pass
1716
        # find out whats there
1717
        self.step('Finding branch files')
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
1718
        last_revision = self.bzrdir.open_branch().last_revision()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1719
        bzrcontents = self.bzrdir.transport.list_dir('.')
1720
        for name in bzrcontents:
1721
            if name.startswith('basis-inventory.'):
1722
                self.garbage_inventories.append(name)
1723
        # create new directories for repository, working tree and branch
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
1724
        self.dir_mode = self.bzrdir._control_files._dir_mode
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1725
        self.file_mode = self.bzrdir._control_files._file_mode
1726
        repository_names = [('inventory.weave', True),
1727
                            ('revision-store', True),
1728
                            ('weaves', True)]
1729
        self.step('Upgrading repository  ')
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
1730
        self.bzrdir.transport.mkdir('repository', mode=self.dir_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1731
        self.make_lock('repository')
1732
        # we hard code the formats here because we are converting into
1733
        # the meta format. The meta format upgrader can take this to a 
1734
        # future format within each component.
1735
        self.put_format('repository', bzrlib.repository.RepositoryFormat7())
1736
        for entry in repository_names:
1737
            self.move_entry('repository', entry)
1738
1739
        self.step('Upgrading branch      ')
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
1740
        self.bzrdir.transport.mkdir('branch', mode=self.dir_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1741
        self.make_lock('branch')
1742
        self.put_format('branch', bzrlib.branch.BzrBranchFormat5())
1743
        branch_files = [('revision-history', True),
1744
                        ('branch-name', True),
1745
                        ('parent', False)]
1746
        for entry in branch_files:
1747
            self.move_entry('branch', entry)
1748
1749
        self.step('Upgrading working tree')
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
1750
        self.bzrdir.transport.mkdir('checkout', mode=self.dir_mode)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1751
        self.make_lock('checkout')
1752
        self.put_format('checkout', bzrlib.workingtree.WorkingTreeFormat3())
1753
        self.bzrdir.transport.delete_multi(self.garbage_inventories, self.pb)
1754
        checkout_files = [('pending-merges', True),
1755
                          ('inventory', True),
1756
                          ('stat-cache', False)]
1757
        for entry in checkout_files:
1758
            self.move_entry('checkout', entry)
1534.5.14 by Robert Collins
Bugfix upgrades to metadir to set the last-revision correctly.
1759
        if last_revision is not None:
1760
            self.bzrdir._control_files.put_utf8('checkout/last-revision',
1761
                                                last_revision)
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1762
        self.bzrdir._control_files.put_utf8('branch-format', BzrDirMetaFormat1().get_format_string())
1534.5.10 by Robert Collins
Make upgrade driver unaware of the specific formats in play.
1763
        return BzrDir.open(self.bzrdir.root_transport.base)
1764
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1765
    def make_lock(self, name):
1766
        """Make a lock for the new control dir name."""
1767
        self.step('Make %s lock' % name)
1553.5.79 by Martin Pool
upgrade to metadir should create LockDirs not files
1768
        ld = LockDir(self.bzrdir.transport, 
1769
                     '%s/lock' % name,
1770
                     file_modebits=self.file_mode,
1771
                     dir_modebits=self.dir_mode)
1772
        ld.create()
1534.5.11 by Robert Collins
Implement upgrades to Metaformat trees.
1773
1774
    def move_entry(self, new_dir, entry):
1775
        """Move then entry name into new_dir."""
1776
        name = entry[0]
1777
        mandatory = entry[1]
1778
        self.step('Moving %s' % name)
1779
        try:
1780
            self.bzrdir.transport.move(name, '%s/%s' % (new_dir, name))
1781
        except errors.NoSuchFile:
1782
            if mandatory:
1783
                raise
1784
1785
    def put_format(self, dirname, format):
1786
        self.bzrdir._control_files.put_utf8('%s/format' % dirname, format.get_format_string())
1787
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.
1788
1789
class ConvertMetaToMeta(Converter):
1790
    """Converts the components of metadirs."""
1791
1792
    def __init__(self, target_format):
1793
        """Create a metadir to metadir converter.
1794
1795
        :param target_format: The final metadir format that is desired.
1796
        """
1797
        self.target_format = target_format
1798
1799
    def convert(self, to_convert, pb):
1800
        """See Converter.convert()."""
1801
        self.bzrdir = to_convert
1802
        self.pb = pb
1803
        self.count = 0
1804
        self.total = 1
1805
        self.step('checking repository format')
1806
        try:
1807
            repo = self.bzrdir.open_repository()
1808
        except errors.NoRepositoryPresent:
1809
            pass
1810
        else:
1811
            if not isinstance(repo._format, self.target_format.repository_format.__class__):
1812
                from bzrlib.repository import CopyConverter
1813
                self.pb.note('starting repository conversion')
1814
                converter = CopyConverter(self.target_format.repository_format)
1815
                converter.convert(repo, pb)
1816
        return to_convert