1
# Copyright (C) 2005, 2006 Canonical Ltd
1
# Copyright (C) 2006-2011 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
"""BzrDir logic. The BzrDir is the basic control directory used by bzr.
19
19
At format 7 this was split out into Branch, Repository and Checkout control
22
Note: This module has a lot of ``open`` functions/methods that return
23
references to in-memory objects. As a rule, there are no matching ``close``
24
methods. To free any associated resources, simply stop referencing the
23
from copy import deepcopy
25
from cStringIO import StringIO
26
from unittest import TestSuite
28
from __future__ import absolute_import
32
from bzrlib.lazy_import import lazy_import
33
lazy_import(globals(), """
29
import bzrlib.errors as errors
30
from bzrlib.lockable_files import LockableFiles, TransportLock
31
from bzrlib.lockdir import LockDir
32
from bzrlib.osutils import safe_unicode
33
from bzrlib.osutils import (
40
from bzrlib.store.revision.text import TextRevisionStore
41
from bzrlib.store.text import TextStore
42
from bzrlib.store.versioned import WeaveStore
43
from bzrlib.symbol_versioning import *
44
from bzrlib.trace import mutter
45
from bzrlib.transactions import WriteTransaction
46
from bzrlib.transport import get_transport, urlunescape
47
from bzrlib.transport.local import LocalTransport
48
from bzrlib.weave import Weave
49
from bzrlib.xml4 import serializer_v4
50
from bzrlib.xml5 import serializer_v5
36
branch as _mod_branch,
47
revision as _mod_revision,
48
transport as _mod_transport,
56
from bzrlib.branchfmt import fullhistory as fullhistorybranch
57
from bzrlib.repofmt import knitpack_repo
58
from bzrlib.transport import (
59
do_catching_redirections,
62
from bzrlib.i18n import gettext
65
from bzrlib.trace import (
75
from bzrlib.symbol_versioning import (
81
class BzrDir(controldir.ControlDir):
54
82
"""A .bzr control diretory.
56
84
BzrDir instances let you create or open any of the things that can be
57
85
found within .bzr - checkouts, branches and repositories.
60
88
the transport which this bzr dir is rooted at (i.e. file:///.../.bzr/)
62
a transport connected to the directory this bzr was opened from.
90
a transport connected to the directory this bzr was opened from
91
(i.e. the parent directory holding the .bzr directory).
93
Everything in the bzrdir should have the same file permissions.
95
:cvar hooks: An instance of BzrDirHooks.
65
def can_convert_format(self):
66
"""Return true if this bzrdir is one whose format we can convert from."""
70
def _check_supported(format, allow_unsupported):
71
"""Check whether format is a supported format.
73
If allow_unsupported is True, this is a no-op.
99
"""Invoke break_lock on the first object in the bzrdir.
101
If there is a tree, the tree is opened and break_lock() called.
102
Otherwise, branch is tried, and finally repository.
75
if not allow_unsupported and not format.is_supported():
76
# see open_downlevel to open legacy branches.
77
raise errors.UnsupportedFormatError(
78
'sorry, format %s not supported' % format,
79
['use a different bzr version',
80
'or remove the .bzr directory'
81
' and "bzr init" again'])
83
def clone(self, url, revision_id=None, basis=None, force_new_repo=False):
84
"""Clone this bzrdir and its contents to url verbatim.
86
If urls last component does not exist, it will be created.
88
if revision_id is not None, then the clone operation may tune
104
# XXX: This seems more like a UI function than something that really
105
# belongs in this class.
107
thing_to_unlock = self.open_workingtree()
108
except (errors.NotLocalUrl, errors.NoWorkingTree):
110
thing_to_unlock = self.open_branch()
111
except errors.NotBranchError:
113
thing_to_unlock = self.open_repository()
114
except errors.NoRepositoryPresent:
116
thing_to_unlock.break_lock()
118
def check_conversion_target(self, target_format):
119
"""Check that a bzrdir as a whole can be converted to a new format."""
120
# The only current restriction is that the repository content can be
121
# fetched compatibly with the target.
122
target_repo_format = target_format.repository_format
124
self.open_repository()._format.check_conversion_target(
126
except errors.NoRepositoryPresent:
127
# No repo, no problem.
130
def clone_on_transport(self, transport, revision_id=None,
131
force_new_repo=False, preserve_stacking=False, stacked_on=None,
132
create_prefix=False, use_existing_dir=True, no_tree=False):
133
"""Clone this bzrdir and its contents to transport verbatim.
135
:param transport: The transport for the location to produce the clone
136
at. If the target directory does not exist, it will be created.
137
:param revision_id: The tip revision-id to use for any branch or
138
working tree. If not None, then the clone operation may tune
89
139
itself to download less data.
90
:param force_new_repo: Do not use a shared repository for the target
140
:param force_new_repo: Do not use a shared repository for the target,
91
141
even if one is available.
142
:param preserve_stacking: When cloning a stacked branch, stack the
143
new branch on top of the other branch's stacked-on branch.
144
:param create_prefix: Create any missing directories leading up to
146
:param use_existing_dir: Use an existing directory if one exists.
147
:param no_tree: If set to true prevents creation of a working tree.
94
basis_repo, basis_branch, basis_tree = self._get_basis_components(basis)
95
result = self._format.initialize(url)
149
# Overview: put together a broad description of what we want to end up
150
# with; then make as few api calls as possible to do it.
152
# We may want to create a repo/branch/tree, if we do so what format
153
# would we want for each:
154
require_stacking = (stacked_on is not None)
155
format = self.cloning_metadir(require_stacking)
157
# Figure out what objects we want:
97
159
local_repo = self.find_repository()
98
160
except errors.NoRepositoryPresent:
163
local_branch = self.open_branch()
164
except errors.NotBranchError:
167
# enable fallbacks when branch is not a branch reference
168
if local_branch.repository.has_same_location(local_repo):
169
local_repo = local_branch.repository
170
if preserve_stacking:
172
stacked_on = local_branch.get_stacked_on_url()
173
except (errors.UnstackableBranchFormat,
174
errors.UnstackableRepositoryFormat,
177
# Bug: We create a metadir without knowing if it can support stacking,
178
# we should look up the policy needs first, or just use it as a hint,
101
# may need to copy content in
103
local_repo.clone(result, revision_id=revision_id, basis=basis_repo)
106
result_repo = result.find_repository()
107
# fetch content this dir needs.
109
# XXX FIXME RBC 20060214 need tests for this when the basis
111
result_repo.fetch(basis_repo, revision_id=revision_id)
181
make_working_trees = local_repo.make_working_trees() and not no_tree
182
want_shared = local_repo.is_shared()
183
repo_format_name = format.repository_format.network_name()
185
make_working_trees = False
187
repo_format_name = None
189
result_repo, result, require_stacking, repository_policy = \
190
format.initialize_on_transport_ex(transport,
191
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
192
force_new_repo=force_new_repo, stacked_on=stacked_on,
193
stack_on_pwd=self.root_transport.base,
194
repo_format_name=repo_format_name,
195
make_working_trees=make_working_trees, shared_repo=want_shared)
198
# If the result repository is in the same place as the
199
# resulting bzr dir, it will have no content, further if the
200
# result is not stacked then we know all content should be
201
# copied, and finally if we are copying up to a specific
202
# revision_id then we can use the pending-ancestry-result which
203
# does not require traversing all of history to describe it.
204
if (result_repo.user_url == result.user_url
205
and not require_stacking and
206
revision_id is not None):
207
fetch_spec = vf_search.PendingAncestryResult(
208
[revision_id], local_repo)
209
result_repo.fetch(local_repo, fetch_spec=fetch_spec)
112
211
result_repo.fetch(local_repo, revision_id=revision_id)
113
except errors.NoRepositoryPresent:
114
# needed to make one anyway.
115
local_repo.clone(result, revision_id=revision_id, basis=basis_repo)
215
if result_repo is not None:
216
raise AssertionError('result_repo not None(%r)' % result_repo)
116
217
# 1 if there is a branch present
117
218
# make sure its content is available in the target repository
120
self.open_branch().clone(result, revision_id=revision_id)
121
except errors.NotBranchError:
124
self.open_workingtree().clone(result, basis=basis_tree)
220
if local_branch is not None:
221
result_branch = local_branch.clone(result, revision_id=revision_id,
222
repository_policy=repository_policy)
224
# Cheaper to check if the target is not local, than to try making
226
result.root_transport.local_abspath('.')
227
if result_repo is None or result_repo.make_working_trees():
228
self.open_workingtree().clone(result, revision_id=revision_id)
125
229
except (errors.NoWorkingTree, errors.NotLocalUrl):
129
def _get_basis_components(self, basis):
130
"""Retrieve the basis components that are available at basis."""
132
return None, None, None
134
basis_tree = basis.open_workingtree()
135
basis_branch = basis_tree.branch
136
basis_repo = basis_branch.repository
137
except (errors.NoWorkingTree, errors.NotLocalUrl):
140
basis_branch = basis.open_branch()
141
basis_repo = basis_branch.repository
142
except errors.NotBranchError:
145
basis_repo = basis.open_repository()
146
except errors.NoRepositoryPresent:
148
return basis_repo, basis_branch, basis_tree
233
# TODO: This should be given a Transport, and should chdir up; otherwise
234
# this will open a new connection.
150
235
def _make_tail(self, url):
151
segments = url.split('/')
152
if segments and segments[-1] not in ('', '.'):
153
parent = '/'.join(segments[:-1])
154
t = bzrlib.transport.get_transport(parent)
156
t.mkdir(segments[-1])
157
except errors.FileExists:
161
def create(cls, base):
162
"""Create a new BzrDir at the url 'base'.
164
This will call the current default formats initialize with base
165
as the only parameter.
167
If you need a specific format, consider creating an instance
168
of that and calling initialize().
170
if cls is not BzrDir:
171
raise AssertionError("BzrDir.create always creates the default format, "
172
"not one of %r" % cls)
173
segments = base.split('/')
174
if segments and segments[-1] not in ('', '.'):
175
parent = '/'.join(segments[:-1])
176
t = bzrlib.transport.get_transport(parent)
178
t.mkdir(segments[-1])
179
except errors.FileExists:
181
return BzrDirFormat.get_default_format().initialize(safe_unicode(base))
183
def create_branch(self):
184
"""Create a branch in this BzrDir.
186
The bzrdirs format will control what branch format is created.
187
For more control see BranchFormatXX.create(a_bzrdir).
189
raise NotImplementedError(self.create_branch)
192
def create_branch_and_repo(base, force_new_repo=False):
193
"""Create a new BzrDir, Branch and Repository at the url 'base'.
195
This will use the current default BzrDirFormat, and use whatever
196
repository format that that uses via bzrdir.create_branch and
197
create_repository. If a shared repository is available that is used
200
The created Branch object is returned.
202
:param base: The URL to create the branch at.
203
:param force_new_repo: If True a new repository is always created.
205
bzrdir = BzrDir.create(base)
206
bzrdir._find_or_create_repository(force_new_repo)
207
return bzrdir.create_branch()
236
t = _mod_transport.get_transport(url)
239
def determine_repository_policy(self, force_new_repo=False, stack_on=None,
240
stack_on_pwd=None, require_stacking=False):
241
"""Return an object representing a policy to use.
243
This controls whether a new repository is created, and the format of
244
that repository, or some existing shared repository used instead.
246
If stack_on is supplied, will not seek a containing shared repo.
248
:param force_new_repo: If True, require a new repository to be created.
249
:param stack_on: If supplied, the location to stack on. If not
250
supplied, a default_stack_on location may be used.
251
:param stack_on_pwd: If stack_on is relative, the location it is
254
def repository_policy(found_bzrdir):
257
config = found_bzrdir.get_config()
259
stack_on = config.get_default_stack_on()
260
if stack_on is not None:
261
stack_on_pwd = found_bzrdir.user_url
263
# does it have a repository ?
265
repository = found_bzrdir.open_repository()
266
except errors.NoRepositoryPresent:
269
if (found_bzrdir.user_url != self.user_url
270
and not repository.is_shared()):
271
# Don't look higher, can't use a higher shared repo.
279
return UseExistingRepository(repository, stack_on,
280
stack_on_pwd, require_stacking=require_stacking), True
282
return CreateRepository(self, stack_on, stack_on_pwd,
283
require_stacking=require_stacking), True
285
if not force_new_repo:
287
policy = self._find_containing(repository_policy)
288
if policy is not None:
292
return UseExistingRepository(self.open_repository(),
293
stack_on, stack_on_pwd,
294
require_stacking=require_stacking)
295
except errors.NoRepositoryPresent:
297
return CreateRepository(self, stack_on, stack_on_pwd,
298
require_stacking=require_stacking)
209
300
def _find_or_create_repository(self, force_new_repo):
210
301
"""Create a new repository if needed, returning the repository."""
212
return self.create_repository()
214
return self.find_repository()
215
except errors.NoRepositoryPresent:
216
return self.create_repository()
302
policy = self.determine_repository_policy(force_new_repo)
303
return policy.acquire_repository()[0]
305
def _find_source_repo(self, add_cleanup, source_branch):
306
"""Find the source branch and repo for a sprout operation.
219
def create_branch_convenience(base, force_new_repo=False,
220
force_new_tree=None, format=None):
221
"""Create a new BzrDir, Branch and Repository at the url 'base'.
223
This is a convenience function - it will use an existing repository
224
if possible, can be told explicitly whether to create a working tree or
227
This will use the current default BzrDirFormat, and use whatever
228
repository format that that uses via bzrdir.create_branch and
229
create_repository. If a shared repository is available that is used
230
preferentially. Whatever repository is used, its tree creation policy
233
The created Branch object is returned.
234
If a working tree cannot be made due to base not being a file:// url,
235
no error is raised unless force_new_tree is True, in which case no
236
data is created on disk and NotLocalUrl is raised.
238
:param base: The URL to create the branch at.
239
:param force_new_repo: If True a new repository is always created.
240
:param force_new_tree: If True or False force creation of a tree or
241
prevent such creation respectively.
242
:param format: Override for the for the bzrdir format to create
245
# check for non local urls
246
t = get_transport(safe_unicode(base))
247
if not isinstance(t, LocalTransport):
248
raise errors.NotLocalUrl(base)
250
bzrdir = BzrDir.create(base)
252
bzrdir = format.initialize(base)
253
repo = bzrdir._find_or_create_repository(force_new_repo)
254
result = bzrdir.create_branch()
255
if force_new_tree or (repo.make_working_trees() and
256
force_new_tree is None):
258
bzrdir.create_workingtree()
259
except errors.NotLocalUrl:
308
This is helper intended for use by _sprout.
310
:returns: (source_branch, source_repository). Either or both may be
311
None. If not None, they will be read-locked (and their unlock(s)
312
scheduled via the add_cleanup param).
314
if source_branch is not None:
315
add_cleanup(source_branch.lock_read().unlock)
316
return source_branch, source_branch.repository
318
source_branch = self.open_branch()
319
source_repository = source_branch.repository
320
except errors.NotBranchError:
323
source_repository = self.open_repository()
324
except errors.NoRepositoryPresent:
325
source_repository = None
327
add_cleanup(source_repository.lock_read().unlock)
329
add_cleanup(source_branch.lock_read().unlock)
330
return source_branch, source_repository
332
def sprout(self, url, revision_id=None, force_new_repo=False,
333
recurse='down', possible_transports=None,
334
accelerator_tree=None, hardlink=False, stacked=False,
335
source_branch=None, create_tree_if_local=True):
336
"""Create a copy of this controldir prepared for use as a new line of
339
If url's last component does not exist, it will be created.
341
Attributes related to the identity of the source branch like
342
branch nickname will be cleaned, a working tree is created
343
whether one existed before or not; and a local branch is always
346
if revision_id is not None, then the clone operation may tune
347
itself to download less data.
349
:param accelerator_tree: A tree which can be used for retrieving file
350
contents more quickly than the revision tree, i.e. a workingtree.
351
The revision tree will be used for cases where accelerator_tree's
352
content is different.
353
:param hardlink: If true, hard-link files from accelerator_tree,
355
:param stacked: If true, create a stacked branch referring to the
356
location of this control directory.
357
:param create_tree_if_local: If true, a working-tree will be created
358
when working locally.
359
:return: The created control directory
361
operation = cleanup.OperationWithCleanups(self._sprout)
362
return operation.run(url, revision_id=revision_id,
363
force_new_repo=force_new_repo, recurse=recurse,
364
possible_transports=possible_transports,
365
accelerator_tree=accelerator_tree, hardlink=hardlink,
366
stacked=stacked, source_branch=source_branch,
367
create_tree_if_local=create_tree_if_local)
369
def _sprout(self, op, url, revision_id=None, force_new_repo=False,
370
recurse='down', possible_transports=None,
371
accelerator_tree=None, hardlink=False, stacked=False,
372
source_branch=None, create_tree_if_local=True):
373
add_cleanup = op.add_cleanup
374
fetch_spec_factory = fetch.FetchSpecFactory()
375
if revision_id is not None:
376
fetch_spec_factory.add_revision_ids([revision_id])
377
fetch_spec_factory.source_branch_stop_revision_id = revision_id
378
if possible_transports is None:
379
possible_transports = []
381
possible_transports = list(possible_transports) + [
383
target_transport = _mod_transport.get_transport(url,
385
target_transport.ensure_base()
386
cloning_format = self.cloning_metadir(stacked)
387
# Create/update the result branch
389
result = controldir.ControlDir.open_from_transport(target_transport)
390
except errors.NotBranchError:
391
result = cloning_format.initialize_on_transport(target_transport)
392
source_branch, source_repository = self._find_source_repo(
393
add_cleanup, source_branch)
394
fetch_spec_factory.source_branch = source_branch
395
# if a stacked branch wasn't requested, we don't create one
396
# even if the origin was stacked
397
if stacked and source_branch is not None:
398
stacked_branch_url = self.root_transport.base
400
stacked_branch_url = None
401
repository_policy = result.determine_repository_policy(
402
force_new_repo, stacked_branch_url, require_stacking=stacked)
403
result_repo, is_new_repo = repository_policy.acquire_repository(
404
possible_transports=possible_transports)
405
add_cleanup(result_repo.lock_write().unlock)
406
fetch_spec_factory.source_repo = source_repository
407
fetch_spec_factory.target_repo = result_repo
408
if stacked or (len(result_repo._fallback_repositories) != 0):
409
target_repo_kind = fetch.TargetRepoKinds.STACKED
411
target_repo_kind = fetch.TargetRepoKinds.EMPTY
413
target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
414
fetch_spec_factory.target_repo_kind = target_repo_kind
415
if source_repository is not None:
416
fetch_spec = fetch_spec_factory.make_fetch_spec()
417
result_repo.fetch(source_repository, fetch_spec=fetch_spec)
419
if source_branch is None:
420
# this is for sprouting a controldir without a branch; is that
422
# Not especially, but it's part of the contract.
423
result_branch = result.create_branch()
425
result_branch = source_branch.sprout(result,
426
revision_id=revision_id, repository_policy=repository_policy,
427
repository=result_repo)
428
mutter("created new branch %r" % (result_branch,))
430
# Create/update the result working tree
431
if (create_tree_if_local and not result.has_workingtree() and
432
isinstance(target_transport, local.LocalTransport) and
433
(result_repo is None or result_repo.make_working_trees())):
434
wt = result.create_workingtree(accelerator_tree=accelerator_tree,
435
hardlink=hardlink, from_branch=result_branch)
438
if wt.path2id('') is None:
440
wt.set_root_id(self.open_workingtree.get_root_id())
441
except errors.NoWorkingTree:
447
if recurse == 'down':
450
basis = wt.basis_tree()
451
elif result_branch is not None:
452
basis = result_branch.basis_tree()
453
elif source_branch is not None:
454
basis = source_branch.basis_tree()
455
if basis is not None:
456
add_cleanup(basis.lock_read().unlock)
457
subtrees = basis.iter_references()
460
for path, file_id in subtrees:
461
target = urlutils.join(url, urlutils.escape(path))
462
sublocation = source_branch.reference_parent(file_id, path)
463
sublocation.bzrdir.sprout(target,
464
basis.get_reference_revision(file_id, path),
465
force_new_repo=force_new_repo, recurse=recurse,
264
def create_repository(base, shared=False):
265
"""Create a new BzrDir and Repository at the url 'base'.
267
This will use the current default BzrDirFormat, and use whatever
268
repository format that that uses for bzrdirformat.create_repository.
270
;param shared: Create a shared repository rather than a standalone
272
The Repository object is returned.
274
This must be overridden as an instance method in child classes, where
275
it should take no parameters and construct whatever repository format
276
that child class desires.
278
bzrdir = BzrDir.create(base)
279
return bzrdir.create_repository()
282
def create_standalone_workingtree(base):
283
"""Create a new BzrDir, WorkingTree, Branch and Repository at 'base'.
285
'base' must be a local path or a file:// url.
287
This will use the current default BzrDirFormat, and use whatever
288
repository format that that uses for bzrdirformat.create_workingtree,
289
create_branch and create_repository.
291
The WorkingTree object is returned.
293
t = get_transport(safe_unicode(base))
294
if not isinstance(t, LocalTransport):
295
raise errors.NotLocalUrl(base)
296
bzrdir = BzrDir.create_branch_and_repo(safe_unicode(base),
297
force_new_repo=True).bzrdir
298
return bzrdir.create_workingtree()
300
def create_workingtree(self, revision_id=None):
301
"""Create a working tree at this BzrDir.
303
revision_id: create it as of this revision id.
305
raise NotImplementedError(self.create_workingtree)
469
def _available_backup_name(self, base):
470
"""Find a non-existing backup file name based on base.
472
See bzrlib.osutils.available_backup_name about race conditions.
474
return osutils.available_backup_name(base, self.root_transport.has)
476
def backup_bzrdir(self):
477
"""Backup this bzr control directory.
479
:return: Tuple with old path name and new path name
482
pb = ui.ui_factory.nested_progress_bar()
484
old_path = self.root_transport.abspath('.bzr')
485
backup_dir = self._available_backup_name('backup.bzr')
486
new_path = self.root_transport.abspath(backup_dir)
487
ui.ui_factory.note(gettext('making backup of {0}\n to {1}').format(
488
urlutils.unescape_for_display(old_path, 'utf-8'),
489
urlutils.unescape_for_display(new_path, 'utf-8')))
490
self.root_transport.copy_tree('.bzr', backup_dir)
491
return (old_path, new_path)
495
def retire_bzrdir(self, limit=10000):
496
"""Permanently disable the bzrdir.
498
This is done by renaming it to give the user some ability to recover
499
if there was a problem.
501
This will have horrible consequences if anyone has anything locked or
503
:param limit: number of times to retry
508
to_path = '.bzr.retired.%d' % i
509
self.root_transport.rename('.bzr', to_path)
510
note(gettext("renamed {0} to {1}").format(
511
self.root_transport.abspath('.bzr'), to_path))
513
except (errors.TransportError, IOError, errors.PathError):
520
def _find_containing(self, evaluate):
521
"""Find something in a containing control directory.
523
This method will scan containing control dirs, until it finds what
524
it is looking for, decides that it will never find it, or runs out
525
of containing control directories to check.
527
It is used to implement find_repository and
528
determine_repository_policy.
530
:param evaluate: A function returning (value, stop). If stop is True,
531
the value will be returned.
535
result, stop = evaluate(found_bzrdir)
538
next_transport = found_bzrdir.root_transport.clone('..')
539
if (found_bzrdir.user_url == next_transport.base):
540
# top of the file system
542
# find the next containing bzrdir
544
found_bzrdir = self.open_containing_from_transport(
546
except errors.NotBranchError:
307
549
def find_repository(self):
308
"""Find the repository that should be used for a_bzrdir.
550
"""Find the repository that should be used.
310
552
This does not require a branch as we use it to find the repo for
311
553
new branches as well as to hook existing branches up to their
315
return self.open_repository()
316
except errors.NoRepositoryPresent:
318
next_transport = self.root_transport.clone('..')
321
found_bzrdir = BzrDir.open_containing_from_transport(
323
except errors.NotBranchError:
324
raise errors.NoRepositoryPresent(self)
556
def usable_repository(found_bzrdir):
557
# does it have a repository ?
326
559
repository = found_bzrdir.open_repository()
327
560
except errors.NoRepositoryPresent:
328
next_transport = found_bzrdir.root_transport.clone('..')
330
if ((found_bzrdir.root_transport.base ==
331
self.root_transport.base) or repository.is_shared()):
334
raise errors.NoRepositoryPresent(self)
335
raise errors.NoRepositoryPresent(self)
337
def get_branch_transport(self, branch_format):
562
if found_bzrdir.user_url == self.user_url:
563
return repository, True
564
elif repository.is_shared():
565
return repository, True
569
found_repo = self._find_containing(usable_repository)
570
if found_repo is None:
571
raise errors.NoRepositoryPresent(self)
574
def _find_creation_modes(self):
575
"""Determine the appropriate modes for files and directories.
577
They're always set to be consistent with the base directory,
578
assuming that this transport allows setting modes.
580
# TODO: Do we need or want an option (maybe a config setting) to turn
581
# this off or override it for particular locations? -- mbp 20080512
582
if self._mode_check_done:
584
self._mode_check_done = True
586
st = self.transport.stat('.')
587
except errors.TransportNotPossible:
588
self._dir_mode = None
589
self._file_mode = None
591
# Check the directory mode, but also make sure the created
592
# directories and files are read-write for this user. This is
593
# mostly a workaround for filesystems which lie about being able to
594
# write to a directory (cygwin & win32)
595
if (st.st_mode & 07777 == 00000):
596
# FTP allows stat but does not return dir/file modes
597
self._dir_mode = None
598
self._file_mode = None
600
self._dir_mode = (st.st_mode & 07777) | 00700
601
# Remove the sticky and execute bits for files
602
self._file_mode = self._dir_mode & ~07111
604
def _get_file_mode(self):
605
"""Return Unix mode for newly created files, or None.
607
if not self._mode_check_done:
608
self._find_creation_modes()
609
return self._file_mode
611
def _get_dir_mode(self):
612
"""Return Unix mode for newly created directories, or None.
614
if not self._mode_check_done:
615
self._find_creation_modes()
616
return self._dir_mode
618
def get_config(self):
619
"""Get configuration for this BzrDir."""
620
return config.BzrDirConfig(self)
622
def _get_config(self):
623
"""By default, no configuration is available."""
626
def __init__(self, _transport, _format):
627
"""Initialize a Bzr control dir object.
629
Only really common logic should reside here, concrete classes should be
630
made with varying behaviours.
632
:param _format: the format that is creating this BzrDir instance.
633
:param _transport: the transport this dir is based at.
635
self._format = _format
636
# these are also under the more standard names of
637
# control_transport and user_transport
638
self.transport = _transport.clone('.bzr')
639
self.root_transport = _transport
640
self._mode_check_done = False
643
def user_transport(self):
644
return self.root_transport
647
def control_transport(self):
648
return self.transport
650
def is_control_filename(self, filename):
651
"""True if filename is the name of a path which is reserved for bzrdir's.
653
:param filename: A filename within the root transport of this bzrdir.
655
This is true IF and ONLY IF the filename is part of the namespace reserved
656
for bzr control dirs. Currently this is the '.bzr' directory in the root
657
of the root_transport.
659
# this might be better on the BzrDirFormat class because it refers to
660
# all the possible bzrdir disk formats.
661
# This method is tested via the workingtree is_control_filename tests-
662
# it was extracted from WorkingTree.is_control_filename. If the method's
663
# contract is extended beyond the current trivial implementation, please
664
# add new tests for it to the appropriate place.
665
return filename == '.bzr' or filename.startswith('.bzr/')
667
def _cloning_metadir(self):
668
"""Produce a metadir suitable for cloning with.
670
:returns: (destination_bzrdir_format, source_repository)
672
result_format = self._format.__class__()
675
branch = self.open_branch(ignore_fallbacks=True)
676
source_repository = branch.repository
677
result_format._branch_format = branch._format
678
except errors.NotBranchError:
680
source_repository = self.open_repository()
681
except errors.NoRepositoryPresent:
682
source_repository = None
684
# XXX TODO: This isinstance is here because we have not implemented
685
# the fix recommended in bug # 103195 - to delegate this choice the
687
repo_format = source_repository._format
688
if isinstance(repo_format, remote.RemoteRepositoryFormat):
689
source_repository._ensure_real()
690
repo_format = source_repository._real_repository._format
691
result_format.repository_format = repo_format
693
# TODO: Couldn't we just probe for the format in these cases,
694
# rather than opening the whole tree? It would be a little
695
# faster. mbp 20070401
696
tree = self.open_workingtree(recommend_upgrade=False)
697
except (errors.NoWorkingTree, errors.NotLocalUrl):
698
result_format.workingtree_format = None
700
result_format.workingtree_format = tree._format.__class__()
701
return result_format, source_repository
703
def cloning_metadir(self, require_stacking=False):
704
"""Produce a metadir suitable for cloning or sprouting with.
706
These operations may produce workingtrees (yes, even though they're
707
"cloning" something that doesn't have a tree), so a viable workingtree
708
format must be selected.
710
:require_stacking: If True, non-stackable formats will be upgraded
711
to similar stackable formats.
712
:returns: a ControlDirFormat with all component formats either set
713
appropriately or set to None if that component should not be
716
format, repository = self._cloning_metadir()
717
if format._workingtree_format is None:
719
if repository is None:
720
# No repository either
722
# We have a repository, so set a working tree? (Why? This seems to
723
# contradict the stated return value in the docstring).
724
tree_format = repository._format._matchingbzrdir.workingtree_format
725
format.workingtree_format = tree_format.__class__()
727
format.require_stacking()
730
def get_branch_transport(self, branch_format, name=None):
338
731
"""Get the transport for use by branch format in this BzrDir.
340
733
Note that bzr dirs that do not support format strings will raise
341
734
IncompatibleFormat if the branch format they are given has
342
a format string, and vice verca.
735
a format string, and vice versa.
344
If branch_format is None, the transport is returned with no
345
checking. if it is not None, then the returned transport is
737
If branch_format is None, the transport is returned with no
738
checking. If it is not None, then the returned transport is
346
739
guaranteed to point to an existing directory ready for use.
348
741
raise NotImplementedError(self.get_branch_transport)
350
743
def get_repository_transport(self, repository_format):
351
744
"""Get the transport for use by repository format in this BzrDir.
353
746
Note that bzr dirs that do not support format strings will raise
354
747
IncompatibleFormat if the repository format they are given has
355
a format string, and vice verca.
748
a format string, and vice versa.
357
If repository_format is None, the transport is returned with no
358
checking. if it is not None, then the returned transport is
750
If repository_format is None, the transport is returned with no
751
checking. If it is not None, then the returned transport is
359
752
guaranteed to point to an existing directory ready for use.
361
754
raise NotImplementedError(self.get_repository_transport)
363
756
def get_workingtree_transport(self, tree_format):
364
757
"""Get the transport for use by workingtree format in this BzrDir.
366
759
Note that bzr dirs that do not support format strings will raise
367
IncompatibleFormat if the workingtree format they are given has
368
a format string, and vice verca.
760
IncompatibleFormat if the workingtree format they are given has a
761
format string, and vice versa.
370
If workingtree_format is None, the transport is returned with no
371
checking. if it is not None, then the returned transport is
763
If workingtree_format is None, the transport is returned with no
764
checking. If it is not None, then the returned transport is
372
765
guaranteed to point to an existing directory ready for use.
374
767
raise NotImplementedError(self.get_workingtree_transport)
376
def __init__(self, _transport, _format):
377
"""Initialize a Bzr control dir object.
379
Only really common logic should reside here, concrete classes should be
380
made with varying behaviours.
382
:param _format: the format that is creating this BzrDir instance.
383
:param _transport: the transport this dir is based at.
385
self._format = _format
386
self.transport = _transport.clone('.bzr')
387
self.root_transport = _transport
389
def needs_format_conversion(self, format=None):
390
"""Return true if this bzrdir needs convert_format run on it.
392
For instance, if the repository format is out of date but the
393
branch and working tree are not, this should return True.
395
:param format: Optional parameter indicating a specific desired
396
format we plan to arrive at.
398
raise NotImplementedError(self.needs_format_conversion)
401
def open_unsupported(base):
402
"""Open a branch which is not supported."""
403
return BzrDir.open(base, _unsupported=True)
406
def open(base, _unsupported=False):
407
"""Open an existing bzrdir, rooted at 'base' (url)
409
_unsupported is a private parameter to the BzrDir class.
411
t = get_transport(base)
412
mutter("trying to open %r with transport %r", base, t)
413
format = BzrDirFormat.find_format(t)
414
BzrDir._check_supported(format, _unsupported)
415
return format.open(t, _found=True)
417
def open_branch(self, unsupported=False):
418
"""Open the branch object at this BzrDir if one is present.
420
If unsupported is True, then no longer supported branch formats can
423
TODO: static convenience version of this?
425
raise NotImplementedError(self.open_branch)
428
def open_containing(url):
429
"""Open an existing branch which contains url.
431
:param url: url to search from.
432
See open_containing_from_transport for more detail.
434
return BzrDir.open_containing_from_transport(get_transport(url))
437
def open_containing_from_transport(a_transport):
438
"""Open an existing branch which contains a_transport.base
440
This probes for a branch at a_transport, and searches upwards from there.
442
Basically we keep looking up until we find the control directory or
443
run into the root. If there isn't one, raises NotBranchError.
444
If there is one and it is either an unrecognised format or an unsupported
445
format, UnknownFormatError or UnsupportedFormatError are raised.
446
If there is one, it is returned, along with the unused portion of url.
448
# this gets the normalised url back. I.e. '.' -> the full path.
449
url = a_transport.base
452
format = BzrDirFormat.find_format(a_transport)
453
BzrDir._check_supported(format, False)
454
return format.open(a_transport), a_transport.relpath(url)
455
except errors.NotBranchError, e:
456
mutter('not a branch in: %r %s', a_transport.base, e)
457
new_t = a_transport.clone('..')
458
if new_t.base == a_transport.base:
459
# reached the root, whatever that may be
460
raise errors.NotBranchError(path=url)
463
def open_repository(self, _unsupported=False):
464
"""Open the repository object at this BzrDir if one is present.
466
This will not follow the Branch object pointer - its strictly a direct
467
open facility. Most client code should use open_branch().repository to
470
_unsupported is a private parameter, not part of the api.
471
TODO: static convenience version of this?
473
raise NotImplementedError(self.open_repository)
475
def open_workingtree(self, _unsupported=False):
476
"""Open the workingtree object at this BzrDir if one is present.
478
TODO: static convenience version of this?
480
raise NotImplementedError(self.open_workingtree)
482
def sprout(self, url, revision_id=None, basis=None, force_new_repo=False):
483
"""Create a copy of this bzrdir prepared for use as a new line of
486
If urls last component does not exist, it will be created.
488
Attributes related to the identity of the source branch like
489
branch nickname will be cleaned, a working tree is created
490
whether one existed before or not; and a local branch is always
493
if revision_id is not None, then the clone operation may tune
494
itself to download less data.
497
result = self._format.initialize(url)
498
basis_repo, basis_branch, basis_tree = self._get_basis_components(basis)
500
source_branch = self.open_branch()
501
source_repository = source_branch.repository
502
except errors.NotBranchError:
505
source_repository = self.open_repository()
506
except errors.NoRepositoryPresent:
507
# copy the entire basis one if there is one
508
# but there is no repository.
509
source_repository = basis_repo
514
result_repo = result.find_repository()
515
except errors.NoRepositoryPresent:
517
if source_repository is None and result_repo is not None:
519
elif source_repository is None and result_repo is None:
520
# no repo available, make a new one
521
result.create_repository()
522
elif source_repository is not None and result_repo is None:
523
# have soure, and want to make a new target repo
524
source_repository.clone(result,
525
revision_id=revision_id,
528
# fetch needed content into target.
530
# XXX FIXME RBC 20060214 need tests for this when the basis
532
result_repo.fetch(basis_repo, revision_id=revision_id)
533
result_repo.fetch(source_repository, revision_id=revision_id)
534
if source_branch is not None:
535
source_branch.sprout(result, revision_id=revision_id)
537
result.create_branch()
538
if result_repo is None or result_repo.make_working_trees():
539
result.create_workingtree()
543
class BzrDirPreSplitOut(BzrDir):
544
"""A common class for the all-in-one formats."""
546
def __init__(self, _transport, _format):
547
"""See BzrDir.__init__."""
548
super(BzrDirPreSplitOut, self).__init__(_transport, _format)
549
assert self._format._lock_class == TransportLock
550
assert self._format._lock_file_name == 'branch-lock'
551
self._control_files = LockableFiles(self.get_branch_transport(None),
552
self._format._lock_file_name,
553
self._format._lock_class)
555
def clone(self, url, revision_id=None, basis=None, force_new_repo=False):
556
"""See BzrDir.clone()."""
557
from bzrlib.workingtree import WorkingTreeFormat2
559
result = self._format.initialize(url, _cloning=True)
560
basis_repo, basis_branch, basis_tree = self._get_basis_components(basis)
561
self.open_repository().clone(result, revision_id=revision_id, basis=basis_repo)
562
self.open_branch().clone(result, revision_id=revision_id)
564
self.open_workingtree().clone(result, basis=basis_tree)
565
except errors.NotLocalUrl:
566
# make a new one, this format always has to have one.
568
WorkingTreeFormat2().initialize(result)
569
except errors.NotLocalUrl:
570
# but we canot do it for remote trees.
574
def create_branch(self):
575
"""See BzrDir.create_branch."""
576
return self.open_branch()
578
def create_repository(self, shared=False):
579
"""See BzrDir.create_repository."""
581
raise errors.IncompatibleFormat('shared repository', self._format)
582
return self.open_repository()
584
def create_workingtree(self, revision_id=None):
585
"""See BzrDir.create_workingtree."""
586
# this looks buggy but is not -really-
587
# clone and sprout will have set the revision_id
588
# and that will have set it for us, its only
589
# specific uses of create_workingtree in isolation
590
# that can do wonky stuff here, and that only
591
# happens for creating checkouts, which cannot be
592
# done on this format anyway. So - acceptable wart.
593
result = self.open_workingtree()
594
if revision_id is not None:
595
result.set_last_revision(revision_id)
598
def get_branch_transport(self, branch_format):
599
"""See BzrDir.get_branch_transport()."""
600
if branch_format is None:
601
return self.transport
603
branch_format.get_format_string()
604
except NotImplementedError:
605
return self.transport
606
raise errors.IncompatibleFormat(branch_format, self._format)
608
def get_repository_transport(self, repository_format):
609
"""See BzrDir.get_repository_transport()."""
610
if repository_format is None:
611
return self.transport
613
repository_format.get_format_string()
614
except NotImplementedError:
615
return self.transport
616
raise errors.IncompatibleFormat(repository_format, self._format)
618
def get_workingtree_transport(self, workingtree_format):
619
"""See BzrDir.get_workingtree_transport()."""
620
if workingtree_format is None:
621
return self.transport
623
workingtree_format.get_format_string()
624
except NotImplementedError:
625
return self.transport
626
raise errors.IncompatibleFormat(workingtree_format, self._format)
628
def needs_format_conversion(self, format=None):
629
"""See BzrDir.needs_format_conversion()."""
630
# if the format is not the same as the system default,
631
# an upgrade is needed.
633
format = BzrDirFormat.get_default_format()
634
return not isinstance(self._format, format.__class__)
636
def open_branch(self, unsupported=False):
637
"""See BzrDir.open_branch."""
638
from bzrlib.branch import BzrBranchFormat4
639
format = BzrBranchFormat4()
640
self._check_supported(format, unsupported)
641
return format.open(self, _found=True)
643
def sprout(self, url, revision_id=None, basis=None):
644
"""See BzrDir.sprout()."""
645
from bzrlib.workingtree import WorkingTreeFormat2
647
result = self._format.initialize(url, _cloning=True)
648
basis_repo, basis_branch, basis_tree = self._get_basis_components(basis)
650
self.open_repository().clone(result, revision_id=revision_id, basis=basis_repo)
651
except errors.NoRepositoryPresent:
654
self.open_branch().sprout(result, revision_id=revision_id)
655
except errors.NotBranchError:
657
# we always want a working tree
658
WorkingTreeFormat2().initialize(result)
662
class BzrDir4(BzrDirPreSplitOut):
663
"""A .bzr version 4 control object.
665
This is a deprecated format and may be removed after sept 2006.
668
def create_repository(self, shared=False):
669
"""See BzrDir.create_repository."""
670
return self._format.repository_format.initialize(self, shared)
672
def needs_format_conversion(self, format=None):
673
"""Format 4 dirs are always in need of conversion."""
676
def open_repository(self):
677
"""See BzrDir.open_repository."""
678
from bzrlib.repository import RepositoryFormat4
679
return RepositoryFormat4().open(self, _found=True)
682
class BzrDir5(BzrDirPreSplitOut):
683
"""A .bzr version 5 control object.
685
This is a deprecated format and may be removed after sept 2006.
688
def open_repository(self):
689
"""See BzrDir.open_repository."""
690
from bzrlib.repository import RepositoryFormat5
691
return RepositoryFormat5().open(self, _found=True)
693
def open_workingtree(self, _unsupported=False):
694
"""See BzrDir.create_workingtree."""
695
from bzrlib.workingtree import WorkingTreeFormat2
696
return WorkingTreeFormat2().open(self, _found=True)
699
class BzrDir6(BzrDirPreSplitOut):
700
"""A .bzr version 6 control object.
702
This is a deprecated format and may be removed after sept 2006.
705
def open_repository(self):
706
"""See BzrDir.open_repository."""
707
from bzrlib.repository import RepositoryFormat6
708
return RepositoryFormat6().open(self, _found=True)
710
def open_workingtree(self, _unsupported=False):
711
"""See BzrDir.create_workingtree."""
712
from bzrlib.workingtree import WorkingTreeFormat2
713
return WorkingTreeFormat2().open(self, _found=True)
770
def create(cls, base, format=None, possible_transports=None):
771
"""Create a new BzrDir at the url 'base'.
773
:param format: If supplied, the format of branch to create. If not
774
supplied, the default is used.
775
:param possible_transports: If supplied, a list of transports that
776
can be reused to share a remote connection.
778
if cls is not BzrDir:
779
raise AssertionError("BzrDir.create always creates the "
780
"default format, not one of %r" % cls)
781
return controldir.ControlDir.create(base, format=format,
782
possible_transports=possible_transports)
785
return "<%s at %r>" % (self.__class__.__name__, self.user_url)
787
def update_feature_flags(self, updated_flags):
788
"""Update the features required by this bzrdir.
790
:param updated_flags: Dictionary mapping feature names to necessities
791
A necessity can be None to indicate the feature should be removed
793
self.control_files.lock_write()
795
self._format._update_feature_flags(updated_flags)
796
self.transport.put_bytes('branch-format', self._format.as_string())
798
self.control_files.unlock()
716
801
class BzrDirMeta1(BzrDir):
717
802
"""A .bzr meta version 1 control object.
719
This is the first control object where the
804
This is the first control object where the
720
805
individual aspects are really split out: there are separate repository,
721
806
workingtree and branch subdirectories and any subset of the three can be
722
807
present within a BzrDir.
810
def _get_branch_path(self, name):
811
"""Obtain the branch path to use.
813
This uses the API specified branch name first, and then falls back to
814
the branch name specified in the URL. If neither of those is specified,
815
it uses the default branch.
817
:param name: Optional branch name to use
818
:return: Relative path to branch
822
return urlutils.join('branches', name.encode("utf-8"))
824
def _read_branch_list(self):
825
"""Read the branch list.
827
:return: List of utf-8 encoded branch names.
830
f = self.control_transport.get('branch-list')
831
except errors.NoSuchFile:
837
ret.append(name.rstrip("\n"))
842
def _write_branch_list(self, branches):
843
"""Write out the branch list.
845
:param branches: List of utf-8 branch names to write
847
self.transport.put_bytes('branch-list',
848
"".join([name+"\n" for name in branches]))
850
def __init__(self, _transport, _format):
851
super(BzrDirMeta1, self).__init__(_transport, _format)
852
self.control_files = lockable_files.LockableFiles(
853
self.control_transport, self._format._lock_file_name,
854
self._format._lock_class)
725
856
def can_convert_format(self):
726
857
"""See BzrDir.can_convert_format()."""
729
def create_branch(self):
730
"""See BzrDir.create_branch."""
731
from bzrlib.branch import BranchFormat
732
return BranchFormat.get_default_format().initialize(self)
860
def create_branch(self, name=None, repository=None,
861
append_revisions_only=None):
862
"""See ControlDir.create_branch."""
864
name = self._get_selected_branch()
865
return self._format.get_branch_format().initialize(self, name=name,
866
repository=repository,
867
append_revisions_only=append_revisions_only)
869
def destroy_branch(self, name=None):
870
"""See ControlDir.destroy_branch."""
872
name = self._get_selected_branch()
873
path = self._get_branch_path(name)
875
self.control_files.lock_write()
877
branches = self._read_branch_list()
879
branches.remove(name.encode("utf-8"))
881
raise errors.NotBranchError(name)
882
self._write_branch_list(branches)
884
self.control_files.unlock()
886
self.transport.delete_tree(path)
887
except errors.NoSuchFile:
888
raise errors.NotBranchError(path=urlutils.join(self.transport.base,
734
891
def create_repository(self, shared=False):
735
892
"""See BzrDir.create_repository."""
736
893
return self._format.repository_format.initialize(self, shared)
738
def create_workingtree(self, revision_id=None):
895
def destroy_repository(self):
896
"""See BzrDir.destroy_repository."""
898
self.transport.delete_tree('repository')
899
except errors.NoSuchFile:
900
raise errors.NoRepositoryPresent(self)
902
def create_workingtree(self, revision_id=None, from_branch=None,
903
accelerator_tree=None, hardlink=False):
739
904
"""See BzrDir.create_workingtree."""
740
from bzrlib.workingtree import WorkingTreeFormat
741
return WorkingTreeFormat.get_default_format().initialize(self, revision_id)
743
def get_branch_transport(self, branch_format):
905
return self._format.workingtree_format.initialize(
906
self, revision_id, from_branch=from_branch,
907
accelerator_tree=accelerator_tree, hardlink=hardlink)
909
def destroy_workingtree(self):
910
"""See BzrDir.destroy_workingtree."""
911
wt = self.open_workingtree(recommend_upgrade=False)
912
repository = wt.branch.repository
913
empty = repository.revision_tree(_mod_revision.NULL_REVISION)
914
# We ignore the conflicts returned by wt.revert since we're about to
915
# delete the wt metadata anyway, all that should be left here are
916
# detritus. But see bug #634470 about subtree .bzr dirs.
917
conflicts = wt.revert(old_tree=empty)
918
self.destroy_workingtree_metadata()
920
def destroy_workingtree_metadata(self):
921
self.transport.delete_tree('checkout')
923
def find_branch_format(self, name=None):
924
"""Find the branch 'format' for this bzrdir.
926
This might be a synthetic object for e.g. RemoteBranch and SVN.
928
from bzrlib.branch import BranchFormatMetadir
929
return BranchFormatMetadir.find_format(self, name=name)
931
def _get_mkdir_mode(self):
932
"""Figure out the mode to use when creating a bzrdir subdir."""
933
temp_control = lockable_files.LockableFiles(self.transport, '',
934
lockable_files.TransportLock)
935
return temp_control._dir_mode
937
def get_branch_reference(self, name=None):
938
"""See BzrDir.get_branch_reference()."""
939
from bzrlib.branch import BranchFormatMetadir
940
format = BranchFormatMetadir.find_format(self, name=name)
941
return format.get_reference(self, name=name)
943
def set_branch_reference(self, target_branch, name=None):
944
format = _mod_branch.BranchReferenceFormat()
945
return format.initialize(self, target_branch=target_branch, name=name)
947
def get_branch_transport(self, branch_format, name=None):
744
948
"""See BzrDir.get_branch_transport()."""
950
name = self._get_selected_branch()
951
path = self._get_branch_path(name)
952
# XXX: this shouldn't implicitly create the directory if it's just
953
# promising to get a transport -- mbp 20090727
745
954
if branch_format is None:
746
return self.transport.clone('branch')
955
return self.transport.clone(path)
748
957
branch_format.get_format_string()
749
958
except NotImplementedError:
750
959
raise errors.IncompatibleFormat(branch_format, self._format)
961
branches = self._read_branch_list()
962
utf8_name = name.encode("utf-8")
963
if not utf8_name in branches:
964
self.control_files.lock_write()
966
branches = self._read_branch_list()
967
dirname = urlutils.dirname(utf8_name)
968
if dirname != "" and dirname in branches:
969
raise errors.ParentBranchExists(name)
971
b.startswith(utf8_name+"/") for b in branches]
972
if any(child_branches):
973
raise errors.AlreadyBranchError(name)
974
branches.append(utf8_name)
975
self._write_branch_list(branches)
977
self.control_files.unlock()
978
branch_transport = self.transport.clone(path)
979
mode = self._get_mkdir_mode()
980
branch_transport.create_prefix(mode=mode)
752
self.transport.mkdir('branch')
982
self.transport.mkdir(path, mode=mode)
753
983
except errors.FileExists:
755
return self.transport.clone('branch')
985
return self.transport.clone(path)
757
987
def get_repository_transport(self, repository_format):
758
988
"""See BzrDir.get_repository_transport()."""
798
1053
except errors.NoRepositoryPresent:
800
# currently there are no other possible conversions for meta1 formats.
1055
for branch in self.list_branches():
1056
if not isinstance(branch._format,
1057
format.get_branch_format().__class__):
1058
# the branch needs an upgrade.
1061
my_wt = self.open_workingtree(recommend_upgrade=False)
1062
if not isinstance(my_wt._format,
1063
format.workingtree_format.__class__):
1064
# the workingtree needs an upgrade.
1066
except (errors.NoWorkingTree, errors.NotLocalUrl):
803
def open_branch(self, unsupported=False):
804
"""See BzrDir.open_branch."""
805
from bzrlib.branch import BranchFormat
806
format = BranchFormat.find_format(self)
807
self._check_supported(format, unsupported)
808
return format.open(self, _found=True)
1070
def open_branch(self, name=None, unsupported=False,
1071
ignore_fallbacks=False, possible_transports=None):
1072
"""See ControlDir.open_branch."""
1074
name = self._get_selected_branch()
1075
format = self.find_branch_format(name=name)
1076
format.check_support_status(unsupported)
1077
return format.open(self, name=name,
1078
_found=True, ignore_fallbacks=ignore_fallbacks,
1079
possible_transports=possible_transports)
810
1081
def open_repository(self, unsupported=False):
811
1082
"""See BzrDir.open_repository."""
812
from bzrlib.repository import RepositoryFormat
813
format = RepositoryFormat.find_format(self)
814
self._check_supported(format, unsupported)
1083
from bzrlib.repository import RepositoryFormatMetaDir
1084
format = RepositoryFormatMetaDir.find_format(self)
1085
format.check_support_status(unsupported)
815
1086
return format.open(self, _found=True)
817
def open_workingtree(self, unsupported=False):
1088
def open_workingtree(self, unsupported=False,
1089
recommend_upgrade=True):
818
1090
"""See BzrDir.open_workingtree."""
819
from bzrlib.workingtree import WorkingTreeFormat
820
format = WorkingTreeFormat.find_format(self)
821
self._check_supported(format, unsupported)
1091
from bzrlib.workingtree import WorkingTreeFormatMetaDir
1092
format = WorkingTreeFormatMetaDir.find_format(self)
1093
format.check_support_status(unsupported, recommend_upgrade,
1094
basedir=self.root_transport.base)
822
1095
return format.open(self, _found=True)
825
class BzrDirFormat(object):
826
"""An encapsulation of the initialization and open routines for a format.
828
Formats provide three things:
829
* An initialization routine,
833
Formats are placed in an dict by their format string for reference
1097
def _get_config(self):
1098
return config.TransportConfig(self.transport, 'control.conf')
1101
class BzrFormat(object):
1102
"""Base class for all formats of things living in metadirs.
1104
This class manages the format string that is stored in the 'format'
1105
or 'branch-format' file.
1107
All classes for (branch-, repository-, workingtree-) formats that
1108
live in meta directories and have their own 'format' file
1109
(i.e. different from .bzr/branch-format) derive from this class,
1110
as well as the relevant base class for their kind
1111
(BranchFormat, WorkingTreeFormat, RepositoryFormat).
1113
Each format is identified by a "format" or "branch-format" file with a
1114
single line containing the base format name and then an optional list of
1117
Feature flags are supported as of bzr 2.5. Setting feature flags on formats
1118
will render them inaccessible to older versions of bzr.
1120
:ivar features: Dictionary mapping feature names to their necessity
1123
_present_features = set()
1129
def register_feature(cls, name):
1130
"""Register a feature as being present.
1132
:param name: Name of the feature
1135
raise ValueError("spaces are not allowed in feature names")
1136
if name in cls._present_features:
1137
raise errors.FeatureAlreadyRegistered(name)
1138
cls._present_features.add(name)
1141
def unregister_feature(cls, name):
1142
"""Unregister a feature."""
1143
cls._present_features.remove(name)
1145
def check_support_status(self, allow_unsupported, recommend_upgrade=True,
1147
for name, necessity in self.features.iteritems():
1148
if name in self._present_features:
1150
if necessity == "optional":
1151
mutter("ignoring optional missing feature %s", name)
1153
elif necessity == "required":
1154
raise errors.MissingFeature(name)
1156
mutter("treating unknown necessity as require for %s",
1158
raise errors.MissingFeature(name)
1161
def get_format_string(cls):
1162
"""Return the ASCII format string that identifies this format."""
1163
raise NotImplementedError(cls.get_format_string)
1166
def from_string(cls, text):
1167
format_string = cls.get_format_string()
1168
if not text.startswith(format_string):
1169
raise AssertionError("Invalid format header %r for %r" % (text, cls))
1170
lines = text[len(format_string):].splitlines()
1172
for lineno, line in enumerate(lines):
1174
(necessity, feature) = line.split(" ", 1)
1176
raise errors.ParseFormatError(format=cls, lineno=lineno+2,
1177
line=line, text=text)
1178
ret.features[feature] = necessity
1181
def as_string(self):
1182
"""Return the string representation of this format.
1184
lines = [self.get_format_string()]
1185
lines.extend([("%s %s\n" % (item[1], item[0])) for item in
1186
self.features.iteritems()])
1187
return "".join(lines)
1190
def _find_format(klass, registry, kind, format_string):
1192
first_line = format_string[:format_string.index("\n")+1]
1194
first_line = format_string
1196
cls = registry.get(first_line)
1198
raise errors.UnknownFormatError(format=first_line, kind=kind)
1199
return cls.from_string(format_string)
1201
def network_name(self):
1202
"""A simple byte string uniquely identifying this format for RPC calls.
1204
Metadir branch formats use their format string.
1206
return self.as_string()
1208
def __eq__(self, other):
1209
return (self.__class__ is other.__class__ and
1210
self.features == other.features)
1212
def _update_feature_flags(self, updated_flags):
1213
"""Update the feature flags in this format.
1215
:param updated_flags: Updated feature flags
1217
for name, necessity in updated_flags.iteritems():
1218
if necessity is None:
1220
del self.features[name]
1224
self.features[name] = necessity
1227
class BzrProber(controldir.Prober):
1228
"""Prober for formats that use a .bzr/ control directory."""
1230
formats = registry.FormatRegistry(controldir.network_format_registry)
1231
"""The known .bzr formats."""
1234
def probe_transport(klass, transport):
1235
"""Return the .bzrdir style format present in a directory."""
1237
format_string = transport.get_bytes(".bzr/branch-format")
1238
except errors.NoSuchFile:
1239
raise errors.NotBranchError(path=transport.base)
1241
first_line = format_string[:format_string.index("\n")+1]
1243
first_line = format_string
1245
cls = klass.formats.get(first_line)
1247
raise errors.UnknownFormatError(format=first_line, kind='bzrdir')
1248
return cls.from_string(format_string)
1251
def known_formats(cls):
1253
for name, format in cls.formats.iteritems():
1254
if callable(format):
1260
controldir.ControlDirFormat.register_prober(BzrProber)
1263
class RemoteBzrProber(controldir.Prober):
1264
"""Prober for remote servers that provide a Bazaar smart server."""
1267
def probe_transport(klass, transport):
1268
"""Return a RemoteBzrDirFormat object if it looks possible."""
1270
medium = transport.get_smart_medium()
1271
except (NotImplementedError, AttributeError,
1272
errors.TransportNotPossible, errors.NoSmartMedium,
1273
errors.SmartProtocolError):
1274
# no smart server, so not a branch for this format type.
1275
raise errors.NotBranchError(path=transport.base)
1277
# Decline to open it if the server doesn't support our required
1278
# version (3) so that the VFS-based transport will do it.
1279
if medium.should_probe():
1281
server_version = medium.protocol_version()
1282
except errors.SmartProtocolError:
1283
# Apparently there's no usable smart server there, even though
1284
# the medium supports the smart protocol.
1285
raise errors.NotBranchError(path=transport.base)
1286
if server_version != '2':
1287
raise errors.NotBranchError(path=transport.base)
1288
from bzrlib.remote import RemoteBzrDirFormat
1289
return RemoteBzrDirFormat()
1292
def known_formats(cls):
1293
from bzrlib.remote import RemoteBzrDirFormat
1294
return set([RemoteBzrDirFormat()])
1297
class BzrDirFormat(BzrFormat, controldir.ControlDirFormat):
1298
"""ControlDirFormat base class for .bzr/ directories.
1300
Formats are placed in a dict by their format string for reference
834
1301
during bzrdir opening. These should be subclasses of BzrDirFormat
835
1302
for consistency.
837
1304
Once a format is deprecated, just deprecate the initialize and open
838
methods on the format class. Do not deprecate the object, as the
1305
methods on the format class. Do not deprecate the object, as the
839
1306
object will be created every system load.
842
_default_format = None
843
"""The default format used for new .bzr dirs."""
846
"""The known formats."""
848
1309
_lock_file_name = 'branch-lock'
850
1311
# _lock_class must be set in subclasses to the lock type, typ.
851
1312
# TransportLock or LockDir
854
def find_format(klass, transport):
855
"""Return the format registered for URL."""
857
format_string = transport.get(".bzr/branch-format").read()
858
return klass._formats[format_string]
1314
def initialize_on_transport(self, transport):
1315
"""Initialize a new bzrdir in the base directory of a Transport."""
1317
# can we hand off the request to the smart server rather than using
1319
client_medium = transport.get_smart_medium()
1320
except errors.NoSmartMedium:
1321
return self._initialize_on_transport_vfs(transport)
1323
# Current RPC's only know how to create bzr metadir1 instances, so
1324
# we still delegate to vfs methods if the requested format is not a
1326
if type(self) != BzrDirMetaFormat1:
1327
return self._initialize_on_transport_vfs(transport)
1328
from bzrlib.remote import RemoteBzrDirFormat
1329
remote_format = RemoteBzrDirFormat()
1330
self._supply_sub_formats_to(remote_format)
1331
return remote_format.initialize_on_transport(transport)
1333
def initialize_on_transport_ex(self, transport, use_existing_dir=False,
1334
create_prefix=False, force_new_repo=False, stacked_on=None,
1335
stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
1336
shared_repo=False, vfs_only=False):
1337
"""Create this format on transport.
1339
The directory to initialize will be created.
1341
:param force_new_repo: Do not use a shared repository for the target,
1342
even if one is available.
1343
:param create_prefix: Create any missing directories leading up to
1345
:param use_existing_dir: Use an existing directory if one exists.
1346
:param stacked_on: A url to stack any created branch on, None to follow
1347
any target stacking policy.
1348
:param stack_on_pwd: If stack_on is relative, the location it is
1350
:param repo_format_name: If non-None, a repository will be
1351
made-or-found. Should none be found, or if force_new_repo is True
1352
the repo_format_name is used to select the format of repository to
1354
:param make_working_trees: Control the setting of make_working_trees
1355
for a new shared repository when one is made. None to use whatever
1356
default the format has.
1357
:param shared_repo: Control whether made repositories are shared or
1359
:param vfs_only: If True do not attempt to use a smart server
1360
:return: repo, controldir, require_stacking, repository_policy. repo is
1361
None if none was created or found, bzrdir is always valid.
1362
require_stacking is the result of examining the stacked_on
1363
parameter and any stacking policy found for the target.
1366
# Try to hand off to a smart server
1368
client_medium = transport.get_smart_medium()
1369
except errors.NoSmartMedium:
1372
from bzrlib.remote import RemoteBzrDirFormat
1373
# TODO: lookup the local format from a server hint.
1374
remote_dir_format = RemoteBzrDirFormat()
1375
remote_dir_format._network_name = self.network_name()
1376
self._supply_sub_formats_to(remote_dir_format)
1377
return remote_dir_format.initialize_on_transport_ex(transport,
1378
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
1379
force_new_repo=force_new_repo, stacked_on=stacked_on,
1380
stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
1381
make_working_trees=make_working_trees, shared_repo=shared_repo)
1382
# XXX: Refactor the create_prefix/no_create_prefix code into a
1383
# common helper function
1384
# The destination may not exist - if so make it according to policy.
1385
def make_directory(transport):
1386
transport.mkdir('.')
1388
def redirected(transport, e, redirection_notice):
1389
note(redirection_notice)
1390
return transport._redirected_to(e.source, e.target)
1392
transport = do_catching_redirections(make_directory, transport,
1394
except errors.FileExists:
1395
if not use_existing_dir:
859
1397
except errors.NoSuchFile:
860
raise errors.NotBranchError(path=transport.base)
862
raise errors.UnknownFormatError(format_string)
865
def get_default_format(klass):
866
"""Return the current default format."""
867
return klass._default_format
869
def get_format_string(self):
870
"""Return the ASCII format string that identifies this format."""
871
raise NotImplementedError(self.get_format_string)
873
def get_converter(self, format=None):
874
"""Return the converter to use to convert bzrdirs needing converts.
876
This returns a bzrlib.bzrdir.Converter object.
878
This should return the best upgrader to step this format towards the
879
current default format. In the case of plugins we can/shouold provide
880
some means for them to extend the range of returnable converters.
882
:param format: Optional format to override the default foramt of the
1398
if not create_prefix:
1400
transport.create_prefix()
1402
require_stacking = (stacked_on is not None)
1403
# Now the target directory exists, but doesn't have a .bzr
1404
# directory. So we need to create it, along with any work to create
1405
# all of the dependent branches, etc.
1407
result = self.initialize_on_transport(transport)
1408
if repo_format_name:
1410
# use a custom format
1411
result._format.repository_format = \
1412
repository.network_format_registry.get(repo_format_name)
1413
except AttributeError:
1414
# The format didn't permit it to be set.
1416
# A repository is desired, either in-place or shared.
1417
repository_policy = result.determine_repository_policy(
1418
force_new_repo, stacked_on, stack_on_pwd,
1419
require_stacking=require_stacking)
1420
result_repo, is_new_repo = repository_policy.acquire_repository(
1421
make_working_trees, shared_repo)
1422
if not require_stacking and repository_policy._require_stacking:
1423
require_stacking = True
1424
result._format.require_stacking()
1425
result_repo.lock_write()
1428
repository_policy = None
1429
return result_repo, result, require_stacking, repository_policy
1431
def _initialize_on_transport_vfs(self, transport):
1432
"""Initialize a new bzrdir using VFS calls.
1434
:param transport: The transport to create the .bzr directory in.
885
raise NotImplementedError(self.get_converter)
887
def initialize(self, url):
888
"""Create a bzr control dir at this url and return an opened copy."""
889
# Since we don't have a .bzr directory, inherit the
1437
# Since we are creating a .bzr directory, inherit the
890
1438
# mode from the root directory
891
t = get_transport(url)
892
temp_control = LockableFiles(t, '', TransportLock)
893
temp_control._transport.mkdir('.bzr',
894
# FIXME: RBC 20060121 dont peek under
896
mode=temp_control._dir_mode)
1439
temp_control = lockable_files.LockableFiles(transport,
1440
'', lockable_files.TransportLock)
1442
temp_control._transport.mkdir('.bzr',
1443
# FIXME: RBC 20060121 don't peek under
1445
mode=temp_control._dir_mode)
1446
except errors.FileExists:
1447
raise errors.AlreadyControlDirError(transport.base)
1448
if sys.platform == 'win32' and isinstance(transport, local.LocalTransport):
1449
win32utils.set_file_attr_hidden(transport._abspath('.bzr'))
897
1450
file_mode = temp_control._file_mode
898
1451
del temp_control
899
mutter('created control directory in ' + t.base)
900
control = t.clone('.bzr')
901
utf8_files = [('README',
902
"This is a Bazaar-NG control directory.\n"
903
"Do not change any files in this directory.\n"),
904
('branch-format', self.get_format_string()),
1452
bzrdir_transport = transport.clone('.bzr')
1453
utf8_files = [('README',
1454
"This is a Bazaar control directory.\n"
1455
"Do not change any files in this directory.\n"
1456
"See http://bazaar.canonical.com/ for more information about Bazaar.\n"),
1457
('branch-format', self.as_string()),
906
1459
# NB: no need to escape relative paths that are url safe.
907
control_files = LockableFiles(control, self._lock_file_name, self._lock_class)
1460
control_files = lockable_files.LockableFiles(bzrdir_transport,
1461
self._lock_file_name, self._lock_class)
908
1462
control_files.create_lock()
909
1463
control_files.lock_write()
911
for file, content in utf8_files:
912
control_files.put_utf8(file, content)
1465
for (filename, content) in utf8_files:
1466
bzrdir_transport.put_bytes(filename, content,
914
1469
control_files.unlock()
915
return self.open(t, _found=True)
917
def is_supported(self):
918
"""Is this format supported?
920
Supported formats must be initializable and openable.
921
Unsupported formats may not support initialization or committing or
922
some other features depending on the reason for not being supported.
1470
return self.open(transport, _found=True)
926
1472
def open(self, transport, _found=False):
927
1473
"""Return an instance of this format for the dir transport points at.
929
1475
_found is a private parameter, do not use it.
932
assert isinstance(BzrDirFormat.find_format(transport),
1478
found_format = controldir.ControlDirFormat.find_format(transport)
1479
if not isinstance(found_format, self.__class__):
1480
raise AssertionError("%s was asked to open %s, but it seems to need "
1482
% (self, transport, found_format))
1483
# Allow subclasses - use the found format.
1484
self._supply_sub_formats_to(found_format)
1485
return found_format._open(transport)
934
1486
return self._open(transport)
936
1488
def _open(self, transport):
1112
1525
This is the first format with split out working tree, branch and repository
1115
- Format 3 working trees [optional]
1116
- Format 5 branches [optional]
1117
- Format 7 repositories [optional]
1530
- Format 3 working trees [optional]
1531
- Format 5 branches [optional]
1532
- Format 7 repositories [optional]
1120
_lock_class = LockDir
1535
_lock_class = lockdir.LockDir
1537
fixed_components = False
1539
colocated_branches = True
1542
BzrDirFormat.__init__(self)
1543
self._workingtree_format = None
1544
self._branch_format = None
1545
self._repository_format = None
1547
def __eq__(self, other):
1548
if other.__class__ is not self.__class__:
1550
if other.repository_format != self.repository_format:
1552
if other.workingtree_format != self.workingtree_format:
1554
if other.features != self.features:
1558
def __ne__(self, other):
1559
return not self == other
1561
def get_branch_format(self):
1562
if self._branch_format is None:
1563
from bzrlib.branch import format_registry as branch_format_registry
1564
self._branch_format = branch_format_registry.get_default()
1565
return self._branch_format
1567
def set_branch_format(self, format):
1568
self._branch_format = format
1570
def require_stacking(self, stack_on=None, possible_transports=None,
1572
"""We have a request to stack, try to ensure the formats support it.
1574
:param stack_on: If supplied, it is the URL to a branch that we want to
1575
stack on. Check to see if that format supports stacking before
1578
# Stacking is desired. requested by the target, but does the place it
1579
# points at support stacking? If it doesn't then we should
1580
# not implicitly upgrade. We check this here.
1581
new_repo_format = None
1582
new_branch_format = None
1584
# a bit of state for get_target_branch so that we don't try to open it
1585
# 2 times, for both repo *and* branch
1586
target = [None, False, None] # target_branch, checked, upgrade anyway
1587
def get_target_branch():
1589
# We've checked, don't check again
1591
if stack_on is None:
1592
# No target format, that means we want to force upgrading
1593
target[:] = [None, True, True]
1596
target_dir = BzrDir.open(stack_on,
1597
possible_transports=possible_transports)
1598
except errors.NotBranchError:
1599
# Nothing there, don't change formats
1600
target[:] = [None, True, False]
1602
except errors.JailBreak:
1603
# JailBreak, JFDI and upgrade anyway
1604
target[:] = [None, True, True]
1607
target_branch = target_dir.open_branch()
1608
except errors.NotBranchError:
1609
# No branch, don't upgrade formats
1610
target[:] = [None, True, False]
1612
target[:] = [target_branch, True, False]
1615
if (not _skip_repo and
1616
not self.repository_format.supports_external_lookups):
1617
# We need to upgrade the Repository.
1618
target_branch, _, do_upgrade = get_target_branch()
1619
if target_branch is None:
1620
# We don't have a target branch, should we upgrade anyway?
1622
# stack_on is inaccessible, JFDI.
1623
# TODO: bad monkey, hard-coded formats...
1624
if self.repository_format.rich_root_data:
1625
new_repo_format = knitpack_repo.RepositoryFormatKnitPack5RichRoot()
1627
new_repo_format = knitpack_repo.RepositoryFormatKnitPack5()
1629
# If the target already supports stacking, then we know the
1630
# project is already able to use stacking, so auto-upgrade
1632
new_repo_format = target_branch.repository._format
1633
if not new_repo_format.supports_external_lookups:
1634
# target doesn't, source doesn't, so don't auto upgrade
1636
new_repo_format = None
1637
if new_repo_format is not None:
1638
self.repository_format = new_repo_format
1639
note(gettext('Source repository format does not support stacking,'
1640
' using format:\n %s'),
1641
new_repo_format.get_format_description())
1643
if not self.get_branch_format().supports_stacking():
1644
# We just checked the repo, now lets check if we need to
1645
# upgrade the branch format
1646
target_branch, _, do_upgrade = get_target_branch()
1647
if target_branch is None:
1649
# TODO: bad monkey, hard-coded formats...
1650
from bzrlib.branch import BzrBranchFormat7
1651
new_branch_format = BzrBranchFormat7()
1653
new_branch_format = target_branch._format
1654
if not new_branch_format.supports_stacking():
1655
new_branch_format = None
1656
if new_branch_format is not None:
1657
# Does support stacking, use its format.
1658
self.set_branch_format(new_branch_format)
1659
note(gettext('Source branch format does not support stacking,'
1660
' using format:\n %s'),
1661
new_branch_format.get_format_description())
1122
1663
def get_converter(self, format=None):
1123
1664
"""See BzrDirFormat.get_converter()."""
1124
1665
if format is None:
1125
1666
format = BzrDirFormat.get_default_format()
1667
if (type(self) is BzrDirMetaFormat1 and
1668
type(format) is BzrDirMetaFormat1Colo):
1669
return ConvertMetaToColo(format)
1670
if (type(self) is BzrDirMetaFormat1Colo and
1671
type(format) is BzrDirMetaFormat1):
1672
return ConvertMetaToColo(format)
1126
1673
if not isinstance(self, format.__class__):
1127
1674
# converting away from metadir is not implemented
1128
1675
raise NotImplementedError(self.get_converter)
1129
1676
return ConvertMetaToMeta(format)
1131
def get_format_string(self):
1679
def get_format_string(cls):
1132
1680
"""See BzrDirFormat.get_format_string()."""
1133
1681
return "Bazaar-NG meta directory, format 1\n"
1683
def get_format_description(self):
1684
"""See BzrDirFormat.get_format_description()."""
1685
return "Meta directory format 1"
1135
1687
def _open(self, transport):
1136
1688
"""See BzrDirFormat._open."""
1137
return BzrDirMeta1(transport, self)
1689
# Create a new format instance because otherwise initialisation of new
1690
# metadirs share the global default format object leading to alias
1692
format = BzrDirMetaFormat1()
1693
self._supply_sub_formats_to(format)
1694
return BzrDirMeta1(transport, format)
1139
1696
def __return_repository_format(self):
1140
1697
"""Circular import protection."""
1141
if getattr(self, '_repository_format', None):
1698
if self._repository_format:
1142
1699
return self._repository_format
1143
from bzrlib.repository import RepositoryFormat
1144
return RepositoryFormat.get_default_format()
1700
from bzrlib.repository import format_registry
1701
return format_registry.get_default()
1146
def __set_repository_format(self, value):
1147
"""Allow changint the repository format for metadir formats."""
1703
def _set_repository_format(self, value):
1704
"""Allow changing the repository format for metadir formats."""
1148
1705
self._repository_format = value
1150
repository_format = property(__return_repository_format, __set_repository_format)
1153
BzrDirFormat.register_format(BzrDirFormat4())
1154
BzrDirFormat.register_format(BzrDirFormat5())
1155
BzrDirFormat.register_format(BzrDirMetaFormat1())
1156
__default_format = BzrDirFormat6()
1157
BzrDirFormat.register_format(__default_format)
1158
BzrDirFormat.set_default_format(__default_format)
1161
class BzrDirTestProviderAdapter(object):
1162
"""A tool to generate a suite testing multiple bzrdir formats at once.
1164
This is done by copying the test once for each transport and injecting
1165
the transport_server, transport_readonly_server, and bzrdir_format
1166
classes into each copy. Each copy is also given a new id() to make it
1170
def __init__(self, transport_server, transport_readonly_server, formats):
1171
self._transport_server = transport_server
1172
self._transport_readonly_server = transport_readonly_server
1173
self._formats = formats
1175
def adapt(self, test):
1176
result = TestSuite()
1177
for format in self._formats:
1178
new_test = deepcopy(test)
1179
new_test.transport_server = self._transport_server
1180
new_test.transport_readonly_server = self._transport_readonly_server
1181
new_test.bzrdir_format = format
1182
def make_new_test_id():
1183
new_id = "%s(%s)" % (new_test.id(), format.__class__.__name__)
1184
return lambda: new_id
1185
new_test.id = make_new_test_id()
1186
result.addTest(new_test)
1190
class ScratchDir(BzrDir6):
1191
"""Special test class: a bzrdir that cleans up itself..
1193
>>> d = ScratchDir()
1194
>>> base = d.transport.base
1197
>>> b.transport.__del__()
1202
def __init__(self, files=[], dirs=[], transport=None):
1203
"""Make a test branch.
1205
This creates a temporary directory and runs init-tree in it.
1207
If any files are listed, they are created in the working copy.
1209
if transport is None:
1210
transport = bzrlib.transport.local.ScratchTransport()
1211
# local import for scope restriction
1212
BzrDirFormat6().initialize(transport.base)
1213
super(ScratchDir, self).__init__(transport, BzrDirFormat6())
1214
self.create_repository()
1215
self.create_branch()
1216
self.create_workingtree()
1218
super(ScratchDir, self).__init__(transport, BzrDirFormat6())
1220
# BzrBranch creates a clone to .bzr and then forgets about the
1221
# original transport. A ScratchTransport() deletes itself and
1222
# everything underneath it when it goes away, so we need to
1223
# grab a local copy to prevent that from happening
1224
self._transport = transport
1227
self._transport.mkdir(d)
1230
self._transport.put(f, 'content of %s' % f)
1234
>>> orig = ScratchDir(files=["file1", "file2"])
1235
>>> os.listdir(orig.base)
1236
[u'.bzr', u'file1', u'file2']
1237
>>> clone = orig.clone()
1238
>>> if os.name != 'nt':
1239
... os.path.samefile(orig.base, clone.base)
1241
... orig.base == clone.base
1244
>>> os.listdir(clone.base)
1245
[u'.bzr', u'file1', u'file2']
1247
from shutil import copytree
1248
from bzrlib.osutils import mkdtemp
1251
copytree(self.base, base, symlinks=True)
1253
transport=bzrlib.transport.local.ScratchTransport(base))
1256
class Converter(object):
1257
"""Converts a disk format object from one format to another."""
1259
def convert(self, to_convert, pb):
1260
"""Perform the conversion of to_convert, giving feedback via pb.
1262
:param to_convert: The disk object to convert.
1263
:param pb: a progress bar to use for progress information.
1266
def step(self, message):
1267
"""Update the pb by a step."""
1269
self.pb.update(message, self.count, self.total)
1272
class ConvertBzrDir4To5(Converter):
1273
"""Converts format 4 bzr dirs to format 5."""
1276
super(ConvertBzrDir4To5, self).__init__()
1277
self.converted_revs = set()
1278
self.absent_revisions = set()
1282
def convert(self, to_convert, pb):
1283
"""See Converter.convert()."""
1284
self.bzrdir = to_convert
1286
self.pb.note('starting upgrade from format 4 to 5')
1287
if isinstance(self.bzrdir.transport, LocalTransport):
1288
self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
1289
self._convert_to_weaves()
1290
return BzrDir.open(self.bzrdir.root_transport.base)
1292
def _convert_to_weaves(self):
1293
self.pb.note('note: upgrade may be faster if all store files are ungzipped first')
1296
stat = self.bzrdir.transport.stat('weaves')
1297
if not S_ISDIR(stat.st_mode):
1298
self.bzrdir.transport.delete('weaves')
1299
self.bzrdir.transport.mkdir('weaves')
1300
except errors.NoSuchFile:
1301
self.bzrdir.transport.mkdir('weaves')
1302
# deliberately not a WeaveFile as we want to build it up slowly.
1303
self.inv_weave = Weave('inventory')
1304
# holds in-memory weaves for all files
1305
self.text_weaves = {}
1306
self.bzrdir.transport.delete('branch-format')
1307
self.branch = self.bzrdir.open_branch()
1308
self._convert_working_inv()
1309
rev_history = self.branch.revision_history()
1310
# to_read is a stack holding the revisions we still need to process;
1311
# appending to it adds new highest-priority revisions
1312
self.known_revisions = set(rev_history)
1313
self.to_read = rev_history[-1:]
1315
rev_id = self.to_read.pop()
1316
if (rev_id not in self.revisions
1317
and rev_id not in self.absent_revisions):
1318
self._load_one_rev(rev_id)
1320
to_import = self._make_order()
1321
for i, rev_id in enumerate(to_import):
1322
self.pb.update('converting revision', i, len(to_import))
1323
self._convert_one_rev(rev_id)
1325
self._write_all_weaves()
1326
self._write_all_revs()
1327
self.pb.note('upgraded to weaves:')
1328
self.pb.note(' %6d revisions and inventories', len(self.revisions))
1329
self.pb.note(' %6d revisions not present', len(self.absent_revisions))
1330
self.pb.note(' %6d texts', self.text_count)
1331
self._cleanup_spare_files_after_format4()
1332
self.branch.control_files.put_utf8('branch-format', BzrDirFormat5().get_format_string())
1334
def _cleanup_spare_files_after_format4(self):
1335
# FIXME working tree upgrade foo.
1336
for n in 'merged-patches', 'pending-merged-patches':
1338
## assert os.path.getsize(p) == 0
1339
self.bzrdir.transport.delete(n)
1340
except errors.NoSuchFile:
1342
self.bzrdir.transport.delete_tree('inventory-store')
1343
self.bzrdir.transport.delete_tree('text-store')
1345
def _convert_working_inv(self):
1346
inv = serializer_v4.read_inventory(self.branch.control_files.get('inventory'))
1347
new_inv_xml = serializer_v5.write_inventory_to_string(inv)
1348
# FIXME inventory is a working tree change.
1349
self.branch.control_files.put('inventory', new_inv_xml)
1351
def _write_all_weaves(self):
1352
controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)
1353
weave_transport = self.bzrdir.transport.clone('weaves')
1354
weaves = WeaveStore(weave_transport, prefixed=False)
1355
transaction = WriteTransaction()
1359
for file_id, file_weave in self.text_weaves.items():
1360
self.pb.update('writing weave', i, len(self.text_weaves))
1361
weaves._put_weave(file_id, file_weave, transaction)
1363
self.pb.update('inventory', 0, 1)
1364
controlweaves._put_weave('inventory', self.inv_weave, transaction)
1365
self.pb.update('inventory', 1, 1)
1369
def _write_all_revs(self):
1370
"""Write all revisions out in new form."""
1371
self.bzrdir.transport.delete_tree('revision-store')
1372
self.bzrdir.transport.mkdir('revision-store')
1373
revision_transport = self.bzrdir.transport.clone('revision-store')
1375
_revision_store = TextRevisionStore(TextStore(revision_transport,
1379
transaction = bzrlib.transactions.WriteTransaction()
1380
for i, rev_id in enumerate(self.converted_revs):
1381
self.pb.update('write revision', i, len(self.converted_revs))
1382
_revision_store.add_revision(self.revisions[rev_id], transaction)
1386
def _load_one_rev(self, rev_id):
1387
"""Load a revision object into memory.
1389
Any parents not either loaded or abandoned get queued to be
1391
self.pb.update('loading revision',
1392
len(self.revisions),
1393
len(self.known_revisions))
1394
if not self.branch.repository.has_revision(rev_id):
1396
self.pb.note('revision {%s} not present in branch; '
1397
'will be converted as a ghost',
1399
self.absent_revisions.add(rev_id)
1401
rev = self.branch.repository._revision_store.get_revision(rev_id,
1402
self.branch.repository.get_transaction())
1403
for parent_id in rev.parent_ids:
1404
self.known_revisions.add(parent_id)
1405
self.to_read.append(parent_id)
1406
self.revisions[rev_id] = rev
1408
def _load_old_inventory(self, rev_id):
1409
assert rev_id not in self.converted_revs
1410
old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
1411
inv = serializer_v4.read_inventory_from_string(old_inv_xml)
1412
rev = self.revisions[rev_id]
1413
if rev.inventory_sha1:
1414
assert rev.inventory_sha1 == sha_string(old_inv_xml), \
1415
'inventory sha mismatch for {%s}' % rev_id
1418
def _load_updated_inventory(self, rev_id):
1419
assert rev_id in self.converted_revs
1420
inv_xml = self.inv_weave.get_text(rev_id)
1421
inv = serializer_v5.read_inventory_from_string(inv_xml)
1424
def _convert_one_rev(self, rev_id):
1425
"""Convert revision and all referenced objects to new format."""
1426
rev = self.revisions[rev_id]
1427
inv = self._load_old_inventory(rev_id)
1428
present_parents = [p for p in rev.parent_ids
1429
if p not in self.absent_revisions]
1430
self._convert_revision_contents(rev, inv, present_parents)
1431
self._store_new_weave(rev, inv, present_parents)
1432
self.converted_revs.add(rev_id)
1434
def _store_new_weave(self, rev, inv, present_parents):
1435
# the XML is now updated with text versions
1439
if ie.kind == 'root_directory':
1441
assert hasattr(ie, 'revision'), \
1442
'no revision on {%s} in {%s}' % \
1443
(file_id, rev.revision_id)
1444
new_inv_xml = serializer_v5.write_inventory_to_string(inv)
1445
new_inv_sha1 = sha_string(new_inv_xml)
1446
self.inv_weave.add_lines(rev.revision_id,
1448
new_inv_xml.splitlines(True))
1449
rev.inventory_sha1 = new_inv_sha1
1451
def _convert_revision_contents(self, rev, inv, present_parents):
1452
"""Convert all the files within a revision.
1454
Also upgrade the inventory to refer to the text revision ids."""
1455
rev_id = rev.revision_id
1456
mutter('converting texts of revision {%s}',
1458
parent_invs = map(self._load_updated_inventory, present_parents)
1461
self._convert_file_version(rev, ie, parent_invs)
1463
def _convert_file_version(self, rev, ie, parent_invs):
1464
"""Convert one version of one file.
1466
The file needs to be added into the weave if it is a merge
1467
of >=2 parents or if it's changed from its parent.
1469
if ie.kind == 'root_directory':
1471
file_id = ie.file_id
1472
rev_id = rev.revision_id
1473
w = self.text_weaves.get(file_id)
1476
self.text_weaves[file_id] = w
1477
text_changed = False
1478
previous_entries = ie.find_previous_heads(parent_invs,
1482
for old_revision in previous_entries:
1483
# if this fails, its a ghost ?
1484
assert old_revision in self.converted_revs
1485
self.snapshot_ie(previous_entries, ie, w, rev_id)
1487
assert getattr(ie, 'revision', None) is not None
1489
def snapshot_ie(self, previous_revisions, ie, w, rev_id):
1490
# TODO: convert this logic, which is ~= snapshot to
1491
# a call to:. This needs the path figured out. rather than a work_tree
1492
# a v4 revision_tree can be given, or something that looks enough like
1493
# one to give the file content to the entry if it needs it.
1494
# and we need something that looks like a weave store for snapshot to
1496
#ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
1497
if len(previous_revisions) == 1:
1498
previous_ie = previous_revisions.values()[0]
1499
if ie._unchanged(previous_ie):
1500
ie.revision = previous_ie.revision
1503
text = self.branch.repository.text_store.get(ie.text_id)
1504
file_lines = text.readlines()
1505
assert sha_strings(file_lines) == ie.text_sha1
1506
assert sum(map(len, file_lines)) == ie.text_size
1507
w.add_lines(rev_id, previous_revisions, file_lines)
1508
self.text_count += 1
1510
w.add_lines(rev_id, previous_revisions, [])
1511
ie.revision = rev_id
1513
def _make_order(self):
1514
"""Return a suitable order for importing revisions.
1516
The order must be such that an revision is imported after all
1517
its (present) parents.
1519
todo = set(self.revisions.keys())
1520
done = self.absent_revisions.copy()
1523
# scan through looking for a revision whose parents
1525
for rev_id in sorted(list(todo)):
1526
rev = self.revisions[rev_id]
1527
parent_ids = set(rev.parent_ids)
1528
if parent_ids.issubset(done):
1529
# can take this one now
1530
order.append(rev_id)
1536
class ConvertBzrDir5To6(Converter):
1537
"""Converts format 5 bzr dirs to format 6."""
1539
def convert(self, to_convert, pb):
1540
"""See Converter.convert()."""
1541
self.bzrdir = to_convert
1543
self.pb.note('starting upgrade from format 5 to 6')
1544
self._convert_to_prefixed()
1545
return BzrDir.open(self.bzrdir.root_transport.base)
1547
def _convert_to_prefixed(self):
1548
from bzrlib.store import hash_prefix
1549
self.bzrdir.transport.delete('branch-format')
1550
for store_name in ["weaves", "revision-store"]:
1551
self.pb.note("adding prefixes to %s" % store_name)
1552
store_transport = self.bzrdir.transport.clone(store_name)
1553
for urlfilename in store_transport.list_dir('.'):
1554
filename = urlunescape(urlfilename)
1555
if (filename.endswith(".weave") or
1556
filename.endswith(".gz") or
1557
filename.endswith(".sig")):
1558
file_id = os.path.splitext(filename)[0]
1561
prefix_dir = hash_prefix(file_id)
1562
# FIXME keep track of the dirs made RBC 20060121
1564
store_transport.move(filename, prefix_dir + '/' + filename)
1565
except errors.NoSuchFile: # catches missing dirs strangely enough
1566
store_transport.mkdir(prefix_dir)
1567
store_transport.move(filename, prefix_dir + '/' + filename)
1568
self.bzrdir._control_files.put_utf8('branch-format', BzrDirFormat6().get_format_string())
1571
class ConvertBzrDir6ToMeta(Converter):
1572
"""Converts format 6 bzr dirs to metadirs."""
1574
def convert(self, to_convert, pb):
1575
"""See Converter.convert()."""
1576
self.bzrdir = to_convert
1579
self.total = 20 # the steps we know about
1580
self.garbage_inventories = []
1582
self.pb.note('starting upgrade from format 6 to metadir')
1583
self.bzrdir._control_files.put_utf8('branch-format', "Converting to format 6")
1584
# its faster to move specific files around than to open and use the apis...
1585
# first off, nuke ancestry.weave, it was never used.
1587
self.step('Removing ancestry.weave')
1588
self.bzrdir.transport.delete('ancestry.weave')
1589
except errors.NoSuchFile:
1591
# find out whats there
1592
self.step('Finding branch files')
1593
last_revision = self.bzrdir.open_workingtree().last_revision()
1594
bzrcontents = self.bzrdir.transport.list_dir('.')
1595
for name in bzrcontents:
1596
if name.startswith('basis-inventory.'):
1597
self.garbage_inventories.append(name)
1598
# create new directories for repository, working tree and branch
1599
self.dir_mode = self.bzrdir._control_files._dir_mode
1600
self.file_mode = self.bzrdir._control_files._file_mode
1601
repository_names = [('inventory.weave', True),
1602
('revision-store', True),
1604
self.step('Upgrading repository ')
1605
self.bzrdir.transport.mkdir('repository', mode=self.dir_mode)
1606
self.make_lock('repository')
1607
# we hard code the formats here because we are converting into
1608
# the meta format. The meta format upgrader can take this to a
1609
# future format within each component.
1610
self.put_format('repository', bzrlib.repository.RepositoryFormat7())
1611
for entry in repository_names:
1612
self.move_entry('repository', entry)
1614
self.step('Upgrading branch ')
1615
self.bzrdir.transport.mkdir('branch', mode=self.dir_mode)
1616
self.make_lock('branch')
1617
self.put_format('branch', bzrlib.branch.BzrBranchFormat5())
1618
branch_files = [('revision-history', True),
1619
('branch-name', True),
1621
for entry in branch_files:
1622
self.move_entry('branch', entry)
1624
self.step('Upgrading working tree')
1625
self.bzrdir.transport.mkdir('checkout', mode=self.dir_mode)
1626
self.make_lock('checkout')
1627
self.put_format('checkout', bzrlib.workingtree.WorkingTreeFormat3())
1628
self.bzrdir.transport.delete_multi(self.garbage_inventories, self.pb)
1629
checkout_files = [('pending-merges', True),
1630
('inventory', True),
1631
('stat-cache', False)]
1632
for entry in checkout_files:
1633
self.move_entry('checkout', entry)
1634
if last_revision is not None:
1635
self.bzrdir._control_files.put_utf8('checkout/last-revision',
1637
self.bzrdir._control_files.put_utf8('branch-format', BzrDirMetaFormat1().get_format_string())
1638
return BzrDir.open(self.bzrdir.root_transport.base)
1640
def make_lock(self, name):
1641
"""Make a lock for the new control dir name."""
1642
self.step('Make %s lock' % name)
1643
ld = LockDir(self.bzrdir.transport,
1645
file_modebits=self.file_mode,
1646
dir_modebits=self.dir_mode)
1649
def move_entry(self, new_dir, entry):
1650
"""Move then entry name into new_dir."""
1652
mandatory = entry[1]
1653
self.step('Moving %s' % name)
1655
self.bzrdir.transport.move(name, '%s/%s' % (new_dir, name))
1656
except errors.NoSuchFile:
1660
def put_format(self, dirname, format):
1661
self.bzrdir._control_files.put_utf8('%s/format' % dirname, format.get_format_string())
1664
class ConvertMetaToMeta(Converter):
1707
repository_format = property(__return_repository_format,
1708
_set_repository_format)
1710
def _supply_sub_formats_to(self, other_format):
1711
"""Give other_format the same values for sub formats as this has.
1713
This method is expected to be used when parameterising a
1714
RemoteBzrDirFormat instance with the parameters from a
1715
BzrDirMetaFormat1 instance.
1717
:param other_format: other_format is a format which should be
1718
compatible with whatever sub formats are supported by self.
1721
super(BzrDirMetaFormat1, self)._supply_sub_formats_to(other_format)
1722
if getattr(self, '_repository_format', None) is not None:
1723
other_format.repository_format = self.repository_format
1724
if self._branch_format is not None:
1725
other_format._branch_format = self._branch_format
1726
if self._workingtree_format is not None:
1727
other_format.workingtree_format = self.workingtree_format
1729
def __get_workingtree_format(self):
1730
if self._workingtree_format is None:
1731
from bzrlib.workingtree import (
1732
format_registry as wt_format_registry,
1734
self._workingtree_format = wt_format_registry.get_default()
1735
return self._workingtree_format
1737
def __set_workingtree_format(self, wt_format):
1738
self._workingtree_format = wt_format
1741
return "<%r>" % (self.__class__.__name__,)
1743
workingtree_format = property(__get_workingtree_format,
1744
__set_workingtree_format)
1747
# Register bzr formats
1748
BzrProber.formats.register(BzrDirMetaFormat1.get_format_string(),
1750
controldir.ControlDirFormat._default_format = BzrDirMetaFormat1()
1753
class BzrDirMetaFormat1Colo(BzrDirMetaFormat1):
1754
"""BzrDirMeta1 format with support for colocated branches."""
1756
colocated_branches = True
1759
def get_format_string(cls):
1760
"""See BzrDirFormat.get_format_string()."""
1761
return "Bazaar meta directory, format 1 (with colocated branches)\n"
1763
def get_format_description(self):
1764
"""See BzrDirFormat.get_format_description()."""
1765
return "Meta directory format 1 with support for colocated branches"
1767
def _open(self, transport):
1768
"""See BzrDirFormat._open."""
1769
# Create a new format instance because otherwise initialisation of new
1770
# metadirs share the global default format object leading to alias
1772
format = BzrDirMetaFormat1Colo()
1773
self._supply_sub_formats_to(format)
1774
return BzrDirMeta1(transport, format)
1777
BzrProber.formats.register(BzrDirMetaFormat1Colo.get_format_string(),
1778
BzrDirMetaFormat1Colo)
1781
class ConvertMetaToMeta(controldir.Converter):
1665
1782
"""Converts the components of metadirs."""
1667
1784
def __init__(self, target_format):
1686
1803
if not isinstance(repo._format, self.target_format.repository_format.__class__):
1687
1804
from bzrlib.repository import CopyConverter
1688
self.pb.note('starting repository conversion')
1805
ui.ui_factory.note(gettext('starting repository conversion'))
1689
1806
converter = CopyConverter(self.target_format.repository_format)
1690
1807
converter.convert(repo, pb)
1808
for branch in self.bzrdir.list_branches():
1809
# TODO: conversions of Branch and Tree should be done by
1810
# InterXFormat lookups/some sort of registry.
1811
# Avoid circular imports
1812
old = branch._format.__class__
1813
new = self.target_format.get_branch_format().__class__
1815
if (old == fullhistorybranch.BzrBranchFormat5 and
1816
new in (_mod_branch.BzrBranchFormat6,
1817
_mod_branch.BzrBranchFormat7,
1818
_mod_branch.BzrBranchFormat8)):
1819
branch_converter = _mod_branch.Converter5to6()
1820
elif (old == _mod_branch.BzrBranchFormat6 and
1821
new in (_mod_branch.BzrBranchFormat7,
1822
_mod_branch.BzrBranchFormat8)):
1823
branch_converter = _mod_branch.Converter6to7()
1824
elif (old == _mod_branch.BzrBranchFormat7 and
1825
new is _mod_branch.BzrBranchFormat8):
1826
branch_converter = _mod_branch.Converter7to8()
1828
raise errors.BadConversionTarget("No converter", new,
1830
branch_converter.convert(branch)
1831
branch = self.bzrdir.open_branch()
1832
old = branch._format.__class__
1834
tree = self.bzrdir.open_workingtree(recommend_upgrade=False)
1835
except (errors.NoWorkingTree, errors.NotLocalUrl):
1838
# TODO: conversions of Branch and Tree should be done by
1839
# InterXFormat lookups
1840
if (isinstance(tree, workingtree_3.WorkingTree3) and
1841
not isinstance(tree, workingtree_4.DirStateWorkingTree) and
1842
isinstance(self.target_format.workingtree_format,
1843
workingtree_4.DirStateWorkingTreeFormat)):
1844
workingtree_4.Converter3to4().convert(tree)
1845
if (isinstance(tree, workingtree_4.DirStateWorkingTree) and
1846
not isinstance(tree, workingtree_4.WorkingTree5) and
1847
isinstance(self.target_format.workingtree_format,
1848
workingtree_4.WorkingTreeFormat5)):
1849
workingtree_4.Converter4to5().convert(tree)
1850
if (isinstance(tree, workingtree_4.DirStateWorkingTree) and
1851
not isinstance(tree, workingtree_4.WorkingTree6) and
1852
isinstance(self.target_format.workingtree_format,
1853
workingtree_4.WorkingTreeFormat6)):
1854
workingtree_4.Converter4or5to6().convert(tree)
1691
1856
return to_convert
1859
class ConvertMetaToColo(controldir.Converter):
1860
"""Add colocated branch support."""
1862
def __init__(self, target_format):
1863
"""Create a converter.that upgrades a metadir to the colo format.
1865
:param target_format: The final metadir format that is desired.
1867
self.target_format = target_format
1869
def convert(self, to_convert, pb):
1870
"""See Converter.convert()."""
1871
to_convert.transport.put_bytes('branch-format',
1872
self.target_format.as_string())
1873
return BzrDir.open_from_transport(to_convert.root_transport)
1876
class ConvertMetaToColo(controldir.Converter):
1877
"""Convert a 'development-colo' bzrdir to a '2a' bzrdir."""
1879
def __init__(self, target_format):
1880
"""Create a converter that converts a 'development-colo' metadir
1883
:param target_format: The final metadir format that is desired.
1885
self.target_format = target_format
1887
def convert(self, to_convert, pb):
1888
"""See Converter.convert()."""
1889
to_convert.transport.put_bytes('branch-format',
1890
self.target_format.as_string())
1891
return BzrDir.open_from_transport(to_convert.root_transport)
1894
controldir.ControlDirFormat.register_server_prober(RemoteBzrProber)
1897
class RepositoryAcquisitionPolicy(object):
1898
"""Abstract base class for repository acquisition policies.
1900
A repository acquisition policy decides how a BzrDir acquires a repository
1901
for a branch that is being created. The most basic policy decision is
1902
whether to create a new repository or use an existing one.
1904
def __init__(self, stack_on, stack_on_pwd, require_stacking):
1907
:param stack_on: A location to stack on
1908
:param stack_on_pwd: If stack_on is relative, the location it is
1910
:param require_stacking: If True, it is a failure to not stack.
1912
self._stack_on = stack_on
1913
self._stack_on_pwd = stack_on_pwd
1914
self._require_stacking = require_stacking
1916
def configure_branch(self, branch):
1917
"""Apply any configuration data from this policy to the branch.
1919
Default implementation sets repository stacking.
1921
if self._stack_on is None:
1923
if self._stack_on_pwd is None:
1924
stack_on = self._stack_on
1927
stack_on = urlutils.rebase_url(self._stack_on,
1930
except errors.InvalidRebaseURLs:
1931
stack_on = self._get_full_stack_on()
1933
branch.set_stacked_on_url(stack_on)
1934
except (errors.UnstackableBranchFormat,
1935
errors.UnstackableRepositoryFormat):
1936
if self._require_stacking:
1939
def requires_stacking(self):
1940
"""Return True if this policy requires stacking."""
1941
return self._stack_on is not None and self._require_stacking
1943
def _get_full_stack_on(self):
1944
"""Get a fully-qualified URL for the stack_on location."""
1945
if self._stack_on is None:
1947
if self._stack_on_pwd is None:
1948
return self._stack_on
1950
return urlutils.join(self._stack_on_pwd, self._stack_on)
1952
def _add_fallback(self, repository, possible_transports=None):
1953
"""Add a fallback to the supplied repository, if stacking is set."""
1954
stack_on = self._get_full_stack_on()
1955
if stack_on is None:
1958
stacked_dir = BzrDir.open(stack_on,
1959
possible_transports=possible_transports)
1960
except errors.JailBreak:
1961
# We keep the stacking details, but we are in the server code so
1962
# actually stacking is not needed.
1965
stacked_repo = stacked_dir.open_branch().repository
1966
except errors.NotBranchError:
1967
stacked_repo = stacked_dir.open_repository()
1969
repository.add_fallback_repository(stacked_repo)
1970
except errors.UnstackableRepositoryFormat:
1971
if self._require_stacking:
1974
self._require_stacking = True
1976
def acquire_repository(self, make_working_trees=None, shared=False,
1977
possible_transports=None):
1978
"""Acquire a repository for this bzrdir.
1980
Implementations may create a new repository or use a pre-exising
1983
:param make_working_trees: If creating a repository, set
1984
make_working_trees to this value (if non-None)
1985
:param shared: If creating a repository, make it shared if True
1986
:return: A repository, is_new_flag (True if the repository was
1989
raise NotImplementedError(RepositoryAcquisitionPolicy.acquire_repository)
1992
class CreateRepository(RepositoryAcquisitionPolicy):
1993
"""A policy of creating a new repository"""
1995
def __init__(self, bzrdir, stack_on=None, stack_on_pwd=None,
1996
require_stacking=False):
1999
:param bzrdir: The bzrdir to create the repository on.
2000
:param stack_on: A location to stack on
2001
:param stack_on_pwd: If stack_on is relative, the location it is
2004
RepositoryAcquisitionPolicy.__init__(self, stack_on, stack_on_pwd,
2006
self._bzrdir = bzrdir
2008
def acquire_repository(self, make_working_trees=None, shared=False,
2009
possible_transports=None):
2010
"""Implementation of RepositoryAcquisitionPolicy.acquire_repository
2012
Creates the desired repository in the bzrdir we already have.
2014
if possible_transports is None:
2015
possible_transports = []
2017
possible_transports = list(possible_transports)
2018
possible_transports.append(self._bzrdir.root_transport)
2019
stack_on = self._get_full_stack_on()
2021
format = self._bzrdir._format
2022
format.require_stacking(stack_on=stack_on,
2023
possible_transports=possible_transports)
2024
if not self._require_stacking:
2025
# We have picked up automatic stacking somewhere.
2026
note(gettext('Using default stacking branch {0} at {1}').format(
2027
self._stack_on, self._stack_on_pwd))
2028
repository = self._bzrdir.create_repository(shared=shared)
2029
self._add_fallback(repository,
2030
possible_transports=possible_transports)
2031
if make_working_trees is not None:
2032
repository.set_make_working_trees(make_working_trees)
2033
return repository, True
2036
class UseExistingRepository(RepositoryAcquisitionPolicy):
2037
"""A policy of reusing an existing repository"""
2039
def __init__(self, repository, stack_on=None, stack_on_pwd=None,
2040
require_stacking=False):
2043
:param repository: The repository to use.
2044
:param stack_on: A location to stack on
2045
:param stack_on_pwd: If stack_on is relative, the location it is
2048
RepositoryAcquisitionPolicy.__init__(self, stack_on, stack_on_pwd,
2050
self._repository = repository
2052
def acquire_repository(self, make_working_trees=None, shared=False,
2053
possible_transports=None):
2054
"""Implementation of RepositoryAcquisitionPolicy.acquire_repository
2056
Returns an existing repository to use.
2058
if possible_transports is None:
2059
possible_transports = []
2061
possible_transports = list(possible_transports)
2062
possible_transports.append(self._repository.bzrdir.transport)
2063
self._add_fallback(self._repository,
2064
possible_transports=possible_transports)
2065
return self._repository, False
2068
def register_metadir(registry, key,
2069
repository_format, help, native=True, deprecated=False,
2074
alias=False, bzrdir_format=None):
2075
"""Register a metadir subformat.
2077
These all use a meta bzrdir, but can be parameterized by the
2078
Repository/Branch/WorkingTreeformats.
2080
:param repository_format: The fully-qualified repository format class
2082
:param branch_format: Fully-qualified branch format class name as
2084
:param tree_format: Fully-qualified tree format class name as
2087
if bzrdir_format is None:
2088
bzrdir_format = BzrDirMetaFormat1
2089
# This should be expanded to support setting WorkingTree and Branch
2090
# formats, once the API supports that.
2091
def _load(full_name):
2092
mod_name, factory_name = full_name.rsplit('.', 1)
2094
factory = pyutils.get_named_object(mod_name, factory_name)
2095
except ImportError, e:
2096
raise ImportError('failed to load %s: %s' % (full_name, e))
2097
except AttributeError:
2098
raise AttributeError('no factory %s in module %r'
2099
% (full_name, sys.modules[mod_name]))
2103
bd = bzrdir_format()
2104
if branch_format is not None:
2105
bd.set_branch_format(_load(branch_format))
2106
if tree_format is not None:
2107
bd.workingtree_format = _load(tree_format)
2108
if repository_format is not None:
2109
bd.repository_format = _load(repository_format)
2111
registry.register(key, helper, help, native, deprecated, hidden,
2112
experimental, alias)
2114
register_metadir(controldir.format_registry, 'knit',
2115
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2116
'Format using knits. Recommended for interoperation with bzr <= 0.14.',
2117
branch_format='bzrlib.branchfmt.fullhistory.BzrBranchFormat5',
2118
tree_format='bzrlib.workingtree_3.WorkingTreeFormat3',
2121
register_metadir(controldir.format_registry, 'dirstate',
2122
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2123
help='Format using dirstate for working trees. '
2124
'Compatible with bzr 0.8 and '
2125
'above when accessed over the network. Introduced in bzr 0.15.',
2126
branch_format='bzrlib.branchfmt.fullhistory.BzrBranchFormat5',
2127
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2130
register_metadir(controldir.format_registry, 'dirstate-tags',
2131
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2132
help='Variant of dirstate with support for tags. '
2133
'Introduced in bzr 0.15.',
2134
branch_format='bzrlib.branch.BzrBranchFormat6',
2135
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2138
register_metadir(controldir.format_registry, 'rich-root',
2139
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit4',
2140
help='Variant of dirstate with better handling of tree roots. '
2141
'Introduced in bzr 1.0',
2142
branch_format='bzrlib.branch.BzrBranchFormat6',
2143
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2146
register_metadir(controldir.format_registry, 'dirstate-with-subtree',
2147
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
2148
help='Variant of dirstate with support for nested trees. '
2149
'Introduced in 0.15.',
2150
branch_format='bzrlib.branch.BzrBranchFormat6',
2151
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2155
register_metadir(controldir.format_registry, 'pack-0.92',
2156
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack1',
2157
help='Pack-based format used in 1.x series. Introduced in 0.92. '
2158
'Interoperates with bzr repositories before 0.92 but cannot be '
2159
'read by bzr < 0.92. '
2161
branch_format='bzrlib.branch.BzrBranchFormat6',
2162
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2165
register_metadir(controldir.format_registry, 'pack-0.92-subtree',
2166
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack3',
2167
help='Pack-based format used in 1.x series, with subtree support. '
2168
'Introduced in 0.92. Interoperates with '
2169
'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
2171
branch_format='bzrlib.branch.BzrBranchFormat6',
2172
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2177
register_metadir(controldir.format_registry, 'rich-root-pack',
2178
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack4',
2179
help='A variant of pack-0.92 that supports rich-root data '
2180
'(needed for bzr-svn and bzr-git). Introduced in 1.0.',
2181
branch_format='bzrlib.branch.BzrBranchFormat6',
2182
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2186
register_metadir(controldir.format_registry, '1.6',
2187
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack5',
2188
help='A format that allows a branch to indicate that there is another '
2189
'(stacked) repository that should be used to access data that is '
2190
'not present locally.',
2191
branch_format='bzrlib.branch.BzrBranchFormat7',
2192
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2196
register_metadir(controldir.format_registry, '1.6.1-rich-root',
2197
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack5RichRoot',
2198
help='A variant of 1.6 that supports rich-root data '
2199
'(needed for bzr-svn and bzr-git).',
2200
branch_format='bzrlib.branch.BzrBranchFormat7',
2201
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2205
register_metadir(controldir.format_registry, '1.9',
2206
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6',
2207
help='A repository format using B+tree indexes. These indexes '
2208
'are smaller in size, have smarter caching and provide faster '
2209
'performance for most operations.',
2210
branch_format='bzrlib.branch.BzrBranchFormat7',
2211
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2215
register_metadir(controldir.format_registry, '1.9-rich-root',
2216
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
2217
help='A variant of 1.9 that supports rich-root data '
2218
'(needed for bzr-svn and bzr-git).',
2219
branch_format='bzrlib.branch.BzrBranchFormat7',
2220
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
2224
register_metadir(controldir.format_registry, '1.14',
2225
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6',
2226
help='A working-tree format that supports content filtering.',
2227
branch_format='bzrlib.branch.BzrBranchFormat7',
2228
tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
2232
register_metadir(controldir.format_registry, '1.14-rich-root',
2233
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
2234
help='A variant of 1.14 that supports rich-root data '
2235
'(needed for bzr-svn and bzr-git).',
2236
branch_format='bzrlib.branch.BzrBranchFormat7',
2237
tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
2241
# The following un-numbered 'development' formats should always just be aliases.
2242
register_metadir(controldir.format_registry, 'development-subtree',
2243
'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2aSubtree',
2244
help='Current development format, subtree variant. Can convert data to and '
2245
'from pack-0.92-subtree (and anything compatible with '
2246
'pack-0.92-subtree) format repositories. Repositories and branches in '
2247
'this format can only be read by bzr.dev. Please read '
2248
'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
2250
branch_format='bzrlib.branch.BzrBranchFormat7',
2251
tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
2254
alias=False, # Restore to being an alias when an actual development subtree format is added
2255
# This current non-alias status is simply because we did not introduce a
2256
# chk based subtree format.
2258
register_metadir(controldir.format_registry, 'development5-subtree',
2259
'bzrlib.repofmt.knitpack_repo.RepositoryFormatPackDevelopment2Subtree',
2260
help='Development format, subtree variant. Can convert data to and '
2261
'from pack-0.92-subtree (and anything compatible with '
2262
'pack-0.92-subtree) format repositories. Repositories and branches in '
2263
'this format can only be read by bzr.dev. Please read '
2264
'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
2266
branch_format='bzrlib.branch.BzrBranchFormat7',
2267
tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
2273
register_metadir(controldir.format_registry, 'development-colo',
2274
'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
2275
help='The 2a format with experimental support for colocated branches.\n',
2276
branch_format='bzrlib.branch.BzrBranchFormat7',
2277
tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
2279
bzrdir_format=BzrDirMetaFormat1Colo,
2283
# And the development formats above will have aliased one of the following:
2285
# Finally, the current format.
2286
register_metadir(controldir.format_registry, '2a',
2287
'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
2288
help='Format for the bzr 2.0 series.\n'
2289
'Uses group-compress storage.\n'
2290
'Provides rich roots which are a one-way transition.\n',
2291
# 'storage in packs, 255-way hashed CHK inventory, bencode revision, group compress, '
2292
# 'rich roots. Supported by bzr 1.16 and later.',
2293
branch_format='bzrlib.branch.BzrBranchFormat7',
2294
tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
2298
# The following format should be an alias for the rich root equivalent
2299
# of the default format
2300
register_metadir(controldir.format_registry, 'default-rich-root',
2301
'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
2302
branch_format='bzrlib.branch.BzrBranchFormat7',
2303
tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
2308
# The current format that is made on 'bzr init'.
2309
format_name = config.GlobalStack().get('default_format')
2310
controldir.format_registry.set_default(format_name)
2312
# XXX 2010-08-20 JRV: There is still a lot of code relying on
2313
# bzrlib.bzrdir.format_registry existing. When BzrDir.create/BzrDir.open/etc
2314
# get changed to ControlDir.create/ControlDir.open/etc this should be removed.
2315
format_registry = controldir.format_registry
added
removed
bzrlib/bzrdir.py
