915
777
self.tree1.commit('removed', rev_id='white-4')
917
779
bundle = self.get_valid_bundle('white-3', 'white-4')
919
781
# Now test a complet roll-up
920
bundle = self.get_valid_bundle('null:', 'white-4')
782
bundle = self.get_valid_bundle(None, 'white-4')
922
784
def test_alt_timezone_bundle(self):
923
self.tree1 = self.make_branch_and_memory_tree('b1')
785
self.tree1 = self.make_branch_and_tree('b1')
924
786
self.b1 = self.tree1.branch
925
builder = treebuilder.TreeBuilder()
927
self.tree1.lock_write()
928
builder.start_tree(self.tree1)
929
builder.build(['newfile'])
930
builder.finish_tree()
788
self.build_tree(['b1/newfile'])
789
self.tree1.add(['newfile'])
932
791
# Asia/Colombo offset = 5 hours 30 minutes
933
792
self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
934
793
timezone=19800, timestamp=1152544886.0)
936
bundle = self.get_valid_bundle('null:', 'tz-1')
795
bundle = self.get_valid_bundle(None, 'tz-1')
938
797
rev = bundle.revisions[0]
939
798
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
940
799
self.assertEqual(19800, rev.timezone)
941
800
self.assertEqual(1152544886.0, rev.timestamp)
944
def test_bundle_root_id(self):
945
self.tree1 = self.make_branch_and_tree('b1')
946
self.b1 = self.tree1.branch
947
self.tree1.commit('message', rev_id='revid1')
948
bundle = self.get_valid_bundle('null:', 'revid1')
949
tree = self.get_bundle_tree(bundle, 'revid1')
950
self.assertEqual('revid1', tree.inventory.root.revision)
952
def test_install_revisions(self):
953
self.tree1 = self.make_branch_and_tree('b1')
954
self.b1 = self.tree1.branch
955
self.tree1.commit('message', rev_id='rev2a')
956
bundle = self.get_valid_bundle('null:', 'rev2a')
957
branch2 = self.make_branch('b2')
958
self.assertFalse(branch2.repository.has_revision('rev2a'))
959
target_revision = bundle.install_revisions(branch2.repository)
960
self.assertTrue(branch2.repository.has_revision('rev2a'))
961
self.assertEqual('rev2a', target_revision)
963
def test_bundle_empty_property(self):
964
"""Test serializing revision properties with an empty value."""
965
tree = self.make_branch_and_memory_tree('tree')
967
self.addCleanup(tree.unlock)
968
tree.add([''], ['TREE_ROOT'])
969
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
970
self.b1 = tree.branch
971
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
972
bundle = read_bundle(bundle_sio)
973
revision_info = bundle.revisions[0]
974
self.assertEqual('rev1', revision_info.revision_id)
975
rev = revision_info.as_revision()
976
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
979
def test_bundle_sorted_properties(self):
980
"""For stability the writer should write properties in sorted order."""
981
tree = self.make_branch_and_memory_tree('tree')
983
self.addCleanup(tree.unlock)
985
tree.add([''], ['TREE_ROOT'])
986
tree.commit('One', rev_id='rev1',
987
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
988
self.b1 = tree.branch
989
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
990
bundle = read_bundle(bundle_sio)
991
revision_info = bundle.revisions[0]
992
self.assertEqual('rev1', revision_info.revision_id)
993
rev = revision_info.as_revision()
994
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
995
'd':'1'}, rev.properties)
997
def test_bundle_unicode_properties(self):
998
"""We should be able to round trip a non-ascii property."""
999
tree = self.make_branch_and_memory_tree('tree')
1001
self.addCleanup(tree.unlock)
1003
tree.add([''], ['TREE_ROOT'])
1004
# Revisions themselves do not require anything about revision property
1005
# keys, other than that they are a basestring, and do not contain
1007
# However, Testaments assert than they are str(), and thus should not
1009
tree.commit('One', rev_id='rev1',
1010
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1011
self.b1 = tree.branch
1012
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1013
bundle = read_bundle(bundle_sio)
1014
revision_info = bundle.revisions[0]
1015
self.assertEqual('rev1', revision_info.revision_id)
1016
rev = revision_info.as_revision()
1017
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1018
'alpha':u'\u03b1'}, rev.properties)
1020
def test_bundle_with_ghosts(self):
1021
tree = self.make_branch_and_tree('tree')
1022
self.b1 = tree.branch
1023
self.build_tree_contents([('tree/file', 'content1')])
1026
self.build_tree_contents([('tree/file', 'content2')])
1027
tree.add_parent_tree_id('ghost')
1028
tree.commit('rev2', rev_id='rev2')
1029
bundle = self.get_valid_bundle('null:', 'rev2')
1031
def make_simple_tree(self, format=None):
1032
tree = self.make_branch_and_tree('b1', format=format)
1033
self.b1 = tree.branch
1034
self.build_tree(['b1/file'])
1038
def test_across_serializers(self):
1039
tree = self.make_simple_tree('knit')
1040
tree.commit('hello', rev_id='rev1')
1041
tree.commit('hello', rev_id='rev2')
1042
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1043
repo = self.make_repository('repo', format='dirstate-with-subtree')
1044
bundle.install_revisions(repo)
1045
inv_text = repo._get_inventory_xml('rev2')
1046
self.assertNotContainsRe(inv_text, 'format="5"')
1047
self.assertContainsRe(inv_text, 'format="7"')
1049
def make_repo_with_installed_revisions(self):
1050
tree = self.make_simple_tree('knit')
1051
tree.commit('hello', rev_id='rev1')
1052
tree.commit('hello', rev_id='rev2')
1053
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1054
repo = self.make_repository('repo', format='dirstate-with-subtree')
1055
bundle.install_revisions(repo)
1058
def test_across_models(self):
1059
repo = self.make_repo_with_installed_revisions()
1060
inv = repo.get_inventory('rev2')
1061
self.assertEqual('rev2', inv.root.revision)
1062
root_id = inv.root.file_id
1064
self.addCleanup(repo.unlock)
1065
self.assertEqual({(root_id, 'rev1'):(),
1066
(root_id, 'rev2'):((root_id, 'rev1'),)},
1067
repo.texts.get_parent_map([(root_id, 'rev1'), (root_id, 'rev2')]))
1069
def test_inv_hash_across_serializers(self):
1070
repo = self.make_repo_with_installed_revisions()
1071
recorded_inv_sha1 = repo.get_revision('rev2').inventory_sha1
1072
xml = repo._get_inventory_xml('rev2')
1073
self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
1075
def test_across_models_incompatible(self):
1076
tree = self.make_simple_tree('dirstate-with-subtree')
1077
tree.commit('hello', rev_id='rev1')
1078
tree.commit('hello', rev_id='rev2')
1080
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1081
except errors.IncompatibleBundleFormat:
1082
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1083
repo = self.make_repository('repo', format='knit')
1084
bundle.install_revisions(repo)
1086
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1087
self.assertRaises(errors.IncompatibleRevision,
1088
bundle.install_revisions, repo)
1090
def test_get_merge_request(self):
1091
tree = self.make_simple_tree()
1092
tree.commit('hello', rev_id='rev1')
1093
tree.commit('hello', rev_id='rev2')
1094
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1095
result = bundle.get_merge_request(tree.branch.repository)
1096
self.assertEqual((None, 'rev1', 'inapplicable'), result)
1098
def test_with_subtree(self):
1099
tree = self.make_branch_and_tree('tree',
1100
format='dirstate-with-subtree')
1101
self.b1 = tree.branch
1102
subtree = self.make_branch_and_tree('tree/subtree',
1103
format='dirstate-with-subtree')
1105
tree.commit('hello', rev_id='rev1')
1107
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1108
except errors.IncompatibleBundleFormat:
1109
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1110
if isinstance(bundle, v09.BundleInfo09):
1111
raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
1112
repo = self.make_repository('repo', format='knit')
1113
self.assertRaises(errors.IncompatibleRevision,
1114
bundle.install_revisions, repo)
1115
repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1116
bundle.install_revisions(repo2)
1118
def test_revision_id_with_slash(self):
1119
self.tree1 = self.make_branch_and_tree('tree')
1120
self.b1 = self.tree1.branch
1122
self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
1124
raise tests.TestSkipped(
1125
"Repository doesn't support revision ids with slashes")
1126
bundle = self.get_valid_bundle('null:', 'rev/id')
1128
def test_skip_file(self):
1129
"""Make sure we don't accidentally write to the wrong versionedfile"""
1130
self.tree1 = self.make_branch_and_tree('tree')
1131
self.b1 = self.tree1.branch
1132
# rev1 is not present in bundle, done by fetch
1133
self.build_tree_contents([('tree/file2', 'contents1')])
1134
self.tree1.add('file2', 'file2-id')
1135
self.tree1.commit('rev1', rev_id='reva')
1136
self.build_tree_contents([('tree/file3', 'contents2')])
1137
# rev2 is present in bundle, and done by fetch
1138
# having file1 in the bunle causes file1's versionedfile to be opened.
1139
self.tree1.add('file3', 'file3-id')
1140
self.tree1.commit('rev2')
1141
# Updating file2 should not cause an attempt to add to file1's vf
1142
target = self.tree1.bzrdir.sprout('target').open_workingtree()
1143
self.build_tree_contents([('tree/file2', 'contents3')])
1144
self.tree1.commit('rev3', rev_id='rev3')
1145
bundle = self.get_valid_bundle('reva', 'rev3')
1146
if getattr(bundle, 'get_bundle_reader', None) is None:
1147
raise tests.TestSkipped('Bundle format cannot provide reader')
1148
# be sure that file1 comes before file2
1149
for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1152
self.assertNotEqual(f, 'file2-id')
1153
bundle.install_revisions(target.branch.repository)
1156
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
1160
def test_bundle_empty_property(self):
1161
"""Test serializing revision properties with an empty value."""
1162
tree = self.make_branch_and_memory_tree('tree')
1164
self.addCleanup(tree.unlock)
1165
tree.add([''], ['TREE_ROOT'])
1166
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1167
self.b1 = tree.branch
1168
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1169
self.assertContainsRe(bundle_sio.getvalue(),
1171
'# branch-nick: tree\n'
1175
bundle = read_bundle(bundle_sio)
1176
revision_info = bundle.revisions[0]
1177
self.assertEqual('rev1', revision_info.revision_id)
1178
rev = revision_info.as_revision()
1179
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1182
def get_bundle_tree(self, bundle, revision_id):
1183
repository = self.make_repository('repo')
1184
return bundle.revision_tree(repository, 'revid1')
1186
def test_bundle_empty_property_alt(self):
1187
"""Test serializing revision properties with an empty value.
1189
Older readers had a bug when reading an empty property.
1190
They assumed that all keys ended in ': \n'. However they would write an
1191
empty value as ':\n'. This tests make sure that all newer bzr versions
1192
can handle th second form.
1194
tree = self.make_branch_and_memory_tree('tree')
1196
self.addCleanup(tree.unlock)
1197
tree.add([''], ['TREE_ROOT'])
1198
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1199
self.b1 = tree.branch
1200
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1201
txt = bundle_sio.getvalue()
1202
loc = txt.find('# empty: ') + len('# empty:')
1203
# Create a new bundle, which strips the trailing space after empty
1204
bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
1206
self.assertContainsRe(bundle_sio.getvalue(),
1208
'# branch-nick: tree\n'
1212
bundle = read_bundle(bundle_sio)
1213
revision_info = bundle.revisions[0]
1214
self.assertEqual('rev1', revision_info.revision_id)
1215
rev = revision_info.as_revision()
1216
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1219
def test_bundle_sorted_properties(self):
1220
"""For stability the writer should write properties in sorted order."""
1221
tree = self.make_branch_and_memory_tree('tree')
1223
self.addCleanup(tree.unlock)
1225
tree.add([''], ['TREE_ROOT'])
1226
tree.commit('One', rev_id='rev1',
1227
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1228
self.b1 = tree.branch
1229
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1230
self.assertContainsRe(bundle_sio.getvalue(),
1234
'# branch-nick: tree\n'
1238
bundle = read_bundle(bundle_sio)
1239
revision_info = bundle.revisions[0]
1240
self.assertEqual('rev1', revision_info.revision_id)
1241
rev = revision_info.as_revision()
1242
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1243
'd':'1'}, rev.properties)
1245
def test_bundle_unicode_properties(self):
1246
"""We should be able to round trip a non-ascii property."""
1247
tree = self.make_branch_and_memory_tree('tree')
1249
self.addCleanup(tree.unlock)
1251
tree.add([''], ['TREE_ROOT'])
1252
# Revisions themselves do not require anything about revision property
1253
# keys, other than that they are a basestring, and do not contain
1255
# However, Testaments assert than they are str(), and thus should not
1257
tree.commit('One', rev_id='rev1',
1258
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1259
self.b1 = tree.branch
1260
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1261
self.assertContainsRe(bundle_sio.getvalue(),
1263
'# alpha: \xce\xb1\n'
1264
'# branch-nick: tree\n'
1265
'# omega: \xce\xa9\n'
1267
bundle = read_bundle(bundle_sio)
1268
revision_info = bundle.revisions[0]
1269
self.assertEqual('rev1', revision_info.revision_id)
1270
rev = revision_info.as_revision()
1271
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1272
'alpha':u'\u03b1'}, rev.properties)
1275
class V09BundleKnit2Tester(V08BundleTester):
1279
def bzrdir_format(self):
1280
format = bzrdir.BzrDirMetaFormat1()
1281
format.repository_format = knitrepo.RepositoryFormatKnit3()
1285
class V09BundleKnit1Tester(V08BundleTester):
1289
def bzrdir_format(self):
1290
format = bzrdir.BzrDirMetaFormat1()
1291
format.repository_format = knitrepo.RepositoryFormatKnit1()
1295
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
1299
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1300
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1301
Make sure that the text generated is valid, and that it
1302
can be applied against the base, and generate the same information.
1304
:return: The in-memory bundle
1306
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1308
# This should also validate the generated bundle
1309
bundle = read_bundle(bundle_txt)
1310
repository = self.b1.repository
1311
for bundle_rev in bundle.real_revisions:
1312
# These really should have already been checked when we read the
1313
# bundle, since it computes the sha1 hash for the revision, which
1314
# only will match if everything is okay, but lets be explicit about
1316
branch_rev = repository.get_revision(bundle_rev.revision_id)
1317
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1318
'timestamp', 'timezone', 'message', 'committer',
1319
'parent_ids', 'properties'):
1320
self.assertEqual(getattr(branch_rev, a),
1321
getattr(bundle_rev, a))
1322
self.assertEqual(len(branch_rev.parent_ids),
1323
len(bundle_rev.parent_ids))
1324
self.assertEqual(set(rev_ids),
1325
set([r.revision_id for r in bundle.real_revisions]))
1326
self.valid_apply_bundle(base_rev_id, bundle,
1327
checkout_dir=checkout_dir)
1331
def get_invalid_bundle(self, base_rev_id, rev_id):
1332
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1333
Munge the text so that it's invalid.
1335
:return: The in-memory bundle
1337
from bzrlib.bundle import serializer
1338
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1339
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1340
new_text = new_text.replace('<file file_id="exe-1"',
1341
'<file executable="y" file_id="exe-1"')
1342
new_text = new_text.replace('B260', 'B275')
1343
bundle_txt = StringIO()
1344
bundle_txt.write(serializer._get_bundle_header('4'))
1345
bundle_txt.write('\n')
1346
bundle_txt.write(new_text.encode('bz2'))
1348
bundle = read_bundle(bundle_txt)
1349
self.valid_apply_bundle(base_rev_id, bundle)
1352
def create_bundle_text(self, base_rev_id, rev_id):
1353
bundle_txt = StringIO()
1354
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1355
bundle_txt, format=self.format)
1357
self.assertEqual(bundle_txt.readline(),
1358
'# Bazaar revision bundle v%s\n' % self.format)
1359
self.assertEqual(bundle_txt.readline(), '#\n')
1360
rev = self.b1.repository.get_revision(rev_id)
1362
return bundle_txt, rev_ids
1364
def get_bundle_tree(self, bundle, revision_id):
1365
repository = self.make_repository('repo')
1366
bundle.install_revisions(repository)
1367
return repository.revision_tree(revision_id)
1369
def test_creation(self):
1370
tree = self.make_branch_and_tree('tree')
1371
self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
1372
tree.add('file', 'fileid-2')
1373
tree.commit('added file', rev_id='rev1')
1374
self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
1375
tree.commit('changed file', rev_id='rev2')
1377
serializer = BundleSerializerV4('1.0')
1378
serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
1380
tree2 = self.make_branch_and_tree('target')
1381
target_repo = tree2.branch.repository
1382
install_bundle(target_repo, serializer.read(s))
1383
target_repo.lock_read()
1384
self.addCleanup(target_repo.unlock)
1385
# Turn the 'iterators_of_bytes' back into simple strings for comparison
1386
repo_texts = dict((i, ''.join(content)) for i, content
1387
in target_repo.iter_files_bytes(
1388
[('fileid-2', 'rev1', '1'),
1389
('fileid-2', 'rev2', '2')]))
1390
self.assertEqual({'1':'contents1\nstatic\n',
1391
'2':'contents2\nstatic\n'},
1393
rtree = target_repo.revision_tree('rev2')
1394
inventory_vf = target_repo.inventories
1395
# If the inventory store has a graph, it must match the revision graph.
1397
[inventory_vf.get_parent_map([('rev2',)])[('rev2',)]],
1398
[None, (('rev1',),)])
1399
self.assertEqual('changed file',
1400
target_repo.get_revision('rev2').message)
1403
def get_raw(bundle_file):
1405
line = bundle_file.readline()
1406
line = bundle_file.readline()
1407
lines = bundle_file.readlines()
1408
return ''.join(lines).decode('bz2')
1410
def test_copy_signatures(self):
1411
tree_a = self.make_branch_and_tree('tree_a')
1413
import bzrlib.commit as commit
1414
oldstrategy = bzrlib.gpg.GPGStrategy
1415
branch = tree_a.branch
1416
repo_a = branch.repository
1417
tree_a.commit("base", allow_pointless=True, rev_id='A')
1418
self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
1420
from bzrlib.testament import Testament
1421
# monkey patch gpg signing mechanism
1422
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1423
new_config = test_commit.MustSignConfig(branch)
1424
commit.Commit(config=new_config).commit(message="base",
1425
allow_pointless=True,
1427
working_tree=tree_a)
1429
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1430
self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1432
bzrlib.gpg.GPGStrategy = oldstrategy
1433
tree_b = self.make_branch_and_tree('tree_b')
1434
repo_b = tree_b.branch.repository
1436
serializer = BundleSerializerV4('4')
1437
serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1439
install_bundle(repo_b, serializer.read(s))
1440
self.assertTrue(repo_b.has_signature_for_revision_id('B'))
1441
self.assertEqual(repo_b.get_signature_text('B'),
1442
repo_a.get_signature_text('B'))
1444
# ensure repeat installs are harmless
1445
install_bundle(repo_b, serializer.read(s))
1448
class V4_2aBundleTester(V4BundleTester):
1450
def bzrdir_format(self):
1453
def get_invalid_bundle(self, base_rev_id, rev_id):
1454
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1455
Munge the text so that it's invalid.
1457
:return: The in-memory bundle
1459
from bzrlib.bundle import serializer
1460
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1461
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1462
# We are going to be replacing some text to set the executable bit on a
1463
# file. Make sure the text replacement actually works correctly.
1464
self.assertContainsRe(new_text, '(?m)B244\n\ni 1\n<inventory')
1465
new_text = new_text.replace('<file file_id="exe-1"',
1466
'<file executable="y" file_id="exe-1"')
1467
new_text = new_text.replace('B244', 'B259')
1468
bundle_txt = StringIO()
1469
bundle_txt.write(serializer._get_bundle_header('4'))
1470
bundle_txt.write('\n')
1471
bundle_txt.write(new_text.encode('bz2'))
1473
bundle = read_bundle(bundle_txt)
1474
self.valid_apply_bundle(base_rev_id, bundle)
1477
def make_merged_branch(self):
1478
builder = self.make_branch_builder('source')
1479
builder.start_series()
1480
builder.build_snapshot('a@cset-0-1', None, [
1481
('add', ('', 'root-id', 'directory', None)),
1482
('add', ('file', 'file-id', 'file', 'original content\n')),
1484
builder.build_snapshot('a@cset-0-2a', ['a@cset-0-1'], [
1485
('modify', ('file-id', 'new-content\n')),
1487
builder.build_snapshot('a@cset-0-2b', ['a@cset-0-1'], [
1488
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1490
builder.build_snapshot('a@cset-0-3', ['a@cset-0-2a', 'a@cset-0-2b'], [
1491
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1493
builder.finish_series()
1494
self.b1 = builder.get_branch()
1496
self.addCleanup(self.b1.unlock)
1498
def make_bundle_just_inventories(self, base_revision_id,
1502
writer = v4.BundleWriteOperation(base_revision_id, target_revision_id,
1503
self.b1.repository, sio)
1504
writer.bundle.begin()
1505
writer._add_inventory_mpdiffs_from_serializer(revision_ids)
1510
def test_single_inventory_multiple_parents_as_xml(self):
1511
self.make_merged_branch()
1512
sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1514
reader = v4.BundleReader(sio, stream_input=False)
1515
records = list(reader.iter_records())
1516
self.assertEqual(1, len(records))
1517
(bytes, metadata, repo_kind, revision_id,
1518
file_id) = records[0]
1519
self.assertIs(None, file_id)
1520
self.assertEqual('a@cset-0-3', revision_id)
1521
self.assertEqual('inventory', repo_kind)
1522
self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1523
'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1524
'storage_kind': 'mpdiff',
1526
# We should have an mpdiff that takes some lines from both parents.
1527
self.assertEqualDiff(
1529
'<inventory format="10" revision_id="a@cset-0-3">\n'
1532
'c 1 3 3 2\n', bytes)
1534
def test_single_inv_no_parents_as_xml(self):
1535
self.make_merged_branch()
1536
sio = self.make_bundle_just_inventories('null:', 'a@cset-0-1',
1538
reader = v4.BundleReader(sio, stream_input=False)
1539
records = list(reader.iter_records())
1540
self.assertEqual(1, len(records))
1541
(bytes, metadata, repo_kind, revision_id,
1542
file_id) = records[0]
1543
self.assertIs(None, file_id)
1544
self.assertEqual('a@cset-0-1', revision_id)
1545
self.assertEqual('inventory', repo_kind)
1546
self.assertEqual({'parents': [],
1547
'sha1': 'a13f42b142d544aac9b085c42595d304150e31a2',
1548
'storage_kind': 'mpdiff',
1550
# We should have an mpdiff that takes some lines from both parents.
1551
self.assertEqualDiff(
1553
'<inventory format="10" revision_id="a@cset-0-1">\n'
1554
'<directory file_id="root-id" name=""'
1555
' revision="a@cset-0-1" />\n'
1556
'<file file_id="file-id" name="file" parent_id="root-id"'
1557
' revision="a@cset-0-1"'
1558
' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
1559
' text_size="17" />\n'
1563
def test_multiple_inventories_as_xml(self):
1564
self.make_merged_branch()
1565
sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1566
['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'])
1567
reader = v4.BundleReader(sio, stream_input=False)
1568
records = list(reader.iter_records())
1569
self.assertEqual(3, len(records))
1570
revision_ids = [rev_id for b, m, k, rev_id, f in records]
1571
self.assertEqual(['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'],
1573
metadata_2a = records[0][1]
1574
self.assertEqual({'parents': ['a@cset-0-1'],
1575
'sha1': '1e105886d62d510763e22885eec733b66f5f09bf',
1576
'storage_kind': 'mpdiff',
1578
metadata_2b = records[1][1]
1579
self.assertEqual({'parents': ['a@cset-0-1'],
1580
'sha1': 'f03f12574bdb5ed2204c28636c98a8547544ccd8',
1581
'storage_kind': 'mpdiff',
1583
metadata_3 = records[2][1]
1584
self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1585
'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1586
'storage_kind': 'mpdiff',
1588
bytes_2a = records[0][0]
1589
self.assertEqualDiff(
1591
'<inventory format="10" revision_id="a@cset-0-2a">\n'
1595
'<file file_id="file-id" name="file" parent_id="root-id"'
1596
' revision="a@cset-0-2a"'
1597
' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
1598
' text_size="12" />\n'
1600
'c 0 3 3 1\n', bytes_2a)
1601
bytes_2b = records[1][0]
1602
self.assertEqualDiff(
1604
'<inventory format="10" revision_id="a@cset-0-2b">\n'
1608
'<file file_id="file2-id" name="other-file" parent_id="root-id"'
1609
' revision="a@cset-0-2b"'
1610
' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
1611
' text_size="14" />\n'
1613
'c 0 3 4 1\n', bytes_2b)
1614
bytes_3 = records[2][0]
1615
self.assertEqualDiff(
1617
'<inventory format="10" revision_id="a@cset-0-3">\n'
1620
'c 1 3 3 2\n', bytes_3)
1622
def test_creating_bundle_preserves_chk_pages(self):
1623
self.make_merged_branch()
1624
target = self.b1.bzrdir.sprout('target',
1625
revision_id='a@cset-0-2a').open_branch()
1626
bundle_txt, rev_ids = self.create_bundle_text('a@cset-0-2a',
1628
self.assertEqual(['a@cset-0-2b', 'a@cset-0-3'], rev_ids)
1629
bundle = read_bundle(bundle_txt)
1631
self.addCleanup(target.unlock)
1632
install_bundle(target.repository, bundle)
1633
inv1 = self.b1.repository.inventories.get_record_stream([
1634
('a@cset-0-3',)], 'unordered',
1635
True).next().get_bytes_as('fulltext')
1636
inv2 = target.repository.inventories.get_record_stream([
1637
('a@cset-0-3',)], 'unordered',
1638
True).next().get_bytes_as('fulltext')
1639
self.assertEqualDiff(inv1, inv2)
1642
class MungedBundleTester(object):
803
class MungedBundleTester(TestCaseWithTransport):
1644
805
def build_test_bundle(self):
1645
806
wt = self.make_branch_and_tree('b1')
1728
884
bundle = read_bundle(bundle_txt)
1729
885
self.check_valid(bundle)
1732
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
1737
class TestBundleWriterReader(tests.TestCase):
1739
def test_roundtrip_record(self):
1740
fileobj = StringIO()
1741
writer = v4.BundleWriter(fileobj)
1743
writer.add_info_record(foo='bar')
1744
writer._add_record("Record body", {'parents': ['1', '3'],
1745
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1748
reader = v4.BundleReader(fileobj, stream_input=True)
1749
record_iter = reader.iter_records()
1750
record = record_iter.next()
1751
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1752
'info', None, None), record)
1753
record = record_iter.next()
1754
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1755
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1758
def test_roundtrip_record_memory_hungry(self):
1759
fileobj = StringIO()
1760
writer = v4.BundleWriter(fileobj)
1762
writer.add_info_record(foo='bar')
1763
writer._add_record("Record body", {'parents': ['1', '3'],
1764
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1767
reader = v4.BundleReader(fileobj, stream_input=False)
1768
record_iter = reader.iter_records()
1769
record = record_iter.next()
1770
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1771
'info', None, None), record)
1772
record = record_iter.next()
1773
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1774
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1777
def test_encode_name(self):
1778
self.assertEqual('revision/rev1',
1779
v4.BundleWriter.encode_name('revision', 'rev1'))
1780
self.assertEqual('file/rev//1/file-id-1',
1781
v4.BundleWriter.encode_name('file', 'rev/1', 'file-id-1'))
1782
self.assertEqual('info',
1783
v4.BundleWriter.encode_name('info', None, None))
1785
def test_decode_name(self):
1786
self.assertEqual(('revision', 'rev1', None),
1787
v4.BundleReader.decode_name('revision/rev1'))
1788
self.assertEqual(('file', 'rev/1', 'file-id-1'),
1789
v4.BundleReader.decode_name('file/rev//1/file-id-1'))
1790
self.assertEqual(('info', None, None),
1791
v4.BundleReader.decode_name('info'))
1793
def test_too_many_names(self):
1794
fileobj = StringIO()
1795
writer = v4.BundleWriter(fileobj)
1797
writer.add_info_record(foo='bar')
1798
writer._container.add_bytes_record('blah', ['two', 'names'])
1801
record_iter = v4.BundleReader(fileobj).iter_records()
1802
record = record_iter.next()
1803
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1804
'info', None, None), record)
1805
self.assertRaises(errors.BadBundle, record_iter.next)
1808
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
1810
def test_read_mergeable_skips_local(self):
1811
"""A local bundle named like the URL should not be read.
1813
out, wt = test_read_bundle.create_bundle_file(self)
1814
class FooService(object):
1815
"""A directory service that always returns source"""
1817
def look_up(self, name, url):
1819
directories.register('foo:', FooService, 'Testing directory service')
1820
self.addCleanup(directories.remove, 'foo:')
1821
self.build_tree_contents([('./foo:bar', out.getvalue())])
1822
self.assertRaises(errors.NotABundle, read_mergeable_from_url,
1825
def test_infinite_redirects_are_not_a_bundle(self):
1826
"""If a URL causes TooManyRedirections then NotABundle is raised.
1828
from bzrlib.tests.blackbox.test_push import RedirectingMemoryServer
1829
server = RedirectingMemoryServer()
1830
self.start_server(server)
1831
url = server.get_url() + 'infinite-loop'
1832
self.assertRaises(errors.NotABundle, read_mergeable_from_url, url)
1834
def test_smart_server_connection_reset(self):
1835
"""If a smart server connection fails during the attempt to read a
1836
bundle, then the ConnectionReset error should be propagated.
1838
# Instantiate a server that will provoke a ConnectionReset
1839
sock_server = _DisconnectingTCPServer()
1840
self.start_server(sock_server)
1841
# We don't really care what the url is since the server will close the
1842
# connection without interpreting it
1843
url = sock_server.get_url()
1844
self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1847
class _DisconnectingTCPServer(object):
1848
"""A TCP server that immediately closes any connection made to it."""
1850
def start_server(self):
1851
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1852
self.sock.bind(('127.0.0.1', 0))
1854
self.port = self.sock.getsockname()[1]
1855
self.thread = threading.Thread(
1856
name='%s (port %d)' % (self.__class__.__name__, self.port),
1857
target=self.accept_and_close)
1860
def accept_and_close(self):
1861
conn, addr = self.sock.accept()
1862
conn.shutdown(socket.SHUT_RDWR)
1866
return 'bzr://127.0.0.1:%d/' % (self.port,)
1868
def stop_server(self):
1870
# make sure the thread dies by connecting to the listening socket,
1871
# just in case the test failed to do so.
1872
conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1873
conn.connect(self.sock.getsockname())
1875
except socket.error:
added
removed
bzrlib/tests/test_bundle.py
