293
233
# TODO: This should be given a Transport, and should chdir up; otherwise
294
234
# this will open a new connection.
295
235
def _make_tail(self, url):
296
t = get_transport(url)
300
def create(cls, base, format=None, possible_transports=None):
301
"""Create a new BzrDir at the url 'base'.
303
:param format: If supplied, the format of branch to create. If not
304
supplied, the default is used.
305
:param possible_transports: If supplied, a list of transports that
306
can be reused to share a remote connection.
308
if cls is not BzrDir:
309
raise AssertionError("BzrDir.create always creates the default"
310
" format, not one of %r" % cls)
311
t = get_transport(base, possible_transports)
314
format = BzrDirFormat.get_default_format()
315
return format.initialize_on_transport(t)
318
def find_bzrdirs(transport, evaluate=None, list_current=None):
319
"""Find bzrdirs recursively from current location.
321
This is intended primarily as a building block for more sophisticated
322
functionality, like finding trees under a directory, or finding
323
branches that use a given repository.
324
:param evaluate: An optional callable that yields recurse, value,
325
where recurse controls whether this bzrdir is recursed into
326
and value is the value to yield. By default, all bzrdirs
327
are recursed into, and the return value is the bzrdir.
328
:param list_current: if supplied, use this function to list the current
329
directory, instead of Transport.list_dir
330
:return: a generator of found bzrdirs, or whatever evaluate returns.
332
if list_current is None:
333
def list_current(transport):
334
return transport.list_dir('')
336
def evaluate(bzrdir):
339
pending = [transport]
340
while len(pending) > 0:
341
current_transport = pending.pop()
344
bzrdir = BzrDir.open_from_transport(current_transport)
345
except errors.NotBranchError:
348
recurse, value = evaluate(bzrdir)
351
subdirs = list_current(current_transport)
352
except errors.NoSuchFile:
355
for subdir in sorted(subdirs, reverse=True):
356
pending.append(current_transport.clone(subdir))
358
def list_branches(self):
359
"""Return a sequence of all branches local to this control directory.
363
return [self.open_branch()]
364
except errors.NotBranchError:
368
def find_branches(transport):
369
"""Find all branches under a transport.
371
This will find all branches below the transport, including branches
372
inside other branches. Where possible, it will use
373
Repository.find_branches.
375
To list all the branches that use a particular Repository, see
376
Repository.find_branches
378
def evaluate(bzrdir):
380
repository = bzrdir.open_repository()
381
except errors.NoRepositoryPresent:
384
return False, ([], repository)
385
return True, (bzrdir.list_branches(), None)
387
for branches, repo in BzrDir.find_bzrdirs(transport,
390
ret.extend(repo.find_branches())
391
if branches is not None:
395
def destroy_repository(self):
396
"""Destroy the repository in this BzrDir"""
397
raise NotImplementedError(self.destroy_repository)
399
def create_branch(self, name=None):
400
"""Create a branch in this BzrDir.
402
:param name: Name of the colocated branch to create, None for
405
The bzrdir's format will control what branch format is created.
406
For more control see BranchFormatXX.create(a_bzrdir).
408
raise NotImplementedError(self.create_branch)
410
def destroy_branch(self, name=None):
411
"""Destroy a branch in this BzrDir.
413
:param name: Name of the branch to destroy, None for the default
416
raise NotImplementedError(self.destroy_branch)
419
def create_branch_and_repo(base, force_new_repo=False, format=None):
420
"""Create a new BzrDir, Branch and Repository at the url 'base'.
422
This will use the current default BzrDirFormat unless one is
423
specified, and use whatever
424
repository format that that uses via bzrdir.create_branch and
425
create_repository. If a shared repository is available that is used
428
The created Branch object is returned.
430
:param base: The URL to create the branch at.
431
:param force_new_repo: If True a new repository is always created.
432
:param format: If supplied, the format of branch to create. If not
433
supplied, the default is used.
435
bzrdir = BzrDir.create(base, format)
436
bzrdir._find_or_create_repository(force_new_repo)
437
return bzrdir.create_branch()
236
t = _mod_transport.get_transport(url)
439
239
def determine_repository_policy(self, force_new_repo=False, stack_on=None,
440
240
stack_on_pwd=None, require_stacking=False):
502
302
policy = self.determine_repository_policy(force_new_repo)
503
303
return policy.acquire_repository()[0]
506
def create_branch_convenience(base, force_new_repo=False,
507
force_new_tree=None, format=None,
508
possible_transports=None):
509
"""Create a new BzrDir, Branch and Repository at the url 'base'.
511
This is a convenience function - it will use an existing repository
512
if possible, can be told explicitly whether to create a working tree or
515
This will use the current default BzrDirFormat unless one is
516
specified, and use whatever
517
repository format that that uses via bzrdir.create_branch and
518
create_repository. If a shared repository is available that is used
519
preferentially. Whatever repository is used, its tree creation policy
522
The created Branch object is returned.
523
If a working tree cannot be made due to base not being a file:// url,
524
no error is raised unless force_new_tree is True, in which case no
525
data is created on disk and NotLocalUrl is raised.
527
:param base: The URL to create the branch at.
528
:param force_new_repo: If True a new repository is always created.
529
:param force_new_tree: If True or False force creation of a tree or
530
prevent such creation respectively.
531
:param format: Override for the bzrdir format to create.
532
:param possible_transports: An optional reusable transports list.
305
def _find_source_repo(self, add_cleanup, source_branch):
306
"""Find the source branch and repo for a sprout operation.
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).
535
# check for non local urls
536
t = get_transport(base, possible_transports)
537
if not isinstance(t, local.LocalTransport):
538
raise errors.NotLocalUrl(base)
539
bzrdir = BzrDir.create(base, format, possible_transports)
540
repo = bzrdir._find_or_create_repository(force_new_repo)
541
result = bzrdir.create_branch()
542
if force_new_tree or (repo.make_working_trees() and
543
force_new_tree is None):
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:
545
bzrdir.create_workingtree()
546
except errors.NotLocalUrl:
551
def create_standalone_workingtree(base, format=None):
552
"""Create a new BzrDir, WorkingTree, Branch and Repository at 'base'.
554
'base' must be a local path or a file:// url.
556
This will use the current default BzrDirFormat unless one is
557
specified, and use whatever
558
repository format that that uses for bzrdirformat.create_workingtree,
559
create_branch and create_repository.
561
:param format: Override for the bzrdir format to create.
562
:return: The WorkingTree object.
564
t = get_transport(base)
565
if not isinstance(t, local.LocalTransport):
566
raise errors.NotLocalUrl(base)
567
bzrdir = BzrDir.create_branch_and_repo(base,
569
format=format).bzrdir
570
return bzrdir.create_workingtree()
572
def create_workingtree(self, revision_id=None, from_branch=None,
573
accelerator_tree=None, hardlink=False):
574
"""Create a working tree at this BzrDir.
576
:param revision_id: create it as of this revision id.
577
:param from_branch: override bzrdir branch (for lightweight checkouts)
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.
578
349
:param accelerator_tree: A tree which can be used for retrieving file
579
350
contents more quickly than the revision tree, i.e. a workingtree.
580
351
The revision tree will be used for cases where accelerator_tree's
581
352
content is different.
583
raise NotImplementedError(self.create_workingtree)
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,
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)
585
476
def backup_bzrdir(self):
586
477
"""Backup this bzr control directory.
588
479
:return: Tuple with old path name and new path name
590
def name_gen(base='backup.bzr'):
592
name = "%s.~%d~" % (base, counter)
593
while self.root_transport.has(name):
595
name = "%s.~%d~" % (base, counter)
598
backup_dir=name_gen()
599
482
pb = ui.ui_factory.nested_progress_bar()
601
# FIXME: bug 300001 -- the backup fails if the backup directory
602
# already exists, but it should instead either remove it or make
603
# a new backup directory.
605
# FIXME: bug 262450 -- the backup directory should have the same
606
# permissions as the .bzr directory (probably a bug in copy_tree)
607
484
old_path = self.root_transport.abspath('.bzr')
485
backup_dir = self._available_backup_name('backup.bzr')
608
486
new_path = self.root_transport.abspath(backup_dir)
609
ui.ui_factory.note('making backup of %s\n to %s' % (old_path, new_path,))
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')))
610
490
self.root_transport.copy_tree('.bzr', backup_dir)
611
491
return (old_path, new_path)
839
664
# add new tests for it to the appropriate place.
840
665
return filename == '.bzr' or filename.startswith('.bzr/')
842
def needs_format_conversion(self, format=None):
843
"""Return true if this bzrdir needs convert_format run on it.
845
For instance, if the repository format is out of date but the
846
branch and working tree are not, this should return True.
848
:param format: Optional parameter indicating a specific desired
849
format we plan to arrive at.
851
raise NotImplementedError(self.needs_format_conversion)
854
def open_unsupported(base):
855
"""Open a branch which is not supported."""
856
return BzrDir.open(base, _unsupported=True)
859
def open(base, _unsupported=False, possible_transports=None):
860
"""Open an existing bzrdir, rooted at 'base' (url).
862
:param _unsupported: a private parameter to the BzrDir class.
864
t = get_transport(base, possible_transports=possible_transports)
865
return BzrDir.open_from_transport(t, _unsupported=_unsupported)
868
def open_from_transport(transport, _unsupported=False,
869
_server_formats=True):
870
"""Open a bzrdir within a particular directory.
872
:param transport: Transport containing the bzrdir.
873
:param _unsupported: private.
875
for hook in BzrDir.hooks['pre_open']:
877
# Keep initial base since 'transport' may be modified while following
879
base = transport.base
880
def find_format(transport):
881
return transport, BzrDirFormat.find_format(
882
transport, _server_formats=_server_formats)
884
def redirected(transport, e, redirection_notice):
885
redirected_transport = transport._redirected_to(e.source, e.target)
886
if redirected_transport is None:
887
raise errors.NotBranchError(base)
888
note('%s is%s redirected to %s',
889
transport.base, e.permanently, redirected_transport.base)
890
return redirected_transport
893
transport, format = do_catching_redirections(find_format,
896
except errors.TooManyRedirections:
897
raise errors.NotBranchError(base)
899
BzrDir._check_supported(format, _unsupported)
900
return format.open(transport, _found=True)
902
def open_branch(self, name=None, unsupported=False,
903
ignore_fallbacks=False):
904
"""Open the branch object at this BzrDir if one is present.
906
If unsupported is True, then no longer supported branch formats can
909
TODO: static convenience version of this?
911
raise NotImplementedError(self.open_branch)
914
def open_containing(url, possible_transports=None):
915
"""Open an existing branch which contains url.
917
:param url: url to search from.
918
See open_containing_from_transport for more detail.
920
transport = get_transport(url, possible_transports)
921
return BzrDir.open_containing_from_transport(transport)
924
def open_containing_from_transport(a_transport):
925
"""Open an existing branch which contains a_transport.base.
927
This probes for a branch at a_transport, and searches upwards from there.
929
Basically we keep looking up until we find the control directory or
930
run into the root. If there isn't one, raises NotBranchError.
931
If there is one and it is either an unrecognised format or an unsupported
932
format, UnknownFormatError or UnsupportedFormatError are raised.
933
If there is one, it is returned, along with the unused portion of url.
935
:return: The BzrDir that contains the path, and a Unicode path
936
for the rest of the URL.
938
# this gets the normalised url back. I.e. '.' -> the full path.
939
url = a_transport.base
942
result = BzrDir.open_from_transport(a_transport)
943
return result, urlutils.unescape(a_transport.relpath(url))
944
except errors.NotBranchError, e:
947
new_t = a_transport.clone('..')
948
except errors.InvalidURLJoin:
949
# reached the root, whatever that may be
950
raise errors.NotBranchError(path=url)
951
if new_t.base == a_transport.base:
952
# reached the root, whatever that may be
953
raise errors.NotBranchError(path=url)
956
def _get_tree_branch(self):
957
"""Return the branch and tree, if any, for this bzrdir.
959
Return None for tree if not present or inaccessible.
960
Raise NotBranchError if no branch is present.
961
:return: (tree, branch)
964
tree = self.open_workingtree()
965
except (errors.NoWorkingTree, errors.NotLocalUrl):
967
branch = self.open_branch()
973
def open_tree_or_branch(klass, location):
974
"""Return the branch and working tree at a location.
976
If there is no tree at the location, tree will be None.
977
If there is no branch at the location, an exception will be
979
:return: (tree, branch)
981
bzrdir = klass.open(location)
982
return bzrdir._get_tree_branch()
985
def open_containing_tree_or_branch(klass, location):
986
"""Return the branch and working tree contained by a location.
988
Returns (tree, branch, relpath).
989
If there is no tree at containing the location, tree will be None.
990
If there is no branch containing the location, an exception will be
992
relpath is the portion of the path that is contained by the branch.
994
bzrdir, relpath = klass.open_containing(location)
995
tree, branch = bzrdir._get_tree_branch()
996
return tree, branch, relpath
999
def open_containing_tree_branch_or_repository(klass, location):
1000
"""Return the working tree, branch and repo contained by a location.
1002
Returns (tree, branch, repository, relpath).
1003
If there is no tree containing the location, tree will be None.
1004
If there is no branch containing the location, branch will be None.
1005
If there is no repository containing the location, repository will be
1007
relpath is the portion of the path that is contained by the innermost
1010
If no tree, branch or repository is found, a NotBranchError is raised.
1012
bzrdir, relpath = klass.open_containing(location)
1014
tree, branch = bzrdir._get_tree_branch()
1015
except errors.NotBranchError:
1017
repo = bzrdir.find_repository()
1018
return None, None, repo, relpath
1019
except (errors.NoRepositoryPresent):
1020
raise errors.NotBranchError(location)
1021
return tree, branch, branch.repository, relpath
1023
def open_repository(self, _unsupported=False):
1024
"""Open the repository object at this BzrDir if one is present.
1026
This will not follow the Branch object pointer - it's strictly a direct
1027
open facility. Most client code should use open_branch().repository to
1028
get at a repository.
1030
:param _unsupported: a private parameter, not part of the api.
1031
TODO: static convenience version of this?
1033
raise NotImplementedError(self.open_repository)
1035
def open_workingtree(self, _unsupported=False,
1036
recommend_upgrade=True, from_branch=None):
1037
"""Open the workingtree object at this BzrDir if one is present.
1039
:param recommend_upgrade: Optional keyword parameter, when True (the
1040
default), emit through the ui module a recommendation that the user
1041
upgrade the working tree when the workingtree being opened is old
1042
(but still fully supported).
1043
:param from_branch: override bzrdir branch (for lightweight checkouts)
1045
raise NotImplementedError(self.open_workingtree)
1047
def has_branch(self, name=None):
1048
"""Tell if this bzrdir contains a branch.
1050
Note: if you're going to open the branch, you should just go ahead
1051
and try, and not ask permission first. (This method just opens the
1052
branch and discards it, and that's somewhat expensive.)
1055
self.open_branch(name)
1057
except errors.NotBranchError:
1060
def has_workingtree(self):
1061
"""Tell if this bzrdir contains a working tree.
1063
This will still raise an exception if the bzrdir has a workingtree that
1064
is remote & inaccessible.
1066
Note: if you're going to open the working tree, you should just go ahead
1067
and try, and not ask permission first. (This method just opens the
1068
workingtree and discards it, and that's somewhat expensive.)
1071
self.open_workingtree(recommend_upgrade=False)
1073
except errors.NoWorkingTree:
1076
667
def _cloning_metadir(self):
1077
668
"""Produce a metadir suitable for cloning with.
1136
727
format.require_stacking()
1139
def checkout_metadir(self):
1140
return self.cloning_metadir()
1142
def sprout(self, url, revision_id=None, force_new_repo=False,
1143
recurse='down', possible_transports=None,
1144
accelerator_tree=None, hardlink=False, stacked=False,
1145
source_branch=None, create_tree_if_local=True):
1146
"""Create a copy of this bzrdir prepared for use as a new line of
1149
If url's last component does not exist, it will be created.
1151
Attributes related to the identity of the source branch like
1152
branch nickname will be cleaned, a working tree is created
1153
whether one existed before or not; and a local branch is always
1156
if revision_id is not None, then the clone operation may tune
1157
itself to download less data.
1158
:param accelerator_tree: A tree which can be used for retrieving file
1159
contents more quickly than the revision tree, i.e. a workingtree.
1160
The revision tree will be used for cases where accelerator_tree's
1161
content is different.
1162
:param hardlink: If true, hard-link files from accelerator_tree,
1164
:param stacked: If true, create a stacked branch referring to the
1165
location of this control directory.
1166
:param create_tree_if_local: If true, a working-tree will be created
1167
when working locally.
1169
target_transport = get_transport(url, possible_transports)
1170
target_transport.ensure_base()
1171
cloning_format = self.cloning_metadir(stacked)
1172
# Create/update the result branch
1173
result = cloning_format.initialize_on_transport(target_transport)
1174
# if a stacked branch wasn't requested, we don't create one
1175
# even if the origin was stacked
1176
stacked_branch_url = None
1177
if source_branch is not None:
1179
stacked_branch_url = self.root_transport.base
1180
source_repository = source_branch.repository
1183
source_branch = self.open_branch()
1184
source_repository = source_branch.repository
1186
stacked_branch_url = self.root_transport.base
1187
except errors.NotBranchError:
1188
source_branch = None
1190
source_repository = self.open_repository()
1191
except errors.NoRepositoryPresent:
1192
source_repository = None
1193
repository_policy = result.determine_repository_policy(
1194
force_new_repo, stacked_branch_url, require_stacking=stacked)
1195
result_repo, is_new_repo = repository_policy.acquire_repository()
1196
if is_new_repo and revision_id is not None and not stacked:
1197
fetch_spec = graph.PendingAncestryResult(
1198
[revision_id], source_repository)
1201
if source_repository is not None:
1202
# Fetch while stacked to prevent unstacked fetch from
1204
if fetch_spec is None:
1205
result_repo.fetch(source_repository, revision_id=revision_id)
1207
result_repo.fetch(source_repository, fetch_spec=fetch_spec)
1209
if source_branch is None:
1210
# this is for sprouting a bzrdir without a branch; is that
1212
# Not especially, but it's part of the contract.
1213
result_branch = result.create_branch()
1215
result_branch = source_branch.sprout(result,
1216
revision_id=revision_id, repository_policy=repository_policy)
1217
mutter("created new branch %r" % (result_branch,))
1219
# Create/update the result working tree
1220
if (create_tree_if_local and
1221
isinstance(target_transport, local.LocalTransport) and
1222
(result_repo is None or result_repo.make_working_trees())):
1223
wt = result.create_workingtree(accelerator_tree=accelerator_tree,
1227
if wt.path2id('') is None:
1229
wt.set_root_id(self.open_workingtree.get_root_id())
1230
except errors.NoWorkingTree:
1236
if recurse == 'down':
1238
basis = wt.basis_tree()
1240
subtrees = basis.iter_references()
1241
elif result_branch is not None:
1242
basis = result_branch.basis_tree()
1244
subtrees = basis.iter_references()
1245
elif source_branch is not None:
1246
basis = source_branch.basis_tree()
1248
subtrees = basis.iter_references()
1253
for path, file_id in subtrees:
1254
target = urlutils.join(url, urlutils.escape(path))
1255
sublocation = source_branch.reference_parent(file_id, path)
1256
sublocation.bzrdir.sprout(target,
1257
basis.get_reference_revision(file_id, path),
1258
force_new_repo=force_new_repo, recurse=recurse,
1261
if basis is not None:
1265
def push_branch(self, source, revision_id=None, overwrite=False,
1266
remember=False, create_prefix=False):
1267
"""Push the source branch into this BzrDir."""
1269
# If we can open a branch, use its direct repository, otherwise see
1270
# if there is a repository without a branch.
1272
br_to = self.open_branch()
1273
except errors.NotBranchError:
1274
# Didn't find a branch, can we find a repository?
1275
repository_to = self.find_repository()
1277
# Found a branch, so we must have found a repository
1278
repository_to = br_to.repository
1280
push_result = PushResult()
1281
push_result.source_branch = source
1283
# We have a repository but no branch, copy the revisions, and then
1285
repository_to.fetch(source.repository, revision_id=revision_id)
1286
br_to = source.clone(self, revision_id=revision_id)
1287
if source.get_push_location() is None or remember:
1288
source.set_push_location(br_to.base)
1289
push_result.stacked_on = None
1290
push_result.branch_push_result = None
1291
push_result.old_revno = None
1292
push_result.old_revid = _mod_revision.NULL_REVISION
1293
push_result.target_branch = br_to
1294
push_result.master_branch = None
1295
push_result.workingtree_updated = False
1297
# We have successfully opened the branch, remember if necessary:
1298
if source.get_push_location() is None or remember:
1299
source.set_push_location(br_to.base)
1301
tree_to = self.open_workingtree()
1302
except errors.NotLocalUrl:
1303
push_result.branch_push_result = source.push(br_to,
1304
overwrite, stop_revision=revision_id)
1305
push_result.workingtree_updated = False
1306
except errors.NoWorkingTree:
1307
push_result.branch_push_result = source.push(br_to,
1308
overwrite, stop_revision=revision_id)
1309
push_result.workingtree_updated = None # Not applicable
1311
tree_to.lock_write()
1313
push_result.branch_push_result = source.push(
1314
tree_to.branch, overwrite, stop_revision=revision_id)
1318
push_result.workingtree_updated = True
1319
push_result.old_revno = push_result.branch_push_result.old_revno
1320
push_result.old_revid = push_result.branch_push_result.old_revid
1321
push_result.target_branch = \
1322
push_result.branch_push_result.target_branch
1326
class BzrDirHooks(hooks.Hooks):
1327
"""Hooks for BzrDir operations."""
1330
"""Create the default hooks."""
1331
hooks.Hooks.__init__(self)
1332
self.create_hook(hooks.HookPoint('pre_open',
1333
"Invoked before attempting to open a BzrDir with the transport "
1334
"that the open will use.", (1, 14), None))
1336
# install the default hooks
1337
BzrDir.hooks = BzrDirHooks()
1340
class BzrDirPreSplitOut(BzrDir):
1341
"""A common class for the all-in-one formats."""
1343
def __init__(self, _transport, _format):
1344
"""See BzrDir.__init__."""
1345
super(BzrDirPreSplitOut, self).__init__(_transport, _format)
1346
self._control_files = lockable_files.LockableFiles(
1347
self.get_branch_transport(None),
1348
self._format._lock_file_name,
1349
self._format._lock_class)
1351
def break_lock(self):
1352
"""Pre-splitout bzrdirs do not suffer from stale locks."""
1353
raise NotImplementedError(self.break_lock)
1355
def cloning_metadir(self, require_stacking=False):
1356
"""Produce a metadir suitable for cloning with."""
1357
if require_stacking:
1358
return format_registry.make_bzrdir('1.6')
1359
return self._format.__class__()
1361
def clone(self, url, revision_id=None, force_new_repo=False,
1362
preserve_stacking=False):
1363
"""See BzrDir.clone().
1365
force_new_repo has no effect, since this family of formats always
1366
require a new repository.
1367
preserve_stacking has no effect, since no source branch using this
1368
family of formats can be stacked, so there is no stacking to preserve.
1370
self._make_tail(url)
1371
result = self._format._initialize_for_clone(url)
1372
self.open_repository().clone(result, revision_id=revision_id)
1373
from_branch = self.open_branch()
1374
from_branch.clone(result, revision_id=revision_id)
1376
tree = self.open_workingtree()
1377
except errors.NotLocalUrl:
1378
# make a new one, this format always has to have one.
1379
result._init_workingtree()
1384
def create_branch(self, name=None):
1385
"""See BzrDir.create_branch."""
1386
if name is not None:
1387
raise errors.NoColocatedBranchSupport(self)
1388
return self._format.get_branch_format().initialize(self)
1390
def destroy_branch(self, name=None):
1391
"""See BzrDir.destroy_branch."""
1392
raise errors.UnsupportedOperation(self.destroy_branch, self)
1394
def create_repository(self, shared=False):
1395
"""See BzrDir.create_repository."""
1397
raise errors.IncompatibleFormat('shared repository', self._format)
1398
return self.open_repository()
1400
def destroy_repository(self):
1401
"""See BzrDir.destroy_repository."""
1402
raise errors.UnsupportedOperation(self.destroy_repository, self)
1404
def create_workingtree(self, revision_id=None, from_branch=None,
1405
accelerator_tree=None, hardlink=False):
1406
"""See BzrDir.create_workingtree."""
1407
# The workingtree is sometimes created when the bzrdir is created,
1408
# but not when cloning.
1410
# this looks buggy but is not -really-
1411
# because this format creates the workingtree when the bzrdir is
1413
# clone and sprout will have set the revision_id
1414
# and that will have set it for us, its only
1415
# specific uses of create_workingtree in isolation
1416
# that can do wonky stuff here, and that only
1417
# happens for creating checkouts, which cannot be
1418
# done on this format anyway. So - acceptable wart.
1420
warning("can't support hardlinked working trees in %r"
1423
result = self.open_workingtree(recommend_upgrade=False)
1424
except errors.NoSuchFile:
1425
result = self._init_workingtree()
1426
if revision_id is not None:
1427
if revision_id == _mod_revision.NULL_REVISION:
1428
result.set_parent_ids([])
1430
result.set_parent_ids([revision_id])
1433
def _init_workingtree(self):
1434
from bzrlib.workingtree import WorkingTreeFormat2
1436
return WorkingTreeFormat2().initialize(self)
1437
except errors.NotLocalUrl:
1438
# Even though we can't access the working tree, we need to
1439
# create its control files.
1440
return WorkingTreeFormat2()._stub_initialize_on_transport(
1441
self.transport, self._control_files._file_mode)
1443
def destroy_workingtree(self):
1444
"""See BzrDir.destroy_workingtree."""
1445
raise errors.UnsupportedOperation(self.destroy_workingtree, self)
1447
def destroy_workingtree_metadata(self):
1448
"""See BzrDir.destroy_workingtree_metadata."""
1449
raise errors.UnsupportedOperation(self.destroy_workingtree_metadata,
1452
def get_branch_transport(self, branch_format):
1453
"""See BzrDir.get_branch_transport()."""
1454
if branch_format is None:
1455
return self.transport
1457
branch_format.get_format_string()
1458
except NotImplementedError:
1459
return self.transport
1460
raise errors.IncompatibleFormat(branch_format, self._format)
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.
741
raise NotImplementedError(self.get_branch_transport)
1462
743
def get_repository_transport(self, repository_format):
1463
"""See BzrDir.get_repository_transport()."""
1464
if repository_format is None:
1465
return self.transport
1467
repository_format.get_format_string()
1468
except NotImplementedError:
1469
return self.transport
1470
raise errors.IncompatibleFormat(repository_format, self._format)
1472
def get_workingtree_transport(self, workingtree_format):
1473
"""See BzrDir.get_workingtree_transport()."""
1474
if workingtree_format is None:
1475
return self.transport
1477
workingtree_format.get_format_string()
1478
except NotImplementedError:
1479
return self.transport
1480
raise errors.IncompatibleFormat(workingtree_format, self._format)
1482
def needs_format_conversion(self, format=None):
1483
"""See BzrDir.needs_format_conversion()."""
1484
# if the format is not the same as the system default,
1485
# an upgrade is needed.
1487
symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1488
% 'needs_format_conversion(format=None)')
1489
format = BzrDirFormat.get_default_format()
1490
return not isinstance(self._format, format.__class__)
1492
def open_branch(self, name=None, unsupported=False,
1493
ignore_fallbacks=False):
1494
"""See BzrDir.open_branch."""
1495
if name is not None:
1496
raise errors.NoColocatedBranchSupport(self)
1497
from bzrlib.branch import BzrBranchFormat4
1498
format = BzrBranchFormat4()
1499
self._check_supported(format, unsupported)
1500
return format.open(self, _found=True)
1502
def sprout(self, url, revision_id=None, force_new_repo=False,
1503
possible_transports=None, accelerator_tree=None,
1504
hardlink=False, stacked=False, create_tree_if_local=True,
1505
source_branch=None):
1506
"""See BzrDir.sprout()."""
1507
if source_branch is not None:
1508
my_branch = self.open_branch()
1509
if source_branch.base != my_branch.base:
1510
raise AssertionError(
1511
"source branch %r is not within %r with branch %r" %
1512
(source_branch, self, my_branch))
1514
raise errors.UnstackableBranchFormat(
1515
self._format, self.root_transport.base)
1516
if not create_tree_if_local:
1517
raise errors.MustHaveWorkingTree(
1518
self._format, self.root_transport.base)
1519
from bzrlib.workingtree import WorkingTreeFormat2
1520
self._make_tail(url)
1521
result = self._format._initialize_for_clone(url)
1523
self.open_repository().clone(result, revision_id=revision_id)
1524
except errors.NoRepositoryPresent:
1527
self.open_branch().sprout(result, revision_id=revision_id)
1528
except errors.NotBranchError:
1531
# we always want a working tree
1532
WorkingTreeFormat2().initialize(result,
1533
accelerator_tree=accelerator_tree,
1538
class BzrDir4(BzrDirPreSplitOut):
1539
"""A .bzr version 4 control object.
1541
This is a deprecated format and may be removed after sept 2006.
1544
def create_repository(self, shared=False):
1545
"""See BzrDir.create_repository."""
1546
return self._format.repository_format.initialize(self, shared)
1548
def needs_format_conversion(self, format=None):
1549
"""Format 4 dirs are always in need of conversion."""
1551
symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1552
% 'needs_format_conversion(format=None)')
1555
def open_repository(self):
1556
"""See BzrDir.open_repository."""
1557
from bzrlib.repofmt.weaverepo import RepositoryFormat4
1558
return RepositoryFormat4().open(self, _found=True)
1561
class BzrDir5(BzrDirPreSplitOut):
1562
"""A .bzr version 5 control object.
1564
This is a deprecated format and may be removed after sept 2006.
1567
def has_workingtree(self):
1568
"""See BzrDir.has_workingtree."""
1571
def open_repository(self):
1572
"""See BzrDir.open_repository."""
1573
from bzrlib.repofmt.weaverepo import RepositoryFormat5
1574
return RepositoryFormat5().open(self, _found=True)
1576
def open_workingtree(self, _unsupported=False,
1577
recommend_upgrade=True):
1578
"""See BzrDir.create_workingtree."""
1579
from bzrlib.workingtree import WorkingTreeFormat2
1580
wt_format = WorkingTreeFormat2()
1581
# we don't warn here about upgrades; that ought to be handled for the
1583
return wt_format.open(self, _found=True)
1586
class BzrDir6(BzrDirPreSplitOut):
1587
"""A .bzr version 6 control object.
1589
This is a deprecated format and may be removed after sept 2006.
1592
def has_workingtree(self):
1593
"""See BzrDir.has_workingtree."""
1596
def open_repository(self):
1597
"""See BzrDir.open_repository."""
1598
from bzrlib.repofmt.weaverepo import RepositoryFormat6
1599
return RepositoryFormat6().open(self, _found=True)
1601
def open_workingtree(self, _unsupported=False,
1602
recommend_upgrade=True):
1603
"""See BzrDir.create_workingtree."""
1604
# we don't warn here about upgrades; that ought to be handled for the
1606
from bzrlib.workingtree import WorkingTreeFormat2
1607
return WorkingTreeFormat2().open(self, _found=True)
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()
1610
801
class BzrDirMeta1(BzrDir):
1801
1098
return config.TransportConfig(self.transport, 'control.conf')
1804
class BzrDirFormat(object):
1805
"""An encapsulation of the initialization and open routines for a format.
1807
Formats provide three things:
1808
* An initialization routine,
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.
1812
1300
Formats are placed in a dict by their format string for reference
1813
1301
during bzrdir opening. These should be subclasses of BzrDirFormat
2182
1504
compatible with whatever sub formats are supported by self.
2187
def unregister_format(klass, format):
2188
del klass._formats[format.get_format_string()]
2191
def unregister_control_format(klass, format):
2192
klass._control_formats.remove(format)
2195
class BzrDirFormat4(BzrDirFormat):
2196
"""Bzr dir format 4.
2198
This format is a combined format for working tree, branch and repository.
2200
- Format 1 working trees [always]
2201
- Format 4 branches [always]
2202
- Format 4 repositories [always]
2204
This format is deprecated: it indexes texts using a text it which is
2205
removed in format 5; write support for this format has been removed.
2208
_lock_class = lockable_files.TransportLock
2210
def get_format_string(self):
2211
"""See BzrDirFormat.get_format_string()."""
2212
return "Bazaar-NG branch, format 0.0.4\n"
2214
def get_format_description(self):
2215
"""See BzrDirFormat.get_format_description()."""
2216
return "All-in-one format 4"
2218
def get_converter(self, format=None):
2219
"""See BzrDirFormat.get_converter()."""
2220
# there is one and only one upgrade path here.
2221
return ConvertBzrDir4To5()
2223
def initialize_on_transport(self, transport):
2224
"""Format 4 branches cannot be created."""
2225
raise errors.UninitializableFormat(self)
2227
def is_supported(self):
2228
"""Format 4 is not supported.
2230
It is not supported because the model changed from 4 to 5 and the
2231
conversion logic is expensive - so doing it on the fly was not
2236
def network_name(self):
2237
return self.get_format_string()
2239
def _open(self, transport):
2240
"""See BzrDirFormat._open."""
2241
return BzrDir4(transport, self)
2243
def __return_repository_format(self):
2244
"""Circular import protection."""
2245
from bzrlib.repofmt.weaverepo import RepositoryFormat4
2246
return RepositoryFormat4()
2247
repository_format = property(__return_repository_format)
2250
class BzrDirFormatAllInOne(BzrDirFormat):
2251
"""Common class for formats before meta-dirs."""
2253
def initialize_on_transport_ex(self, transport, use_existing_dir=False,
2254
create_prefix=False, force_new_repo=False, stacked_on=None,
2255
stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
2257
"""See BzrDirFormat.initialize_on_transport_ex."""
2258
require_stacking = (stacked_on is not None)
2259
# Format 5 cannot stack, but we've been asked to - actually init
2261
if require_stacking:
2262
format = BzrDirMetaFormat1()
2263
return format.initialize_on_transport_ex(transport,
2264
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
2265
force_new_repo=force_new_repo, stacked_on=stacked_on,
2266
stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
2267
make_working_trees=make_working_trees, shared_repo=shared_repo)
2268
return BzrDirFormat.initialize_on_transport_ex(self, transport,
2269
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
2270
force_new_repo=force_new_repo, stacked_on=stacked_on,
2271
stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
2272
make_working_trees=make_working_trees, shared_repo=shared_repo)
2275
class BzrDirFormat5(BzrDirFormatAllInOne):
2276
"""Bzr control format 5.
2278
This format is a combined format for working tree, branch and repository.
2280
- Format 2 working trees [always]
2281
- Format 4 branches [always]
2282
- Format 5 repositories [always]
2283
Unhashed stores in the repository.
2286
_lock_class = lockable_files.TransportLock
2288
def get_format_string(self):
2289
"""See BzrDirFormat.get_format_string()."""
2290
return "Bazaar-NG branch, format 5\n"
2292
def get_branch_format(self):
2293
from bzrlib import branch
2294
return branch.BzrBranchFormat4()
2296
def get_format_description(self):
2297
"""See BzrDirFormat.get_format_description()."""
2298
return "All-in-one format 5"
2300
def get_converter(self, format=None):
2301
"""See BzrDirFormat.get_converter()."""
2302
# there is one and only one upgrade path here.
2303
return ConvertBzrDir5To6()
2305
def _initialize_for_clone(self, url):
2306
return self.initialize_on_transport(get_transport(url), _cloning=True)
2308
def initialize_on_transport(self, transport, _cloning=False):
2309
"""Format 5 dirs always have working tree, branch and repository.
2311
Except when they are being cloned.
2313
from bzrlib.branch import BzrBranchFormat4
2314
from bzrlib.repofmt.weaverepo import RepositoryFormat5
2315
result = (super(BzrDirFormat5, self).initialize_on_transport(transport))
2316
RepositoryFormat5().initialize(result, _internal=True)
2318
branch = BzrBranchFormat4().initialize(result)
2319
result._init_workingtree()
2322
def network_name(self):
2323
return self.get_format_string()
2325
def _open(self, transport):
2326
"""See BzrDirFormat._open."""
2327
return BzrDir5(transport, self)
2329
def __return_repository_format(self):
2330
"""Circular import protection."""
2331
from bzrlib.repofmt.weaverepo import RepositoryFormat5
2332
return RepositoryFormat5()
2333
repository_format = property(__return_repository_format)
2336
class BzrDirFormat6(BzrDirFormatAllInOne):
2337
"""Bzr control format 6.
2339
This format is a combined format for working tree, branch and repository.
2341
- Format 2 working trees [always]
2342
- Format 4 branches [always]
2343
- Format 6 repositories [always]
2346
_lock_class = lockable_files.TransportLock
2348
def get_format_string(self):
2349
"""See BzrDirFormat.get_format_string()."""
2350
return "Bazaar-NG branch, format 6\n"
2352
def get_format_description(self):
2353
"""See BzrDirFormat.get_format_description()."""
2354
return "All-in-one format 6"
2356
def get_branch_format(self):
2357
from bzrlib import branch
2358
return branch.BzrBranchFormat4()
2360
def get_converter(self, format=None):
2361
"""See BzrDirFormat.get_converter()."""
2362
# there is one and only one upgrade path here.
2363
return ConvertBzrDir6ToMeta()
2365
def _initialize_for_clone(self, url):
2366
return self.initialize_on_transport(get_transport(url), _cloning=True)
2368
def initialize_on_transport(self, transport, _cloning=False):
2369
"""Format 6 dirs always have working tree, branch and repository.
2371
Except when they are being cloned.
2373
from bzrlib.branch import BzrBranchFormat4
2374
from bzrlib.repofmt.weaverepo import RepositoryFormat6
2375
result = super(BzrDirFormat6, self).initialize_on_transport(transport)
2376
RepositoryFormat6().initialize(result, _internal=True)
2378
branch = BzrBranchFormat4().initialize(result)
2379
result._init_workingtree()
2382
def network_name(self):
2383
return self.get_format_string()
2385
def _open(self, transport):
2386
"""See BzrDirFormat._open."""
2387
return BzrDir6(transport, self)
2389
def __return_repository_format(self):
2390
"""Circular import protection."""
2391
from bzrlib.repofmt.weaverepo import RepositoryFormat6
2392
return RepositoryFormat6()
2393
repository_format = property(__return_repository_format)
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)
2396
1522
class BzrDirMetaFormat1(BzrDirFormat):
2588
1729
def __get_workingtree_format(self):
2589
1730
if self._workingtree_format is None:
2590
from bzrlib.workingtree import WorkingTreeFormat
2591
self._workingtree_format = WorkingTreeFormat.get_default_format()
1731
from bzrlib.workingtree import (
1732
format_registry as wt_format_registry,
1734
self._workingtree_format = wt_format_registry.get_default()
2592
1735
return self._workingtree_format
2594
1737
def __set_workingtree_format(self, wt_format):
2595
1738
self._workingtree_format = wt_format
1741
return "<%r>" % (self.__class__.__name__,)
2597
1743
workingtree_format = property(__get_workingtree_format,
2598
1744
__set_workingtree_format)
2601
network_format_registry = registry.FormatRegistry()
2602
"""Registry of formats indexed by their network name.
2604
The network name for a BzrDirFormat is an identifier that can be used when
2605
referring to formats with smart server operations. See
2606
BzrDirFormat.network_name() for more detail.
2610
# Register bzr control format
2611
BzrDirFormat.register_control_format(BzrDirFormat)
2613
1747
# Register bzr formats
2614
BzrDirFormat.register_format(BzrDirFormat4())
2615
BzrDirFormat.register_format(BzrDirFormat5())
2616
BzrDirFormat.register_format(BzrDirFormat6())
2617
__default_format = BzrDirMetaFormat1()
2618
BzrDirFormat.register_format(__default_format)
2619
BzrDirFormat._default_format = __default_format
2622
class Converter(object):
2623
"""Converts a disk format object from one format to another."""
2625
def convert(self, to_convert, pb):
2626
"""Perform the conversion of to_convert, giving feedback via pb.
2628
:param to_convert: The disk object to convert.
2629
:param pb: a progress bar to use for progress information.
2632
def step(self, message):
2633
"""Update the pb by a step."""
2635
self.pb.update(message, self.count, self.total)
2638
class ConvertBzrDir4To5(Converter):
2639
"""Converts format 4 bzr dirs to format 5."""
2642
super(ConvertBzrDir4To5, self).__init__()
2643
self.converted_revs = set()
2644
self.absent_revisions = set()
2648
def convert(self, to_convert, pb):
2649
"""See Converter.convert()."""
2650
self.bzrdir = to_convert
2652
warnings.warn("pb parameter to convert() is deprecated")
2653
self.pb = ui.ui_factory.nested_progress_bar()
2655
ui.ui_factory.note('starting upgrade from format 4 to 5')
2656
if isinstance(self.bzrdir.transport, local.LocalTransport):
2657
self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
2658
self._convert_to_weaves()
2659
return BzrDir.open(self.bzrdir.root_transport.base)
2663
def _convert_to_weaves(self):
2664
ui.ui_factory.note('note: upgrade may be faster if all store files are ungzipped first')
2667
stat = self.bzrdir.transport.stat('weaves')
2668
if not S_ISDIR(stat.st_mode):
2669
self.bzrdir.transport.delete('weaves')
2670
self.bzrdir.transport.mkdir('weaves')
2671
except errors.NoSuchFile:
2672
self.bzrdir.transport.mkdir('weaves')
2673
# deliberately not a WeaveFile as we want to build it up slowly.
2674
self.inv_weave = Weave('inventory')
2675
# holds in-memory weaves for all files
2676
self.text_weaves = {}
2677
self.bzrdir.transport.delete('branch-format')
2678
self.branch = self.bzrdir.open_branch()
2679
self._convert_working_inv()
2680
rev_history = self.branch.revision_history()
2681
# to_read is a stack holding the revisions we still need to process;
2682
# appending to it adds new highest-priority revisions
2683
self.known_revisions = set(rev_history)
2684
self.to_read = rev_history[-1:]
2686
rev_id = self.to_read.pop()
2687
if (rev_id not in self.revisions
2688
and rev_id not in self.absent_revisions):
2689
self._load_one_rev(rev_id)
2691
to_import = self._make_order()
2692
for i, rev_id in enumerate(to_import):
2693
self.pb.update('converting revision', i, len(to_import))
2694
self._convert_one_rev(rev_id)
2696
self._write_all_weaves()
2697
self._write_all_revs()
2698
ui.ui_factory.note('upgraded to weaves:')
2699
ui.ui_factory.note(' %6d revisions and inventories' % len(self.revisions))
2700
ui.ui_factory.note(' %6d revisions not present' % len(self.absent_revisions))
2701
ui.ui_factory.note(' %6d texts' % self.text_count)
2702
self._cleanup_spare_files_after_format4()
2703
self.branch._transport.put_bytes(
2705
BzrDirFormat5().get_format_string(),
2706
mode=self.bzrdir._get_file_mode())
2708
def _cleanup_spare_files_after_format4(self):
2709
# FIXME working tree upgrade foo.
2710
for n in 'merged-patches', 'pending-merged-patches':
2712
## assert os.path.getsize(p) == 0
2713
self.bzrdir.transport.delete(n)
2714
except errors.NoSuchFile:
2716
self.bzrdir.transport.delete_tree('inventory-store')
2717
self.bzrdir.transport.delete_tree('text-store')
2719
def _convert_working_inv(self):
2720
inv = xml4.serializer_v4.read_inventory(
2721
self.branch._transport.get('inventory'))
2722
new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv, working=True)
2723
self.branch._transport.put_bytes('inventory', new_inv_xml,
2724
mode=self.bzrdir._get_file_mode())
2726
def _write_all_weaves(self):
2727
controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)
2728
weave_transport = self.bzrdir.transport.clone('weaves')
2729
weaves = WeaveStore(weave_transport, prefixed=False)
2730
transaction = WriteTransaction()
2734
for file_id, file_weave in self.text_weaves.items():
2735
self.pb.update('writing weave', i, len(self.text_weaves))
2736
weaves._put_weave(file_id, file_weave, transaction)
2738
self.pb.update('inventory', 0, 1)
2739
controlweaves._put_weave('inventory', self.inv_weave, transaction)
2740
self.pb.update('inventory', 1, 1)
2744
def _write_all_revs(self):
2745
"""Write all revisions out in new form."""
2746
self.bzrdir.transport.delete_tree('revision-store')
2747
self.bzrdir.transport.mkdir('revision-store')
2748
revision_transport = self.bzrdir.transport.clone('revision-store')
2750
from bzrlib.xml5 import serializer_v5
2751
from bzrlib.repofmt.weaverepo import RevisionTextStore
2752
revision_store = RevisionTextStore(revision_transport,
2753
serializer_v5, False, versionedfile.PrefixMapper(),
2754
lambda:True, lambda:True)
2756
for i, rev_id in enumerate(self.converted_revs):
2757
self.pb.update('write revision', i, len(self.converted_revs))
2758
text = serializer_v5.write_revision_to_string(
2759
self.revisions[rev_id])
2761
revision_store.add_lines(key, None, osutils.split_lines(text))
2765
def _load_one_rev(self, rev_id):
2766
"""Load a revision object into memory.
2768
Any parents not either loaded or abandoned get queued to be
2770
self.pb.update('loading revision',
2771
len(self.revisions),
2772
len(self.known_revisions))
2773
if not self.branch.repository.has_revision(rev_id):
2775
ui.ui_factory.note('revision {%s} not present in branch; '
2776
'will be converted as a ghost' %
2778
self.absent_revisions.add(rev_id)
2780
rev = self.branch.repository.get_revision(rev_id)
2781
for parent_id in rev.parent_ids:
2782
self.known_revisions.add(parent_id)
2783
self.to_read.append(parent_id)
2784
self.revisions[rev_id] = rev
2786
def _load_old_inventory(self, rev_id):
2787
old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
2788
inv = xml4.serializer_v4.read_inventory_from_string(old_inv_xml)
2789
inv.revision_id = rev_id
2790
rev = self.revisions[rev_id]
2793
def _load_updated_inventory(self, rev_id):
2794
inv_xml = self.inv_weave.get_text(rev_id)
2795
inv = xml5.serializer_v5.read_inventory_from_string(inv_xml, rev_id)
2798
def _convert_one_rev(self, rev_id):
2799
"""Convert revision and all referenced objects to new format."""
2800
rev = self.revisions[rev_id]
2801
inv = self._load_old_inventory(rev_id)
2802
present_parents = [p for p in rev.parent_ids
2803
if p not in self.absent_revisions]
2804
self._convert_revision_contents(rev, inv, present_parents)
2805
self._store_new_inv(rev, inv, present_parents)
2806
self.converted_revs.add(rev_id)
2808
def _store_new_inv(self, rev, inv, present_parents):
2809
new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv)
2810
new_inv_sha1 = sha_string(new_inv_xml)
2811
self.inv_weave.add_lines(rev.revision_id,
2813
new_inv_xml.splitlines(True))
2814
rev.inventory_sha1 = new_inv_sha1
2816
def _convert_revision_contents(self, rev, inv, present_parents):
2817
"""Convert all the files within a revision.
2819
Also upgrade the inventory to refer to the text revision ids."""
2820
rev_id = rev.revision_id
2821
mutter('converting texts of revision {%s}',
2823
parent_invs = map(self._load_updated_inventory, present_parents)
2824
entries = inv.iter_entries()
2826
for path, ie in entries:
2827
self._convert_file_version(rev, ie, parent_invs)
2829
def _convert_file_version(self, rev, ie, parent_invs):
2830
"""Convert one version of one file.
2832
The file needs to be added into the weave if it is a merge
2833
of >=2 parents or if it's changed from its parent.
2835
file_id = ie.file_id
2836
rev_id = rev.revision_id
2837
w = self.text_weaves.get(file_id)
2840
self.text_weaves[file_id] = w
2841
text_changed = False
2842
parent_candiate_entries = ie.parent_candidates(parent_invs)
2843
heads = graph.Graph(self).heads(parent_candiate_entries.keys())
2844
# XXX: Note that this is unordered - and this is tolerable because
2845
# the previous code was also unordered.
2846
previous_entries = dict((head, parent_candiate_entries[head]) for head
2848
self.snapshot_ie(previous_entries, ie, w, rev_id)
2851
def get_parent_map(self, revision_ids):
2852
"""See graph.StackedParentsProvider.get_parent_map"""
2853
return dict((revision_id, self.revisions[revision_id])
2854
for revision_id in revision_ids
2855
if revision_id in self.revisions)
2857
def snapshot_ie(self, previous_revisions, ie, w, rev_id):
2858
# TODO: convert this logic, which is ~= snapshot to
2859
# a call to:. This needs the path figured out. rather than a work_tree
2860
# a v4 revision_tree can be given, or something that looks enough like
2861
# one to give the file content to the entry if it needs it.
2862
# and we need something that looks like a weave store for snapshot to
2864
#ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
2865
if len(previous_revisions) == 1:
2866
previous_ie = previous_revisions.values()[0]
2867
if ie._unchanged(previous_ie):
2868
ie.revision = previous_ie.revision
2871
text = self.branch.repository._text_store.get(ie.text_id)
2872
file_lines = text.readlines()
2873
w.add_lines(rev_id, previous_revisions, file_lines)
2874
self.text_count += 1
2876
w.add_lines(rev_id, previous_revisions, [])
2877
ie.revision = rev_id
2879
def _make_order(self):
2880
"""Return a suitable order for importing revisions.
2882
The order must be such that an revision is imported after all
2883
its (present) parents.
2885
todo = set(self.revisions.keys())
2886
done = self.absent_revisions.copy()
2889
# scan through looking for a revision whose parents
2891
for rev_id in sorted(list(todo)):
2892
rev = self.revisions[rev_id]
2893
parent_ids = set(rev.parent_ids)
2894
if parent_ids.issubset(done):
2895
# can take this one now
2896
order.append(rev_id)
2902
class ConvertBzrDir5To6(Converter):
2903
"""Converts format 5 bzr dirs to format 6."""
2905
def convert(self, to_convert, pb):
2906
"""See Converter.convert()."""
2907
self.bzrdir = to_convert
2908
pb = ui.ui_factory.nested_progress_bar()
2910
ui.ui_factory.note('starting upgrade from format 5 to 6')
2911
self._convert_to_prefixed()
2912
return BzrDir.open(self.bzrdir.root_transport.base)
2916
def _convert_to_prefixed(self):
2917
from bzrlib.store import TransportStore
2918
self.bzrdir.transport.delete('branch-format')
2919
for store_name in ["weaves", "revision-store"]:
2920
ui.ui_factory.note("adding prefixes to %s" % store_name)
2921
store_transport = self.bzrdir.transport.clone(store_name)
2922
store = TransportStore(store_transport, prefixed=True)
2923
for urlfilename in store_transport.list_dir('.'):
2924
filename = urlutils.unescape(urlfilename)
2925
if (filename.endswith(".weave") or
2926
filename.endswith(".gz") or
2927
filename.endswith(".sig")):
2928
file_id, suffix = os.path.splitext(filename)
2932
new_name = store._mapper.map((file_id,)) + suffix
2933
# FIXME keep track of the dirs made RBC 20060121
2935
store_transport.move(filename, new_name)
2936
except errors.NoSuchFile: # catches missing dirs strangely enough
2937
store_transport.mkdir(osutils.dirname(new_name))
2938
store_transport.move(filename, new_name)
2939
self.bzrdir.transport.put_bytes(
2941
BzrDirFormat6().get_format_string(),
2942
mode=self.bzrdir._get_file_mode())
2945
class ConvertBzrDir6ToMeta(Converter):
2946
"""Converts format 6 bzr dirs to metadirs."""
2948
def convert(self, to_convert, pb):
2949
"""See Converter.convert()."""
2950
from bzrlib.repofmt.weaverepo import RepositoryFormat7
2951
from bzrlib.branch import BzrBranchFormat5
2952
self.bzrdir = to_convert
2953
self.pb = ui.ui_factory.nested_progress_bar()
2955
self.total = 20 # the steps we know about
2956
self.garbage_inventories = []
2957
self.dir_mode = self.bzrdir._get_dir_mode()
2958
self.file_mode = self.bzrdir._get_file_mode()
2960
ui.ui_factory.note('starting upgrade from format 6 to metadir')
2961
self.bzrdir.transport.put_bytes(
2963
"Converting to format 6",
2964
mode=self.file_mode)
2965
# its faster to move specific files around than to open and use the apis...
2966
# first off, nuke ancestry.weave, it was never used.
2968
self.step('Removing ancestry.weave')
2969
self.bzrdir.transport.delete('ancestry.weave')
2970
except errors.NoSuchFile:
2972
# find out whats there
2973
self.step('Finding branch files')
2974
last_revision = self.bzrdir.open_branch().last_revision()
2975
bzrcontents = self.bzrdir.transport.list_dir('.')
2976
for name in bzrcontents:
2977
if name.startswith('basis-inventory.'):
2978
self.garbage_inventories.append(name)
2979
# create new directories for repository, working tree and branch
2980
repository_names = [('inventory.weave', True),
2981
('revision-store', True),
2983
self.step('Upgrading repository ')
2984
self.bzrdir.transport.mkdir('repository', mode=self.dir_mode)
2985
self.make_lock('repository')
2986
# we hard code the formats here because we are converting into
2987
# the meta format. The meta format upgrader can take this to a
2988
# future format within each component.
2989
self.put_format('repository', RepositoryFormat7())
2990
for entry in repository_names:
2991
self.move_entry('repository', entry)
2993
self.step('Upgrading branch ')
2994
self.bzrdir.transport.mkdir('branch', mode=self.dir_mode)
2995
self.make_lock('branch')
2996
self.put_format('branch', BzrBranchFormat5())
2997
branch_files = [('revision-history', True),
2998
('branch-name', True),
3000
for entry in branch_files:
3001
self.move_entry('branch', entry)
3003
checkout_files = [('pending-merges', True),
3004
('inventory', True),
3005
('stat-cache', False)]
3006
# If a mandatory checkout file is not present, the branch does not have
3007
# a functional checkout. Do not create a checkout in the converted
3009
for name, mandatory in checkout_files:
3010
if mandatory and name not in bzrcontents:
3011
has_checkout = False
3015
if not has_checkout:
3016
ui.ui_factory.note('No working tree.')
3017
# If some checkout files are there, we may as well get rid of them.
3018
for name, mandatory in checkout_files:
3019
if name in bzrcontents:
3020
self.bzrdir.transport.delete(name)
3022
from bzrlib.workingtree import WorkingTreeFormat3
3023
self.step('Upgrading working tree')
3024
self.bzrdir.transport.mkdir('checkout', mode=self.dir_mode)
3025
self.make_lock('checkout')
3027
'checkout', WorkingTreeFormat3())
3028
self.bzrdir.transport.delete_multi(
3029
self.garbage_inventories, self.pb)
3030
for entry in checkout_files:
3031
self.move_entry('checkout', entry)
3032
if last_revision is not None:
3033
self.bzrdir.transport.put_bytes(
3034
'checkout/last-revision', last_revision)
3035
self.bzrdir.transport.put_bytes(
3037
BzrDirMetaFormat1().get_format_string(),
3038
mode=self.file_mode)
3040
return BzrDir.open(self.bzrdir.root_transport.base)
3042
def make_lock(self, name):
3043
"""Make a lock for the new control dir name."""
3044
self.step('Make %s lock' % name)
3045
ld = lockdir.LockDir(self.bzrdir.transport,
3047
file_modebits=self.file_mode,
3048
dir_modebits=self.dir_mode)
3051
def move_entry(self, new_dir, entry):
3052
"""Move then entry name into new_dir."""
3054
mandatory = entry[1]
3055
self.step('Moving %s' % name)
3057
self.bzrdir.transport.move(name, '%s/%s' % (new_dir, name))
3058
except errors.NoSuchFile:
3062
def put_format(self, dirname, format):
3063
self.bzrdir.transport.put_bytes('%s/format' % dirname,
3064
format.get_format_string(),
3068
class ConvertMetaToMeta(Converter):
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):
3069
1782
"""Converts the components of metadirs."""
3071
1784
def __init__(self, target_format):
3144
1856
return to_convert
3147
# This is not in remote.py because it's relatively small, and needs to be
3148
# registered. Putting it in remote.py creates a circular import problem.
3149
# we can make it a lazy object if the control formats is turned into something
3151
class RemoteBzrDirFormat(BzrDirMetaFormat1):
3152
"""Format representing bzrdirs accessed via a smart server"""
3155
BzrDirMetaFormat1.__init__(self)
3156
# XXX: It's a bit ugly that the network name is here, because we'd
3157
# like to believe that format objects are stateless or at least
3158
# immutable, However, we do at least avoid mutating the name after
3159
# it's returned. See <https://bugs.edge.launchpad.net/bzr/+bug/504102>
3160
self._network_name = None
3163
return "%s(_network_name=%r)" % (self.__class__.__name__,
3166
def get_format_description(self):
3167
if self._network_name:
3168
real_format = network_format_registry.get(self._network_name)
3169
return 'Remote: ' + real_format.get_format_description()
3170
return 'bzr remote bzrdir'
3172
def get_format_string(self):
3173
raise NotImplementedError(self.get_format_string)
3175
def network_name(self):
3176
if self._network_name:
3177
return self._network_name
3179
raise AssertionError("No network name set.")
3182
def probe_transport(klass, transport):
3183
"""Return a RemoteBzrDirFormat object if it looks possible."""
3185
medium = transport.get_smart_medium()
3186
except (NotImplementedError, AttributeError,
3187
errors.TransportNotPossible, errors.NoSmartMedium,
3188
errors.SmartProtocolError):
3189
# no smart server, so not a branch for this format type.
3190
raise errors.NotBranchError(path=transport.base)
3192
# Decline to open it if the server doesn't support our required
3193
# version (3) so that the VFS-based transport will do it.
3194
if medium.should_probe():
3196
server_version = medium.protocol_version()
3197
except errors.SmartProtocolError:
3198
# Apparently there's no usable smart server there, even though
3199
# the medium supports the smart protocol.
3200
raise errors.NotBranchError(path=transport.base)
3201
if server_version != '2':
3202
raise errors.NotBranchError(path=transport.base)
3205
def initialize_on_transport(self, transport):
3207
# hand off the request to the smart server
3208
client_medium = transport.get_smart_medium()
3209
except errors.NoSmartMedium:
3210
# TODO: lookup the local format from a server hint.
3211
local_dir_format = BzrDirMetaFormat1()
3212
return local_dir_format.initialize_on_transport(transport)
3213
client = _SmartClient(client_medium)
3214
path = client.remote_path_from_transport(transport)
3216
response = client.call('BzrDirFormat.initialize', path)
3217
except errors.ErrorFromSmartServer, err:
3218
remote._translate_error(err, path=path)
3219
if response[0] != 'ok':
3220
raise errors.SmartProtocolError('unexpected response code %s' % (response,))
3221
format = RemoteBzrDirFormat()
3222
self._supply_sub_formats_to(format)
3223
return remote.RemoteBzrDir(transport, format)
3225
def parse_NoneTrueFalse(self, arg):
3232
raise AssertionError("invalid arg %r" % arg)
3234
def _serialize_NoneTrueFalse(self, arg):
3241
def _serialize_NoneString(self, arg):
3244
def initialize_on_transport_ex(self, transport, use_existing_dir=False,
3245
create_prefix=False, force_new_repo=False, stacked_on=None,
3246
stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
3249
# hand off the request to the smart server
3250
client_medium = transport.get_smart_medium()
3251
except errors.NoSmartMedium:
3254
# Decline to open it if the server doesn't support our required
3255
# version (3) so that the VFS-based transport will do it.
3256
if client_medium.should_probe():
3258
server_version = client_medium.protocol_version()
3259
if server_version != '2':
3263
except errors.SmartProtocolError:
3264
# Apparently there's no usable smart server there, even though
3265
# the medium supports the smart protocol.
3270
client = _SmartClient(client_medium)
3271
path = client.remote_path_from_transport(transport)
3272
if client_medium._is_remote_before((1, 16)):
3275
# TODO: lookup the local format from a server hint.
3276
local_dir_format = BzrDirMetaFormat1()
3277
self._supply_sub_formats_to(local_dir_format)
3278
return local_dir_format.initialize_on_transport_ex(transport,
3279
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
3280
force_new_repo=force_new_repo, stacked_on=stacked_on,
3281
stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
3282
make_working_trees=make_working_trees, shared_repo=shared_repo,
3284
return self._initialize_on_transport_ex_rpc(client, path, transport,
3285
use_existing_dir, create_prefix, force_new_repo, stacked_on,
3286
stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
3288
def _initialize_on_transport_ex_rpc(self, client, path, transport,
3289
use_existing_dir, create_prefix, force_new_repo, stacked_on,
3290
stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
3292
args.append(self._serialize_NoneTrueFalse(use_existing_dir))
3293
args.append(self._serialize_NoneTrueFalse(create_prefix))
3294
args.append(self._serialize_NoneTrueFalse(force_new_repo))
3295
args.append(self._serialize_NoneString(stacked_on))
3296
# stack_on_pwd is often/usually our transport
3299
stack_on_pwd = transport.relpath(stack_on_pwd)
3300
if not stack_on_pwd:
3302
except errors.PathNotChild:
3304
args.append(self._serialize_NoneString(stack_on_pwd))
3305
args.append(self._serialize_NoneString(repo_format_name))
3306
args.append(self._serialize_NoneTrueFalse(make_working_trees))
3307
args.append(self._serialize_NoneTrueFalse(shared_repo))
3308
request_network_name = self._network_name or \
3309
BzrDirFormat.get_default_format().network_name()
3311
response = client.call('BzrDirFormat.initialize_ex_1.16',
3312
request_network_name, path, *args)
3313
except errors.UnknownSmartMethod:
3314
client._medium._remember_remote_is_before((1,16))
3315
local_dir_format = BzrDirMetaFormat1()
3316
self._supply_sub_formats_to(local_dir_format)
3317
return local_dir_format.initialize_on_transport_ex(transport,
3318
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
3319
force_new_repo=force_new_repo, stacked_on=stacked_on,
3320
stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
3321
make_working_trees=make_working_trees, shared_repo=shared_repo,
3323
except errors.ErrorFromSmartServer, err:
3324
remote._translate_error(err, path=path)
3325
repo_path = response[0]
3326
bzrdir_name = response[6]
3327
require_stacking = response[7]
3328
require_stacking = self.parse_NoneTrueFalse(require_stacking)
3329
format = RemoteBzrDirFormat()
3330
format._network_name = bzrdir_name
3331
self._supply_sub_formats_to(format)
3332
bzrdir = remote.RemoteBzrDir(transport, format, _client=client)
3334
repo_format = remote.response_tuple_to_repo_format(response[1:])
3335
if repo_path == '.':
3338
repo_bzrdir_format = RemoteBzrDirFormat()
3339
repo_bzrdir_format._network_name = response[5]
3340
repo_bzr = remote.RemoteBzrDir(transport.clone(repo_path),
3344
final_stack = response[8] or None
3345
final_stack_pwd = response[9] or None
3347
final_stack_pwd = urlutils.join(
3348
transport.base, final_stack_pwd)
3349
remote_repo = remote.RemoteRepository(repo_bzr, repo_format)
3350
if len(response) > 10:
3351
# Updated server verb that locks remotely.
3352
repo_lock_token = response[10] or None
3353
remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
3355
remote_repo.dont_leave_lock_in_place()
3357
remote_repo.lock_write()
3358
policy = UseExistingRepository(remote_repo, final_stack,
3359
final_stack_pwd, require_stacking)
3360
policy.acquire_repository()
3364
bzrdir._format.set_branch_format(self.get_branch_format())
3365
if require_stacking:
3366
# The repo has already been created, but we need to make sure that
3367
# we'll make a stackable branch.
3368
bzrdir._format.require_stacking(_skip_repo=True)
3369
return remote_repo, bzrdir, require_stacking, policy
3371
def _open(self, transport):
3372
return remote.RemoteBzrDir(transport, self)
3374
def __eq__(self, other):
3375
if not isinstance(other, RemoteBzrDirFormat):
3377
return self.get_format_description() == other.get_format_description()
3379
def __return_repository_format(self):
3380
# Always return a RemoteRepositoryFormat object, but if a specific bzr
3381
# repository format has been asked for, tell the RemoteRepositoryFormat
3382
# that it should use that for init() etc.
3383
result = remote.RemoteRepositoryFormat()
3384
custom_format = getattr(self, '_repository_format', None)
3386
if isinstance(custom_format, remote.RemoteRepositoryFormat):
3387
return custom_format
3389
# We will use the custom format to create repositories over the
3390
# wire; expose its details like rich_root_data for code to
3392
result._custom_format = custom_format
3395
def get_branch_format(self):
3396
result = BzrDirMetaFormat1.get_branch_format(self)
3397
if not isinstance(result, remote.RemoteBranchFormat):
3398
new_result = remote.RemoteBranchFormat()
3399
new_result._custom_format = result
3401
self.set_branch_format(new_result)
3405
repository_format = property(__return_repository_format,
3406
BzrDirMetaFormat1._set_repository_format) #.im_func)
3409
BzrDirFormat.register_control_server_format(RemoteBzrDirFormat)
3412
class BzrDirFormatInfo(object):
3414
def __init__(self, native, deprecated, hidden, experimental):
3415
self.deprecated = deprecated
3416
self.native = native
3417
self.hidden = hidden
3418
self.experimental = experimental
3421
class BzrDirFormatRegistry(registry.Registry):
3422
"""Registry of user-selectable BzrDir subformats.
3424
Differs from BzrDirFormat._control_formats in that it provides sub-formats,
3425
e.g. BzrDirMeta1 with weave repository. Also, it's more user-oriented.
3429
"""Create a BzrDirFormatRegistry."""
3430
self._aliases = set()
3431
self._registration_order = list()
3432
super(BzrDirFormatRegistry, self).__init__()
3435
"""Return a set of the format names which are aliases."""
3436
return frozenset(self._aliases)
3438
def register_metadir(self, key,
3439
repository_format, help, native=True, deprecated=False,
3445
"""Register a metadir subformat.
3447
These all use a BzrDirMetaFormat1 bzrdir, but can be parameterized
3448
by the Repository/Branch/WorkingTreeformats.
3450
:param repository_format: The fully-qualified repository format class
3452
:param branch_format: Fully-qualified branch format class name as
3454
:param tree_format: Fully-qualified tree format class name as
3457
# This should be expanded to support setting WorkingTree and Branch
3458
# formats, once BzrDirMetaFormat1 supports that.
3459
def _load(full_name):
3460
mod_name, factory_name = full_name.rsplit('.', 1)
3462
mod = __import__(mod_name, globals(), locals(),
3464
except ImportError, e:
3465
raise ImportError('failed to load %s: %s' % (full_name, e))
3467
factory = getattr(mod, factory_name)
3468
except AttributeError:
3469
raise AttributeError('no factory %s in module %r'
3474
bd = BzrDirMetaFormat1()
3475
if branch_format is not None:
3476
bd.set_branch_format(_load(branch_format))
3477
if tree_format is not None:
3478
bd.workingtree_format = _load(tree_format)
3479
if repository_format is not None:
3480
bd.repository_format = _load(repository_format)
3482
self.register(key, helper, help, native, deprecated, hidden,
3483
experimental, alias)
3485
def register(self, key, factory, help, native=True, deprecated=False,
3486
hidden=False, experimental=False, alias=False):
3487
"""Register a BzrDirFormat factory.
3489
The factory must be a callable that takes one parameter: the key.
3490
It must produce an instance of the BzrDirFormat when called.
3492
This function mainly exists to prevent the info object from being
3495
registry.Registry.register(self, key, factory, help,
3496
BzrDirFormatInfo(native, deprecated, hidden, experimental))
3498
self._aliases.add(key)
3499
self._registration_order.append(key)
3501
def register_lazy(self, key, module_name, member_name, help, native=True,
3502
deprecated=False, hidden=False, experimental=False, alias=False):
3503
registry.Registry.register_lazy(self, key, module_name, member_name,
3504
help, BzrDirFormatInfo(native, deprecated, hidden, experimental))
3506
self._aliases.add(key)
3507
self._registration_order.append(key)
3509
def set_default(self, key):
3510
"""Set the 'default' key to be a clone of the supplied key.
3512
This method must be called once and only once.
3514
registry.Registry.register(self, 'default', self.get(key),
3515
self.get_help(key), info=self.get_info(key))
3516
self._aliases.add('default')
3518
def set_default_repository(self, key):
3519
"""Set the FormatRegistry default and Repository default.
3521
This is a transitional method while Repository.set_default_format
3524
if 'default' in self:
3525
self.remove('default')
3526
self.set_default(key)
3527
format = self.get('default')()
3529
def make_bzrdir(self, key):
3530
return self.get(key)()
3532
def help_topic(self, topic):
3534
default_realkey = None
3535
default_help = self.get_help('default')
3537
for key in self._registration_order:
3538
if key == 'default':
3540
help = self.get_help(key)
3541
if help == default_help:
3542
default_realkey = key
3544
help_pairs.append((key, help))
3546
def wrapped(key, help, info):
3548
help = '(native) ' + help
3549
return ':%s:\n%s\n\n' % (key,
3550
textwrap.fill(help, initial_indent=' ',
3551
subsequent_indent=' ',
3552
break_long_words=False))
3553
if default_realkey is not None:
3554
output += wrapped(default_realkey, '(default) %s' % default_help,
3555
self.get_info('default'))
3556
deprecated_pairs = []
3557
experimental_pairs = []
3558
for key, help in help_pairs:
3559
info = self.get_info(key)
3562
elif info.deprecated:
3563
deprecated_pairs.append((key, help))
3564
elif info.experimental:
3565
experimental_pairs.append((key, help))
3567
output += wrapped(key, help, info)
3568
output += "\nSee :doc:`formats-help` for more about storage formats."
3570
if len(experimental_pairs) > 0:
3571
other_output += "Experimental formats are shown below.\n\n"
3572
for key, help in experimental_pairs:
3573
info = self.get_info(key)
3574
other_output += wrapped(key, help, info)
3577
"No experimental formats are available.\n\n"
3578
if len(deprecated_pairs) > 0:
3579
other_output += "\nDeprecated formats are shown below.\n\n"
3580
for key, help in deprecated_pairs:
3581
info = self.get_info(key)
3582
other_output += wrapped(key, help, info)
3585
"\nNo deprecated formats are available.\n\n"
3587
"\nSee :doc:`formats-help` for more about storage formats."
3589
if topic == 'other-formats':
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)
3595
1897
class RepositoryAcquisitionPolicy(object):
3739
2049
require_stacking)
3740
2050
self._repository = repository
3742
def acquire_repository(self, make_working_trees=None, shared=False):
2052
def acquire_repository(self, make_working_trees=None, shared=False,
2053
possible_transports=None):
3743
2054
"""Implementation of RepositoryAcquisitionPolicy.acquire_repository
3745
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)
3747
2063
self._add_fallback(self._repository,
3748
possible_transports=[self._repository.bzrdir.transport])
2064
possible_transports=possible_transports)
3749
2065
return self._repository, False
3752
# Please register new formats after old formats so that formats
3753
# appear in chronological order and format descriptions can build
3755
format_registry = BzrDirFormatRegistry()
3756
# The pre-0.8 formats have their repository format network name registered in
3757
# repository.py. MetaDir formats have their repository format network name
3758
# inferred from their disk format string.
3759
format_registry.register('weave', BzrDirFormat6,
3760
'Pre-0.8 format. Slower than knit and does not'
3761
' support checkouts or shared repositories.',
3764
format_registry.register_metadir('metaweave',
3765
'bzrlib.repofmt.weaverepo.RepositoryFormat7',
3766
'Transitional format in 0.8. Slower than knit.',
3767
branch_format='bzrlib.branch.BzrBranchFormat5',
3768
tree_format='bzrlib.workingtree.WorkingTreeFormat3',
3771
format_registry.register_metadir('knit',
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',
3772
2115
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3773
2116
'Format using knits. Recommended for interoperation with bzr <= 0.14.',
3774
branch_format='bzrlib.branch.BzrBranchFormat5',
3775
tree_format='bzrlib.workingtree.WorkingTreeFormat3',
3778
format_registry.register_metadir('dirstate',
3779
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3780
help='New in 0.15: Fast local operations. Compatible with bzr 0.8 and '
3781
'above when accessed over the network.',
3782
branch_format='bzrlib.branch.BzrBranchFormat5',
3783
# this uses bzrlib.workingtree.WorkingTreeFormat4 because importing
3784
# directly from workingtree_4 triggers a circular import.
3785
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3788
format_registry.register_metadir('dirstate-tags',
3789
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3790
help='New in 0.15: Fast local operations and improved scaling for '
3791
'network operations. Additionally adds support for tags.'
3792
' Incompatible with bzr < 0.15.',
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.',
3793
2134
branch_format='bzrlib.branch.BzrBranchFormat6',
3794
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2135
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3796
2137
deprecated=True)
3797
format_registry.register_metadir('rich-root',
2138
register_metadir(controldir.format_registry, 'rich-root',
3798
2139
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit4',
3799
help='New in 1.0. Better handling of tree roots. Incompatible with'
2140
help='Variant of dirstate with better handling of tree roots. '
2141
'Introduced in bzr 1.0',
3801
2142
branch_format='bzrlib.branch.BzrBranchFormat6',
3802
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2143
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3804
2145
deprecated=True)
3805
format_registry.register_metadir('dirstate-with-subtree',
2146
register_metadir(controldir.format_registry, 'dirstate-with-subtree',
3806
2147
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
3807
help='New in 0.15: Fast local operations and improved scaling for '
3808
'network operations. Additionally adds support for versioning nested '
3809
'bzr branches. Incompatible with bzr < 0.15.',
3810
branch_format='bzrlib.branch.BzrBranchFormat6',
3811
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3815
format_registry.register_metadir('pack-0.92',
3816
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack1',
3817
help='New in 0.92: Pack-based format with data compatible with '
3818
'dirstate-tags format repositories. Interoperates with '
3819
'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
3821
branch_format='bzrlib.branch.BzrBranchFormat6',
3822
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3824
format_registry.register_metadir('pack-0.92-subtree',
3825
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack3',
3826
help='New in 0.92: Pack-based format with data compatible with '
3827
'dirstate-with-subtree format repositories. Interoperates with '
3828
'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
3830
branch_format='bzrlib.branch.BzrBranchFormat6',
3831
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3835
format_registry.register_metadir('rich-root-pack',
3836
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack4',
3837
help='New in 1.0: A variant of pack-0.92 that supports rich-root data '
3838
'(needed for bzr-svn and bzr-git).',
3839
branch_format='bzrlib.branch.BzrBranchFormat6',
3840
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3843
format_registry.register_metadir('1.6',
3844
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5',
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',
3845
2188
help='A format that allows a branch to indicate that there is another '
3846
2189
'(stacked) repository that should be used to access data that is '
3847
2190
'not present locally.',
3848
2191
branch_format='bzrlib.branch.BzrBranchFormat7',
3849
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2192
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3852
format_registry.register_metadir('1.6.1-rich-root',
3853
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5RichRoot',
2196
register_metadir(controldir.format_registry, '1.6.1-rich-root',
2197
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack5RichRoot',
3854
2198
help='A variant of 1.6 that supports rich-root data '
3855
2199
'(needed for bzr-svn and bzr-git).',
3856
2200
branch_format='bzrlib.branch.BzrBranchFormat7',
3857
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2201
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3860
format_registry.register_metadir('1.9',
3861
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
2205
register_metadir(controldir.format_registry, '1.9',
2206
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6',
3862
2207
help='A repository format using B+tree indexes. These indexes '
3863
2208
'are smaller in size, have smarter caching and provide faster '
3864
2209
'performance for most operations.',
3865
2210
branch_format='bzrlib.branch.BzrBranchFormat7',
3866
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2211
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3869
format_registry.register_metadir('1.9-rich-root',
3870
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
2215
register_metadir(controldir.format_registry, '1.9-rich-root',
2216
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
3871
2217
help='A variant of 1.9 that supports rich-root data '
3872
2218
'(needed for bzr-svn and bzr-git).',
3873
2219
branch_format='bzrlib.branch.BzrBranchFormat7',
3874
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2220
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3877
format_registry.register_metadir('1.14',
3878
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
2224
register_metadir(controldir.format_registry, '1.14',
2225
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6',
3879
2226
help='A working-tree format that supports content filtering.',
3880
2227
branch_format='bzrlib.branch.BzrBranchFormat7',
3881
tree_format='bzrlib.workingtree.WorkingTreeFormat5',
2228
tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
3883
format_registry.register_metadir('1.14-rich-root',
3884
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
2232
register_metadir(controldir.format_registry, '1.14-rich-root',
2233
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
3885
2234
help='A variant of 1.14 that supports rich-root data '
3886
2235
'(needed for bzr-svn and bzr-git).',
3887
2236
branch_format='bzrlib.branch.BzrBranchFormat7',
3888
tree_format='bzrlib.workingtree.WorkingTreeFormat5',
2237
tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
3890
2241
# The following un-numbered 'development' formats should always just be aliases.
3891
format_registry.register_metadir('development-rich-root',
3892
'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK1',
3893
help='Current development format. Supports rich roots. Can convert data '
3894
'to and from rich-root-pack (and anything compatible with '
3895
'rich-root-pack) format repositories. Repositories and branches in '
3896
'this format can only be read by bzr.dev. Please read '
3897
'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
3899
branch_format='bzrlib.branch.BzrBranchFormat7',
3900
tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3905
format_registry.register_metadir('development-subtree',
3906
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment2Subtree',
2242
register_metadir(controldir.format_registry, 'development-subtree',
2243
'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2aSubtree',
3907
2244
help='Current development format, subtree variant. Can convert data to and '
3908
2245
'from pack-0.92-subtree (and anything compatible with '
3909
2246
'pack-0.92-subtree) format repositories. Repositories and branches in '
3911
2248
'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
3913
2250
branch_format='bzrlib.branch.BzrBranchFormat7',
3914
tree_format='bzrlib.workingtree.WorkingTreeFormat6',
2251
tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
3915
2252
experimental=True,
3917
2254
alias=False, # Restore to being an alias when an actual development subtree format is added
3918
2255
# This current non-alias status is simply because we did not introduce a
3919
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,
3922
2283
# And the development formats above will have aliased one of the following:
3923
format_registry.register_metadir('development6-rich-root',
3924
'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK1',
3925
help='pack-1.9 with 255-way hashed CHK inv, group compress, rich roots '
3927
'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
3929
branch_format='bzrlib.branch.BzrBranchFormat7',
3930
tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3935
format_registry.register_metadir('development7-rich-root',
3936
'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK2',
3937
help='pack-1.9 with 255-way hashed CHK inv, bencode revision, group compress, '
3938
'rich roots. Please read '
3939
'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
3941
branch_format='bzrlib.branch.BzrBranchFormat7',
3942
tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3947
format_registry.register_metadir('2a',
2285
# Finally, the current format.
2286
register_metadir(controldir.format_registry, '2a',
3948
2287
'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
3949
help='First format for bzr 2.0 series.\n'
2288
help='Format for the bzr 2.0 series.\n'
3950
2289
'Uses group-compress storage.\n'
3951
2290
'Provides rich roots which are a one-way transition.\n',
3952
2291
# 'storage in packs, 255-way hashed CHK inventory, bencode revision, group compress, '
3953
2292
# 'rich roots. Supported by bzr 1.16 and later.',
3954
2293
branch_format='bzrlib.branch.BzrBranchFormat7',
3955
tree_format='bzrlib.workingtree.WorkingTreeFormat6',
2294
tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
3959
2298
# The following format should be an alias for the rich root equivalent
3960
2299
# of the default format
3961
format_registry.register_metadir('default-rich-root',
2300
register_metadir(controldir.format_registry, 'default-rich-root',
3962
2301
'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
3963
2302
branch_format='bzrlib.branch.BzrBranchFormat7',
3964
tree_format='bzrlib.workingtree.WorkingTreeFormat6',
2303
tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
3967
2306
help='Same as 2a.')
3969
2308
# The current format that is made on 'bzr init'.
3970
format_registry.set_default('2a')
2309
format_name = config.GlobalStack().get('default_format')
2310
controldir.format_registry.set_default(format_name)
2312
# XXX 2010-08-20 JRV: There is still a lot of code relying on
2313
# bzrlib.bzrdir.format_registry existing. When BzrDir.create/BzrDir.open/etc
2314
# get changed to ControlDir.create/ControlDir.open/etc this should be removed.
2315
format_registry = controldir.format_registry
added
removed
bzrlib/bzrdir.py
