116
109
thing_to_unlock.break_lock()
111
def can_convert_format(self):
112
"""Return true if this bzrdir is one whose format we can convert from."""
118
115
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
116
target_repo_format = target_format.repository_format
124
self.open_repository()._format.check_conversion_target(
126
except errors.NoRepositoryPresent:
127
# No repo, no problem.
117
source_repo_format = self._format.repository_format
118
source_repo_format.check_conversion_target(target_repo_format)
121
def _check_supported(format, allow_unsupported,
122
recommend_upgrade=True,
124
"""Give an error or warning on old formats.
126
:param format: may be any kind of format - workingtree, branch,
129
:param allow_unsupported: If true, allow opening
130
formats that are strongly deprecated, and which may
131
have limited functionality.
133
:param recommend_upgrade: If true (default), warn
134
the user through the ui object that they may wish
135
to upgrade the object.
137
# TODO: perhaps move this into a base Format class; it's not BzrDir
138
# specific. mbp 20070323
139
if not allow_unsupported and not format.is_supported():
140
# see open_downlevel to open legacy branches.
141
raise errors.UnsupportedFormatError(format=format)
142
if recommend_upgrade \
143
and getattr(format, 'upgrade_recommended', False):
144
ui.ui_factory.recommend_upgrade(
145
format.get_format_description(),
148
def clone(self, url, revision_id=None, force_new_repo=False):
149
"""Clone this bzrdir and its contents to url verbatim.
151
If urls last component does not exist, it will be created.
153
if revision_id is not None, then the clone operation may tune
154
itself to download less data.
155
:param force_new_repo: Do not use a shared repository for the target
156
even if one is available.
158
return self.clone_on_transport(get_transport(url),
159
revision_id=revision_id,
160
force_new_repo=force_new_repo)
130
162
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):
163
force_new_repo=False):
133
164
"""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
166
If the target directory does not exist, it will be created.
168
if revision_id is not None, then the clone operation may tune
139
169
itself to download less data.
140
:param force_new_repo: Do not use a shared repository for the target,
170
:param force_new_repo: Do not use a shared repository for the target
141
171
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.
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:
173
transport.ensure_base()
174
result = self._format.initialize_on_transport(transport)
159
176
local_repo = self.find_repository()
160
177
except errors.NoRepositoryPresent:
161
178
local_repo = None
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,
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)
180
# may need to copy content in
182
result_repo = local_repo.clone(
184
revision_id=revision_id)
185
result_repo.set_make_working_trees(local_repo.make_working_trees())
188
result_repo = result.find_repository()
189
# fetch content this dir needs.
211
190
result_repo.fetch(local_repo, revision_id=revision_id)
215
if result_repo is not None:
216
raise AssertionError('result_repo not None(%r)' % result_repo)
191
except errors.NoRepositoryPresent:
192
# needed to make one anyway.
193
result_repo = local_repo.clone(
195
revision_id=revision_id)
196
result_repo.set_make_working_trees(local_repo.make_working_trees())
217
197
# 1 if there is a branch present
218
198
# make sure its content is available in the target repository
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)
201
self.open_branch().clone(result, revision_id=revision_id)
202
except errors.NotBranchError:
205
self.open_workingtree().clone(result)
229
206
except (errors.NoWorkingTree, errors.NotLocalUrl):
233
210
# TODO: This should be given a Transport, and should chdir up; otherwise
234
211
# this will open a new connection.
235
212
def _make_tail(self, url):
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)
213
t = get_transport(url)
216
# TODO: Should take a Transport
218
def create(cls, base, format=None):
219
"""Create a new BzrDir at the url 'base'.
221
This will call the current default formats initialize with base
222
as the only parameter.
224
:param format: If supplied, the format of branch to create. If not
225
supplied, the default is used.
227
if cls is not BzrDir:
228
raise AssertionError("BzrDir.create always creates the default"
229
" format, not one of %r" % cls)
230
t = get_transport(base)
233
format = BzrDirFormat.get_default_format()
234
return format.initialize(safe_unicode(base))
236
def create_branch(self):
237
"""Create a branch in this BzrDir.
239
The bzrdirs format will control what branch format is created.
240
For more control see BranchFormatXX.create(a_bzrdir).
242
raise NotImplementedError(self.create_branch)
245
def create_branch_and_repo(base, force_new_repo=False, format=None):
246
"""Create a new BzrDir, Branch and Repository at the url 'base'.
248
This will use the current default BzrDirFormat, and use whatever
249
repository format that that uses via bzrdir.create_branch and
250
create_repository. If a shared repository is available that is used
253
The created Branch object is returned.
255
:param base: The URL to create the branch at.
256
:param force_new_repo: If True a new repository is always created.
258
bzrdir = BzrDir.create(base, format)
259
bzrdir._find_or_create_repository(force_new_repo)
260
return bzrdir.create_branch()
300
262
def _find_or_create_repository(self, force_new_repo):
301
263
"""Create a new repository if needed, returning the 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.
265
return self.create_repository()
267
return self.find_repository()
268
except errors.NoRepositoryPresent:
269
return self.create_repository()
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,
272
def create_branch_convenience(base, force_new_repo=False,
273
force_new_tree=None, format=None):
274
"""Create a new BzrDir, Branch and Repository at the url 'base'.
276
This is a convenience function - it will use an existing repository
277
if possible, can be told explicitly whether to create a working tree or
280
This will use the current default BzrDirFormat, and use whatever
281
repository format that that uses via bzrdir.create_branch and
282
create_repository. If a shared repository is available that is used
283
preferentially. Whatever repository is used, its tree creation policy
286
The created Branch object is returned.
287
If a working tree cannot be made due to base not being a file:// url,
288
no error is raised unless force_new_tree is True, in which case no
289
data is created on disk and NotLocalUrl is raised.
291
:param base: The URL to create the branch at.
292
:param force_new_repo: If True a new repository is always created.
293
:param force_new_tree: If True or False force creation of a tree or
294
prevent such creation respectively.
295
:param format: Override for the for the bzrdir format to create
298
# check for non local urls
299
t = get_transport(safe_unicode(base))
300
if not isinstance(t, LocalTransport):
301
raise errors.NotLocalUrl(base)
302
bzrdir = BzrDir.create(base, format)
303
repo = bzrdir._find_or_create_repository(force_new_repo)
304
result = bzrdir.create_branch()
305
if force_new_tree or (repo.make_working_trees() and
306
force_new_tree is None):
308
bzrdir.create_workingtree()
309
except errors.NotLocalUrl:
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):
314
def create_repository(base, shared=False, format=None):
315
"""Create a new BzrDir and Repository at the url 'base'.
317
If no format is supplied, this will default to the current default
318
BzrDirFormat by default, and use whatever repository format that that
319
uses for bzrdirformat.create_repository.
321
:param shared: Create a shared repository rather than a standalone
323
The Repository object is returned.
325
This must be overridden as an instance method in child classes, where
326
it should take no parameters and construct whatever repository format
327
that child class desires.
329
bzrdir = BzrDir.create(base, format)
330
return bzrdir.create_repository(shared)
333
def create_standalone_workingtree(base, format=None):
334
"""Create a new BzrDir, WorkingTree, Branch and Repository at 'base'.
336
'base' must be a local path or a file:// url.
338
This will use the current default BzrDirFormat, and use whatever
339
repository format that that uses for bzrdirformat.create_workingtree,
340
create_branch and create_repository.
342
:return: The WorkingTree object.
344
t = get_transport(safe_unicode(base))
345
if not isinstance(t, LocalTransport):
346
raise errors.NotLocalUrl(base)
347
bzrdir = BzrDir.create_branch_and_repo(safe_unicode(base),
349
format=format).bzrdir
350
return bzrdir.create_workingtree()
352
def create_workingtree(self, revision_id=None):
353
"""Create a working tree at this BzrDir.
355
revision_id: create it as of this revision id.
357
raise NotImplementedError(self.create_workingtree)
359
def retire_bzrdir(self):
496
360
"""Permanently disable the bzrdir.
498
362
This is done by renaming it to give the user some ability to recover
501
365
This will have horrible consequences if anyone has anything locked or
503
:param limit: number of times to retry
368
for i in xrange(10000):
508
370
to_path = '.bzr.retired.%d' % i
509
371
self.root_transport.rename('.bzr', to_path)
510
note(gettext("renamed {0} to {1}").format(
511
self.root_transport.abspath('.bzr'), to_path))
372
note("renamed %s to %s"
373
% (self.root_transport.abspath('.bzr'), to_path))
513
375
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:
378
def destroy_workingtree(self):
379
"""Destroy the working tree at this BzrDir.
381
Formats that do not support this may raise UnsupportedOperation.
383
raise NotImplementedError(self.destroy_workingtree)
385
def destroy_workingtree_metadata(self):
386
"""Destroy the control files for the working tree at this BzrDir.
388
The contents of working tree files are not affected.
389
Formats that do not support this may raise UnsupportedOperation.
391
raise NotImplementedError(self.destroy_workingtree_metadata)
549
393
def find_repository(self):
550
"""Find the repository that should be used.
394
"""Find the repository that should be used for a_bzrdir.
552
396
This does not require a branch as we use it to find the repo for
553
397
new branches as well as to hook existing branches up to their
556
def usable_repository(found_bzrdir):
401
return self.open_repository()
402
except errors.NoRepositoryPresent:
404
next_transport = self.root_transport.clone('..')
406
# find the next containing bzrdir
408
found_bzrdir = BzrDir.open_containing_from_transport(
410
except errors.NotBranchError:
412
raise errors.NoRepositoryPresent(self)
557
413
# does it have a repository ?
559
415
repository = found_bzrdir.open_repository()
560
416
except errors.NoRepositoryPresent:
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."""
417
next_transport = found_bzrdir.root_transport.clone('..')
418
if (found_bzrdir.root_transport.base == next_transport.base):
419
# top of the file system
423
if ((found_bzrdir.root_transport.base ==
424
self.root_transport.base) or repository.is_shared()):
427
raise errors.NoRepositoryPresent(self)
428
raise errors.NoRepositoryPresent(self)
430
def get_branch_reference(self):
431
"""Return the referenced URL for the branch in this bzrdir.
433
:raises NotBranchError: If there is no Branch.
434
:return: The URL the branch in this bzrdir references if it is a
435
reference branch, or None for regular branches.
439
def get_branch_transport(self, branch_format):
440
"""Get the transport for use by branch format in this BzrDir.
442
Note that bzr dirs that do not support format strings will raise
443
IncompatibleFormat if the branch format they are given has
444
a format string, and vice versa.
446
If branch_format is None, the transport is returned with no
447
checking. if it is not None, then the returned transport is
448
guaranteed to point to an existing directory ready for use.
450
raise NotImplementedError(self.get_branch_transport)
452
def get_repository_transport(self, repository_format):
453
"""Get the transport for use by repository format in this BzrDir.
455
Note that bzr dirs that do not support format strings will raise
456
IncompatibleFormat if the repository format they are given has
457
a format string, and vice versa.
459
If repository_format is None, the transport is returned with no
460
checking. if it is not None, then the returned transport is
461
guaranteed to point to an existing directory ready for use.
463
raise NotImplementedError(self.get_repository_transport)
465
def get_workingtree_transport(self, tree_format):
466
"""Get the transport for use by workingtree format in this BzrDir.
468
Note that bzr dirs that do not support format strings will raise
469
IncompatibleFormat if the workingtree format they are given has a
470
format string, and vice versa.
472
If workingtree_format is None, the transport is returned with no
473
checking. if it is not None, then the returned transport is
474
guaranteed to point to an existing directory ready for use.
476
raise NotImplementedError(self.get_workingtree_transport)
626
478
def __init__(self, _transport, _format):
627
479
"""Initialize a Bzr control dir object.
629
481
Only really common logic should reside here, concrete classes should be
630
482
made with varying behaviours.
633
485
:param _transport: the transport this dir is based at.
635
487
self._format = _format
636
# these are also under the more standard names of
637
# control_transport and user_transport
638
488
self.transport = _transport.clone('.bzr')
639
489
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
491
def is_control_filename(self, filename):
651
492
"""True if filename is the name of a path which is reserved for bzrdir's.
653
494
:param filename: A filename within the root transport of this bzrdir.
655
496
This is true IF and ONLY IF the filename is part of the namespace reserved
656
497
for bzr control dirs. Currently this is the '.bzr' directory in the root
657
of the root_transport.
498
of the root_transport. it is expected that plugins will need to extend
499
this in the future - for instance to make bzr talk with svn working
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
502
# this might be better on the BzrDirFormat class because it refers to
503
# all the possible bzrdir disk formats.
504
# This method is tested via the workingtree is_control_filename tests-
505
# it was extracted from WorkingTree.is_control_filename. If the methods
506
# contract is extended beyond the current trivial implementation please
664
507
# add new tests for it to the appropriate place.
665
508
return filename == '.bzr' or filename.startswith('.bzr/')
510
def needs_format_conversion(self, format=None):
511
"""Return true if this bzrdir needs convert_format run on it.
513
For instance, if the repository format is out of date but the
514
branch and working tree are not, this should return True.
516
:param format: Optional parameter indicating a specific desired
517
format we plan to arrive at.
519
raise NotImplementedError(self.needs_format_conversion)
522
def open_unsupported(base):
523
"""Open a branch which is not supported."""
524
return BzrDir.open(base, _unsupported=True)
527
def open(base, _unsupported=False):
528
"""Open an existing bzrdir, rooted at 'base' (url)
530
_unsupported is a private parameter to the BzrDir class.
532
t = get_transport(base)
533
return BzrDir.open_from_transport(t, _unsupported=_unsupported)
536
def open_from_transport(transport, _unsupported=False,
537
_server_formats=True):
538
"""Open a bzrdir within a particular directory.
540
:param transport: Transport containing the bzrdir.
541
:param _unsupported: private.
543
base = transport.base
545
def find_format(transport):
546
return transport, BzrDirFormat.find_format(
547
transport, _server_formats=_server_formats)
549
def redirected(transport, e, redirection_notice):
550
qualified_source = e.get_source_url()
551
relpath = transport.relpath(qualified_source)
552
if not e.target.endswith(relpath):
553
# Not redirected to a branch-format, not a branch
554
raise errors.NotBranchError(path=e.target)
555
target = e.target[:-len(relpath)]
556
note('%s is%s redirected to %s',
557
transport.base, e.permanently, target)
558
# Let's try with a new transport
559
qualified_target = e.get_target_url()[:-len(relpath)]
560
# FIXME: If 'transport' has a qualifier, this should
561
# be applied again to the new transport *iff* the
562
# schemes used are the same. It's a bit tricky to
563
# verify, so I'll punt for now
565
return get_transport(target)
568
transport, format = do_catching_redirections(find_format,
571
except errors.TooManyRedirections:
572
raise errors.NotBranchError(base)
574
BzrDir._check_supported(format, _unsupported)
575
return format.open(transport, _found=True)
577
def open_branch(self, unsupported=False):
578
"""Open the branch object at this BzrDir if one is present.
580
If unsupported is True, then no longer supported branch formats can
583
TODO: static convenience version of this?
585
raise NotImplementedError(self.open_branch)
588
def open_containing(url):
589
"""Open an existing branch which contains url.
591
:param url: url to search from.
592
See open_containing_from_transport for more detail.
594
return BzrDir.open_containing_from_transport(get_transport(url))
597
def open_containing_from_transport(a_transport):
598
"""Open an existing branch which contains a_transport.base
600
This probes for a branch at a_transport, and searches upwards from there.
602
Basically we keep looking up until we find the control directory or
603
run into the root. If there isn't one, raises NotBranchError.
604
If there is one and it is either an unrecognised format or an unsupported
605
format, UnknownFormatError or UnsupportedFormatError are raised.
606
If there is one, it is returned, along with the unused portion of url.
608
:return: The BzrDir that contains the path, and a Unicode path
609
for the rest of the URL.
611
# this gets the normalised url back. I.e. '.' -> the full path.
612
url = a_transport.base
615
result = BzrDir.open_from_transport(a_transport)
616
return result, urlutils.unescape(a_transport.relpath(url))
617
except errors.NotBranchError, e:
620
new_t = a_transport.clone('..')
621
except errors.InvalidURLJoin:
622
# reached the root, whatever that may be
623
raise errors.NotBranchError(path=url)
624
if new_t.base == a_transport.base:
625
# reached the root, whatever that may be
626
raise errors.NotBranchError(path=url)
630
def open_containing_tree_or_branch(klass, location):
631
"""Return the branch and working tree contained by a location.
633
Returns (tree, branch, relpath).
634
If there is no tree at containing the location, tree will be None.
635
If there is no branch containing the location, an exception will be
637
relpath is the portion of the path that is contained by the branch.
639
bzrdir, relpath = klass.open_containing(location)
641
tree = bzrdir.open_workingtree()
642
except (errors.NoWorkingTree, errors.NotLocalUrl):
644
branch = bzrdir.open_branch()
647
return tree, branch, relpath
649
def open_repository(self, _unsupported=False):
650
"""Open the repository object at this BzrDir if one is present.
652
This will not follow the Branch object pointer - its strictly a direct
653
open facility. Most client code should use open_branch().repository to
656
_unsupported is a private parameter, not part of the api.
657
TODO: static convenience version of this?
659
raise NotImplementedError(self.open_repository)
661
def open_workingtree(self, _unsupported=False,
662
recommend_upgrade=True):
663
"""Open the workingtree object at this BzrDir if one is present.
665
:param recommend_upgrade: Optional keyword parameter, when True (the
666
default), emit through the ui module a recommendation that the user
667
upgrade the working tree when the workingtree being opened is old
668
(but still fully supported).
670
raise NotImplementedError(self.open_workingtree)
672
def has_branch(self):
673
"""Tell if this bzrdir contains a branch.
675
Note: if you're going to open the branch, you should just go ahead
676
and try, and not ask permission first. (This method just opens the
677
branch and discards it, and that's somewhat expensive.)
682
except errors.NotBranchError:
685
def has_workingtree(self):
686
"""Tell if this bzrdir contains a working tree.
688
This will still raise an exception if the bzrdir has a workingtree that
689
is remote & inaccessible.
691
Note: if you're going to open the working tree, you should just go ahead
692
and try, and not ask permission first. (This method just opens the
693
workingtree and discards it, and that's somewhat expensive.)
696
self.open_workingtree(recommend_upgrade=False)
698
except errors.NoWorkingTree:
667
701
def _cloning_metadir(self):
668
"""Produce a metadir suitable for cloning with.
670
:returns: (destination_bzrdir_format, source_repository)
702
"""Produce a metadir suitable for cloning with"""
672
703
result_format = self._format.__class__()
675
branch = self.open_branch(ignore_fallbacks=True)
706
branch = self.open_branch()
676
707
source_repository = branch.repository
677
result_format._branch_format = branch._format
678
708
except errors.NotBranchError:
679
709
source_branch = None
680
710
source_repository = self.open_repository()
700
728
result_format.workingtree_format = tree._format.__class__()
701
729
return result_format, source_repository
703
def cloning_metadir(self, require_stacking=False):
731
def cloning_metadir(self):
704
732
"""Produce a metadir suitable for cloning or sprouting with.
706
734
These operations may produce workingtrees (yes, even though they're
707
"cloning" something that doesn't have a tree), so a viable workingtree
735
"cloning" something that doesn't have a tree, so a viable workingtree
708
736
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
738
format, repository = self._cloning_metadir()
717
739
if format._workingtree_format is None:
719
740
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
742
tree_format = repository._format._matchingbzrdir.workingtree_format
725
743
format.workingtree_format = tree_format.__class__()
727
format.require_stacking()
730
def get_branch_transport(self, branch_format, name=None):
731
"""Get the transport for use by branch format in this BzrDir.
733
Note that bzr dirs that do not support format strings will raise
734
IncompatibleFormat if the branch format they are given has
735
a format string, and vice versa.
737
If branch_format is None, the transport is returned with no
738
checking. If it is not None, then the returned transport is
739
guaranteed to point to an existing directory ready for use.
746
def checkout_metadir(self):
747
return self.cloning_metadir()
749
def sprout(self, url, revision_id=None, force_new_repo=False,
751
"""Create a copy of this bzrdir prepared for use as a new line of
754
If urls last component does not exist, it will be created.
756
Attributes related to the identity of the source branch like
757
branch nickname will be cleaned, a working tree is created
758
whether one existed before or not; and a local branch is always
761
if revision_id is not None, then the clone operation may tune
762
itself to download less data.
741
raise NotImplementedError(self.get_branch_transport)
764
target_transport = get_transport(url)
765
target_transport.ensure_base()
766
cloning_format = self.cloning_metadir()
767
result = cloning_format.initialize_on_transport(target_transport)
769
source_branch = self.open_branch()
770
source_repository = source_branch.repository
771
except errors.NotBranchError:
774
source_repository = self.open_repository()
775
except errors.NoRepositoryPresent:
776
source_repository = None
781
result_repo = result.find_repository()
782
except errors.NoRepositoryPresent:
784
if source_repository is None and result_repo is not None:
786
elif source_repository is None and result_repo is None:
787
# no repo available, make a new one
788
result.create_repository()
789
elif source_repository is not None and result_repo is None:
790
# have source, and want to make a new target repo
791
result_repo = source_repository.sprout(result, revision_id=revision_id)
793
# fetch needed content into target.
794
if source_repository is not None:
796
# source_repository.copy_content_into(result_repo, revision_id=revision_id)
797
# so we can override the copy method
798
result_repo.fetch(source_repository, revision_id=revision_id)
799
if source_branch is not None:
800
source_branch.sprout(result, revision_id=revision_id)
802
result.create_branch()
803
# TODO: jam 20060426 we probably need a test in here in the
804
# case that the newly sprouted branch is a remote one
805
if result_repo is None or result_repo.make_working_trees():
806
wt = result.create_workingtree()
809
if wt.path2id('') is None:
811
wt.set_root_id(self.open_workingtree.get_root_id())
812
except errors.NoWorkingTree:
818
if recurse == 'down':
820
basis = wt.basis_tree()
822
subtrees = basis.iter_references()
823
recurse_branch = wt.branch
824
elif source_branch is not None:
825
basis = source_branch.basis_tree()
827
subtrees = basis.iter_references()
828
recurse_branch = source_branch
833
for path, file_id in subtrees:
834
target = urlutils.join(url, urlutils.escape(path))
835
sublocation = source_branch.reference_parent(file_id, path)
836
sublocation.bzrdir.sprout(target,
837
basis.get_reference_revision(file_id, path),
838
force_new_repo=force_new_repo, recurse=recurse)
840
if basis is not None:
845
class BzrDirPreSplitOut(BzrDir):
846
"""A common class for the all-in-one formats."""
848
def __init__(self, _transport, _format):
849
"""See BzrDir.__init__."""
850
super(BzrDirPreSplitOut, self).__init__(_transport, _format)
851
assert self._format._lock_class == lockable_files.TransportLock
852
assert self._format._lock_file_name == 'branch-lock'
853
self._control_files = lockable_files.LockableFiles(
854
self.get_branch_transport(None),
855
self._format._lock_file_name,
856
self._format._lock_class)
858
def break_lock(self):
859
"""Pre-splitout bzrdirs do not suffer from stale locks."""
860
raise NotImplementedError(self.break_lock)
862
def clone(self, url, revision_id=None, force_new_repo=False):
863
"""See BzrDir.clone()."""
864
from bzrlib.workingtree import WorkingTreeFormat2
866
result = self._format._initialize_for_clone(url)
867
self.open_repository().clone(result, revision_id=revision_id)
868
from_branch = self.open_branch()
869
from_branch.clone(result, revision_id=revision_id)
871
self.open_workingtree().clone(result)
872
except errors.NotLocalUrl:
873
# make a new one, this format always has to have one.
875
WorkingTreeFormat2().initialize(result)
876
except errors.NotLocalUrl:
877
# but we cannot do it for remote trees.
878
to_branch = result.open_branch()
879
WorkingTreeFormat2().stub_initialize_remote(to_branch.control_files)
882
def create_branch(self):
883
"""See BzrDir.create_branch."""
884
return self.open_branch()
886
def create_repository(self, shared=False):
887
"""See BzrDir.create_repository."""
889
raise errors.IncompatibleFormat('shared repository', self._format)
890
return self.open_repository()
892
def create_workingtree(self, revision_id=None):
893
"""See BzrDir.create_workingtree."""
894
# this looks buggy but is not -really-
895
# because this format creates the workingtree when the bzrdir is
897
# clone and sprout will have set the revision_id
898
# and that will have set it for us, its only
899
# specific uses of create_workingtree in isolation
900
# that can do wonky stuff here, and that only
901
# happens for creating checkouts, which cannot be
902
# done on this format anyway. So - acceptable wart.
903
result = self.open_workingtree(recommend_upgrade=False)
904
if revision_id is not None:
905
if revision_id == _mod_revision.NULL_REVISION:
906
result.set_parent_ids([])
908
result.set_parent_ids([revision_id])
911
def destroy_workingtree(self):
912
"""See BzrDir.destroy_workingtree."""
913
raise errors.UnsupportedOperation(self.destroy_workingtree, self)
915
def destroy_workingtree_metadata(self):
916
"""See BzrDir.destroy_workingtree_metadata."""
917
raise errors.UnsupportedOperation(self.destroy_workingtree_metadata,
920
def get_branch_transport(self, branch_format):
921
"""See BzrDir.get_branch_transport()."""
922
if branch_format is None:
923
return self.transport
925
branch_format.get_format_string()
926
except NotImplementedError:
927
return self.transport
928
raise errors.IncompatibleFormat(branch_format, self._format)
743
930
def get_repository_transport(self, repository_format):
744
"""Get the transport for use by repository format in this BzrDir.
746
Note that bzr dirs that do not support format strings will raise
747
IncompatibleFormat if the repository format they are given has
748
a format string, and vice versa.
750
If repository_format is None, the transport is returned with no
751
checking. If it is not None, then the returned transport is
752
guaranteed to point to an existing directory ready for use.
754
raise NotImplementedError(self.get_repository_transport)
756
def get_workingtree_transport(self, tree_format):
757
"""Get the transport for use by workingtree format in this BzrDir.
759
Note that bzr dirs that do not support format strings will raise
760
IncompatibleFormat if the workingtree format they are given has a
761
format string, and vice versa.
763
If workingtree_format is None, the transport is returned with no
764
checking. If it is not None, then the returned transport is
765
guaranteed to point to an existing directory ready for use.
767
raise NotImplementedError(self.get_workingtree_transport)
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()
931
"""See BzrDir.get_repository_transport()."""
932
if repository_format is None:
933
return self.transport
935
repository_format.get_format_string()
936
except NotImplementedError:
937
return self.transport
938
raise errors.IncompatibleFormat(repository_format, self._format)
940
def get_workingtree_transport(self, workingtree_format):
941
"""See BzrDir.get_workingtree_transport()."""
942
if workingtree_format is None:
943
return self.transport
945
workingtree_format.get_format_string()
946
except NotImplementedError:
947
return self.transport
948
raise errors.IncompatibleFormat(workingtree_format, self._format)
950
def needs_format_conversion(self, format=None):
951
"""See BzrDir.needs_format_conversion()."""
952
# if the format is not the same as the system default,
953
# an upgrade is needed.
955
format = BzrDirFormat.get_default_format()
956
return not isinstance(self._format, format.__class__)
958
def open_branch(self, unsupported=False):
959
"""See BzrDir.open_branch."""
960
from bzrlib.branch import BzrBranchFormat4
961
format = BzrBranchFormat4()
962
self._check_supported(format, unsupported)
963
return format.open(self, _found=True)
965
def sprout(self, url, revision_id=None, force_new_repo=False):
966
"""See BzrDir.sprout()."""
967
from bzrlib.workingtree import WorkingTreeFormat2
969
result = self._format._initialize_for_clone(url)
971
self.open_repository().clone(result, revision_id=revision_id)
972
except errors.NoRepositoryPresent:
975
self.open_branch().sprout(result, revision_id=revision_id)
976
except errors.NotBranchError:
978
# we always want a working tree
979
WorkingTreeFormat2().initialize(result)
983
class BzrDir4(BzrDirPreSplitOut):
984
"""A .bzr version 4 control object.
986
This is a deprecated format and may be removed after sept 2006.
989
def create_repository(self, shared=False):
990
"""See BzrDir.create_repository."""
991
return self._format.repository_format.initialize(self, shared)
993
def needs_format_conversion(self, format=None):
994
"""Format 4 dirs are always in need of conversion."""
997
def open_repository(self):
998
"""See BzrDir.open_repository."""
999
from bzrlib.repofmt.weaverepo import RepositoryFormat4
1000
return RepositoryFormat4().open(self, _found=True)
1003
class BzrDir5(BzrDirPreSplitOut):
1004
"""A .bzr version 5 control object.
1006
This is a deprecated format and may be removed after sept 2006.
1009
def open_repository(self):
1010
"""See BzrDir.open_repository."""
1011
from bzrlib.repofmt.weaverepo import RepositoryFormat5
1012
return RepositoryFormat5().open(self, _found=True)
1014
def open_workingtree(self, _unsupported=False,
1015
recommend_upgrade=True):
1016
"""See BzrDir.create_workingtree."""
1017
from bzrlib.workingtree import WorkingTreeFormat2
1018
wt_format = WorkingTreeFormat2()
1019
# we don't warn here about upgrades; that ought to be handled for the
1021
return wt_format.open(self, _found=True)
1024
class BzrDir6(BzrDirPreSplitOut):
1025
"""A .bzr version 6 control object.
1027
This is a deprecated format and may be removed after sept 2006.
1030
def open_repository(self):
1031
"""See BzrDir.open_repository."""
1032
from bzrlib.repofmt.weaverepo import RepositoryFormat6
1033
return RepositoryFormat6().open(self, _found=True)
1035
def open_workingtree(self, _unsupported=False,
1036
recommend_upgrade=True):
1037
"""See BzrDir.create_workingtree."""
1038
# we don't warn here about upgrades; that ought to be handled for the
1040
from bzrlib.workingtree import WorkingTreeFormat2
1041
return WorkingTreeFormat2().open(self, _found=True)
801
1044
class BzrDirMeta1(BzrDir):
802
1045
"""A .bzr meta version 1 control object.
804
This is the first control object where the
1047
This is the first control object where the
805
1048
individual aspects are really split out: there are separate repository,
806
1049
workingtree and branch subdirectories and any subset of the three can be
807
1050
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)
856
1053
def can_convert_format(self):
857
1054
"""See BzrDir.can_convert_format()."""
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,
1057
def create_branch(self):
1058
"""See BzrDir.create_branch."""
1059
return self._format.get_branch_format().initialize(self)
891
1061
def create_repository(self, shared=False):
892
1062
"""See BzrDir.create_repository."""
893
1063
return self._format.repository_format.initialize(self, shared)
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):
1065
def create_workingtree(self, revision_id=None):
904
1066
"""See BzrDir.create_workingtree."""
905
return self._format.workingtree_format.initialize(
906
self, revision_id, from_branch=from_branch,
907
accelerator_tree=accelerator_tree, hardlink=hardlink)
1067
from bzrlib.workingtree import WorkingTreeFormat
1068
return self._format.workingtree_format.initialize(self, revision_id)
909
1070
def destroy_workingtree(self):
910
1071
"""See BzrDir.destroy_workingtree."""
911
1072
wt = self.open_workingtree(recommend_upgrade=False)
912
1073
repository = wt.branch.repository
913
1074
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)
1075
wt.revert([], old_tree=empty)
918
1076
self.destroy_workingtree_metadata()
920
1078
def destroy_workingtree_metadata(self):
921
1079
self.transport.delete_tree('checkout')
923
def find_branch_format(self, name=None):
1081
def find_branch_format(self):
924
1082
"""Find the branch 'format' for this bzrdir.
926
1084
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)
1086
from bzrlib.branch import BranchFormat
1087
return BranchFormat.find_format(self)
931
1089
def _get_mkdir_mode(self):
932
1090
"""Figure out the mode to use when creating a bzrdir subdir."""
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)
1175
def open_branch(self, unsupported=False):
1176
"""See BzrDir.open_branch."""
1177
format = self.find_branch_format()
1178
self._check_supported(format, unsupported)
1179
return format.open(self, _found=True)
1081
1181
def open_repository(self, unsupported=False):
1082
1182
"""See BzrDir.open_repository."""
1083
from bzrlib.repository import RepositoryFormatMetaDir
1084
format = RepositoryFormatMetaDir.find_format(self)
1085
format.check_support_status(unsupported)
1183
from bzrlib.repository import RepositoryFormat
1184
format = RepositoryFormat.find_format(self)
1185
self._check_supported(format, unsupported)
1086
1186
return format.open(self, _found=True)
1088
1188
def open_workingtree(self, unsupported=False,
1089
1189
recommend_upgrade=True):
1090
1190
"""See BzrDir.open_workingtree."""
1091
from bzrlib.workingtree import WorkingTreeFormatMetaDir
1092
format = WorkingTreeFormatMetaDir.find_format(self)
1093
format.check_support_status(unsupported, recommend_upgrade,
1191
from bzrlib.workingtree import WorkingTreeFormat
1192
format = WorkingTreeFormat.find_format(self)
1193
self._check_supported(format, unsupported,
1094
1195
basedir=self.root_transport.base)
1095
1196
return format.open(self, _found=True)
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
1199
class BzrDirFormat(object):
1200
"""An encapsulation of the initialization and open routines for a format.
1202
Formats provide three things:
1203
* An initialization routine,
1207
Formats are placed in an dict by their format string for reference
1301
1208
during bzrdir opening. These should be subclasses of BzrDirFormat
1302
1209
for consistency.
1304
1211
Once a format is deprecated, just deprecate the initialize and open
1305
methods on the format class. Do not deprecate the object, as the
1212
methods on the format class. Do not deprecate the object, as the
1306
1213
object will be created every system load.
1216
_default_format = None
1217
"""The default format used for new .bzr dirs."""
1220
"""The known formats."""
1222
_control_formats = []
1223
"""The registered control formats - .bzr, ....
1225
This is a list of BzrDirFormat objects.
1228
_control_server_formats = []
1229
"""The registered control server formats, e.g. RemoteBzrDirs.
1231
This is a list of BzrDirFormat objects.
1309
1234
_lock_file_name = 'branch-lock'
1311
1236
# _lock_class must be set in subclasses to the lock type, typ.
1312
1237
# TransportLock or LockDir
1240
def find_format(klass, transport, _server_formats=True):
1241
"""Return the format present at transport."""
1243
formats = klass._control_server_formats + klass._control_formats
1245
formats = klass._control_formats
1246
for format in formats:
1248
return format.probe_transport(transport)
1249
except errors.NotBranchError:
1250
# this format does not find a control dir here.
1252
raise errors.NotBranchError(path=transport.base)
1255
def probe_transport(klass, transport):
1256
"""Return the .bzrdir style format present in a directory."""
1258
format_string = transport.get(".bzr/branch-format").read()
1259
except errors.NoSuchFile:
1260
raise errors.NotBranchError(path=transport.base)
1263
return klass._formats[format_string]
1265
raise errors.UnknownFormatError(format=format_string)
1268
def get_default_format(klass):
1269
"""Return the current default format."""
1270
return klass._default_format
1272
def get_format_string(self):
1273
"""Return the ASCII format string that identifies this format."""
1274
raise NotImplementedError(self.get_format_string)
1276
def get_format_description(self):
1277
"""Return the short description for this format."""
1278
raise NotImplementedError(self.get_format_description)
1280
def get_converter(self, format=None):
1281
"""Return the converter to use to convert bzrdirs needing converts.
1283
This returns a bzrlib.bzrdir.Converter object.
1285
This should return the best upgrader to step this format towards the
1286
current default format. In the case of plugins we can/should provide
1287
some means for them to extend the range of returnable converters.
1289
:param format: Optional format to override the default format of the
1292
raise NotImplementedError(self.get_converter)
1294
def initialize(self, url):
1295
"""Create a bzr control dir at this url and return an opened copy.
1297
Subclasses should typically override initialize_on_transport
1298
instead of this method.
1300
return self.initialize_on_transport(get_transport(url))
1314
1302
def initialize_on_transport(self, transport):
1315
1303
"""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:
1397
except errors.NoSuchFile:
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.
1437
# Since we are creating a .bzr directory, inherit the
1304
# Since we don't have a .bzr directory, inherit the
1438
1305
# mode from the root directory
1439
1306
temp_control = lockable_files.LockableFiles(transport,
1440
1307
'', 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'))
1308
temp_control._transport.mkdir('.bzr',
1309
# FIXME: RBC 20060121 don't peek under
1311
mode=temp_control._dir_mode)
1450
1312
file_mode = temp_control._file_mode
1451
1313
del temp_control
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()),
1314
mutter('created control directory in ' + transport.base)
1315
control = transport.clone('.bzr')
1316
utf8_files = [('README',
1317
"This is a Bazaar-NG control directory.\n"
1318
"Do not change any files in this directory.\n"),
1319
('branch-format', self.get_format_string()),
1459
1321
# NB: no need to escape relative paths that are url safe.
1460
control_files = lockable_files.LockableFiles(bzrdir_transport,
1461
self._lock_file_name, self._lock_class)
1322
control_files = lockable_files.LockableFiles(control,
1323
self._lock_file_name, self._lock_class)
1462
1324
control_files.create_lock()
1463
1325
control_files.lock_write()
1465
for (filename, content) in utf8_files:
1466
bzrdir_transport.put_bytes(filename, content,
1327
for file, content in utf8_files:
1328
control_files.put_utf8(file, content)
1469
1330
control_files.unlock()
1470
1331
return self.open(transport, _found=True)
1333
def is_supported(self):
1334
"""Is this format supported?
1336
Supported formats must be initializable and openable.
1337
Unsupported formats may not support initialization or committing or
1338
some other features depending on the reason for not being supported.
1342
def same_model(self, target_format):
1343
return (self.repository_format.rich_root_data ==
1344
target_format.rich_root_data)
1347
def known_formats(klass):
1348
"""Return all the known formats.
1350
Concrete formats should override _known_formats.
1352
# There is double indirection here to make sure that control
1353
# formats used by more than one dir format will only be probed
1354
# once. This can otherwise be quite expensive for remote connections.
1356
for format in klass._control_formats:
1357
result.update(format._known_formats())
1361
def _known_formats(klass):
1362
"""Return the known format instances for this control format."""
1363
return set(klass._formats.values())
1472
1365
def open(self, transport, _found=False):
1473
1366
"""Return an instance of this format for the dir transport points at.
1475
1368
_found is a private parameter, do not use it.
1478
found_format = controldir.ControlDirFormat.find_format(transport)
1371
found_format = BzrDirFormat.find_format(transport)
1479
1372
if not isinstance(found_format, self.__class__):
1480
1373
raise AssertionError("%s was asked to open %s, but it seems to need "
1482
1375
% (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)
1486
1376
return self._open(transport)
1488
1378
def _open(self, transport):
1494
1384
raise NotImplementedError(self._open)
1496
def _supply_sub_formats_to(self, other_format):
1497
"""Give other_format the same values for sub formats as this has.
1499
This method is expected to be used when parameterising a
1500
RemoteBzrDirFormat instance with the parameters from a
1501
BzrDirMetaFormat1 instance.
1503
:param other_format: other_format is a format which should be
1504
compatible with whatever sub formats are supported by self.
1507
other_format.features = dict(self.features)
1509
def supports_transport(self, transport):
1510
# bzr formats can be opened over all known transports
1513
def check_support_status(self, allow_unsupported, recommend_upgrade=True,
1515
controldir.ControlDirFormat.check_support_status(self,
1516
allow_unsupported=allow_unsupported, recommend_upgrade=recommend_upgrade,
1518
BzrFormat.check_support_status(self, allow_unsupported=allow_unsupported,
1519
recommend_upgrade=recommend_upgrade, basedir=basedir)
1387
def register_format(klass, format):
1388
klass._formats[format.get_format_string()] = format
1391
def register_control_format(klass, format):
1392
"""Register a format that does not use '.bzr' for its control dir.
1394
TODO: This should be pulled up into a 'ControlDirFormat' base class
1395
which BzrDirFormat can inherit from, and renamed to register_format
1396
there. It has been done without that for now for simplicity of
1399
klass._control_formats.append(format)
1402
def register_control_server_format(klass, format):
1403
"""Register a control format for client-server environments.
1405
These formats will be tried before ones registered with
1406
register_control_format. This gives implementations that decide to the
1407
chance to grab it before anything looks at the contents of the format
1410
klass._control_server_formats.append(format)
1413
@symbol_versioning.deprecated_method(symbol_versioning.zero_fourteen)
1414
def set_default_format(klass, format):
1415
klass._set_default_format(format)
1418
def _set_default_format(klass, format):
1419
"""Set default format (for testing behavior of defaults only)"""
1420
klass._default_format = format
1423
return self.get_format_string()[:-1]
1426
def unregister_format(klass, format):
1427
assert klass._formats[format.get_format_string()] is format
1428
del klass._formats[format.get_format_string()]
1431
def unregister_control_format(klass, format):
1432
klass._control_formats.remove(format)
1435
class BzrDirFormat4(BzrDirFormat):
1436
"""Bzr dir format 4.
1438
This format is a combined format for working tree, branch and repository.
1440
- Format 1 working trees [always]
1441
- Format 4 branches [always]
1442
- Format 4 repositories [always]
1444
This format is deprecated: it indexes texts using a text it which is
1445
removed in format 5; write support for this format has been removed.
1448
_lock_class = lockable_files.TransportLock
1450
def get_format_string(self):
1451
"""See BzrDirFormat.get_format_string()."""
1452
return "Bazaar-NG branch, format 0.0.4\n"
1454
def get_format_description(self):
1455
"""See BzrDirFormat.get_format_description()."""
1456
return "All-in-one format 4"
1458
def get_converter(self, format=None):
1459
"""See BzrDirFormat.get_converter()."""
1460
# there is one and only one upgrade path here.
1461
return ConvertBzrDir4To5()
1463
def initialize_on_transport(self, transport):
1464
"""Format 4 branches cannot be created."""
1465
raise errors.UninitializableFormat(self)
1467
def is_supported(self):
1468
"""Format 4 is not supported.
1470
It is not supported because the model changed from 4 to 5 and the
1471
conversion logic is expensive - so doing it on the fly was not
1476
def _open(self, transport):
1477
"""See BzrDirFormat._open."""
1478
return BzrDir4(transport, self)
1480
def __return_repository_format(self):
1481
"""Circular import protection."""
1482
from bzrlib.repofmt.weaverepo import RepositoryFormat4
1483
return RepositoryFormat4()
1484
repository_format = property(__return_repository_format)
1487
class BzrDirFormat5(BzrDirFormat):
1488
"""Bzr control format 5.
1490
This format is a combined format for working tree, branch and repository.
1492
- Format 2 working trees [always]
1493
- Format 4 branches [always]
1494
- Format 5 repositories [always]
1495
Unhashed stores in the repository.
1498
_lock_class = lockable_files.TransportLock
1500
def get_format_string(self):
1501
"""See BzrDirFormat.get_format_string()."""
1502
return "Bazaar-NG branch, format 5\n"
1504
def get_format_description(self):
1505
"""See BzrDirFormat.get_format_description()."""
1506
return "All-in-one format 5"
1508
def get_converter(self, format=None):
1509
"""See BzrDirFormat.get_converter()."""
1510
# there is one and only one upgrade path here.
1511
return ConvertBzrDir5To6()
1513
def _initialize_for_clone(self, url):
1514
return self.initialize_on_transport(get_transport(url), _cloning=True)
1516
def initialize_on_transport(self, transport, _cloning=False):
1517
"""Format 5 dirs always have working tree, branch and repository.
1519
Except when they are being cloned.
1521
from bzrlib.branch import BzrBranchFormat4
1522
from bzrlib.repofmt.weaverepo import RepositoryFormat5
1523
from bzrlib.workingtree import WorkingTreeFormat2
1524
result = (super(BzrDirFormat5, self).initialize_on_transport(transport))
1525
RepositoryFormat5().initialize(result, _internal=True)
1527
branch = BzrBranchFormat4().initialize(result)
1529
WorkingTreeFormat2().initialize(result)
1530
except errors.NotLocalUrl:
1531
# Even though we can't access the working tree, we need to
1532
# create its control files.
1533
WorkingTreeFormat2().stub_initialize_remote(branch.control_files)
1536
def _open(self, transport):
1537
"""See BzrDirFormat._open."""
1538
return BzrDir5(transport, self)
1540
def __return_repository_format(self):
1541
"""Circular import protection."""
1542
from bzrlib.repofmt.weaverepo import RepositoryFormat5
1543
return RepositoryFormat5()
1544
repository_format = property(__return_repository_format)
1547
class BzrDirFormat6(BzrDirFormat):
1548
"""Bzr control format 6.
1550
This format is a combined format for working tree, branch and repository.
1552
- Format 2 working trees [always]
1553
- Format 4 branches [always]
1554
- Format 6 repositories [always]
1557
_lock_class = lockable_files.TransportLock
1559
def get_format_string(self):
1560
"""See BzrDirFormat.get_format_string()."""
1561
return "Bazaar-NG branch, format 6\n"
1563
def get_format_description(self):
1564
"""See BzrDirFormat.get_format_description()."""
1565
return "All-in-one format 6"
1567
def get_converter(self, format=None):
1568
"""See BzrDirFormat.get_converter()."""
1569
# there is one and only one upgrade path here.
1570
return ConvertBzrDir6ToMeta()
1572
def _initialize_for_clone(self, url):
1573
return self.initialize_on_transport(get_transport(url), _cloning=True)
1575
def initialize_on_transport(self, transport, _cloning=False):
1576
"""Format 6 dirs always have working tree, branch and repository.
1578
Except when they are being cloned.
1580
from bzrlib.branch import BzrBranchFormat4
1581
from bzrlib.repofmt.weaverepo import RepositoryFormat6
1582
from bzrlib.workingtree import WorkingTreeFormat2
1583
result = super(BzrDirFormat6, self).initialize_on_transport(transport)
1584
RepositoryFormat6().initialize(result, _internal=True)
1586
branch = BzrBranchFormat4().initialize(result)
1588
WorkingTreeFormat2().initialize(result)
1589
except errors.NotLocalUrl:
1590
# Even though we can't access the working tree, we need to
1591
# create its control files.
1592
WorkingTreeFormat2().stub_initialize_remote(branch.control_files)
1595
def _open(self, transport):
1596
"""See BzrDirFormat._open."""
1597
return BzrDir6(transport, self)
1599
def __return_repository_format(self):
1600
"""Circular import protection."""
1601
from bzrlib.repofmt.weaverepo import RepositoryFormat6
1602
return RepositoryFormat6()
1603
repository_format = property(__return_repository_format)
1522
1606
class BzrDirMetaFormat1(BzrDirFormat):
1687
1661
def _open(self, transport):
1688
1662
"""See BzrDirFormat._open."""
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)
1663
return BzrDirMeta1(transport, self)
1696
1665
def __return_repository_format(self):
1697
1666
"""Circular import protection."""
1698
if self._repository_format:
1667
if getattr(self, '_repository_format', None):
1699
1668
return self._repository_format
1700
from bzrlib.repository import format_registry
1701
return format_registry.get_default()
1669
from bzrlib.repository import RepositoryFormat
1670
return RepositoryFormat.get_default_format()
1703
def _set_repository_format(self, value):
1704
"""Allow changing the repository format for metadir formats."""
1672
def __set_repository_format(self, value):
1673
"""Allow changint the repository format for metadir formats."""
1705
1674
self._repository_format = value
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
1676
repository_format = property(__return_repository_format, __set_repository_format)
1729
1678
def __get_workingtree_format(self):
1730
1679
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()
1680
from bzrlib.workingtree import WorkingTreeFormat
1681
self._workingtree_format = WorkingTreeFormat.get_default_format()
1735
1682
return self._workingtree_format
1737
1684
def __set_workingtree_format(self, wt_format):
1738
1685
self._workingtree_format = wt_format
1741
return "<%r>" % (self.__class__.__name__,)
1743
1687
workingtree_format = property(__get_workingtree_format,
1744
1688
__set_workingtree_format)
1691
# Register bzr control format
1692
BzrDirFormat.register_control_format(BzrDirFormat)
1747
1694
# 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):
1695
BzrDirFormat.register_format(BzrDirFormat4())
1696
BzrDirFormat.register_format(BzrDirFormat5())
1697
BzrDirFormat.register_format(BzrDirFormat6())
1698
__default_format = BzrDirMetaFormat1()
1699
BzrDirFormat.register_format(__default_format)
1700
BzrDirFormat._default_format = __default_format
1703
class BzrDirTestProviderAdapter(object):
1704
"""A tool to generate a suite testing multiple bzrdir formats at once.
1706
This is done by copying the test once for each transport and injecting
1707
the transport_server, transport_readonly_server, and bzrdir_format
1708
classes into each copy. Each copy is also given a new id() to make it
1712
def __init__(self, vfs_factory, transport_server, transport_readonly_server,
1714
"""Create an object to adapt tests.
1716
:param vfs_server: A factory to create a Transport Server which has
1717
all the VFS methods working, and is writable.
1719
self._vfs_factory = vfs_factory
1720
self._transport_server = transport_server
1721
self._transport_readonly_server = transport_readonly_server
1722
self._formats = formats
1724
def adapt(self, test):
1725
result = unittest.TestSuite()
1726
for format in self._formats:
1727
new_test = deepcopy(test)
1728
new_test.vfs_transport_factory = self._vfs_factory
1729
new_test.transport_server = self._transport_server
1730
new_test.transport_readonly_server = self._transport_readonly_server
1731
new_test.bzrdir_format = format
1732
def make_new_test_id():
1733
new_id = "%s(%s)" % (new_test.id(), format.__class__.__name__)
1734
return lambda: new_id
1735
new_test.id = make_new_test_id()
1736
result.addTest(new_test)
1740
class Converter(object):
1741
"""Converts a disk format object from one format to another."""
1743
def convert(self, to_convert, pb):
1744
"""Perform the conversion of to_convert, giving feedback via pb.
1746
:param to_convert: The disk object to convert.
1747
:param pb: a progress bar to use for progress information.
1750
def step(self, message):
1751
"""Update the pb by a step."""
1753
self.pb.update(message, self.count, self.total)
1756
class ConvertBzrDir4To5(Converter):
1757
"""Converts format 4 bzr dirs to format 5."""
1760
super(ConvertBzrDir4To5, self).__init__()
1761
self.converted_revs = set()
1762
self.absent_revisions = set()
1766
def convert(self, to_convert, pb):
1767
"""See Converter.convert()."""
1768
self.bzrdir = to_convert
1770
self.pb.note('starting upgrade from format 4 to 5')
1771
if isinstance(self.bzrdir.transport, LocalTransport):
1772
self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
1773
self._convert_to_weaves()
1774
return BzrDir.open(self.bzrdir.root_transport.base)
1776
def _convert_to_weaves(self):
1777
self.pb.note('note: upgrade may be faster if all store files are ungzipped first')
1780
stat = self.bzrdir.transport.stat('weaves')
1781
if not S_ISDIR(stat.st_mode):
1782
self.bzrdir.transport.delete('weaves')
1783
self.bzrdir.transport.mkdir('weaves')
1784
except errors.NoSuchFile:
1785
self.bzrdir.transport.mkdir('weaves')
1786
# deliberately not a WeaveFile as we want to build it up slowly.
1787
self.inv_weave = Weave('inventory')
1788
# holds in-memory weaves for all files
1789
self.text_weaves = {}
1790
self.bzrdir.transport.delete('branch-format')
1791
self.branch = self.bzrdir.open_branch()
1792
self._convert_working_inv()
1793
rev_history = self.branch.revision_history()
1794
# to_read is a stack holding the revisions we still need to process;
1795
# appending to it adds new highest-priority revisions
1796
self.known_revisions = set(rev_history)
1797
self.to_read = rev_history[-1:]
1799
rev_id = self.to_read.pop()
1800
if (rev_id not in self.revisions
1801
and rev_id not in self.absent_revisions):
1802
self._load_one_rev(rev_id)
1804
to_import = self._make_order()
1805
for i, rev_id in enumerate(to_import):
1806
self.pb.update('converting revision', i, len(to_import))
1807
self._convert_one_rev(rev_id)
1809
self._write_all_weaves()
1810
self._write_all_revs()
1811
self.pb.note('upgraded to weaves:')
1812
self.pb.note(' %6d revisions and inventories', len(self.revisions))
1813
self.pb.note(' %6d revisions not present', len(self.absent_revisions))
1814
self.pb.note(' %6d texts', self.text_count)
1815
self._cleanup_spare_files_after_format4()
1816
self.branch.control_files.put_utf8('branch-format', BzrDirFormat5().get_format_string())
1818
def _cleanup_spare_files_after_format4(self):
1819
# FIXME working tree upgrade foo.
1820
for n in 'merged-patches', 'pending-merged-patches':
1822
## assert os.path.getsize(p) == 0
1823
self.bzrdir.transport.delete(n)
1824
except errors.NoSuchFile:
1826
self.bzrdir.transport.delete_tree('inventory-store')
1827
self.bzrdir.transport.delete_tree('text-store')
1829
def _convert_working_inv(self):
1830
inv = xml4.serializer_v4.read_inventory(
1831
self.branch.control_files.get('inventory'))
1832
new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv)
1833
# FIXME inventory is a working tree change.
1834
self.branch.control_files.put('inventory', StringIO(new_inv_xml))
1836
def _write_all_weaves(self):
1837
controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)
1838
weave_transport = self.bzrdir.transport.clone('weaves')
1839
weaves = WeaveStore(weave_transport, prefixed=False)
1840
transaction = WriteTransaction()
1844
for file_id, file_weave in self.text_weaves.items():
1845
self.pb.update('writing weave', i, len(self.text_weaves))
1846
weaves._put_weave(file_id, file_weave, transaction)
1848
self.pb.update('inventory', 0, 1)
1849
controlweaves._put_weave('inventory', self.inv_weave, transaction)
1850
self.pb.update('inventory', 1, 1)
1854
def _write_all_revs(self):
1855
"""Write all revisions out in new form."""
1856
self.bzrdir.transport.delete_tree('revision-store')
1857
self.bzrdir.transport.mkdir('revision-store')
1858
revision_transport = self.bzrdir.transport.clone('revision-store')
1860
_revision_store = TextRevisionStore(TextStore(revision_transport,
1864
transaction = WriteTransaction()
1865
for i, rev_id in enumerate(self.converted_revs):
1866
self.pb.update('write revision', i, len(self.converted_revs))
1867
_revision_store.add_revision(self.revisions[rev_id], transaction)
1871
def _load_one_rev(self, rev_id):
1872
"""Load a revision object into memory.
1874
Any parents not either loaded or abandoned get queued to be
1876
self.pb.update('loading revision',
1877
len(self.revisions),
1878
len(self.known_revisions))
1879
if not self.branch.repository.has_revision(rev_id):
1881
self.pb.note('revision {%s} not present in branch; '
1882
'will be converted as a ghost',
1884
self.absent_revisions.add(rev_id)
1886
rev = self.branch.repository._revision_store.get_revision(rev_id,
1887
self.branch.repository.get_transaction())
1888
for parent_id in rev.parent_ids:
1889
self.known_revisions.add(parent_id)
1890
self.to_read.append(parent_id)
1891
self.revisions[rev_id] = rev
1893
def _load_old_inventory(self, rev_id):
1894
assert rev_id not in self.converted_revs
1895
old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
1896
inv = xml4.serializer_v4.read_inventory_from_string(old_inv_xml)
1897
inv.revision_id = rev_id
1898
rev = self.revisions[rev_id]
1899
if rev.inventory_sha1:
1900
assert rev.inventory_sha1 == sha_string(old_inv_xml), \
1901
'inventory sha mismatch for {%s}' % rev_id
1904
def _load_updated_inventory(self, rev_id):
1905
assert rev_id in self.converted_revs
1906
inv_xml = self.inv_weave.get_text(rev_id)
1907
inv = xml5.serializer_v5.read_inventory_from_string(inv_xml)
1910
def _convert_one_rev(self, rev_id):
1911
"""Convert revision and all referenced objects to new format."""
1912
rev = self.revisions[rev_id]
1913
inv = self._load_old_inventory(rev_id)
1914
present_parents = [p for p in rev.parent_ids
1915
if p not in self.absent_revisions]
1916
self._convert_revision_contents(rev, inv, present_parents)
1917
self._store_new_weave(rev, inv, present_parents)
1918
self.converted_revs.add(rev_id)
1920
def _store_new_weave(self, rev, inv, present_parents):
1921
# the XML is now updated with text versions
1923
entries = inv.iter_entries()
1925
for path, ie in entries:
1926
assert getattr(ie, 'revision', None) is not None, \
1927
'no revision on {%s} in {%s}' % \
1928
(file_id, rev.revision_id)
1929
new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv)
1930
new_inv_sha1 = sha_string(new_inv_xml)
1931
self.inv_weave.add_lines(rev.revision_id,
1933
new_inv_xml.splitlines(True))
1934
rev.inventory_sha1 = new_inv_sha1
1936
def _convert_revision_contents(self, rev, inv, present_parents):
1937
"""Convert all the files within a revision.
1939
Also upgrade the inventory to refer to the text revision ids."""
1940
rev_id = rev.revision_id
1941
mutter('converting texts of revision {%s}',
1943
parent_invs = map(self._load_updated_inventory, present_parents)
1944
entries = inv.iter_entries()
1946
for path, ie in entries:
1947
self._convert_file_version(rev, ie, parent_invs)
1949
def _convert_file_version(self, rev, ie, parent_invs):
1950
"""Convert one version of one file.
1952
The file needs to be added into the weave if it is a merge
1953
of >=2 parents or if it's changed from its parent.
1955
file_id = ie.file_id
1956
rev_id = rev.revision_id
1957
w = self.text_weaves.get(file_id)
1960
self.text_weaves[file_id] = w
1961
text_changed = False
1962
previous_entries = ie.find_previous_heads(parent_invs,
1966
for old_revision in previous_entries:
1967
# if this fails, its a ghost ?
1968
assert old_revision in self.converted_revs, \
1969
"Revision {%s} not in converted_revs" % old_revision
1970
self.snapshot_ie(previous_entries, ie, w, rev_id)
1972
assert getattr(ie, 'revision', None) is not None
1974
def snapshot_ie(self, previous_revisions, ie, w, rev_id):
1975
# TODO: convert this logic, which is ~= snapshot to
1976
# a call to:. This needs the path figured out. rather than a work_tree
1977
# a v4 revision_tree can be given, or something that looks enough like
1978
# one to give the file content to the entry if it needs it.
1979
# and we need something that looks like a weave store for snapshot to
1981
#ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
1982
if len(previous_revisions) == 1:
1983
previous_ie = previous_revisions.values()[0]
1984
if ie._unchanged(previous_ie):
1985
ie.revision = previous_ie.revision
1988
text = self.branch.repository.text_store.get(ie.text_id)
1989
file_lines = text.readlines()
1990
assert sha_strings(file_lines) == ie.text_sha1
1991
assert sum(map(len, file_lines)) == ie.text_size
1992
w.add_lines(rev_id, previous_revisions, file_lines)
1993
self.text_count += 1
1995
w.add_lines(rev_id, previous_revisions, [])
1996
ie.revision = rev_id
1998
def _make_order(self):
1999
"""Return a suitable order for importing revisions.
2001
The order must be such that an revision is imported after all
2002
its (present) parents.
2004
todo = set(self.revisions.keys())
2005
done = self.absent_revisions.copy()
2008
# scan through looking for a revision whose parents
2010
for rev_id in sorted(list(todo)):
2011
rev = self.revisions[rev_id]
2012
parent_ids = set(rev.parent_ids)
2013
if parent_ids.issubset(done):
2014
# can take this one now
2015
order.append(rev_id)
2021
class ConvertBzrDir5To6(Converter):
2022
"""Converts format 5 bzr dirs to format 6."""
2024
def convert(self, to_convert, pb):
2025
"""See Converter.convert()."""
2026
self.bzrdir = to_convert
2028
self.pb.note('starting upgrade from format 5 to 6')
2029
self._convert_to_prefixed()
2030
return BzrDir.open(self.bzrdir.root_transport.base)
2032
def _convert_to_prefixed(self):
2033
from bzrlib.store import TransportStore
2034
self.bzrdir.transport.delete('branch-format')
2035
for store_name in ["weaves", "revision-store"]:
2036
self.pb.note("adding prefixes to %s" % store_name)
2037
store_transport = self.bzrdir.transport.clone(store_name)
2038
store = TransportStore(store_transport, prefixed=True)
2039
for urlfilename in store_transport.list_dir('.'):
2040
filename = urlutils.unescape(urlfilename)
2041
if (filename.endswith(".weave") or
2042
filename.endswith(".gz") or
2043
filename.endswith(".sig")):
2044
file_id = os.path.splitext(filename)[0]
2047
prefix_dir = store.hash_prefix(file_id)
2048
# FIXME keep track of the dirs made RBC 20060121
2050
store_transport.move(filename, prefix_dir + '/' + filename)
2051
except errors.NoSuchFile: # catches missing dirs strangely enough
2052
store_transport.mkdir(prefix_dir)
2053
store_transport.move(filename, prefix_dir + '/' + filename)
2054
self.bzrdir._control_files.put_utf8('branch-format', BzrDirFormat6().get_format_string())
2057
class ConvertBzrDir6ToMeta(Converter):
2058
"""Converts format 6 bzr dirs to metadirs."""
2060
def convert(self, to_convert, pb):
2061
"""See Converter.convert()."""
2062
from bzrlib.repofmt.weaverepo import RepositoryFormat7
2063
from bzrlib.branch import BzrBranchFormat5
2064
self.bzrdir = to_convert
2067
self.total = 20 # the steps we know about
2068
self.garbage_inventories = []
2070
self.pb.note('starting upgrade from format 6 to metadir')
2071
self.bzrdir._control_files.put_utf8('branch-format', "Converting to format 6")
2072
# its faster to move specific files around than to open and use the apis...
2073
# first off, nuke ancestry.weave, it was never used.
2075
self.step('Removing ancestry.weave')
2076
self.bzrdir.transport.delete('ancestry.weave')
2077
except errors.NoSuchFile:
2079
# find out whats there
2080
self.step('Finding branch files')
2081
last_revision = self.bzrdir.open_branch().last_revision()
2082
bzrcontents = self.bzrdir.transport.list_dir('.')
2083
for name in bzrcontents:
2084
if name.startswith('basis-inventory.'):
2085
self.garbage_inventories.append(name)
2086
# create new directories for repository, working tree and branch
2087
self.dir_mode = self.bzrdir._control_files._dir_mode
2088
self.file_mode = self.bzrdir._control_files._file_mode
2089
repository_names = [('inventory.weave', True),
2090
('revision-store', True),
2092
self.step('Upgrading repository ')
2093
self.bzrdir.transport.mkdir('repository', mode=self.dir_mode)
2094
self.make_lock('repository')
2095
# we hard code the formats here because we are converting into
2096
# the meta format. The meta format upgrader can take this to a
2097
# future format within each component.
2098
self.put_format('repository', RepositoryFormat7())
2099
for entry in repository_names:
2100
self.move_entry('repository', entry)
2102
self.step('Upgrading branch ')
2103
self.bzrdir.transport.mkdir('branch', mode=self.dir_mode)
2104
self.make_lock('branch')
2105
self.put_format('branch', BzrBranchFormat5())
2106
branch_files = [('revision-history', True),
2107
('branch-name', True),
2109
for entry in branch_files:
2110
self.move_entry('branch', entry)
2112
checkout_files = [('pending-merges', True),
2113
('inventory', True),
2114
('stat-cache', False)]
2115
# If a mandatory checkout file is not present, the branch does not have
2116
# a functional checkout. Do not create a checkout in the converted
2118
for name, mandatory in checkout_files:
2119
if mandatory and name not in bzrcontents:
2120
has_checkout = False
2124
if not has_checkout:
2125
self.pb.note('No working tree.')
2126
# If some checkout files are there, we may as well get rid of them.
2127
for name, mandatory in checkout_files:
2128
if name in bzrcontents:
2129
self.bzrdir.transport.delete(name)
2131
from bzrlib.workingtree import WorkingTreeFormat3
2132
self.step('Upgrading working tree')
2133
self.bzrdir.transport.mkdir('checkout', mode=self.dir_mode)
2134
self.make_lock('checkout')
2136
'checkout', WorkingTreeFormat3())
2137
self.bzrdir.transport.delete_multi(
2138
self.garbage_inventories, self.pb)
2139
for entry in checkout_files:
2140
self.move_entry('checkout', entry)
2141
if last_revision is not None:
2142
self.bzrdir._control_files.put_utf8(
2143
'checkout/last-revision', last_revision)
2144
self.bzrdir._control_files.put_utf8(
2145
'branch-format', BzrDirMetaFormat1().get_format_string())
2146
return BzrDir.open(self.bzrdir.root_transport.base)
2148
def make_lock(self, name):
2149
"""Make a lock for the new control dir name."""
2150
self.step('Make %s lock' % name)
2151
ld = lockdir.LockDir(self.bzrdir.transport,
2153
file_modebits=self.file_mode,
2154
dir_modebits=self.dir_mode)
2157
def move_entry(self, new_dir, entry):
2158
"""Move then entry name into new_dir."""
2160
mandatory = entry[1]
2161
self.step('Moving %s' % name)
2163
self.bzrdir.transport.move(name, '%s/%s' % (new_dir, name))
2164
except errors.NoSuchFile:
2168
def put_format(self, dirname, format):
2169
self.bzrdir._control_files.put_utf8('%s/format' % dirname, format.get_format_string())
2172
class ConvertMetaToMeta(Converter):
1782
2173
"""Converts the components of metadirs."""
1784
2175
def __init__(self, target_format):
1838
2218
# TODO: conversions of Branch and Tree should be done by
1839
2219
# InterXFormat lookups
1840
if (isinstance(tree, workingtree_3.WorkingTree3) and
1841
not isinstance(tree, workingtree_4.DirStateWorkingTree) and
2220
if (isinstance(tree, workingtree.WorkingTree3) and
2221
not isinstance(tree, workingtree_4.WorkingTree4) and
1842
2222
isinstance(self.target_format.workingtree_format,
1843
workingtree_4.DirStateWorkingTreeFormat)):
2223
workingtree_4.WorkingTreeFormat4)):
1844
2224
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)
1856
2225
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',
2228
# This is not in remote.py because it's small, and needs to be registered.
2229
# Putting it in remote.py creates a circular import problem.
2230
# we can make it a lazy object if the control formats is turned into something
2232
class RemoteBzrDirFormat(BzrDirMetaFormat1):
2233
"""Format representing bzrdirs accessed via a smart server"""
2235
def get_format_description(self):
2236
return 'bzr remote bzrdir'
2239
def probe_transport(klass, transport):
2240
"""Return a RemoteBzrDirFormat object if it looks possible."""
2242
client = transport.get_smart_client()
2243
except (NotImplementedError, AttributeError,
2244
errors.TransportNotPossible):
2245
# no smart server, so not a branch for this format type.
2246
raise errors.NotBranchError(path=transport.base)
2248
# Send a 'hello' request in protocol version one, and decline to
2249
# open it if the server doesn't support our required version (2) so
2250
# that the VFS-based transport will do it.
2251
request = client.get_request()
2252
smart_protocol = protocol.SmartClientRequestProtocolOne(request)
2253
server_version = smart_protocol.query_version()
2254
if server_version != 2:
2255
raise errors.NotBranchError(path=transport.base)
2258
def initialize_on_transport(self, transport):
2260
# hand off the request to the smart server
2261
medium = transport.get_smart_medium()
2262
except errors.NoSmartMedium:
2263
# TODO: lookup the local format from a server hint.
2264
local_dir_format = BzrDirMetaFormat1()
2265
return local_dir_format.initialize_on_transport(transport)
2266
client = _SmartClient(medium)
2267
path = client.remote_path_from_transport(transport)
2268
response = _SmartClient(medium).call('BzrDirFormat.initialize', path)
2269
assert response[0] in ('ok', ), 'unexpected response code %s' % (response,)
2270
return remote.RemoteBzrDir(transport)
2272
def _open(self, transport):
2273
return remote.RemoteBzrDir(transport)
2275
def __eq__(self, other):
2276
if not isinstance(other, RemoteBzrDirFormat):
2278
return self.get_format_description() == other.get_format_description()
2281
BzrDirFormat.register_control_server_format(RemoteBzrDirFormat)
2284
class BzrDirFormatInfo(object):
2286
def __init__(self, native, deprecated, hidden):
2287
self.deprecated = deprecated
2288
self.native = native
2289
self.hidden = hidden
2292
class BzrDirFormatRegistry(registry.Registry):
2293
"""Registry of user-selectable BzrDir subformats.
2295
Differs from BzrDirFormat._control_formats in that it provides sub-formats,
2296
e.g. BzrDirMeta1 with weave repository. Also, it's more user-oriented.
2299
def register_metadir(self, key,
2300
repository_format, help, native=True, deprecated=False,
2304
"""Register a metadir subformat.
2306
These all use a BzrDirMetaFormat1 bzrdir, but can be parameterized
2307
by the Repository format.
2309
:param repository_format: The fully-qualified repository format class
2311
:param branch_format: Fully-qualified branch format class name as
2313
:param tree_format: Fully-qualified tree format class name as
2316
# This should be expanded to support setting WorkingTree and Branch
2317
# formats, once BzrDirMetaFormat1 supports that.
2318
def _load(full_name):
2319
mod_name, factory_name = full_name.rsplit('.', 1)
2321
mod = __import__(mod_name, globals(), locals(),
2323
except ImportError, e:
2324
raise ImportError('failed to load %s: %s' % (full_name, e))
2326
factory = getattr(mod, factory_name)
2327
except AttributeError:
2328
raise AttributeError('no factory %s in module %r'
2333
bd = BzrDirMetaFormat1()
2334
if branch_format is not None:
2335
bd.set_branch_format(_load(branch_format))
2336
if tree_format is not None:
2337
bd.workingtree_format = _load(tree_format)
2338
if repository_format is not None:
2339
bd.repository_format = _load(repository_format)
2341
self.register(key, helper, help, native, deprecated, hidden)
2343
def register(self, key, factory, help, native=True, deprecated=False,
2345
"""Register a BzrDirFormat factory.
2347
The factory must be a callable that takes one parameter: the key.
2348
It must produce an instance of the BzrDirFormat when called.
2350
This function mainly exists to prevent the info object from being
2353
registry.Registry.register(self, key, factory, help,
2354
BzrDirFormatInfo(native, deprecated, hidden))
2356
def register_lazy(self, key, module_name, member_name, help, native=True,
2357
deprecated=False, hidden=False):
2358
registry.Registry.register_lazy(self, key, module_name, member_name,
2359
help, BzrDirFormatInfo(native, deprecated, hidden))
2361
def set_default(self, key):
2362
"""Set the 'default' key to be a clone of the supplied key.
2364
This method must be called once and only once.
2366
registry.Registry.register(self, 'default', self.get(key),
2367
self.get_help(key), info=self.get_info(key))
2369
def set_default_repository(self, key):
2370
"""Set the FormatRegistry default and Repository default.
2372
This is a transitional method while Repository.set_default_format
2375
if 'default' in self:
2376
self.remove('default')
2377
self.set_default(key)
2378
format = self.get('default')()
2379
assert isinstance(format, BzrDirMetaFormat1)
2381
def make_bzrdir(self, key):
2382
return self.get(key)()
2384
def help_topic(self, topic):
2385
output = textwrap.dedent("""\
2386
Bazaar directory formats
2387
------------------------
2389
These formats can be used for creating branches, working trees, and
2393
default_help = self.get_help('default')
2395
for key in self.keys():
2396
if key == 'default':
2398
help = self.get_help(key)
2399
if help == default_help:
2400
default_realkey = key
2402
help_pairs.append((key, help))
2404
def wrapped(key, help, info):
2406
help = '(native) ' + help
2407
return ' %s:\n%s\n\n' % (key,
2408
textwrap.fill(help, initial_indent=' ',
2409
subsequent_indent=' '))
2410
output += wrapped('%s/default' % default_realkey, default_help,
2411
self.get_info('default'))
2412
deprecated_pairs = []
2413
for key, help in help_pairs:
2414
info = self.get_info(key)
2417
elif info.deprecated:
2418
deprecated_pairs.append((key, help))
2420
output += wrapped(key, help, info)
2421
if len(deprecated_pairs) > 0:
2422
output += "Deprecated formats\n------------------\n\n"
2423
for key, help in deprecated_pairs:
2424
info = self.get_info(key)
2425
output += wrapped(key, help, info)
2430
format_registry = BzrDirFormatRegistry()
2431
format_registry.register('weave', BzrDirFormat6,
2432
'Pre-0.8 format. Slower than knit and does not'
2433
' support checkouts or shared repositories.',
2435
format_registry.register_metadir('knit',
2115
2436
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2116
2437
'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',
2438
branch_format='bzrlib.branch.BzrBranchFormat5',
2439
tree_format='bzrlib.workingtree.WorkingTreeFormat3')
2440
format_registry.register_metadir('metaweave',
2441
'bzrlib.repofmt.weaverepo.RepositoryFormat7',
2442
'Transitional format in 0.8. Slower than knit.',
2443
branch_format='bzrlib.branch.BzrBranchFormat5',
2444
tree_format='bzrlib.workingtree.WorkingTreeFormat3',
2446
format_registry.register_metadir('dirstate',
2447
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2448
help='New in 0.15: Fast local operations. Compatible with bzr 0.8 and '
2449
'above when accessed over the network.',
2450
branch_format='bzrlib.branch.BzrBranchFormat5',
2451
# this uses bzrlib.workingtree.WorkingTreeFormat4 because importing
2452
# directly from workingtree_4 triggers a circular import.
2453
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2455
format_registry.register_metadir('dirstate-tags',
2456
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2457
help='New in 0.15: Fast local operations and improved scaling for '
2458
'network operations. Additionally adds support for tags.'
2459
' Incompatible with bzr < 0.15.',
2460
branch_format='bzrlib.branch.BzrBranchFormat6',
2461
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2463
format_registry.register_metadir('dirstate-with-subtree',
2147
2464
'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
2465
help='New in 0.15: Fast local operations and improved scaling for '
2466
'network operations. Additionally adds support for versioning nested '
2467
'bzr branches. Incompatible with bzr < 0.15.',
2468
branch_format='bzrlib.branch.BzrBranchFormat6',
2469
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2472
format_registry.set_default('dirstate')
added
removed
bzrlib/bzrdir.py
