389
495
policy = self.determine_repository_policy(force_new_repo)
390
496
return policy.acquire_repository()[0]
392
def _find_source_repo(self, add_cleanup, source_branch):
393
"""Find the source branch and repo for a sprout operation.
395
This is helper intended for use by _sprout.
397
:returns: (source_branch, source_repository). Either or both may be
398
None. If not None, they will be read-locked (and their unlock(s)
399
scheduled via the add_cleanup param).
401
if source_branch is not None:
402
add_cleanup(source_branch.lock_read().unlock)
403
return source_branch, source_branch.repository
405
source_branch = self.open_branch()
406
source_repository = source_branch.repository
407
except errors.NotBranchError:
410
source_repository = self.open_repository()
411
except errors.NoRepositoryPresent:
412
source_repository = None
414
add_cleanup(source_repository.lock_read().unlock)
416
add_cleanup(source_branch.lock_read().unlock)
417
return source_branch, source_repository
419
def sprout(self, url, revision_id=None, force_new_repo=False,
420
recurse='down', possible_transports=None,
421
accelerator_tree=None, hardlink=False, stacked=False,
422
source_branch=None, create_tree_if_local=True):
423
"""Create a copy of this controldir prepared for use as a new line of
426
If url's last component does not exist, it will be created.
428
Attributes related to the identity of the source branch like
429
branch nickname will be cleaned, a working tree is created
430
whether one existed before or not; and a local branch is always
433
if revision_id is not None, then the clone operation may tune
434
itself to download less data.
436
:param accelerator_tree: A tree which can be used for retrieving file
437
contents more quickly than the revision tree, i.e. a workingtree.
438
The revision tree will be used for cases where accelerator_tree's
439
content is different.
440
:param hardlink: If true, hard-link files from accelerator_tree,
442
:param stacked: If true, create a stacked branch referring to the
443
location of this control directory.
444
:param create_tree_if_local: If true, a working-tree will be created
445
when working locally.
447
operation = cleanup.OperationWithCleanups(self._sprout)
448
return operation.run(url, revision_id=revision_id,
449
force_new_repo=force_new_repo, recurse=recurse,
450
possible_transports=possible_transports,
451
accelerator_tree=accelerator_tree, hardlink=hardlink,
452
stacked=stacked, source_branch=source_branch,
453
create_tree_if_local=create_tree_if_local)
455
def _sprout(self, op, url, revision_id=None, force_new_repo=False,
456
recurse='down', possible_transports=None,
457
accelerator_tree=None, hardlink=False, stacked=False,
458
source_branch=None, create_tree_if_local=True):
459
add_cleanup = op.add_cleanup
460
fetch_spec_factory = fetch.FetchSpecFactory()
461
if revision_id is not None:
462
fetch_spec_factory.add_revision_ids([revision_id])
463
fetch_spec_factory.source_branch_stop_revision_id = revision_id
464
target_transport = _mod_transport.get_transport(url,
466
target_transport.ensure_base()
467
cloning_format = self.cloning_metadir(stacked)
468
# Create/update the result branch
469
result = cloning_format.initialize_on_transport(target_transport)
470
source_branch, source_repository = self._find_source_repo(
471
add_cleanup, source_branch)
472
fetch_spec_factory.source_branch = source_branch
473
# if a stacked branch wasn't requested, we don't create one
474
# even if the origin was stacked
475
if stacked and source_branch is not None:
476
stacked_branch_url = self.root_transport.base
478
stacked_branch_url = None
479
repository_policy = result.determine_repository_policy(
480
force_new_repo, stacked_branch_url, require_stacking=stacked)
481
result_repo, is_new_repo = repository_policy.acquire_repository()
482
add_cleanup(result_repo.lock_write().unlock)
483
fetch_spec_factory.source_repo = source_repository
484
fetch_spec_factory.target_repo = result_repo
485
if stacked or (len(result_repo._fallback_repositories) != 0):
486
target_repo_kind = fetch.TargetRepoKinds.STACKED
488
target_repo_kind = fetch.TargetRepoKinds.EMPTY
490
target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
491
fetch_spec_factory.target_repo_kind = target_repo_kind
492
if source_repository is not None:
493
fetch_spec = fetch_spec_factory.make_fetch_spec()
494
result_repo.fetch(source_repository, fetch_spec=fetch_spec)
496
if source_branch is None:
497
# this is for sprouting a controldir without a branch; is that
499
# Not especially, but it's part of the contract.
500
result_branch = result.create_branch()
502
result_branch = source_branch.sprout(result,
503
revision_id=revision_id, repository_policy=repository_policy,
504
repository=result_repo)
505
mutter("created new branch %r" % (result_branch,))
507
# Create/update the result working tree
508
if (create_tree_if_local and
509
isinstance(target_transport, local.LocalTransport) and
510
(result_repo is None or result_repo.make_working_trees())):
511
wt = result.create_workingtree(accelerator_tree=accelerator_tree,
512
hardlink=hardlink, from_branch=result_branch)
515
if wt.path2id('') is None:
517
wt.set_root_id(self.open_workingtree.get_root_id())
518
except errors.NoWorkingTree:
524
if recurse == 'down':
527
basis = wt.basis_tree()
528
elif result_branch is not None:
529
basis = result_branch.basis_tree()
530
elif source_branch is not None:
531
basis = source_branch.basis_tree()
532
if basis is not None:
533
add_cleanup(basis.lock_read().unlock)
534
subtrees = basis.iter_references()
537
for path, file_id in subtrees:
538
target = urlutils.join(url, urlutils.escape(path))
539
sublocation = source_branch.reference_parent(file_id, path)
540
sublocation.bzrdir.sprout(target,
541
basis.get_reference_revision(file_id, path),
542
force_new_repo=force_new_repo, recurse=recurse,
549
499
def create_branch_convenience(base, force_new_repo=False,
550
500
force_new_tree=None, format=None,
1020
1119
format.require_stacking()
1024
def create(cls, base, format=None, possible_transports=None):
1025
"""Create a new BzrDir at the url 'base'.
1027
:param format: If supplied, the format of branch to create. If not
1028
supplied, the default is used.
1029
:param possible_transports: If supplied, a list of transports that
1030
can be reused to share a remote connection.
1032
if cls is not BzrDir:
1033
raise AssertionError("BzrDir.create always creates the"
1034
"default format, not one of %r" % cls)
1035
t = _mod_transport.get_transport(base, possible_transports)
1038
format = controldir.ControlDirFormat.get_default_format()
1039
return format.initialize_on_transport(t)
1041
def get_branch_transport(self, branch_format, name=None):
1042
"""Get the transport for use by branch format in this BzrDir.
1044
Note that bzr dirs that do not support format strings will raise
1045
IncompatibleFormat if the branch format they are given has
1046
a format string, and vice versa.
1048
If branch_format is None, the transport is returned with no
1049
checking. If it is not None, then the returned transport is
1050
guaranteed to point to an existing directory ready for use.
1052
raise NotImplementedError(self.get_branch_transport)
1054
def get_repository_transport(self, repository_format):
1055
"""Get the transport for use by repository format in this BzrDir.
1057
Note that bzr dirs that do not support format strings will raise
1058
IncompatibleFormat if the repository format they are given has
1059
a format string, and vice versa.
1061
If repository_format is None, the transport is returned with no
1062
checking. If it is not None, then the returned transport is
1063
guaranteed to point to an existing directory ready for use.
1065
raise NotImplementedError(self.get_repository_transport)
1067
def get_workingtree_transport(self, tree_format):
1068
"""Get the transport for use by workingtree format in this BzrDir.
1070
Note that bzr dirs that do not support format strings will raise
1071
IncompatibleFormat if the workingtree format they are given has a
1072
format string, and vice versa.
1074
If workingtree_format is None, the transport is returned with no
1075
checking. If it is not None, then the returned transport is
1076
guaranteed to point to an existing directory ready for use.
1078
raise NotImplementedError(self.get_workingtree_transport)
1122
def checkout_metadir(self):
1123
return self.cloning_metadir()
1125
def sprout(self, url, revision_id=None, force_new_repo=False,
1126
recurse='down', possible_transports=None,
1127
accelerator_tree=None, hardlink=False, stacked=False,
1128
source_branch=None, create_tree_if_local=True):
1129
"""Create a copy of this bzrdir prepared for use as a new line of
1132
If url's last component does not exist, it will be created.
1134
Attributes related to the identity of the source branch like
1135
branch nickname will be cleaned, a working tree is created
1136
whether one existed before or not; and a local branch is always
1139
if revision_id is not None, then the clone operation may tune
1140
itself to download less data.
1141
:param accelerator_tree: A tree which can be used for retrieving file
1142
contents more quickly than the revision tree, i.e. a workingtree.
1143
The revision tree will be used for cases where accelerator_tree's
1144
content is different.
1145
:param hardlink: If true, hard-link files from accelerator_tree,
1147
:param stacked: If true, create a stacked branch referring to the
1148
location of this control directory.
1149
:param create_tree_if_local: If true, a working-tree will be created
1150
when working locally.
1152
target_transport = get_transport(url, possible_transports)
1153
target_transport.ensure_base()
1154
cloning_format = self.cloning_metadir(stacked)
1155
# Create/update the result branch
1156
result = cloning_format.initialize_on_transport(target_transport)
1157
# if a stacked branch wasn't requested, we don't create one
1158
# even if the origin was stacked
1159
stacked_branch_url = None
1160
if source_branch is not None:
1162
stacked_branch_url = self.root_transport.base
1163
source_repository = source_branch.repository
1166
source_branch = self.open_branch()
1167
source_repository = source_branch.repository
1169
stacked_branch_url = self.root_transport.base
1170
except errors.NotBranchError:
1171
source_branch = None
1173
source_repository = self.open_repository()
1174
except errors.NoRepositoryPresent:
1175
source_repository = None
1176
repository_policy = result.determine_repository_policy(
1177
force_new_repo, stacked_branch_url, require_stacking=stacked)
1178
result_repo, is_new_repo = repository_policy.acquire_repository()
1179
if is_new_repo and revision_id is not None and not stacked:
1180
fetch_spec = graph.PendingAncestryResult(
1181
[revision_id], source_repository)
1184
if source_repository is not None:
1185
# Fetch while stacked to prevent unstacked fetch from
1187
if fetch_spec is None:
1188
result_repo.fetch(source_repository, revision_id=revision_id)
1190
result_repo.fetch(source_repository, fetch_spec=fetch_spec)
1192
if source_branch is None:
1193
# this is for sprouting a bzrdir without a branch; is that
1195
# Not especially, but it's part of the contract.
1196
result_branch = result.create_branch()
1198
result_branch = source_branch.sprout(result,
1199
revision_id=revision_id, repository_policy=repository_policy)
1200
mutter("created new branch %r" % (result_branch,))
1202
# Create/update the result working tree
1203
if (create_tree_if_local and
1204
isinstance(target_transport, local.LocalTransport) and
1205
(result_repo is None or result_repo.make_working_trees())):
1206
wt = result.create_workingtree(accelerator_tree=accelerator_tree,
1210
if wt.path2id('') is None:
1212
wt.set_root_id(self.open_workingtree.get_root_id())
1213
except errors.NoWorkingTree:
1219
if recurse == 'down':
1221
basis = wt.basis_tree()
1223
subtrees = basis.iter_references()
1224
elif result_branch is not None:
1225
basis = result_branch.basis_tree()
1227
subtrees = basis.iter_references()
1228
elif source_branch is not None:
1229
basis = source_branch.basis_tree()
1231
subtrees = basis.iter_references()
1236
for path, file_id in subtrees:
1237
target = urlutils.join(url, urlutils.escape(path))
1238
sublocation = source_branch.reference_parent(file_id, path)
1239
sublocation.bzrdir.sprout(target,
1240
basis.get_reference_revision(file_id, path),
1241
force_new_repo=force_new_repo, recurse=recurse,
1244
if basis is not None:
1248
def push_branch(self, source, revision_id=None, overwrite=False,
1249
remember=False, create_prefix=False):
1250
"""Push the source branch into this BzrDir."""
1252
# If we can open a branch, use its direct repository, otherwise see
1253
# if there is a repository without a branch.
1255
br_to = self.open_branch()
1256
except errors.NotBranchError:
1257
# Didn't find a branch, can we find a repository?
1258
repository_to = self.find_repository()
1260
# Found a branch, so we must have found a repository
1261
repository_to = br_to.repository
1263
push_result = PushResult()
1264
push_result.source_branch = source
1266
# We have a repository but no branch, copy the revisions, and then
1268
repository_to.fetch(source.repository, revision_id=revision_id)
1269
br_to = source.clone(self, revision_id=revision_id)
1270
if source.get_push_location() is None or remember:
1271
source.set_push_location(br_to.base)
1272
push_result.stacked_on = None
1273
push_result.branch_push_result = None
1274
push_result.old_revno = None
1275
push_result.old_revid = _mod_revision.NULL_REVISION
1276
push_result.target_branch = br_to
1277
push_result.master_branch = None
1278
push_result.workingtree_updated = False
1280
# We have successfully opened the branch, remember if necessary:
1281
if source.get_push_location() is None or remember:
1282
source.set_push_location(br_to.base)
1284
tree_to = self.open_workingtree()
1285
except errors.NotLocalUrl:
1286
push_result.branch_push_result = source.push(br_to,
1287
overwrite, stop_revision=revision_id)
1288
push_result.workingtree_updated = False
1289
except errors.NoWorkingTree:
1290
push_result.branch_push_result = source.push(br_to,
1291
overwrite, stop_revision=revision_id)
1292
push_result.workingtree_updated = None # Not applicable
1294
tree_to.lock_write()
1296
push_result.branch_push_result = source.push(
1297
tree_to.branch, overwrite, stop_revision=revision_id)
1301
push_result.workingtree_updated = True
1302
push_result.old_revno = push_result.branch_push_result.old_revno
1303
push_result.old_revid = push_result.branch_push_result.old_revid
1304
push_result.target_branch = \
1305
push_result.branch_push_result.target_branch
1081
1309
class BzrDirHooks(hooks.Hooks):
1084
1312
def __init__(self):
1085
1313
"""Create the default hooks."""
1086
hooks.Hooks.__init__(self, "bzrlib.bzrdir", "BzrDir.hooks")
1087
self.add_hook('pre_open',
1314
hooks.Hooks.__init__(self)
1315
self.create_hook(hooks.HookPoint('pre_open',
1088
1316
"Invoked before attempting to open a BzrDir with the transport "
1089
"that the open will use.", (1, 14))
1090
self.add_hook('post_repo_init',
1091
"Invoked after a repository has been initialized. "
1092
"post_repo_init is called with a "
1093
"bzrlib.bzrdir.RepoInitHookParams.",
1317
"that the open will use.", (1, 14), None))
1096
1319
# install the default hooks
1097
1320
BzrDir.hooks = BzrDirHooks()
1100
class RepoInitHookParams(object):
1101
"""Object holding parameters passed to `*_repo_init` hooks.
1103
There are 4 fields that hooks may wish to access:
1105
:ivar repository: Repository created
1106
:ivar format: Repository format
1107
:ivar bzrdir: The bzrdir for the repository
1108
:ivar shared: The repository is shared
1111
def __init__(self, repository, format, a_bzrdir, shared):
1112
"""Create a group of RepoInitHook parameters.
1114
:param repository: Repository created
1115
:param format: Repository format
1116
:param bzrdir: The bzrdir for the repository
1117
:param shared: The repository is shared
1323
class BzrDirPreSplitOut(BzrDir):
1324
"""A common class for the all-in-one formats."""
1326
def __init__(self, _transport, _format):
1327
"""See BzrDir.__init__."""
1328
super(BzrDirPreSplitOut, self).__init__(_transport, _format)
1329
self._control_files = lockable_files.LockableFiles(
1330
self.get_branch_transport(None),
1331
self._format._lock_file_name,
1332
self._format._lock_class)
1334
def break_lock(self):
1335
"""Pre-splitout bzrdirs do not suffer from stale locks."""
1336
raise NotImplementedError(self.break_lock)
1338
def cloning_metadir(self, require_stacking=False):
1339
"""Produce a metadir suitable for cloning with."""
1340
if require_stacking:
1341
return format_registry.make_bzrdir('1.6')
1342
return self._format.__class__()
1344
def clone(self, url, revision_id=None, force_new_repo=False,
1345
preserve_stacking=False):
1346
"""See BzrDir.clone().
1348
force_new_repo has no effect, since this family of formats always
1349
require a new repository.
1350
preserve_stacking has no effect, since no source branch using this
1351
family of formats can be stacked, so there is no stacking to preserve.
1119
self.repository = repository
1120
self.format = format
1121
self.bzrdir = a_bzrdir
1122
self.shared = shared
1124
def __eq__(self, other):
1125
return self.__dict__ == other.__dict__
1129
return "<%s for %s>" % (self.__class__.__name__,
1353
self._make_tail(url)
1354
result = self._format._initialize_for_clone(url)
1355
self.open_repository().clone(result, revision_id=revision_id)
1356
from_branch = self.open_branch()
1357
from_branch.clone(result, revision_id=revision_id)
1359
tree = self.open_workingtree()
1360
except errors.NotLocalUrl:
1361
# make a new one, this format always has to have one.
1362
result._init_workingtree()
1132
return "<%s for %s>" % (self.__class__.__name__,
1367
def create_branch(self):
1368
"""See BzrDir.create_branch."""
1369
return self._format.get_branch_format().initialize(self)
1371
def destroy_branch(self):
1372
"""See BzrDir.destroy_branch."""
1373
raise errors.UnsupportedOperation(self.destroy_branch, self)
1375
def create_repository(self, shared=False):
1376
"""See BzrDir.create_repository."""
1378
raise errors.IncompatibleFormat('shared repository', self._format)
1379
return self.open_repository()
1381
def destroy_repository(self):
1382
"""See BzrDir.destroy_repository."""
1383
raise errors.UnsupportedOperation(self.destroy_repository, self)
1385
def create_workingtree(self, revision_id=None, from_branch=None,
1386
accelerator_tree=None, hardlink=False):
1387
"""See BzrDir.create_workingtree."""
1388
# The workingtree is sometimes created when the bzrdir is created,
1389
# but not when cloning.
1391
# this looks buggy but is not -really-
1392
# because this format creates the workingtree when the bzrdir is
1394
# clone and sprout will have set the revision_id
1395
# and that will have set it for us, its only
1396
# specific uses of create_workingtree in isolation
1397
# that can do wonky stuff here, and that only
1398
# happens for creating checkouts, which cannot be
1399
# done on this format anyway. So - acceptable wart.
1401
warning("can't support hardlinked working trees in %r"
1404
result = self.open_workingtree(recommend_upgrade=False)
1405
except errors.NoSuchFile:
1406
result = self._init_workingtree()
1407
if revision_id is not None:
1408
if revision_id == _mod_revision.NULL_REVISION:
1409
result.set_parent_ids([])
1411
result.set_parent_ids([revision_id])
1414
def _init_workingtree(self):
1415
from bzrlib.workingtree import WorkingTreeFormat2
1417
return WorkingTreeFormat2().initialize(self)
1418
except errors.NotLocalUrl:
1419
# Even though we can't access the working tree, we need to
1420
# create its control files.
1421
return WorkingTreeFormat2()._stub_initialize_on_transport(
1422
self.transport, self._control_files._file_mode)
1424
def destroy_workingtree(self):
1425
"""See BzrDir.destroy_workingtree."""
1426
raise errors.UnsupportedOperation(self.destroy_workingtree, self)
1428
def destroy_workingtree_metadata(self):
1429
"""See BzrDir.destroy_workingtree_metadata."""
1430
raise errors.UnsupportedOperation(self.destroy_workingtree_metadata,
1433
def get_branch_transport(self, branch_format):
1434
"""See BzrDir.get_branch_transport()."""
1435
if branch_format is None:
1436
return self.transport
1438
branch_format.get_format_string()
1439
except NotImplementedError:
1440
return self.transport
1441
raise errors.IncompatibleFormat(branch_format, self._format)
1443
def get_repository_transport(self, repository_format):
1444
"""See BzrDir.get_repository_transport()."""
1445
if repository_format is None:
1446
return self.transport
1448
repository_format.get_format_string()
1449
except NotImplementedError:
1450
return self.transport
1451
raise errors.IncompatibleFormat(repository_format, self._format)
1453
def get_workingtree_transport(self, workingtree_format):
1454
"""See BzrDir.get_workingtree_transport()."""
1455
if workingtree_format is None:
1456
return self.transport
1458
workingtree_format.get_format_string()
1459
except NotImplementedError:
1460
return self.transport
1461
raise errors.IncompatibleFormat(workingtree_format, self._format)
1463
def needs_format_conversion(self, format=None):
1464
"""See BzrDir.needs_format_conversion()."""
1465
# if the format is not the same as the system default,
1466
# an upgrade is needed.
1468
symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1469
% 'needs_format_conversion(format=None)')
1470
format = BzrDirFormat.get_default_format()
1471
return not isinstance(self._format, format.__class__)
1473
def open_branch(self, unsupported=False, ignore_fallbacks=False):
1474
"""See BzrDir.open_branch."""
1475
from bzrlib.branch import BzrBranchFormat4
1476
format = BzrBranchFormat4()
1477
self._check_supported(format, unsupported)
1478
return format.open(self, _found=True)
1480
def sprout(self, url, revision_id=None, force_new_repo=False,
1481
possible_transports=None, accelerator_tree=None,
1482
hardlink=False, stacked=False, create_tree_if_local=True,
1483
source_branch=None):
1484
"""See BzrDir.sprout()."""
1485
if source_branch is not None:
1486
my_branch = self.open_branch()
1487
if source_branch.base != my_branch.base:
1488
raise AssertionError(
1489
"source branch %r is not within %r with branch %r" %
1490
(source_branch, self, my_branch))
1492
raise errors.UnstackableBranchFormat(
1493
self._format, self.root_transport.base)
1494
if not create_tree_if_local:
1495
raise errors.MustHaveWorkingTree(
1496
self._format, self.root_transport.base)
1497
from bzrlib.workingtree import WorkingTreeFormat2
1498
self._make_tail(url)
1499
result = self._format._initialize_for_clone(url)
1501
self.open_repository().clone(result, revision_id=revision_id)
1502
except errors.NoRepositoryPresent:
1505
self.open_branch().sprout(result, revision_id=revision_id)
1506
except errors.NotBranchError:
1509
# we always want a working tree
1510
WorkingTreeFormat2().initialize(result,
1511
accelerator_tree=accelerator_tree,
1516
class BzrDir4(BzrDirPreSplitOut):
1517
"""A .bzr version 4 control object.
1519
This is a deprecated format and may be removed after sept 2006.
1522
def create_repository(self, shared=False):
1523
"""See BzrDir.create_repository."""
1524
return self._format.repository_format.initialize(self, shared)
1526
def needs_format_conversion(self, format=None):
1527
"""Format 4 dirs are always in need of conversion."""
1529
symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1530
% 'needs_format_conversion(format=None)')
1533
def open_repository(self):
1534
"""See BzrDir.open_repository."""
1535
from bzrlib.repofmt.weaverepo import RepositoryFormat4
1536
return RepositoryFormat4().open(self, _found=True)
1539
class BzrDir5(BzrDirPreSplitOut):
1540
"""A .bzr version 5 control object.
1542
This is a deprecated format and may be removed after sept 2006.
1545
def has_workingtree(self):
1546
"""See BzrDir.has_workingtree."""
1549
def open_repository(self):
1550
"""See BzrDir.open_repository."""
1551
from bzrlib.repofmt.weaverepo import RepositoryFormat5
1552
return RepositoryFormat5().open(self, _found=True)
1554
def open_workingtree(self, _unsupported=False,
1555
recommend_upgrade=True):
1556
"""See BzrDir.create_workingtree."""
1557
from bzrlib.workingtree import WorkingTreeFormat2
1558
wt_format = WorkingTreeFormat2()
1559
# we don't warn here about upgrades; that ought to be handled for the
1561
return wt_format.open(self, _found=True)
1564
class BzrDir6(BzrDirPreSplitOut):
1565
"""A .bzr version 6 control object.
1567
This is a deprecated format and may be removed after sept 2006.
1570
def has_workingtree(self):
1571
"""See BzrDir.has_workingtree."""
1574
def open_repository(self):
1575
"""See BzrDir.open_repository."""
1576
from bzrlib.repofmt.weaverepo import RepositoryFormat6
1577
return RepositoryFormat6().open(self, _found=True)
1579
def open_workingtree(self, _unsupported=False,
1580
recommend_upgrade=True):
1581
"""See BzrDir.create_workingtree."""
1582
# we don't warn here about upgrades; that ought to be handled for the
1584
from bzrlib.workingtree import WorkingTreeFormat2
1585
return WorkingTreeFormat2().open(self, _found=True)
1136
1588
class BzrDirMeta1(BzrDir):
2154
def unregister_format(klass, format):
2155
del klass._formats[format.get_format_string()]
2158
def unregister_control_format(klass, format):
2159
klass._control_formats.remove(format)
2162
class BzrDirFormat4(BzrDirFormat):
2163
"""Bzr dir format 4.
2165
This format is a combined format for working tree, branch and repository.
2167
- Format 1 working trees [always]
2168
- Format 4 branches [always]
2169
- Format 4 repositories [always]
2171
This format is deprecated: it indexes texts using a text it which is
2172
removed in format 5; write support for this format has been removed.
2175
_lock_class = lockable_files.TransportLock
2177
def get_format_string(self):
2178
"""See BzrDirFormat.get_format_string()."""
2179
return "Bazaar-NG branch, format 0.0.4\n"
2181
def get_format_description(self):
2182
"""See BzrDirFormat.get_format_description()."""
2183
return "All-in-one format 4"
2185
def get_converter(self, format=None):
2186
"""See BzrDirFormat.get_converter()."""
2187
# there is one and only one upgrade path here.
2188
return ConvertBzrDir4To5()
2190
def initialize_on_transport(self, transport):
2191
"""Format 4 branches cannot be created."""
2192
raise errors.UninitializableFormat(self)
2194
def is_supported(self):
2195
"""Format 4 is not supported.
2197
It is not supported because the model changed from 4 to 5 and the
2198
conversion logic is expensive - so doing it on the fly was not
2203
def network_name(self):
2204
return self.get_format_string()
2206
def _open(self, transport):
2207
"""See BzrDirFormat._open."""
2208
return BzrDir4(transport, self)
2210
def __return_repository_format(self):
2211
"""Circular import protection."""
2212
from bzrlib.repofmt.weaverepo import RepositoryFormat4
2213
return RepositoryFormat4()
2214
repository_format = property(__return_repository_format)
2217
class BzrDirFormatAllInOne(BzrDirFormat):
2218
"""Common class for formats before meta-dirs."""
2220
def initialize_on_transport_ex(self, transport, use_existing_dir=False,
2221
create_prefix=False, force_new_repo=False, stacked_on=None,
2222
stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
2224
"""See BzrDirFormat.initialize_on_transport_ex."""
2225
require_stacking = (stacked_on is not None)
2226
# Format 5 cannot stack, but we've been asked to - actually init
2228
if require_stacking:
2229
format = BzrDirMetaFormat1()
2230
return format.initialize_on_transport_ex(transport,
2231
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
2232
force_new_repo=force_new_repo, stacked_on=stacked_on,
2233
stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
2234
make_working_trees=make_working_trees, shared_repo=shared_repo)
2235
return BzrDirFormat.initialize_on_transport_ex(self, transport,
2236
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
2237
force_new_repo=force_new_repo, stacked_on=stacked_on,
2238
stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
2239
make_working_trees=make_working_trees, shared_repo=shared_repo)
2242
class BzrDirFormat5(BzrDirFormatAllInOne):
2243
"""Bzr control format 5.
2245
This format is a combined format for working tree, branch and repository.
2247
- Format 2 working trees [always]
2248
- Format 4 branches [always]
2249
- Format 5 repositories [always]
2250
Unhashed stores in the repository.
2253
_lock_class = lockable_files.TransportLock
2255
def get_format_string(self):
2256
"""See BzrDirFormat.get_format_string()."""
2257
return "Bazaar-NG branch, format 5\n"
2259
def get_branch_format(self):
2260
from bzrlib import branch
2261
return branch.BzrBranchFormat4()
2263
def get_format_description(self):
2264
"""See BzrDirFormat.get_format_description()."""
2265
return "All-in-one format 5"
2267
def get_converter(self, format=None):
2268
"""See BzrDirFormat.get_converter()."""
2269
# there is one and only one upgrade path here.
2270
return ConvertBzrDir5To6()
2272
def _initialize_for_clone(self, url):
2273
return self.initialize_on_transport(get_transport(url), _cloning=True)
2275
def initialize_on_transport(self, transport, _cloning=False):
2276
"""Format 5 dirs always have working tree, branch and repository.
2278
Except when they are being cloned.
2280
from bzrlib.branch import BzrBranchFormat4
2281
from bzrlib.repofmt.weaverepo import RepositoryFormat5
2282
result = (super(BzrDirFormat5, self).initialize_on_transport(transport))
2283
RepositoryFormat5().initialize(result, _internal=True)
2285
branch = BzrBranchFormat4().initialize(result)
2286
result._init_workingtree()
2289
def network_name(self):
2290
return self.get_format_string()
2292
def _open(self, transport):
2293
"""See BzrDirFormat._open."""
2294
return BzrDir5(transport, self)
2296
def __return_repository_format(self):
2297
"""Circular import protection."""
2298
from bzrlib.repofmt.weaverepo import RepositoryFormat5
2299
return RepositoryFormat5()
2300
repository_format = property(__return_repository_format)
2303
class BzrDirFormat6(BzrDirFormatAllInOne):
2304
"""Bzr control format 6.
2306
This format is a combined format for working tree, branch and repository.
2308
- Format 2 working trees [always]
2309
- Format 4 branches [always]
2310
- Format 6 repositories [always]
2313
_lock_class = lockable_files.TransportLock
2315
def get_format_string(self):
2316
"""See BzrDirFormat.get_format_string()."""
2317
return "Bazaar-NG branch, format 6\n"
2319
def get_format_description(self):
2320
"""See BzrDirFormat.get_format_description()."""
2321
return "All-in-one format 6"
2323
def get_branch_format(self):
2324
from bzrlib import branch
2325
return branch.BzrBranchFormat4()
2327
def get_converter(self, format=None):
2328
"""See BzrDirFormat.get_converter()."""
2329
# there is one and only one upgrade path here.
2330
return ConvertBzrDir6ToMeta()
2332
def _initialize_for_clone(self, url):
2333
return self.initialize_on_transport(get_transport(url), _cloning=True)
2335
def initialize_on_transport(self, transport, _cloning=False):
2336
"""Format 6 dirs always have working tree, branch and repository.
2338
Except when they are being cloned.
2340
from bzrlib.branch import BzrBranchFormat4
2341
from bzrlib.repofmt.weaverepo import RepositoryFormat6
2342
result = super(BzrDirFormat6, self).initialize_on_transport(transport)
2343
RepositoryFormat6().initialize(result, _internal=True)
2345
branch = BzrBranchFormat4().initialize(result)
2346
result._init_workingtree()
2349
def network_name(self):
2350
return self.get_format_string()
2352
def _open(self, transport):
2353
"""See BzrDirFormat._open."""
2354
return BzrDir6(transport, self)
2356
def __return_repository_format(self):
2357
"""Circular import protection."""
2358
from bzrlib.repofmt.weaverepo import RepositoryFormat6
2359
return RepositoryFormat6()
2360
repository_format = property(__return_repository_format)
1613
2363
class BzrDirMetaFormat1(BzrDirFormat):
1614
2364
"""Bzr meta control format 1
1616
2366
This is the first format with split out working tree, branch and repository
1621
- Format 3 working trees [optional]
1622
- Format 5 branches [optional]
1623
- Format 7 repositories [optional]
2369
- Format 3 working trees [optional]
2370
- Format 5 branches [optional]
2371
- Format 7 repositories [optional]
1626
2374
_lock_class = lockdir.LockDir
1628
fixed_components = False
1630
2376
def __init__(self):
1631
2377
self._workingtree_format = None
1632
2378
self._branch_format = None
1823
2565
__set_workingtree_format)
2568
network_format_registry = registry.FormatRegistry()
2569
"""Registry of formats indexed by their network name.
2571
The network name for a BzrDirFormat is an identifier that can be used when
2572
referring to formats with smart server operations. See
2573
BzrDirFormat.network_name() for more detail.
2577
# Register bzr control format
2578
BzrDirFormat.register_control_format(BzrDirFormat)
1826
2580
# Register bzr formats
1827
BzrProber.formats.register(BzrDirMetaFormat1.get_format_string(),
1829
controldir.ControlDirFormat._default_format = BzrDirMetaFormat1()
1832
class ConvertMetaToMeta(controldir.Converter):
2581
BzrDirFormat.register_format(BzrDirFormat4())
2582
BzrDirFormat.register_format(BzrDirFormat5())
2583
BzrDirFormat.register_format(BzrDirFormat6())
2584
__default_format = BzrDirMetaFormat1()
2585
BzrDirFormat.register_format(__default_format)
2586
BzrDirFormat._default_format = __default_format
2589
class Converter(object):
2590
"""Converts a disk format object from one format to another."""
2592
def convert(self, to_convert, pb):
2593
"""Perform the conversion of to_convert, giving feedback via pb.
2595
:param to_convert: The disk object to convert.
2596
:param pb: a progress bar to use for progress information.
2599
def step(self, message):
2600
"""Update the pb by a step."""
2602
self.pb.update(message, self.count, self.total)
2605
class ConvertBzrDir4To5(Converter):
2606
"""Converts format 4 bzr dirs to format 5."""
2609
super(ConvertBzrDir4To5, self).__init__()
2610
self.converted_revs = set()
2611
self.absent_revisions = set()
2615
def convert(self, to_convert, pb):
2616
"""See Converter.convert()."""
2617
self.bzrdir = to_convert
2619
warnings.warn("pb parameter to convert() is deprecated")
2620
self.pb = ui.ui_factory.nested_progress_bar()
2622
ui.ui_factory.note('starting upgrade from format 4 to 5')
2623
if isinstance(self.bzrdir.transport, local.LocalTransport):
2624
self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
2625
self._convert_to_weaves()
2626
return BzrDir.open(self.bzrdir.root_transport.base)
2630
def _convert_to_weaves(self):
2631
ui.ui_factory.note('note: upgrade may be faster if all store files are ungzipped first')
2634
stat = self.bzrdir.transport.stat('weaves')
2635
if not S_ISDIR(stat.st_mode):
2636
self.bzrdir.transport.delete('weaves')
2637
self.bzrdir.transport.mkdir('weaves')
2638
except errors.NoSuchFile:
2639
self.bzrdir.transport.mkdir('weaves')
2640
# deliberately not a WeaveFile as we want to build it up slowly.
2641
self.inv_weave = Weave('inventory')
2642
# holds in-memory weaves for all files
2643
self.text_weaves = {}
2644
self.bzrdir.transport.delete('branch-format')
2645
self.branch = self.bzrdir.open_branch()
2646
self._convert_working_inv()
2647
rev_history = self.branch.revision_history()
2648
# to_read is a stack holding the revisions we still need to process;
2649
# appending to it adds new highest-priority revisions
2650
self.known_revisions = set(rev_history)
2651
self.to_read = rev_history[-1:]
2653
rev_id = self.to_read.pop()
2654
if (rev_id not in self.revisions
2655
and rev_id not in self.absent_revisions):
2656
self._load_one_rev(rev_id)
2658
to_import = self._make_order()
2659
for i, rev_id in enumerate(to_import):
2660
self.pb.update('converting revision', i, len(to_import))
2661
self._convert_one_rev(rev_id)
2663
self._write_all_weaves()
2664
self._write_all_revs()
2665
ui.ui_factory.note('upgraded to weaves:')
2666
ui.ui_factory.note(' %6d revisions and inventories' % len(self.revisions))
2667
ui.ui_factory.note(' %6d revisions not present' % len(self.absent_revisions))
2668
ui.ui_factory.note(' %6d texts' % self.text_count)
2669
self._cleanup_spare_files_after_format4()
2670
self.branch._transport.put_bytes(
2672
BzrDirFormat5().get_format_string(),
2673
mode=self.bzrdir._get_file_mode())
2675
def _cleanup_spare_files_after_format4(self):
2676
# FIXME working tree upgrade foo.
2677
for n in 'merged-patches', 'pending-merged-patches':
2679
## assert os.path.getsize(p) == 0
2680
self.bzrdir.transport.delete(n)
2681
except errors.NoSuchFile:
2683
self.bzrdir.transport.delete_tree('inventory-store')
2684
self.bzrdir.transport.delete_tree('text-store')
2686
def _convert_working_inv(self):
2687
inv = xml4.serializer_v4.read_inventory(
2688
self.branch._transport.get('inventory'))
2689
new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv, working=True)
2690
self.branch._transport.put_bytes('inventory', new_inv_xml,
2691
mode=self.bzrdir._get_file_mode())
2693
def _write_all_weaves(self):
2694
controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)
2695
weave_transport = self.bzrdir.transport.clone('weaves')
2696
weaves = WeaveStore(weave_transport, prefixed=False)
2697
transaction = WriteTransaction()
2701
for file_id, file_weave in self.text_weaves.items():
2702
self.pb.update('writing weave', i, len(self.text_weaves))
2703
weaves._put_weave(file_id, file_weave, transaction)
2705
self.pb.update('inventory', 0, 1)
2706
controlweaves._put_weave('inventory', self.inv_weave, transaction)
2707
self.pb.update('inventory', 1, 1)
2711
def _write_all_revs(self):
2712
"""Write all revisions out in new form."""
2713
self.bzrdir.transport.delete_tree('revision-store')
2714
self.bzrdir.transport.mkdir('revision-store')
2715
revision_transport = self.bzrdir.transport.clone('revision-store')
2717
from bzrlib.xml5 import serializer_v5
2718
from bzrlib.repofmt.weaverepo import RevisionTextStore
2719
revision_store = RevisionTextStore(revision_transport,
2720
serializer_v5, False, versionedfile.PrefixMapper(),
2721
lambda:True, lambda:True)
2723
for i, rev_id in enumerate(self.converted_revs):
2724
self.pb.update('write revision', i, len(self.converted_revs))
2725
text = serializer_v5.write_revision_to_string(
2726
self.revisions[rev_id])
2728
revision_store.add_lines(key, None, osutils.split_lines(text))
2732
def _load_one_rev(self, rev_id):
2733
"""Load a revision object into memory.
2735
Any parents not either loaded or abandoned get queued to be
2737
self.pb.update('loading revision',
2738
len(self.revisions),
2739
len(self.known_revisions))
2740
if not self.branch.repository.has_revision(rev_id):
2742
ui.ui_factory.note('revision {%s} not present in branch; '
2743
'will be converted as a ghost' %
2745
self.absent_revisions.add(rev_id)
2747
rev = self.branch.repository.get_revision(rev_id)
2748
for parent_id in rev.parent_ids:
2749
self.known_revisions.add(parent_id)
2750
self.to_read.append(parent_id)
2751
self.revisions[rev_id] = rev
2753
def _load_old_inventory(self, rev_id):
2754
old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
2755
inv = xml4.serializer_v4.read_inventory_from_string(old_inv_xml)
2756
inv.revision_id = rev_id
2757
rev = self.revisions[rev_id]
2760
def _load_updated_inventory(self, rev_id):
2761
inv_xml = self.inv_weave.get_text(rev_id)
2762
inv = xml5.serializer_v5.read_inventory_from_string(inv_xml, rev_id)
2765
def _convert_one_rev(self, rev_id):
2766
"""Convert revision and all referenced objects to new format."""
2767
rev = self.revisions[rev_id]
2768
inv = self._load_old_inventory(rev_id)
2769
present_parents = [p for p in rev.parent_ids
2770
if p not in self.absent_revisions]
2771
self._convert_revision_contents(rev, inv, present_parents)
2772
self._store_new_inv(rev, inv, present_parents)
2773
self.converted_revs.add(rev_id)
2775
def _store_new_inv(self, rev, inv, present_parents):
2776
new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv)
2777
new_inv_sha1 = sha_string(new_inv_xml)
2778
self.inv_weave.add_lines(rev.revision_id,
2780
new_inv_xml.splitlines(True))
2781
rev.inventory_sha1 = new_inv_sha1
2783
def _convert_revision_contents(self, rev, inv, present_parents):
2784
"""Convert all the files within a revision.
2786
Also upgrade the inventory to refer to the text revision ids."""
2787
rev_id = rev.revision_id
2788
mutter('converting texts of revision {%s}',
2790
parent_invs = map(self._load_updated_inventory, present_parents)
2791
entries = inv.iter_entries()
2793
for path, ie in entries:
2794
self._convert_file_version(rev, ie, parent_invs)
2796
def _convert_file_version(self, rev, ie, parent_invs):
2797
"""Convert one version of one file.
2799
The file needs to be added into the weave if it is a merge
2800
of >=2 parents or if it's changed from its parent.
2802
file_id = ie.file_id
2803
rev_id = rev.revision_id
2804
w = self.text_weaves.get(file_id)
2807
self.text_weaves[file_id] = w
2808
text_changed = False
2809
parent_candiate_entries = ie.parent_candidates(parent_invs)
2810
heads = graph.Graph(self).heads(parent_candiate_entries.keys())
2811
# XXX: Note that this is unordered - and this is tolerable because
2812
# the previous code was also unordered.
2813
previous_entries = dict((head, parent_candiate_entries[head]) for head
2815
self.snapshot_ie(previous_entries, ie, w, rev_id)
2818
def get_parent_map(self, revision_ids):
2819
"""See graph.StackedParentsProvider.get_parent_map"""
2820
return dict((revision_id, self.revisions[revision_id])
2821
for revision_id in revision_ids
2822
if revision_id in self.revisions)
2824
def snapshot_ie(self, previous_revisions, ie, w, rev_id):
2825
# TODO: convert this logic, which is ~= snapshot to
2826
# a call to:. This needs the path figured out. rather than a work_tree
2827
# a v4 revision_tree can be given, or something that looks enough like
2828
# one to give the file content to the entry if it needs it.
2829
# and we need something that looks like a weave store for snapshot to
2831
#ie.snapshot(rev, PATH, previous_revisions, REVISION_TREE, InMemoryWeaveStore(self.text_weaves))
2832
if len(previous_revisions) == 1:
2833
previous_ie = previous_revisions.values()[0]
2834
if ie._unchanged(previous_ie):
2835
ie.revision = previous_ie.revision
2838
text = self.branch.repository._text_store.get(ie.text_id)
2839
file_lines = text.readlines()
2840
w.add_lines(rev_id, previous_revisions, file_lines)
2841
self.text_count += 1
2843
w.add_lines(rev_id, previous_revisions, [])
2844
ie.revision = rev_id
2846
def _make_order(self):
2847
"""Return a suitable order for importing revisions.
2849
The order must be such that an revision is imported after all
2850
its (present) parents.
2852
todo = set(self.revisions.keys())
2853
done = self.absent_revisions.copy()
2856
# scan through looking for a revision whose parents
2858
for rev_id in sorted(list(todo)):
2859
rev = self.revisions[rev_id]
2860
parent_ids = set(rev.parent_ids)
2861
if parent_ids.issubset(done):
2862
# can take this one now
2863
order.append(rev_id)
2869
class ConvertBzrDir5To6(Converter):
2870
"""Converts format 5 bzr dirs to format 6."""
2872
def convert(self, to_convert, pb):
2873
"""See Converter.convert()."""
2874
self.bzrdir = to_convert
2875
pb = ui.ui_factory.nested_progress_bar()
2877
ui.ui_factory.note('starting upgrade from format 5 to 6')
2878
self._convert_to_prefixed()
2879
return BzrDir.open(self.bzrdir.root_transport.base)
2883
def _convert_to_prefixed(self):
2884
from bzrlib.store import TransportStore
2885
self.bzrdir.transport.delete('branch-format')
2886
for store_name in ["weaves", "revision-store"]:
2887
ui.ui_factory.note("adding prefixes to %s" % store_name)
2888
store_transport = self.bzrdir.transport.clone(store_name)
2889
store = TransportStore(store_transport, prefixed=True)
2890
for urlfilename in store_transport.list_dir('.'):
2891
filename = urlutils.unescape(urlfilename)
2892
if (filename.endswith(".weave") or
2893
filename.endswith(".gz") or
2894
filename.endswith(".sig")):
2895
file_id, suffix = os.path.splitext(filename)
2899
new_name = store._mapper.map((file_id,)) + suffix
2900
# FIXME keep track of the dirs made RBC 20060121
2902
store_transport.move(filename, new_name)
2903
except errors.NoSuchFile: # catches missing dirs strangely enough
2904
store_transport.mkdir(osutils.dirname(new_name))
2905
store_transport.move(filename, new_name)
2906
self.bzrdir.transport.put_bytes(
2908
BzrDirFormat6().get_format_string(),
2909
mode=self.bzrdir._get_file_mode())
2912
class ConvertBzrDir6ToMeta(Converter):
2913
"""Converts format 6 bzr dirs to metadirs."""
2915
def convert(self, to_convert, pb):
2916
"""See Converter.convert()."""
2917
from bzrlib.repofmt.weaverepo import RepositoryFormat7
2918
from bzrlib.branch import BzrBranchFormat5
2919
self.bzrdir = to_convert
2920
self.pb = ui.ui_factory.nested_progress_bar()
2922
self.total = 20 # the steps we know about
2923
self.garbage_inventories = []
2924
self.dir_mode = self.bzrdir._get_dir_mode()
2925
self.file_mode = self.bzrdir._get_file_mode()
2927
ui.ui_factory.note('starting upgrade from format 6 to metadir')
2928
self.bzrdir.transport.put_bytes(
2930
"Converting to format 6",
2931
mode=self.file_mode)
2932
# its faster to move specific files around than to open and use the apis...
2933
# first off, nuke ancestry.weave, it was never used.
2935
self.step('Removing ancestry.weave')
2936
self.bzrdir.transport.delete('ancestry.weave')
2937
except errors.NoSuchFile:
2939
# find out whats there
2940
self.step('Finding branch files')
2941
last_revision = self.bzrdir.open_branch().last_revision()
2942
bzrcontents = self.bzrdir.transport.list_dir('.')
2943
for name in bzrcontents:
2944
if name.startswith('basis-inventory.'):
2945
self.garbage_inventories.append(name)
2946
# create new directories for repository, working tree and branch
2947
repository_names = [('inventory.weave', True),
2948
('revision-store', True),
2950
self.step('Upgrading repository ')
2951
self.bzrdir.transport.mkdir('repository', mode=self.dir_mode)
2952
self.make_lock('repository')
2953
# we hard code the formats here because we are converting into
2954
# the meta format. The meta format upgrader can take this to a
2955
# future format within each component.
2956
self.put_format('repository', RepositoryFormat7())
2957
for entry in repository_names:
2958
self.move_entry('repository', entry)
2960
self.step('Upgrading branch ')
2961
self.bzrdir.transport.mkdir('branch', mode=self.dir_mode)
2962
self.make_lock('branch')
2963
self.put_format('branch', BzrBranchFormat5())
2964
branch_files = [('revision-history', True),
2965
('branch-name', True),
2967
for entry in branch_files:
2968
self.move_entry('branch', entry)
2970
checkout_files = [('pending-merges', True),
2971
('inventory', True),
2972
('stat-cache', False)]
2973
# If a mandatory checkout file is not present, the branch does not have
2974
# a functional checkout. Do not create a checkout in the converted
2976
for name, mandatory in checkout_files:
2977
if mandatory and name not in bzrcontents:
2978
has_checkout = False
2982
if not has_checkout:
2983
ui.ui_factory.note('No working tree.')
2984
# If some checkout files are there, we may as well get rid of them.
2985
for name, mandatory in checkout_files:
2986
if name in bzrcontents:
2987
self.bzrdir.transport.delete(name)
2989
from bzrlib.workingtree import WorkingTreeFormat3
2990
self.step('Upgrading working tree')
2991
self.bzrdir.transport.mkdir('checkout', mode=self.dir_mode)
2992
self.make_lock('checkout')
2994
'checkout', WorkingTreeFormat3())
2995
self.bzrdir.transport.delete_multi(
2996
self.garbage_inventories, self.pb)
2997
for entry in checkout_files:
2998
self.move_entry('checkout', entry)
2999
if last_revision is not None:
3000
self.bzrdir.transport.put_bytes(
3001
'checkout/last-revision', last_revision)
3002
self.bzrdir.transport.put_bytes(
3004
BzrDirMetaFormat1().get_format_string(),
3005
mode=self.file_mode)
3007
return BzrDir.open(self.bzrdir.root_transport.base)
3009
def make_lock(self, name):
3010
"""Make a lock for the new control dir name."""
3011
self.step('Make %s lock' % name)
3012
ld = lockdir.LockDir(self.bzrdir.transport,
3014
file_modebits=self.file_mode,
3015
dir_modebits=self.dir_mode)
3018
def move_entry(self, new_dir, entry):
3019
"""Move then entry name into new_dir."""
3021
mandatory = entry[1]
3022
self.step('Moving %s' % name)
3024
self.bzrdir.transport.move(name, '%s/%s' % (new_dir, name))
3025
except errors.NoSuchFile:
3029
def put_format(self, dirname, format):
3030
self.bzrdir.transport.put_bytes('%s/format' % dirname,
3031
format.get_format_string(),
3035
class ConvertMetaToMeta(Converter):
1833
3036
"""Converts the components of metadirs."""
1835
3038
def __init__(self, target_format):
1907
3111
return to_convert
1910
controldir.ControlDirFormat.register_server_prober(RemoteBzrProber)
3114
# This is not in remote.py because it's relatively small, and needs to be
3115
# registered. Putting it in remote.py creates a circular import problem.
3116
# we can make it a lazy object if the control formats is turned into something
3118
class RemoteBzrDirFormat(BzrDirMetaFormat1):
3119
"""Format representing bzrdirs accessed via a smart server"""
3122
BzrDirMetaFormat1.__init__(self)
3123
# XXX: It's a bit ugly that the network name is here, because we'd
3124
# like to believe that format objects are stateless or at least
3125
# immutable, However, we do at least avoid mutating the name after
3126
# it's returned. See <https://bugs.edge.launchpad.net/bzr/+bug/504102>
3127
self._network_name = None
3130
return "%s(_network_name=%r)" % (self.__class__.__name__,
3133
def get_format_description(self):
3134
if self._network_name:
3135
real_format = network_format_registry.get(self._network_name)
3136
return 'Remote: ' + real_format.get_format_description()
3137
return 'bzr remote bzrdir'
3139
def get_format_string(self):
3140
raise NotImplementedError(self.get_format_string)
3142
def network_name(self):
3143
if self._network_name:
3144
return self._network_name
3146
raise AssertionError("No network name set.")
3149
def probe_transport(klass, transport):
3150
"""Return a RemoteBzrDirFormat object if it looks possible."""
3152
medium = transport.get_smart_medium()
3153
except (NotImplementedError, AttributeError,
3154
errors.TransportNotPossible, errors.NoSmartMedium,
3155
errors.SmartProtocolError):
3156
# no smart server, so not a branch for this format type.
3157
raise errors.NotBranchError(path=transport.base)
3159
# Decline to open it if the server doesn't support our required
3160
# version (3) so that the VFS-based transport will do it.
3161
if medium.should_probe():
3163
server_version = medium.protocol_version()
3164
except errors.SmartProtocolError:
3165
# Apparently there's no usable smart server there, even though
3166
# the medium supports the smart protocol.
3167
raise errors.NotBranchError(path=transport.base)
3168
if server_version != '2':
3169
raise errors.NotBranchError(path=transport.base)
3172
def initialize_on_transport(self, transport):
3174
# hand off the request to the smart server
3175
client_medium = transport.get_smart_medium()
3176
except errors.NoSmartMedium:
3177
# TODO: lookup the local format from a server hint.
3178
local_dir_format = BzrDirMetaFormat1()
3179
return local_dir_format.initialize_on_transport(transport)
3180
client = _SmartClient(client_medium)
3181
path = client.remote_path_from_transport(transport)
3183
response = client.call('BzrDirFormat.initialize', path)
3184
except errors.ErrorFromSmartServer, err:
3185
remote._translate_error(err, path=path)
3186
if response[0] != 'ok':
3187
raise errors.SmartProtocolError('unexpected response code %s' % (response,))
3188
format = RemoteBzrDirFormat()
3189
self._supply_sub_formats_to(format)
3190
return remote.RemoteBzrDir(transport, format)
3192
def parse_NoneTrueFalse(self, arg):
3199
raise AssertionError("invalid arg %r" % arg)
3201
def _serialize_NoneTrueFalse(self, arg):
3208
def _serialize_NoneString(self, arg):
3211
def initialize_on_transport_ex(self, transport, use_existing_dir=False,
3212
create_prefix=False, force_new_repo=False, stacked_on=None,
3213
stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
3216
# hand off the request to the smart server
3217
client_medium = transport.get_smart_medium()
3218
except errors.NoSmartMedium:
3221
# Decline to open it if the server doesn't support our required
3222
# version (3) so that the VFS-based transport will do it.
3223
if client_medium.should_probe():
3225
server_version = client_medium.protocol_version()
3226
if server_version != '2':
3230
except errors.SmartProtocolError:
3231
# Apparently there's no usable smart server there, even though
3232
# the medium supports the smart protocol.
3237
client = _SmartClient(client_medium)
3238
path = client.remote_path_from_transport(transport)
3239
if client_medium._is_remote_before((1, 16)):
3242
# TODO: lookup the local format from a server hint.
3243
local_dir_format = BzrDirMetaFormat1()
3244
self._supply_sub_formats_to(local_dir_format)
3245
return local_dir_format.initialize_on_transport_ex(transport,
3246
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
3247
force_new_repo=force_new_repo, stacked_on=stacked_on,
3248
stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
3249
make_working_trees=make_working_trees, shared_repo=shared_repo,
3251
return self._initialize_on_transport_ex_rpc(client, path, transport,
3252
use_existing_dir, create_prefix, force_new_repo, stacked_on,
3253
stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
3255
def _initialize_on_transport_ex_rpc(self, client, path, transport,
3256
use_existing_dir, create_prefix, force_new_repo, stacked_on,
3257
stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
3259
args.append(self._serialize_NoneTrueFalse(use_existing_dir))
3260
args.append(self._serialize_NoneTrueFalse(create_prefix))
3261
args.append(self._serialize_NoneTrueFalse(force_new_repo))
3262
args.append(self._serialize_NoneString(stacked_on))
3263
# stack_on_pwd is often/usually our transport
3266
stack_on_pwd = transport.relpath(stack_on_pwd)
3267
if not stack_on_pwd:
3269
except errors.PathNotChild:
3271
args.append(self._serialize_NoneString(stack_on_pwd))
3272
args.append(self._serialize_NoneString(repo_format_name))
3273
args.append(self._serialize_NoneTrueFalse(make_working_trees))
3274
args.append(self._serialize_NoneTrueFalse(shared_repo))
3275
request_network_name = self._network_name or \
3276
BzrDirFormat.get_default_format().network_name()
3278
response = client.call('BzrDirFormat.initialize_ex_1.16',
3279
request_network_name, path, *args)
3280
except errors.UnknownSmartMethod:
3281
client._medium._remember_remote_is_before((1,16))
3282
local_dir_format = BzrDirMetaFormat1()
3283
self._supply_sub_formats_to(local_dir_format)
3284
return local_dir_format.initialize_on_transport_ex(transport,
3285
use_existing_dir=use_existing_dir, create_prefix=create_prefix,
3286
force_new_repo=force_new_repo, stacked_on=stacked_on,
3287
stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
3288
make_working_trees=make_working_trees, shared_repo=shared_repo,
3290
except errors.ErrorFromSmartServer, err:
3291
remote._translate_error(err, path=path)
3292
repo_path = response[0]
3293
bzrdir_name = response[6]
3294
require_stacking = response[7]
3295
require_stacking = self.parse_NoneTrueFalse(require_stacking)
3296
format = RemoteBzrDirFormat()
3297
format._network_name = bzrdir_name
3298
self._supply_sub_formats_to(format)
3299
bzrdir = remote.RemoteBzrDir(transport, format, _client=client)
3301
repo_format = remote.response_tuple_to_repo_format(response[1:])
3302
if repo_path == '.':
3305
repo_bzrdir_format = RemoteBzrDirFormat()
3306
repo_bzrdir_format._network_name = response[5]
3307
repo_bzr = remote.RemoteBzrDir(transport.clone(repo_path),
3311
final_stack = response[8] or None
3312
final_stack_pwd = response[9] or None
3314
final_stack_pwd = urlutils.join(
3315
transport.base, final_stack_pwd)
3316
remote_repo = remote.RemoteRepository(repo_bzr, repo_format)
3317
if len(response) > 10:
3318
# Updated server verb that locks remotely.
3319
repo_lock_token = response[10] or None
3320
remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
3322
remote_repo.dont_leave_lock_in_place()
3324
remote_repo.lock_write()
3325
policy = UseExistingRepository(remote_repo, final_stack,
3326
final_stack_pwd, require_stacking)
3327
policy.acquire_repository()
3331
bzrdir._format.set_branch_format(self.get_branch_format())
3332
if require_stacking:
3333
# The repo has already been created, but we need to make sure that
3334
# we'll make a stackable branch.
3335
bzrdir._format.require_stacking(_skip_repo=True)
3336
return remote_repo, bzrdir, require_stacking, policy
3338
def _open(self, transport):
3339
return remote.RemoteBzrDir(transport, self)
3341
def __eq__(self, other):
3342
if not isinstance(other, RemoteBzrDirFormat):
3344
return self.get_format_description() == other.get_format_description()
3346
def __return_repository_format(self):
3347
# Always return a RemoteRepositoryFormat object, but if a specific bzr
3348
# repository format has been asked for, tell the RemoteRepositoryFormat
3349
# that it should use that for init() etc.
3350
result = remote.RemoteRepositoryFormat()
3351
custom_format = getattr(self, '_repository_format', None)
3353
if isinstance(custom_format, remote.RemoteRepositoryFormat):
3354
return custom_format
3356
# We will use the custom format to create repositories over the
3357
# wire; expose its details like rich_root_data for code to
3359
result._custom_format = custom_format
3362
def get_branch_format(self):
3363
result = BzrDirMetaFormat1.get_branch_format(self)
3364
if not isinstance(result, remote.RemoteBranchFormat):
3365
new_result = remote.RemoteBranchFormat()
3366
new_result._custom_format = result
3368
self.set_branch_format(new_result)
3372
repository_format = property(__return_repository_format,
3373
BzrDirMetaFormat1._set_repository_format) #.im_func)
3376
BzrDirFormat.register_control_server_format(RemoteBzrDirFormat)
3379
class BzrDirFormatInfo(object):
3381
def __init__(self, native, deprecated, hidden, experimental):
3382
self.deprecated = deprecated
3383
self.native = native
3384
self.hidden = hidden
3385
self.experimental = experimental
3388
class BzrDirFormatRegistry(registry.Registry):
3389
"""Registry of user-selectable BzrDir subformats.
3391
Differs from BzrDirFormat._control_formats in that it provides sub-formats,
3392
e.g. BzrDirMeta1 with weave repository. Also, it's more user-oriented.
3396
"""Create a BzrDirFormatRegistry."""
3397
self._aliases = set()
3398
self._registration_order = list()
3399
super(BzrDirFormatRegistry, self).__init__()
3402
"""Return a set of the format names which are aliases."""
3403
return frozenset(self._aliases)
3405
def register_metadir(self, key,
3406
repository_format, help, native=True, deprecated=False,
3412
"""Register a metadir subformat.
3414
These all use a BzrDirMetaFormat1 bzrdir, but can be parameterized
3415
by the Repository/Branch/WorkingTreeformats.
3417
:param repository_format: The fully-qualified repository format class
3419
:param branch_format: Fully-qualified branch format class name as
3421
:param tree_format: Fully-qualified tree format class name as
3424
# This should be expanded to support setting WorkingTree and Branch
3425
# formats, once BzrDirMetaFormat1 supports that.
3426
def _load(full_name):
3427
mod_name, factory_name = full_name.rsplit('.', 1)
3429
mod = __import__(mod_name, globals(), locals(),
3431
except ImportError, e:
3432
raise ImportError('failed to load %s: %s' % (full_name, e))
3434
factory = getattr(mod, factory_name)
3435
except AttributeError:
3436
raise AttributeError('no factory %s in module %r'
3441
bd = BzrDirMetaFormat1()
3442
if branch_format is not None:
3443
bd.set_branch_format(_load(branch_format))
3444
if tree_format is not None:
3445
bd.workingtree_format = _load(tree_format)
3446
if repository_format is not None:
3447
bd.repository_format = _load(repository_format)
3449
self.register(key, helper, help, native, deprecated, hidden,
3450
experimental, alias)
3452
def register(self, key, factory, help, native=True, deprecated=False,
3453
hidden=False, experimental=False, alias=False):
3454
"""Register a BzrDirFormat factory.
3456
The factory must be a callable that takes one parameter: the key.
3457
It must produce an instance of the BzrDirFormat when called.
3459
This function mainly exists to prevent the info object from being
3462
registry.Registry.register(self, key, factory, help,
3463
BzrDirFormatInfo(native, deprecated, hidden, experimental))
3465
self._aliases.add(key)
3466
self._registration_order.append(key)
3468
def register_lazy(self, key, module_name, member_name, help, native=True,
3469
deprecated=False, hidden=False, experimental=False, alias=False):
3470
registry.Registry.register_lazy(self, key, module_name, member_name,
3471
help, BzrDirFormatInfo(native, deprecated, hidden, experimental))
3473
self._aliases.add(key)
3474
self._registration_order.append(key)
3476
def set_default(self, key):
3477
"""Set the 'default' key to be a clone of the supplied key.
3479
This method must be called once and only once.
3481
registry.Registry.register(self, 'default', self.get(key),
3482
self.get_help(key), info=self.get_info(key))
3483
self._aliases.add('default')
3485
def set_default_repository(self, key):
3486
"""Set the FormatRegistry default and Repository default.
3488
This is a transitional method while Repository.set_default_format
3491
if 'default' in self:
3492
self.remove('default')
3493
self.set_default(key)
3494
format = self.get('default')()
3496
def make_bzrdir(self, key):
3497
return self.get(key)()
3499
def help_topic(self, topic):
3501
default_realkey = None
3502
default_help = self.get_help('default')
3504
for key in self._registration_order:
3505
if key == 'default':
3507
help = self.get_help(key)
3508
if help == default_help:
3509
default_realkey = key
3511
help_pairs.append((key, help))
3513
def wrapped(key, help, info):
3515
help = '(native) ' + help
3516
return ':%s:\n%s\n\n' % (key,
3517
textwrap.fill(help, initial_indent=' ',
3518
subsequent_indent=' ',
3519
break_long_words=False))
3520
if default_realkey is not None:
3521
output += wrapped(default_realkey, '(default) %s' % default_help,
3522
self.get_info('default'))
3523
deprecated_pairs = []
3524
experimental_pairs = []
3525
for key, help in help_pairs:
3526
info = self.get_info(key)
3529
elif info.deprecated:
3530
deprecated_pairs.append((key, help))
3531
elif info.experimental:
3532
experimental_pairs.append((key, help))
3534
output += wrapped(key, help, info)
3535
output += "\nSee :doc:`formats-help` for more about storage formats."
3537
if len(experimental_pairs) > 0:
3538
other_output += "Experimental formats are shown below.\n\n"
3539
for key, help in experimental_pairs:
3540
info = self.get_info(key)
3541
other_output += wrapped(key, help, info)
3544
"No experimental formats are available.\n\n"
3545
if len(deprecated_pairs) > 0:
3546
other_output += "\nDeprecated formats are shown below.\n\n"
3547
for key, help in deprecated_pairs:
3548
info = self.get_info(key)
3549
other_output += wrapped(key, help, info)
3552
"\nNo deprecated formats are available.\n\n"
3554
"\nSee :doc:`formats-help` for more about storage formats."
3556
if topic == 'other-formats':
1913
3562
class RepositoryAcquisitionPolicy(object):
2068
3716
return self._repository, False
2071
def register_metadir(registry, key,
2072
repository_format, help, native=True, deprecated=False,
2078
"""Register a metadir subformat.
2080
These all use a BzrDirMetaFormat1 bzrdir, but can be parameterized
2081
by the Repository/Branch/WorkingTreeformats.
2083
:param repository_format: The fully-qualified repository format class
2085
:param branch_format: Fully-qualified branch format class name as
2087
:param tree_format: Fully-qualified tree format class name as
2090
# This should be expanded to support setting WorkingTree and Branch
2091
# formats, once BzrDirMetaFormat1 supports that.
2092
def _load(full_name):
2093
mod_name, factory_name = full_name.rsplit('.', 1)
2095
factory = pyutils.get_named_object(mod_name, factory_name)
2096
except ImportError, e:
2097
raise ImportError('failed to load %s: %s' % (full_name, e))
2098
except AttributeError:
2099
raise AttributeError('no factory %s in module %r'
2100
% (full_name, sys.modules[mod_name]))
2104
bd = BzrDirMetaFormat1()
2105
if branch_format is not None:
2106
bd.set_branch_format(_load(branch_format))
2107
if tree_format is not None:
2108
bd.workingtree_format = _load(tree_format)
2109
if repository_format is not None:
2110
bd.repository_format = _load(repository_format)
2112
registry.register(key, helper, help, native, deprecated, hidden,
2113
experimental, alias)
2115
register_metadir(controldir.format_registry, 'knit',
3719
# Please register new formats after old formats so that formats
3720
# appear in chronological order and format descriptions can build
3722
format_registry = BzrDirFormatRegistry()
3723
# The pre-0.8 formats have their repository format network name registered in
3724
# repository.py. MetaDir formats have their repository format network name
3725
# inferred from their disk format string.
3726
format_registry.register('weave', BzrDirFormat6,
3727
'Pre-0.8 format. Slower than knit and does not'
3728
' support checkouts or shared repositories.',
3731
format_registry.register_metadir('metaweave',
3732
'bzrlib.repofmt.weaverepo.RepositoryFormat7',
3733
'Transitional format in 0.8. Slower than knit.',
3734
branch_format='bzrlib.branch.BzrBranchFormat5',
3735
tree_format='bzrlib.workingtree.WorkingTreeFormat3',
3738
format_registry.register_metadir('knit',
2116
3739
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2117
3740
'Format using knits. Recommended for interoperation with bzr <= 0.14.',
2118
3741
branch_format='bzrlib.branch.BzrBranchFormat5',
2119
tree_format='bzrlib.workingtree_3.WorkingTreeFormat3',
3742
tree_format='bzrlib.workingtree.WorkingTreeFormat3',
2121
3744
deprecated=True)
2122
register_metadir(controldir.format_registry, 'dirstate',
3745
format_registry.register_metadir('dirstate',
2123
3746
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2124
3747
help='New in 0.15: Fast local operations. Compatible with bzr 0.8 and '
2125
3748
'above when accessed over the network.',
2126
3749
branch_format='bzrlib.branch.BzrBranchFormat5',
2127
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3750
# this uses bzrlib.workingtree.WorkingTreeFormat4 because importing
3751
# directly from workingtree_4 triggers a circular import.
3752
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2129
3754
deprecated=True)
2130
register_metadir(controldir.format_registry, 'dirstate-tags',
3755
format_registry.register_metadir('dirstate-tags',
2131
3756
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2132
3757
help='New in 0.15: Fast local operations and improved scaling for '
2133
3758
'network operations. Additionally adds support for tags.'
2134
3759
' Incompatible with bzr < 0.15.',
2135
3760
branch_format='bzrlib.branch.BzrBranchFormat6',
2136
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3761
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2138
3763
deprecated=True)
2139
register_metadir(controldir.format_registry, 'rich-root',
3764
format_registry.register_metadir('rich-root',
2140
3765
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit4',
2141
3766
help='New in 1.0. Better handling of tree roots. Incompatible with'
2143
3768
branch_format='bzrlib.branch.BzrBranchFormat6',
2144
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3769
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2146
3771
deprecated=True)
2147
register_metadir(controldir.format_registry, 'dirstate-with-subtree',
3772
format_registry.register_metadir('dirstate-with-subtree',
2148
3773
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
2149
3774
help='New in 0.15: Fast local operations and improved scaling for '
2150
3775
'network operations. Additionally adds support for versioning nested '
2151
3776
'bzr branches. Incompatible with bzr < 0.15.',
2152
3777
branch_format='bzrlib.branch.BzrBranchFormat6',
2153
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3778
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2154
3779
experimental=True,
2157
register_metadir(controldir.format_registry, 'pack-0.92',
2158
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack1',
3782
format_registry.register_metadir('pack-0.92',
3783
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack1',
2159
3784
help='New in 0.92: Pack-based format with data compatible with '
2160
3785
'dirstate-tags format repositories. Interoperates with '
2161
3786
'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
2163
3788
branch_format='bzrlib.branch.BzrBranchFormat6',
2164
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3789
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2166
register_metadir(controldir.format_registry, 'pack-0.92-subtree',
2167
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack3',
3791
format_registry.register_metadir('pack-0.92-subtree',
3792
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack3',
2168
3793
help='New in 0.92: Pack-based format with data compatible with '
2169
3794
'dirstate-with-subtree format repositories. Interoperates with '
2170
3795
'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
2172
3797
branch_format='bzrlib.branch.BzrBranchFormat6',
2173
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3798
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2175
3800
experimental=True,
2177
register_metadir(controldir.format_registry, 'rich-root-pack',
2178
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack4',
3802
format_registry.register_metadir('rich-root-pack',
3803
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack4',
2179
3804
help='New in 1.0: A variant of pack-0.92 that supports rich-root data '
2180
3805
'(needed for bzr-svn and bzr-git).',
2181
3806
branch_format='bzrlib.branch.BzrBranchFormat6',
2182
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3807
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2185
register_metadir(controldir.format_registry, '1.6',
2186
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack5',
3810
format_registry.register_metadir('1.6',
3811
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5',
2187
3812
help='A format that allows a branch to indicate that there is another '
2188
3813
'(stacked) repository that should be used to access data that is '
2189
3814
'not present locally.',
2190
3815
branch_format='bzrlib.branch.BzrBranchFormat7',
2191
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3816
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2194
register_metadir(controldir.format_registry, '1.6.1-rich-root',
2195
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack5RichRoot',
3819
format_registry.register_metadir('1.6.1-rich-root',
3820
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5RichRoot',
2196
3821
help='A variant of 1.6 that supports rich-root data '
2197
3822
'(needed for bzr-svn and bzr-git).',
2198
3823
branch_format='bzrlib.branch.BzrBranchFormat7',
2199
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3824
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2202
register_metadir(controldir.format_registry, '1.9',
2203
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6',
3827
format_registry.register_metadir('1.9',
3828
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
2204
3829
help='A repository format using B+tree indexes. These indexes '
2205
3830
'are smaller in size, have smarter caching and provide faster '
2206
3831
'performance for most operations.',
2207
3832
branch_format='bzrlib.branch.BzrBranchFormat7',
2208
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3833
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2211
register_metadir(controldir.format_registry, '1.9-rich-root',
2212
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
3836
format_registry.register_metadir('1.9-rich-root',
3837
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
2213
3838
help='A variant of 1.9 that supports rich-root data '
2214
3839
'(needed for bzr-svn and bzr-git).',
2215
3840
branch_format='bzrlib.branch.BzrBranchFormat7',
2216
tree_format='bzrlib.workingtree_4.WorkingTreeFormat4',
3841
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2219
register_metadir(controldir.format_registry, '1.14',
2220
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6',
3844
format_registry.register_metadir('1.14',
3845
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
2221
3846
help='A working-tree format that supports content filtering.',
2222
3847
branch_format='bzrlib.branch.BzrBranchFormat7',
2223
tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
3848
tree_format='bzrlib.workingtree.WorkingTreeFormat5',
2225
register_metadir(controldir.format_registry, '1.14-rich-root',
2226
'bzrlib.repofmt.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
3850
format_registry.register_metadir('1.14-rich-root',
3851
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
2227
3852
help='A variant of 1.14 that supports rich-root data '
2228
3853
'(needed for bzr-svn and bzr-git).',
2229
3854
branch_format='bzrlib.branch.BzrBranchFormat7',
2230
tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
3855
tree_format='bzrlib.workingtree.WorkingTreeFormat5',
2232
3857
# The following un-numbered 'development' formats should always just be aliases.
2233
register_metadir(controldir.format_registry, 'development-subtree',
2234
'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2aSubtree',
3858
format_registry.register_metadir('development-rich-root',
3859
'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK1',
3860
help='Current development format. Supports rich roots. Can convert data '
3861
'to and from rich-root-pack (and anything compatible with '
3862
'rich-root-pack) format repositories. Repositories and branches in '
3863
'this format can only be read by bzr.dev. Please read '
3864
'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
3866
branch_format='bzrlib.branch.BzrBranchFormat7',
3867
tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3872
format_registry.register_metadir('development-subtree',
3873
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment2Subtree',
2235
3874
help='Current development format, subtree variant. Can convert data to and '
2236
3875
'from pack-0.92-subtree (and anything compatible with '
2237
3876
'pack-0.92-subtree) format repositories. Repositories and branches in '
added
removed
bzrlib/bzrdir.py
