912
780
self.tree1.commit('removed', rev_id='white-4')
914
782
bundle = self.get_valid_bundle('white-3', 'white-4')
916
784
# Now test a complet roll-up
917
bundle = self.get_valid_bundle('null:', 'white-4')
785
bundle = self.get_valid_bundle(None, 'white-4')
919
787
def test_alt_timezone_bundle(self):
920
self.tree1 = self.make_branch_and_memory_tree('b1')
788
self.tree1 = self.make_branch_and_tree('b1')
921
789
self.b1 = self.tree1.branch
922
builder = treebuilder.TreeBuilder()
924
self.tree1.lock_write()
925
builder.start_tree(self.tree1)
926
builder.build(['newfile'])
927
builder.finish_tree()
791
self.build_tree(['b1/newfile'])
792
self.tree1.add(['newfile'])
929
794
# Asia/Colombo offset = 5 hours 30 minutes
930
795
self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
931
796
timezone=19800, timestamp=1152544886.0)
933
bundle = self.get_valid_bundle('null:', 'tz-1')
798
bundle = self.get_valid_bundle(None, 'tz-1')
935
800
rev = bundle.revisions[0]
936
801
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
937
802
self.assertEqual(19800, rev.timezone)
938
803
self.assertEqual(1152544886.0, rev.timestamp)
941
805
def test_bundle_root_id(self):
942
806
self.tree1 = self.make_branch_and_tree('b1')
943
807
self.b1 = self.tree1.branch
944
808
self.tree1.commit('message', rev_id='revid1')
945
bundle = self.get_valid_bundle('null:', 'revid1')
946
tree = self.get_bundle_tree(bundle, 'revid1')
809
bundle = self.get_valid_bundle(None, 'revid1')
810
tree = bundle.revision_tree(self.b1.repository, 'revid1')
947
811
self.assertEqual('revid1', tree.inventory.root.revision)
949
def test_install_revisions(self):
950
self.tree1 = self.make_branch_and_tree('b1')
951
self.b1 = self.tree1.branch
952
self.tree1.commit('message', rev_id='rev2a')
953
bundle = self.get_valid_bundle('null:', 'rev2a')
954
branch2 = self.make_branch('b2')
955
self.assertFalse(branch2.repository.has_revision('rev2a'))
956
target_revision = bundle.install_revisions(branch2.repository)
957
self.assertTrue(branch2.repository.has_revision('rev2a'))
958
self.assertEqual('rev2a', target_revision)
960
def test_bundle_empty_property(self):
961
"""Test serializing revision properties with an empty value."""
962
tree = self.make_branch_and_memory_tree('tree')
964
self.addCleanup(tree.unlock)
965
tree.add([''], ['TREE_ROOT'])
966
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
967
self.b1 = tree.branch
968
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
969
bundle = read_bundle(bundle_sio)
970
revision_info = bundle.revisions[0]
971
self.assertEqual('rev1', revision_info.revision_id)
972
rev = revision_info.as_revision()
973
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
976
def test_bundle_sorted_properties(self):
977
"""For stability the writer should write properties in sorted order."""
978
tree = self.make_branch_and_memory_tree('tree')
980
self.addCleanup(tree.unlock)
982
tree.add([''], ['TREE_ROOT'])
983
tree.commit('One', rev_id='rev1',
984
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
985
self.b1 = tree.branch
986
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
987
bundle = read_bundle(bundle_sio)
988
revision_info = bundle.revisions[0]
989
self.assertEqual('rev1', revision_info.revision_id)
990
rev = revision_info.as_revision()
991
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
992
'd':'1'}, rev.properties)
994
def test_bundle_unicode_properties(self):
995
"""We should be able to round trip a non-ascii property."""
996
tree = self.make_branch_and_memory_tree('tree')
998
self.addCleanup(tree.unlock)
1000
tree.add([''], ['TREE_ROOT'])
1001
# Revisions themselves do not require anything about revision property
1002
# keys, other than that they are a basestring, and do not contain
1004
# However, Testaments assert than they are str(), and thus should not
1006
tree.commit('One', rev_id='rev1',
1007
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1008
self.b1 = tree.branch
1009
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1010
bundle = read_bundle(bundle_sio)
1011
revision_info = bundle.revisions[0]
1012
self.assertEqual('rev1', revision_info.revision_id)
1013
rev = revision_info.as_revision()
1014
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1015
'alpha':u'\u03b1'}, rev.properties)
1017
def test_bundle_with_ghosts(self):
1018
tree = self.make_branch_and_tree('tree')
1019
self.b1 = tree.branch
1020
self.build_tree_contents([('tree/file', 'content1')])
1023
self.build_tree_contents([('tree/file', 'content2')])
1024
tree.add_parent_tree_id('ghost')
1025
tree.commit('rev2', rev_id='rev2')
1026
bundle = self.get_valid_bundle('null:', 'rev2')
1028
def make_simple_tree(self, format=None):
1029
tree = self.make_branch_and_tree('b1', format=format)
1030
self.b1 = tree.branch
1031
self.build_tree(['b1/file'])
1035
def test_across_serializers(self):
1036
tree = self.make_simple_tree('knit')
1037
tree.commit('hello', rev_id='rev1')
1038
tree.commit('hello', rev_id='rev2')
1039
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1040
repo = self.make_repository('repo', format='dirstate-with-subtree')
1041
bundle.install_revisions(repo)
1042
inv_text = repo._get_inventory_xml('rev2')
1043
self.assertNotContainsRe(inv_text, 'format="5"')
1044
self.assertContainsRe(inv_text, 'format="7"')
1046
def make_repo_with_installed_revisions(self):
1047
tree = self.make_simple_tree('knit')
1048
tree.commit('hello', rev_id='rev1')
1049
tree.commit('hello', rev_id='rev2')
1050
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1051
repo = self.make_repository('repo', format='dirstate-with-subtree')
1052
bundle.install_revisions(repo)
1055
def test_across_models(self):
1056
repo = self.make_repo_with_installed_revisions()
1057
inv = repo.get_inventory('rev2')
1058
self.assertEqual('rev2', inv.root.revision)
1059
root_id = inv.root.file_id
1061
self.addCleanup(repo.unlock)
1062
self.assertEqual({(root_id, 'rev1'):(),
1063
(root_id, 'rev2'):((root_id, 'rev1'),)},
1064
repo.texts.get_parent_map([(root_id, 'rev1'), (root_id, 'rev2')]))
1066
def test_inv_hash_across_serializers(self):
1067
repo = self.make_repo_with_installed_revisions()
1068
recorded_inv_sha1 = repo.get_revision('rev2').inventory_sha1
1069
xml = repo._get_inventory_xml('rev2')
1070
self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
1072
def test_across_models_incompatible(self):
1073
tree = self.make_simple_tree('dirstate-with-subtree')
1074
tree.commit('hello', rev_id='rev1')
1075
tree.commit('hello', rev_id='rev2')
1077
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1078
except errors.IncompatibleBundleFormat:
1079
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1080
repo = self.make_repository('repo', format='knit')
1081
bundle.install_revisions(repo)
1083
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1084
self.assertRaises(errors.IncompatibleRevision,
1085
bundle.install_revisions, repo)
1087
def test_get_merge_request(self):
1088
tree = self.make_simple_tree()
1089
tree.commit('hello', rev_id='rev1')
1090
tree.commit('hello', rev_id='rev2')
1091
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1092
result = bundle.get_merge_request(tree.branch.repository)
1093
self.assertEqual((None, 'rev1', 'inapplicable'), result)
1095
def test_with_subtree(self):
1096
tree = self.make_branch_and_tree('tree',
1097
format='dirstate-with-subtree')
1098
self.b1 = tree.branch
1099
subtree = self.make_branch_and_tree('tree/subtree',
1100
format='dirstate-with-subtree')
1102
tree.commit('hello', rev_id='rev1')
1104
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1105
except errors.IncompatibleBundleFormat:
1106
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1107
if isinstance(bundle, v09.BundleInfo09):
1108
raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
1109
repo = self.make_repository('repo', format='knit')
1110
self.assertRaises(errors.IncompatibleRevision,
1111
bundle.install_revisions, repo)
1112
repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1113
bundle.install_revisions(repo2)
1115
def test_revision_id_with_slash(self):
1116
self.tree1 = self.make_branch_and_tree('tree')
1117
self.b1 = self.tree1.branch
1119
self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
1121
raise tests.TestSkipped(
1122
"Repository doesn't support revision ids with slashes")
1123
bundle = self.get_valid_bundle('null:', 'rev/id')
1125
def test_skip_file(self):
1126
"""Make sure we don't accidentally write to the wrong versionedfile"""
1127
self.tree1 = self.make_branch_and_tree('tree')
1128
self.b1 = self.tree1.branch
1129
# rev1 is not present in bundle, done by fetch
1130
self.build_tree_contents([('tree/file2', 'contents1')])
1131
self.tree1.add('file2', 'file2-id')
1132
self.tree1.commit('rev1', rev_id='reva')
1133
self.build_tree_contents([('tree/file3', 'contents2')])
1134
# rev2 is present in bundle, and done by fetch
1135
# having file1 in the bunle causes file1's versionedfile to be opened.
1136
self.tree1.add('file3', 'file3-id')
1137
self.tree1.commit('rev2')
1138
# Updating file2 should not cause an attempt to add to file1's vf
1139
target = self.tree1.bzrdir.sprout('target').open_workingtree()
1140
self.build_tree_contents([('tree/file2', 'contents3')])
1141
self.tree1.commit('rev3', rev_id='rev3')
1142
bundle = self.get_valid_bundle('reva', 'rev3')
1143
if getattr(bundle, 'get_bundle_reader', None) is None:
1144
raise tests.TestSkipped('Bundle format cannot provide reader')
1145
# be sure that file1 comes before file2
1146
for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1149
self.assertNotEqual(f, 'file2-id')
1150
bundle.install_revisions(target.branch.repository)
1153
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
1157
def test_bundle_empty_property(self):
1158
"""Test serializing revision properties with an empty value."""
1159
tree = self.make_branch_and_memory_tree('tree')
1161
self.addCleanup(tree.unlock)
1162
tree.add([''], ['TREE_ROOT'])
1163
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1164
self.b1 = tree.branch
1165
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1166
self.assertContainsRe(bundle_sio.getvalue(),
1168
'# branch-nick: tree\n'
1172
bundle = read_bundle(bundle_sio)
1173
revision_info = bundle.revisions[0]
1174
self.assertEqual('rev1', revision_info.revision_id)
1175
rev = revision_info.as_revision()
1176
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1179
def get_bundle_tree(self, bundle, revision_id):
1180
repository = self.make_repository('repo')
1181
return bundle.revision_tree(repository, 'revid1')
1183
def test_bundle_empty_property_alt(self):
1184
"""Test serializing revision properties with an empty value.
1186
Older readers had a bug when reading an empty property.
1187
They assumed that all keys ended in ': \n'. However they would write an
1188
empty value as ':\n'. This tests make sure that all newer bzr versions
1189
can handle th second form.
1191
tree = self.make_branch_and_memory_tree('tree')
1193
self.addCleanup(tree.unlock)
1194
tree.add([''], ['TREE_ROOT'])
1195
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1196
self.b1 = tree.branch
1197
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1198
txt = bundle_sio.getvalue()
1199
loc = txt.find('# empty: ') + len('# empty:')
1200
# Create a new bundle, which strips the trailing space after empty
1201
bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
1203
self.assertContainsRe(bundle_sio.getvalue(),
1205
'# branch-nick: tree\n'
1209
bundle = read_bundle(bundle_sio)
1210
revision_info = bundle.revisions[0]
1211
self.assertEqual('rev1', revision_info.revision_id)
1212
rev = revision_info.as_revision()
1213
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1216
def test_bundle_sorted_properties(self):
1217
"""For stability the writer should write properties in sorted order."""
1218
tree = self.make_branch_and_memory_tree('tree')
1220
self.addCleanup(tree.unlock)
1222
tree.add([''], ['TREE_ROOT'])
1223
tree.commit('One', rev_id='rev1',
1224
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1225
self.b1 = tree.branch
1226
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1227
self.assertContainsRe(bundle_sio.getvalue(),
1231
'# branch-nick: tree\n'
1235
bundle = read_bundle(bundle_sio)
1236
revision_info = bundle.revisions[0]
1237
self.assertEqual('rev1', revision_info.revision_id)
1238
rev = revision_info.as_revision()
1239
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1240
'd':'1'}, rev.properties)
1242
def test_bundle_unicode_properties(self):
1243
"""We should be able to round trip a non-ascii property."""
1244
tree = self.make_branch_and_memory_tree('tree')
1246
self.addCleanup(tree.unlock)
1248
tree.add([''], ['TREE_ROOT'])
1249
# Revisions themselves do not require anything about revision property
1250
# keys, other than that they are a basestring, and do not contain
1252
# However, Testaments assert than they are str(), and thus should not
1254
tree.commit('One', rev_id='rev1',
1255
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1256
self.b1 = tree.branch
1257
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1258
self.assertContainsRe(bundle_sio.getvalue(),
1260
'# alpha: \xce\xb1\n'
1261
'# branch-nick: tree\n'
1262
'# omega: \xce\xa9\n'
1264
bundle = read_bundle(bundle_sio)
1265
revision_info = bundle.revisions[0]
1266
self.assertEqual('rev1', revision_info.revision_id)
1267
rev = revision_info.as_revision()
1268
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1269
'alpha':u'\u03b1'}, rev.properties)
1272
class V09BundleKnit2Tester(V08BundleTester):
1276
def bzrdir_format(self):
1277
format = bzrdir.BzrDirMetaFormat1()
1278
format.repository_format = knitrepo.RepositoryFormatKnit3()
1282
class V09BundleKnit1Tester(V08BundleTester):
1286
def bzrdir_format(self):
1287
format = bzrdir.BzrDirMetaFormat1()
1288
format.repository_format = knitrepo.RepositoryFormatKnit1()
1292
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
1296
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1297
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1298
Make sure that the text generated is valid, and that it
1299
can be applied against the base, and generate the same information.
1301
:return: The in-memory bundle
1303
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1305
# This should also validate the generated bundle
1306
bundle = read_bundle(bundle_txt)
1307
repository = self.b1.repository
1308
for bundle_rev in bundle.real_revisions:
1309
# These really should have already been checked when we read the
1310
# bundle, since it computes the sha1 hash for the revision, which
1311
# only will match if everything is okay, but lets be explicit about
1313
branch_rev = repository.get_revision(bundle_rev.revision_id)
1314
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1315
'timestamp', 'timezone', 'message', 'committer',
1316
'parent_ids', 'properties'):
1317
self.assertEqual(getattr(branch_rev, a),
1318
getattr(bundle_rev, a))
1319
self.assertEqual(len(branch_rev.parent_ids),
1320
len(bundle_rev.parent_ids))
1321
self.assertEqual(set(rev_ids),
1322
set([r.revision_id for r in bundle.real_revisions]))
1323
self.valid_apply_bundle(base_rev_id, bundle,
1324
checkout_dir=checkout_dir)
1328
def get_invalid_bundle(self, base_rev_id, rev_id):
1329
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1330
Munge the text so that it's invalid.
1332
:return: The in-memory bundle
1334
from bzrlib.bundle import serializer
1335
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1336
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1337
new_text = new_text.replace('<file file_id="exe-1"',
1338
'<file executable="y" file_id="exe-1"')
1339
new_text = new_text.replace('B260', 'B275')
1340
bundle_txt = StringIO()
1341
bundle_txt.write(serializer._get_bundle_header('4'))
1342
bundle_txt.write('\n')
1343
bundle_txt.write(new_text.encode('bz2'))
1345
bundle = read_bundle(bundle_txt)
1346
self.valid_apply_bundle(base_rev_id, bundle)
1349
def create_bundle_text(self, base_rev_id, rev_id):
1350
bundle_txt = StringIO()
1351
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1352
bundle_txt, format=self.format)
1354
self.assertEqual(bundle_txt.readline(),
1355
'# Bazaar revision bundle v%s\n' % self.format)
1356
self.assertEqual(bundle_txt.readline(), '#\n')
1357
rev = self.b1.repository.get_revision(rev_id)
1359
return bundle_txt, rev_ids
1361
def get_bundle_tree(self, bundle, revision_id):
1362
repository = self.make_repository('repo')
1363
bundle.install_revisions(repository)
1364
return repository.revision_tree(revision_id)
1366
def test_creation(self):
1367
tree = self.make_branch_and_tree('tree')
1368
self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
1369
tree.add('file', 'fileid-2')
1370
tree.commit('added file', rev_id='rev1')
1371
self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
1372
tree.commit('changed file', rev_id='rev2')
1374
serializer = BundleSerializerV4('1.0')
1375
serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
1377
tree2 = self.make_branch_and_tree('target')
1378
target_repo = tree2.branch.repository
1379
install_bundle(target_repo, serializer.read(s))
1380
target_repo.lock_read()
1381
self.addCleanup(target_repo.unlock)
1382
# Turn the 'iterators_of_bytes' back into simple strings for comparison
1383
repo_texts = dict((i, ''.join(content)) for i, content
1384
in target_repo.iter_files_bytes(
1385
[('fileid-2', 'rev1', '1'),
1386
('fileid-2', 'rev2', '2')]))
1387
self.assertEqual({'1':'contents1\nstatic\n',
1388
'2':'contents2\nstatic\n'},
1390
rtree = target_repo.revision_tree('rev2')
1391
inventory_vf = target_repo.inventories
1392
# If the inventory store has a graph, it must match the revision graph.
1394
[inventory_vf.get_parent_map([('rev2',)])[('rev2',)]],
1395
[None, (('rev1',),)])
1396
self.assertEqual('changed file',
1397
target_repo.get_revision('rev2').message)
1400
def get_raw(bundle_file):
1402
line = bundle_file.readline()
1403
line = bundle_file.readline()
1404
lines = bundle_file.readlines()
1405
return ''.join(lines).decode('bz2')
1407
def test_copy_signatures(self):
1408
tree_a = self.make_branch_and_tree('tree_a')
1410
import bzrlib.commit as commit
1411
oldstrategy = bzrlib.gpg.GPGStrategy
1412
branch = tree_a.branch
1413
repo_a = branch.repository
1414
tree_a.commit("base", allow_pointless=True, rev_id='A')
1415
self.failIf(branch.repository.has_signature_for_revision_id('A'))
1417
from bzrlib.testament import Testament
1418
# monkey patch gpg signing mechanism
1419
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1420
new_config = test_commit.MustSignConfig(branch)
1421
commit.Commit(config=new_config).commit(message="base",
1422
allow_pointless=True,
1424
working_tree=tree_a)
1426
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1427
self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1429
bzrlib.gpg.GPGStrategy = oldstrategy
1430
tree_b = self.make_branch_and_tree('tree_b')
1431
repo_b = tree_b.branch.repository
1433
serializer = BundleSerializerV4('4')
1434
serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1436
install_bundle(repo_b, serializer.read(s))
1437
self.assertTrue(repo_b.has_signature_for_revision_id('B'))
1438
self.assertEqual(repo_b.get_signature_text('B'),
1439
repo_a.get_signature_text('B'))
1441
# ensure repeat installs are harmless
1442
install_bundle(repo_b, serializer.read(s))
1445
class V4WeaveBundleTester(V4BundleTester):
1447
def bzrdir_format(self):
1451
class V4_2aBundleTester(V4BundleTester):
1453
def bzrdir_format(self):
1456
def get_invalid_bundle(self, base_rev_id, rev_id):
1457
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1458
Munge the text so that it's invalid.
1460
:return: The in-memory bundle
1462
from bzrlib.bundle import serializer
1463
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1464
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1465
# We are going to be replacing some text to set the executable bit on a
1466
# file. Make sure the text replacement actually works correctly.
1467
self.assertContainsRe(new_text, '(?m)B244\n\ni 1\n<inventory')
1468
new_text = new_text.replace('<file file_id="exe-1"',
1469
'<file executable="y" file_id="exe-1"')
1470
new_text = new_text.replace('B244', 'B259')
1471
bundle_txt = StringIO()
1472
bundle_txt.write(serializer._get_bundle_header('4'))
1473
bundle_txt.write('\n')
1474
bundle_txt.write(new_text.encode('bz2'))
1476
bundle = read_bundle(bundle_txt)
1477
self.valid_apply_bundle(base_rev_id, bundle)
1480
def make_merged_branch(self):
1481
builder = self.make_branch_builder('source')
1482
builder.start_series()
1483
builder.build_snapshot('a@cset-0-1', None, [
1484
('add', ('', 'root-id', 'directory', None)),
1485
('add', ('file', 'file-id', 'file', 'original content\n')),
1487
builder.build_snapshot('a@cset-0-2a', ['a@cset-0-1'], [
1488
('modify', ('file-id', 'new-content\n')),
1490
builder.build_snapshot('a@cset-0-2b', ['a@cset-0-1'], [
1491
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1493
builder.build_snapshot('a@cset-0-3', ['a@cset-0-2a', 'a@cset-0-2b'], [
1494
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1496
builder.finish_series()
1497
self.b1 = builder.get_branch()
1499
self.addCleanup(self.b1.unlock)
1501
def make_bundle_just_inventories(self, base_revision_id,
1505
writer = v4.BundleWriteOperation(base_revision_id, target_revision_id,
1506
self.b1.repository, sio)
1507
writer.bundle.begin()
1508
writer._add_inventory_mpdiffs_from_serializer(revision_ids)
1513
def test_single_inventory_multiple_parents_as_xml(self):
1514
self.make_merged_branch()
1515
sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1517
reader = v4.BundleReader(sio, stream_input=False)
1518
records = list(reader.iter_records())
1519
self.assertEqual(1, len(records))
1520
(bytes, metadata, repo_kind, revision_id,
1521
file_id) = records[0]
1522
self.assertIs(None, file_id)
1523
self.assertEqual('a@cset-0-3', revision_id)
1524
self.assertEqual('inventory', repo_kind)
1525
self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1526
'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1527
'storage_kind': 'mpdiff',
1529
# We should have an mpdiff that takes some lines from both parents.
1530
self.assertEqualDiff(
1532
'<inventory format="10" revision_id="a@cset-0-3">\n'
1535
'c 1 3 3 2\n', bytes)
1537
def test_single_inv_no_parents_as_xml(self):
1538
self.make_merged_branch()
1539
sio = self.make_bundle_just_inventories('null:', 'a@cset-0-1',
1541
reader = v4.BundleReader(sio, stream_input=False)
1542
records = list(reader.iter_records())
1543
self.assertEqual(1, len(records))
1544
(bytes, metadata, repo_kind, revision_id,
1545
file_id) = records[0]
1546
self.assertIs(None, file_id)
1547
self.assertEqual('a@cset-0-1', revision_id)
1548
self.assertEqual('inventory', repo_kind)
1549
self.assertEqual({'parents': [],
1550
'sha1': 'a13f42b142d544aac9b085c42595d304150e31a2',
1551
'storage_kind': 'mpdiff',
1553
# We should have an mpdiff that takes some lines from both parents.
1554
self.assertEqualDiff(
1556
'<inventory format="10" revision_id="a@cset-0-1">\n'
1557
'<directory file_id="root-id" name=""'
1558
' revision="a@cset-0-1" />\n'
1559
'<file file_id="file-id" name="file" parent_id="root-id"'
1560
' revision="a@cset-0-1"'
1561
' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
1562
' text_size="17" />\n'
1566
def test_multiple_inventories_as_xml(self):
1567
self.make_merged_branch()
1568
sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1569
['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'])
1570
reader = v4.BundleReader(sio, stream_input=False)
1571
records = list(reader.iter_records())
1572
self.assertEqual(3, len(records))
1573
revision_ids = [rev_id for b, m, k, rev_id, f in records]
1574
self.assertEqual(['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'],
1576
metadata_2a = records[0][1]
1577
self.assertEqual({'parents': ['a@cset-0-1'],
1578
'sha1': '1e105886d62d510763e22885eec733b66f5f09bf',
1579
'storage_kind': 'mpdiff',
1581
metadata_2b = records[1][1]
1582
self.assertEqual({'parents': ['a@cset-0-1'],
1583
'sha1': 'f03f12574bdb5ed2204c28636c98a8547544ccd8',
1584
'storage_kind': 'mpdiff',
1586
metadata_3 = records[2][1]
1587
self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1588
'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1589
'storage_kind': 'mpdiff',
1591
bytes_2a = records[0][0]
1592
self.assertEqualDiff(
1594
'<inventory format="10" revision_id="a@cset-0-2a">\n'
1598
'<file file_id="file-id" name="file" parent_id="root-id"'
1599
' revision="a@cset-0-2a"'
1600
' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
1601
' text_size="12" />\n'
1603
'c 0 3 3 1\n', bytes_2a)
1604
bytes_2b = records[1][0]
1605
self.assertEqualDiff(
1607
'<inventory format="10" revision_id="a@cset-0-2b">\n'
1611
'<file file_id="file2-id" name="other-file" parent_id="root-id"'
1612
' revision="a@cset-0-2b"'
1613
' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
1614
' text_size="14" />\n'
1616
'c 0 3 4 1\n', bytes_2b)
1617
bytes_3 = records[2][0]
1618
self.assertEqualDiff(
1620
'<inventory format="10" revision_id="a@cset-0-3">\n'
1623
'c 1 3 3 2\n', bytes_3)
1625
def test_creating_bundle_preserves_chk_pages(self):
1626
self.make_merged_branch()
1627
target = self.b1.bzrdir.sprout('target',
1628
revision_id='a@cset-0-2a').open_branch()
1629
bundle_txt, rev_ids = self.create_bundle_text('a@cset-0-2a',
1631
self.assertEqual(['a@cset-0-2b', 'a@cset-0-3'], rev_ids)
1632
bundle = read_bundle(bundle_txt)
1634
self.addCleanup(target.unlock)
1635
install_bundle(target.repository, bundle)
1636
inv1 = self.b1.repository.inventories.get_record_stream([
1637
('a@cset-0-3',)], 'unordered',
1638
True).next().get_bytes_as('fulltext')
1639
inv2 = target.repository.inventories.get_record_stream([
1640
('a@cset-0-3',)], 'unordered',
1641
True).next().get_bytes_as('fulltext')
1642
self.assertEqualDiff(inv1, inv2)
1645
class MungedBundleTester(object):
814
class MungedBundleTester(TestCaseWithTransport):
1647
816
def build_test_bundle(self):
1648
817
wt = self.make_branch_and_tree('b1')
1731
895
bundle = read_bundle(bundle_txt)
1732
896
self.check_valid(bundle)
1735
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
1740
class TestBundleWriterReader(tests.TestCase):
1742
def test_roundtrip_record(self):
1743
fileobj = StringIO()
1744
writer = v4.BundleWriter(fileobj)
1746
writer.add_info_record(foo='bar')
1747
writer._add_record("Record body", {'parents': ['1', '3'],
1748
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1751
reader = v4.BundleReader(fileobj, stream_input=True)
1752
record_iter = reader.iter_records()
1753
record = record_iter.next()
1754
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1755
'info', None, None), record)
1756
record = record_iter.next()
1757
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1758
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1761
def test_roundtrip_record_memory_hungry(self):
1762
fileobj = StringIO()
1763
writer = v4.BundleWriter(fileobj)
1765
writer.add_info_record(foo='bar')
1766
writer._add_record("Record body", {'parents': ['1', '3'],
1767
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1770
reader = v4.BundleReader(fileobj, stream_input=False)
1771
record_iter = reader.iter_records()
1772
record = record_iter.next()
1773
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1774
'info', None, None), record)
1775
record = record_iter.next()
1776
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1777
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1780
def test_encode_name(self):
1781
self.assertEqual('revision/rev1',
1782
v4.BundleWriter.encode_name('revision', 'rev1'))
1783
self.assertEqual('file/rev//1/file-id-1',
1784
v4.BundleWriter.encode_name('file', 'rev/1', 'file-id-1'))
1785
self.assertEqual('info',
1786
v4.BundleWriter.encode_name('info', None, None))
1788
def test_decode_name(self):
1789
self.assertEqual(('revision', 'rev1', None),
1790
v4.BundleReader.decode_name('revision/rev1'))
1791
self.assertEqual(('file', 'rev/1', 'file-id-1'),
1792
v4.BundleReader.decode_name('file/rev//1/file-id-1'))
1793
self.assertEqual(('info', None, None),
1794
v4.BundleReader.decode_name('info'))
1796
def test_too_many_names(self):
1797
fileobj = StringIO()
1798
writer = v4.BundleWriter(fileobj)
1800
writer.add_info_record(foo='bar')
1801
writer._container.add_bytes_record('blah', ['two', 'names'])
1804
record_iter = v4.BundleReader(fileobj).iter_records()
1805
record = record_iter.next()
1806
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1807
'info', None, None), record)
1808
self.assertRaises(errors.BadBundle, record_iter.next)
1811
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
1813
def test_read_mergeable_skips_local(self):
1814
"""A local bundle named like the URL should not be read.
1816
out, wt = test_read_bundle.create_bundle_file(self)
1817
class FooService(object):
1818
"""A directory service that always returns source"""
1820
def look_up(self, name, url):
1822
directories.register('foo:', FooService, 'Testing directory service')
1823
self.addCleanup(directories.remove, 'foo:')
1824
self.build_tree_contents([('./foo:bar', out.getvalue())])
1825
self.assertRaises(errors.NotABundle, read_mergeable_from_url,
1828
def test_infinite_redirects_are_not_a_bundle(self):
1829
"""If a URL causes TooManyRedirections then NotABundle is raised.
1831
from bzrlib.tests.blackbox.test_push import RedirectingMemoryServer
1832
server = RedirectingMemoryServer()
1833
self.start_server(server)
1834
url = server.get_url() + 'infinite-loop'
1835
self.assertRaises(errors.NotABundle, read_mergeable_from_url, url)
1837
def test_smart_server_connection_reset(self):
1838
"""If a smart server connection fails during the attempt to read a
1839
bundle, then the ConnectionReset error should be propagated.
1841
# Instantiate a server that will provoke a ConnectionReset
1842
sock_server = _DisconnectingTCPServer()
1843
self.start_server(sock_server)
1844
# We don't really care what the url is since the server will close the
1845
# connection without interpreting it
1846
url = sock_server.get_url()
1847
self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1850
class _DisconnectingTCPServer(object):
1851
"""A TCP server that immediately closes any connection made to it."""
1853
def start_server(self):
1854
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1855
self.sock.bind(('127.0.0.1', 0))
1857
self.port = self.sock.getsockname()[1]
1858
self.thread = threading.Thread(
1859
name='%s (port %d)' % (self.__class__.__name__, self.port),
1860
target=self.accept_and_close)
1863
def accept_and_close(self):
1864
conn, addr = self.sock.accept()
1865
conn.shutdown(socket.SHUT_RDWR)
1869
return 'bzr://127.0.0.1:%d/' % (self.port,)
1871
def stop_server(self):
1873
# make sure the thread dies by connecting to the listening socket,
1874
# just in case the test failed to do so.
1875
conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1876
conn.connect(self.sock.getsockname())
1878
except socket.error:
added
removed
bzrlib/tests/test_bundle.py
