« back to all changes in this revision
Viewing changes to bzrlib/bzrdir.py
- browse files at revision 3537
- compare with another revision
- download diff
- download tarball
- view history from revision 3537
- Committer: Canonical.com Patch Queue Manager
- Date: 2008-07-14 08:21:19 UTC
- mfrom: (3517.4.20 stacking)
- Revision ID: pqm@pqm.ubuntu.com-20080714082119-ju6qe5weo8pp7f1c
merge integrated branch stacking
- files added:
- bzrlib/push.py
- files modified:
- NEWS
added
removed
bzrlib/bzrdir.py
973
973
974
974
def sprout(self, url, revision_id=None, force_new_repo=False,
975
975
recurse='down', possible_transports=None,
976
accelerator_tree=None, hardlink=False):
976
accelerator_tree=None, hardlink=False, stacked=False):
977
977
"""Create a copy of this bzrdir prepared for use as a new line of
978
978
development.
979
979
992
992
content is different.
993
993
:param hardlink: If true, hard-link files from accelerator_tree,
994
994
where possible.
995
:param stacked: If true, create a stacked branch referring to the
996
location of this control directory.
995
997
"""
996
998
target_transport = get_transport(url, possible_transports)
997
999
target_transport.ensure_base()
1000
1002
try:
1001
1003
source_branch = self.open_branch()
1002
1004
source_repository = source_branch.repository
1005
if stacked:
1006
stacked_branch_url = self.root_transport.base
1007
else:
1008
try:
1009
stacked_branch_url = source_branch.get_stacked_on()
1010
except (errors.NotStacked, errors.UnstackableBranchFormat,
1011
errors.UnstackableRepositoryFormat):
1012
stacked_branch_url = None
1003
1013
except errors.NotBranchError:
1004
1014
source_branch = None
1005
1015
try:
1006
1016
source_repository = self.open_repository()
1007
1017
except errors.NoRepositoryPresent:
1008
1018
source_repository = None
1019
stacked_branch_url = None
1009
1020
if force_new_repo:
1010
1021
result_repo = None
1011
1022
else:
1013
1024
result_repo = result.find_repository()
1014
1025
except errors.NoRepositoryPresent:
1015
1026
result_repo = None
1016
if source_repository is None and result_repo is not None:
1017
pass
1018
elif source_repository is None and result_repo is None:
1019
# no repo available, make a new one
1020
result.create_repository()
1021
elif source_repository is not None and result_repo is None:
1027
1028
# Create/update the result repository as required
1029
if source_repository is None:
1030
if result_repo is None:
1031
# no repo available, make a new one
1032
result.create_repository()
1033
elif stacked_branch_url is not None:
1034
if result_repo is None:
1035
result_repo = source_repository._format.initialize(result)
1036
stacked_dir = BzrDir.open(stacked_branch_url)
1037
try:
1038
stacked_repo = stacked_dir.open_branch().repository
1039
except errors.NotBranchError:
1040
stacked_repo = stacked_dir.open_repository()
1041
result_repo.add_fallback_repository(stacked_repo)
1042
result_repo.fetch(source_repository, revision_id=revision_id)
1043
elif result_repo is None:
1022
1044
# have source, and want to make a new target repo
1023
1045
result_repo = source_repository.sprout(result,
1024
1046
revision_id=revision_id)
1025
1047
else:
1026
# fetch needed content into target.
1027
if source_repository is not None:
1028
# would rather do
1029
# source_repository.copy_content_into(result_repo,
1030
# revision_id=revision_id)
1031
# so we can override the copy method
1032
result_repo.fetch(source_repository, revision_id=revision_id)
1048
# Fetch needed content into target.
1049
# Would rather do it this way ...
1050
# source_repository.copy_content_into(result_repo,
1051
# revision_id=revision_id)
1052
# so we can override the copy method
1053
result_repo.fetch(source_repository, revision_id=revision_id)
1054
1055
# Create/update the result branch
1033
1056
if source_branch is not None:
1034
source_branch.sprout(result, revision_id=revision_id)
1057
result_branch = source_branch.sprout(result,
1058
revision_id=revision_id)
1035
1059
else:
1036
result.create_branch()
1060
result_branch = result.create_branch()
1061
if stacked_branch_url is not None:
1062
result_branch.set_stacked_on(stacked_branch_url)
1063
1064
# Create/update the result working tree
1037
1065
if isinstance(target_transport, LocalTransport) and (
1038
1066
result_repo is None or result_repo.make_working_trees()):
1039
1067
wt = result.create_workingtree(accelerator_tree=accelerator_tree,
1054
1082
basis = wt.basis_tree()
1055
1083
basis.lock_read()
1056
1084
subtrees = basis.iter_references()
1057
recurse_branch = wt.branch
1058
1085
elif source_branch is not None:
1059
1086
basis = source_branch.basis_tree()
1060
1087
basis.lock_read()
1061
1088
subtrees = basis.iter_references()
1062
recurse_branch = source_branch
1063
1089
else:
1064
1090
subtrees = []
1065
1091
basis = None
1069
1095
sublocation = source_branch.reference_parent(file_id, path)
1070
1096
sublocation.bzrdir.sprout(target,
1071
1097
basis.get_reference_revision(file_id, path),
1072
force_new_repo=force_new_repo, recurse=recurse)
1098
force_new_repo=force_new_repo, recurse=recurse,
1099
stacked=stacked)
1073
1100
finally:
1074
1101
if basis is not None:
1075
1102
basis.unlock()
1209
1236
1210
1237
def sprout(self, url, revision_id=None, force_new_repo=False,
1211
1238
possible_transports=None, accelerator_tree=None,
1212
hardlink=False):
1239
hardlink=False, stacked=False):
1213
1240
"""See BzrDir.sprout()."""
1241
if stacked:
1242
raise errors.UnstackableBranchFormat(
1243
self._format, self.root_transport.base)
1214
1244
from bzrlib.workingtree import WorkingTreeFormat2
1215
1245
self._make_tail(url)
1216
1246
result = self._format._initialize_for_clone(url)
2433
2463
pass
2434
2464
else:
2435
2465
# TODO: conversions of Branch and Tree should be done by
2436
# InterXFormat lookups
2466
# InterXFormat lookups/some sort of registry.
2437
2467
# Avoid circular imports
2438
2468
from bzrlib import branch as _mod_branch
2439
if (branch._format.__class__ is _mod_branch.BzrBranchFormat5 and
2440
self.target_format.get_branch_format().__class__ is
2441
_mod_branch.BzrBranchFormat6):
2442
branch_converter = _mod_branch.Converter5to6()
2469
old = branch._format.__class__
2470
new = self.target_format.get_branch_format().__class__
2471
while old != new:
2472
if (old == _mod_branch.BzrBranchFormat5 and
2473
new in (_mod_branch.BzrBranchFormat6,
2474
_mod_branch.BzrBranchFormat7)):
2475
branch_converter = _mod_branch.Converter5to6()
2476
elif (old == _mod_branch.BzrBranchFormat6 and
2477
new == _mod_branch.BzrBranchFormat7):
2478
branch_converter = _mod_branch.Converter6to7()
2479
else:
2480
raise errors.BadConversionTarget("No converter", new)
2443
2481
branch_converter.convert(branch)
2482
branch = self.bzrdir.open_branch()
2483
old = branch._format.__class__
2444
2484
try:
2445
2485
tree = self.bzrdir.open_workingtree(recommend_upgrade=False)
2446
2486
except (errors.NoWorkingTree, errors.NotLocalUrl):
2832
2872
)
2833
2873
# The following two formats should always just be aliases.
2834
2874
format_registry.register_metadir('development',
2835
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0',
2875
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment1',
2836
2876
help='Current development format. Can convert data to and from pack-0.92 '
2837
2877
'(and anything compatible with pack-0.92) format repositories. '
2838
'Repositories in this format can only be read by bzr.dev. '
2878
'Repositories and branches in this format can only be read by bzr.dev. '
2839
2879
'Please read '
2840
2880
'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
2841
2881
'before use.',
2842
branch_format='bzrlib.branch.BzrBranchFormat6',
2882
branch_format='bzrlib.branch.BzrBranchFormat7',
2843
2883
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2844
2884
experimental=True,
2845
2885
alias=True,
2846
2886
)
2847
2887
format_registry.register_metadir('development-subtree',
2848
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0Subtree',
2888
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment1Subtree',
2849
2889
help='Current development format, subtree variant. Can convert data to and '
2850
'from pack-0.92 (and anything compatible with pack-0.92) format '
2851
'repositories. Repositories in this format can only be read by '
2852
'bzr.dev. Please read '
2890
'from pack-0.92-subtree (and anything compatible with '
2891
'pack-0.92-subtree) format repositories. Repositories and branches in '
2892
'this format can only be read by bzr.dev. Please read '
2853
2893
'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
2854
2894
'before use.',
2855
branch_format='bzrlib.branch.BzrBranchFormat6',
2895
branch_format='bzrlib.branch.BzrBranchFormat7',
2856
2896
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2857
2897
experimental=True,
2858
2898
alias=True,
2880
2920
hidden=True,
2881
2921
experimental=True,
2882
2922
)
2923
format_registry.register_metadir('development1',
2924
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment1',
2925
help='A branch and pack based repository that supports stacking. '
2926
'Please read '
2927
'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
2928
'before use.',
2929
branch_format='bzrlib.branch.BzrBranchFormat7',
2930
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2931
hidden=True,
2932
experimental=True,
2933
)
2934
format_registry.register_metadir('development1-subtree',
2935
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment1Subtree',
2936
help='A branch and pack based repository that supports stacking. '
2937
'Please read '
2938
'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
2939
'before use.',
2940
branch_format='bzrlib.branch.BzrBranchFormat7',
2941
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
2942
hidden=True,
2943
experimental=True,
2944
)
2945
# The current format that is made on 'bzr init'.
2883
2946
format_registry.set_default('pack-0.92')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1