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