14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from cStringIO import StringIO
21
import SocketServer as socketserver
31
29
revision as _mod_revision,
35
from bzrlib.bundle import read_mergeable_from_url
36
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
37
from bzrlib.bundle.bundle_data import BundleTree
38
from bzrlib.bzrdir import BzrDir
39
from bzrlib.directory_service import directories
40
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
41
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
42
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
43
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
44
from bzrlib.branch import Branch
45
from bzrlib.repofmt import knitrepo
46
from bzrlib.tests import (
37
from ..bundle import read_mergeable_from_url
38
from ..bundle.apply_bundle import install_bundle, merge_bundle
39
from ..bundle.bundle_data import BundleTree
40
from ..directory_service import directories
41
from ..bundle.serializer import write_bundle, read_bundle, v09, v4
42
from ..bundle.serializer.v08 import BundleSerializerV08
43
from ..bundle.serializer.v09 import BundleSerializerV09
44
from ..bundle.serializer.v4 import BundleSerializerV4
45
from ..bzr import knitrepo
46
from ..sixish import (
50
from bzrlib.transform import TreeTransform
55
from ..transform import TreeTransform
53
58
def get_text(vf, key):
54
59
"""Get the fulltext for a given revision id that is present in the vf"""
55
60
stream = vf.get_record_stream([key], 'unordered', True)
56
record = stream.next()
57
62
return record.get_bytes_as('fulltext')
76
82
self.root = InventoryDirectory(ROOT_ID, '', None)
78
84
inventory = property(lambda x:x)
81
return self.paths.iterkeys()
85
root_inventory = property(lambda x:x)
87
def get_root_id(self):
88
return self.root.file_id
90
def all_file_ids(self):
91
return set(self.paths.keys())
93
def all_versioned_paths(self):
94
return set(self.paths.values())
96
def is_executable(self, path, file_id):
97
# Not all the files are executable.
83
100
def __getitem__(self, file_id):
84
101
if file_id == self.root.file_id:
93
110
return self.ids[parent_dir]
95
112
def iter_entries(self):
96
for path, file_id in self.ids.iteritems():
113
for path, file_id in self.ids.items():
97
114
yield path, self[file_id]
99
def get_file_kind(self, file_id):
116
def kind(self, path, file_id=None):
118
file_id = self.path2id(path)
100
119
if file_id in self.contents:
106
125
def make_entry(self, file_id, path):
107
from bzrlib.inventory import (InventoryEntry, InventoryFile
108
, InventoryDirectory, InventoryLink)
126
from ..bzr.inventory import (InventoryFile, InventoryDirectory,
109
128
name = os.path.basename(path)
110
kind = self.get_file_kind(file_id)
129
kind = self.kind(path, file_id)
111
130
parent_id = self.parent_id(file_id)
112
text_sha_1, text_size = self.contents_stats(file_id)
131
text_sha_1, text_size = self.contents_stats(path, file_id)
113
132
if kind == 'directory':
114
133
ie = InventoryDirectory(file_id, name, parent_id)
115
134
elif kind == 'file':
116
135
ie = InventoryFile(file_id, name, parent_id)
136
ie.text_sha1 = text_sha_1
137
ie.text_size = text_size
117
138
elif kind == 'symlink':
118
139
ie = InventoryLink(file_id, name, parent_id)
120
141
raise errors.BzrError('unknown kind %r' % kind)
121
ie.text_sha1 = text_sha_1
122
ie.text_size = text_size
125
144
def add_dir(self, file_id, path):
139
158
def has_id(self, file_id):
140
159
return self.id2path(file_id) is not None
142
def get_file(self, file_id):
144
result.write(self.contents[file_id])
161
def get_file(self, path, file_id=None):
163
file_id = self.path2id(path)
166
result.write(self.contents[file_id])
168
raise errors.NoSuchFile(path)
148
def contents_stats(self, file_id):
172
def get_file_revision(self, path, file_id=None):
174
file_id = self.path2id(path)
175
return self.inventory[file_id].revision
177
def get_file_size(self, path, file_id=None):
179
file_id = self.path2id(path)
180
return self.inventory[file_id].text_size
182
def get_file_sha1(self, path, file_id=None):
184
file_id = self.path2id(path)
185
return self.inventory[file_id].text_sha1
187
def contents_stats(self, path, file_id):
149
188
if file_id not in self.contents:
150
189
return None, None
151
text_sha1 = osutils.sha_file(self.get_file(file_id))
190
text_sha1 = osutils.sha_file(self.get_file(path, file_id))
152
191
return text_sha1, len(self.contents[file_id])
180
219
self.assertEqual(btree.path2id("grandparent/parent"), "b")
181
220
self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
183
self.assertTrue(btree.path2id("grandparent2") is None)
184
self.assertTrue(btree.path2id("grandparent2/parent") is None)
185
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
222
self.assertIs(btree.path2id("grandparent2"), None)
223
self.assertIs(btree.path2id("grandparent2/parent"), None)
224
self.assertIs(btree.path2id("grandparent2/parent/file"), None)
187
226
btree.note_rename("grandparent", "grandparent2")
188
self.assertTrue(btree.old_path("grandparent") is None)
189
self.assertTrue(btree.old_path("grandparent/parent") is None)
190
self.assertTrue(btree.old_path("grandparent/parent/file") is None)
227
self.assertIs(btree.old_path("grandparent"), None)
228
self.assertIs(btree.old_path("grandparent/parent"), None)
229
self.assertIs(btree.old_path("grandparent/parent/file"), None)
192
231
self.assertEqual(btree.id2path("a"), "grandparent2")
193
232
self.assertEqual(btree.id2path("b"), "grandparent2/parent")
235
274
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
237
276
def unified_diff(self, old, new):
239
278
diff.internal_diff("old", old, "new", new, out)
241
280
return out.read()
243
282
def make_tree_2(self):
261
300
def adds_test(self, btree):
262
301
self.assertEqual(btree.id2path("e"), "grandparent/parent/file")
263
302
self.assertEqual(btree.path2id("grandparent/parent/file"), "e")
264
self.assertEqual(btree.get_file("e").read(), "Extra cheese\n")
265
self.assertEqual(btree.get_symlink_target('f'), 'venus')
303
self.assertEqual(btree.get_file("grandparent/parent/file").read(),
306
btree.get_symlink_target('grandparent/parent/symlink'), 'venus')
267
308
def test_adds2(self):
268
309
"""File/inventory adds, with patch-compatibile renames"""
286
327
def get_file_test(self, btree):
287
self.assertEqual(btree.get_file("e").read(), "Lemon\n")
288
self.assertEqual(btree.get_file("c").read(), "Hello\n")
328
self.assertEqual(btree.get_file(btree.id2path("e")).read(), "Lemon\n")
329
self.assertEqual(btree.get_file(btree.id2path("c")).read(), "Hello\n")
290
331
def test_get_file(self):
291
332
"""Get file contents"""
295
336
self.get_file_test(btree)
297
338
def test_get_file2(self):
298
"""Get file contents, with patch-compatibile renames"""
339
"""Get file contents, with patch-compatible renames"""
299
340
btree = self.make_tree_3()
300
341
btree.contents_by_id = False
301
342
mod_patch = self.unified_diff([], ["Lemon\n"])
307
348
def test_delete(self):
308
349
"Deletion by bundle"
309
350
btree = self.make_tree_1()[0]
310
self.assertEqual(btree.get_file("c").read(), "Hello\n")
351
self.assertEqual(btree.get_file(btree.id2path("c")).read(), "Hello\n")
311
352
btree.note_deletion("grandparent/parent/file")
312
353
self.assertTrue(btree.id2path("c") is None)
313
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
354
self.assertFalse(btree.is_versioned("grandparent/parent/file"))
315
356
def sorted_ids(self, tree):
357
ids = sorted(tree.all_file_ids())
320
360
def test_iteration(self):
338
378
serializer = BundleSerializerV08('0.8')
339
379
b = self.make_branch('.', format=format)
340
380
self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
341
b.repository, [], {}, StringIO())
381
b.repository, [], {}, BytesIO())
343
383
def test_matched_bundle(self):
344
384
"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
346
386
format.repository_format = knitrepo.RepositoryFormatKnit3()
347
387
serializer = BundleSerializerV09('0.9')
348
388
b = self.make_branch('.', format=format)
349
serializer.write(b.repository, [], {}, StringIO())
389
serializer.write(b.repository, [], {}, BytesIO())
351
391
def test_mismatched_model(self):
352
392
"""Try copying a bundle from knit2 to knit1"""
355
395
source = self.make_branch_and_tree('source', format=format)
356
396
source.commit('one', rev_id='one-id')
357
397
source.commit('two', rev_id='two-id')
359
399
write_bundle(source.branch.repository, 'two-id', 'null:', text,
386
426
return tests.TestCaseWithTransport.make_branch(self, path, format)
388
428
def create_bundle_text(self, base_rev_id, rev_id):
389
bundle_txt = StringIO()
429
bundle_txt = BytesIO()
390
430
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
391
431
bundle_txt, format=self.format)
392
432
bundle_txt.seek(0)
441
481
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
442
482
new_text = bundle_txt.getvalue().replace('executable:no',
443
483
'executable:yes')
444
bundle_txt = StringIO(new_text)
484
bundle_txt = BytesIO(new_text)
445
485
bundle = read_bundle(bundle_txt)
446
486
self.valid_apply_bundle(base_rev_id, bundle)
449
489
def test_non_bundle(self):
450
490
self.assertRaises(errors.NotABundle,
451
read_bundle, StringIO('#!/bin/sh\n'))
491
read_bundle, BytesIO(b'#!/bin/sh\n'))
453
493
def test_malformed(self):
454
494
self.assertRaises(errors.BadBundle, read_bundle,
455
StringIO('# Bazaar revision bundle v'))
495
BytesIO(b'# Bazaar revision bundle v'))
457
497
def test_crlf_bundle(self):
459
read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
499
read_bundle(BytesIO(b'# Bazaar revision bundle v0.8\r\n'))
460
500
except errors.BadBundle:
461
501
# It is currently permitted for bundles with crlf line endings to
462
502
# make read_bundle raise a BadBundle, but this should be fixed.
494
534
# Now check that the file contents are all correct
495
for inventory_id in old:
535
for path in old.all_versioned_paths():
497
old_file = old.get_file(inventory_id)
537
old_file = old.get_file(path)
498
538
except errors.NoSuchFile:
502
self.assertEqual(old_file.read(),
503
new.get_file(inventory_id).read())
541
old_file.read(), new.get_file(path).read())
507
545
if not _mod_revision.is_null(rev_id):
508
rh = self.b1.revision_history()
509
tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
546
tree.branch.generate_revision_history(rev_id)
511
548
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
512
549
self.assertFalse(delta.has_changed(),
530
567
original_parents = to_tree.get_parent_ids()
531
568
self.assertIs(repository.has_revision(base_rev_id), True)
532
569
for rev in info.real_revisions:
533
self.assert_(not repository.has_revision(rev.revision_id),
534
'Revision {%s} present before applying bundle'
570
self.assertTrue(not repository.has_revision(rev.revision_id),
571
'Revision {%s} present before applying bundle'
536
573
merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
538
575
for rev in info.real_revisions:
539
self.assert_(repository.has_revision(rev.revision_id),
540
'Missing revision {%s} after applying bundle'
576
self.assertTrue(repository.has_revision(rev.revision_id),
577
'Missing revision {%s} after applying bundle'
543
self.assert_(to_tree.branch.repository.has_revision(info.target))
580
self.assertTrue(to_tree.branch.repository.has_revision(info.target))
544
581
# Do we also want to verify that all the texts have been added?
546
583
self.assertEqual(original_parents + [info.target],
547
to_tree.get_parent_ids())
584
to_tree.get_parent_ids())
549
586
rev = info.real_revisions[-1]
550
587
base_tree = self.b1.repository.revision_tree(rev.revision_id)
562
599
for path, status, kind, fileid, entry in base_files:
563
600
# Check that the meta information is the same
564
self.assertEqual(base_tree.get_file_size(fileid),
565
to_tree.get_file_size(fileid))
566
self.assertEqual(base_tree.get_file_sha1(fileid),
567
to_tree.get_file_sha1(fileid))
601
self.assertEqual(base_tree.get_file_size(path, fileid),
602
to_tree.get_file_size(to_tree.id2path(fileid)))
603
self.assertEqual(base_tree.get_file_sha1(path, fileid),
604
to_tree.get_file_sha1(to_tree.id2path(fileid)))
568
605
# Check that the contents are the same
569
606
# This is pretty expensive
570
607
# self.assertEqual(base_tree.get_file(fileid).read(),
648
685
bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
651
open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
652
open('b1/sub/dir/ pre space', 'ab').write(
688
with open('b1/sub/dir/WithCaps.txt', 'ab') as f: f.write('\nAdding some text\n')
689
with open('b1/sub/dir/ pre space', 'ab') as f: f.write(
653
690
'\r\nAdding some\r\nDOS format lines\r\n')
654
open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
691
with open('b1/sub/dir/nolastnewline.txt', 'ab') as f: f.write('\n')
655
692
self.tree1.rename_one('sub/dir/ pre space',
656
693
'sub/ start space')
657
694
self.tree1.commit('Modified files', rev_id='a@cset-0-5')
679
716
def _test_symlink_bundle(self, link_name, link_target, new_link_target):
680
717
link_id = 'link-1'
682
self.requireFeature(tests.SymlinkFeature)
719
self.requireFeature(features.SymlinkFeature)
683
720
self.tree1 = self.make_branch_and_tree('b1')
684
721
self.b1 = self.tree1.branch
689
726
self.tree1.commit('add symlink', rev_id='l@cset-0-1')
690
727
bundle = self.get_valid_bundle('null:', 'l@cset-0-1')
691
if getattr(bundle ,'revision_tree', None) is not None:
728
if getattr(bundle, 'revision_tree', None) is not None:
692
729
# Not all bundle formats supports revision_tree
693
730
bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-1')
694
self.assertEqual(link_target, bund_tree.get_symlink_target(link_id))
731
self.assertEqual(link_target, bund_tree.get_symlink_target(link_name))
696
733
tt = TreeTransform(self.tree1)
697
734
trans_id = tt.trans_id_tree_file_id(link_id)
702
739
self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
703
740
bundle = self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
704
if getattr(bundle ,'revision_tree', None) is not None:
741
if getattr(bundle, 'revision_tree', None) is not None:
705
742
# Not all bundle formats supports revision_tree
706
743
bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-2')
707
744
self.assertEqual(new_link_target,
708
bund_tree.get_symlink_target(link_id))
745
bund_tree.get_symlink_target('link2'))
710
747
tt = TreeTransform(self.tree1)
711
748
trans_id = tt.trans_id_tree_file_id(link_id)
726
763
self._test_symlink_bundle('link', 'bar/foo', 'mars')
728
765
def test_unicode_symlink_bundle(self):
729
self.requireFeature(tests.UnicodeFilenameFeature)
766
self.requireFeature(features.UnicodeFilenameFeature)
730
767
self._test_symlink_bundle(u'\N{Euro Sign}link',
731
768
u'bar/\N{Euro Sign}foo',
732
769
u'mars\N{Euro Sign}')
806
843
self.tree1 = self.make_branch_and_tree('b1')
807
844
self.b1 = self.tree1.branch
809
open('b1/one', 'wb').write('one\n')
846
with open('b1/one', 'wb') as f: f.write('one\n')
810
847
self.tree1.add('one')
811
848
self.tree1.commit('add file', rev_id='a@cset-0-1')
812
open('b1/one', 'wb').write('two\n')
849
with open('b1/one', 'wb') as f: f.write('two\n')
813
850
self.tree1.commit('modify', rev_id='a@cset-0-2')
814
open('b1/one', 'wb').write('three\n')
851
with open('b1/one', 'wb') as f: f.write('three\n')
815
852
self.tree1.commit('modify', rev_id='a@cset-0-3')
816
bundle_file = StringIO()
853
bundle_file = BytesIO()
817
854
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
818
855
'a@cset-0-1', bundle_file, format=self.format)
819
856
self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
824
861
"""Ensure using the basis as the target doesn't cause an error"""
825
862
self.tree1 = self.make_branch_and_tree('b1')
826
863
self.tree1.commit('add file', rev_id='a@cset-0-1')
827
bundle_file = StringIO()
864
bundle_file = BytesIO()
828
865
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
829
866
'a@cset-0-1', bundle_file)
833
870
return bundle_file.getvalue()
835
872
def test_unicode_bundle(self):
836
self.requireFeature(tests.UnicodeFilenameFeature)
873
self.requireFeature(features.UnicodeFilenameFeature)
837
874
# Handle international characters
839
876
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
896
933
bundle = self.get_valid_bundle('null:', 'white-1')
899
open('b1/trailing space ', 'ab').write('add some text\n')
936
with open('b1/trailing space ', 'ab') as f: f.write('add some text\n')
900
937
self.tree1.commit('add text', rev_id='white-2')
902
939
bundle = self.get_valid_bundle('white-1', 'white-2')
944
981
self.tree1.commit('message', rev_id='revid1')
945
982
bundle = self.get_valid_bundle('null:', 'revid1')
946
983
tree = self.get_bundle_tree(bundle, 'revid1')
947
self.assertEqual('revid1', tree.inventory.root.revision)
984
root_revision = tree.get_file_revision(u'', tree.get_root_id())
985
self.assertEqual('revid1', root_revision)
949
987
def test_install_revisions(self):
950
988
self.tree1 = self.make_branch_and_tree('b1')
1136
1174
self.tree1.add('file3', 'file3-id')
1137
1175
self.tree1.commit('rev2')
1138
1176
# Updating file2 should not cause an attempt to add to file1's vf
1139
target = self.tree1.bzrdir.sprout('target').open_workingtree()
1177
target = self.tree1.controldir.sprout('target').open_workingtree()
1140
1178
self.build_tree_contents([('tree/file2', 'contents3')])
1141
1179
self.tree1.commit('rev3', rev_id='rev3')
1142
1180
bundle = self.get_valid_bundle('reva', 'rev3')
1198
1236
txt = bundle_sio.getvalue()
1199
1237
loc = txt.find('# empty: ') + len('# empty:')
1200
1238
# Create a new bundle, which strips the trailing space after empty
1201
bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
1239
bundle_sio = BytesIO(txt[:loc] + txt[loc+1:])
1203
1241
self.assertContainsRe(bundle_sio.getvalue(),
1204
1242
'# properties:\n'
1319
1357
self.assertEqual(len(branch_rev.parent_ids),
1320
1358
len(bundle_rev.parent_ids))
1321
1359
self.assertEqual(set(rev_ids),
1322
set([r.revision_id for r in bundle.real_revisions]))
1360
{r.revision_id for r in bundle.real_revisions})
1323
1361
self.valid_apply_bundle(base_rev_id, bundle,
1324
1362
checkout_dir=checkout_dir)
1332
1370
:return: The in-memory bundle
1334
from bzrlib.bundle import serializer
1372
from ..bundle import serializer
1335
1373
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1336
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1374
new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1337
1375
new_text = new_text.replace('<file file_id="exe-1"',
1338
1376
'<file executable="y" file_id="exe-1"')
1339
1377
new_text = new_text.replace('B260', 'B275')
1340
bundle_txt = StringIO()
1378
bundle_txt = BytesIO()
1341
1379
bundle_txt.write(serializer._get_bundle_header('4'))
1342
1380
bundle_txt.write('\n')
1343
1381
bundle_txt.write(new_text.encode('bz2'))
1349
1387
def create_bundle_text(self, base_rev_id, rev_id):
1350
bundle_txt = StringIO()
1388
bundle_txt = BytesIO()
1351
1389
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1352
1390
bundle_txt, format=self.format)
1353
1391
bundle_txt.seek(0)
1370
1408
tree.commit('added file', rev_id='rev1')
1371
1409
self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
1372
1410
tree.commit('changed file', rev_id='rev2')
1374
1412
serializer = BundleSerializerV4('1.0')
1375
1413
serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
1407
1445
def test_copy_signatures(self):
1408
1446
tree_a = self.make_branch_and_tree('tree_a')
1410
import bzrlib.commit as commit
1411
oldstrategy = bzrlib.gpg.GPGStrategy
1448
import breezy.commit as commit
1449
oldstrategy = breezy.gpg.GPGStrategy
1412
1450
branch = tree_a.branch
1413
1451
repo_a = branch.repository
1414
1452
tree_a.commit("base", allow_pointless=True, rev_id='A')
1415
self.failIf(branch.repository.has_signature_for_revision_id('A'))
1453
self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
1417
from bzrlib.testament import Testament
1455
from ..testament import Testament
1418
1456
# 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",
1457
breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
1458
new_config = test_commit.MustSignConfig()
1459
commit.Commit(config_stack=new_config).commit(message="base",
1422
1460
allow_pointless=True,
1424
1462
working_tree=tree_a)
1425
1463
def sign(text):
1426
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1464
return breezy.gpg.LoopbackGPGStrategy(None).sign(text)
1427
1465
self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1429
bzrlib.gpg.GPGStrategy = oldstrategy
1467
breezy.gpg.GPGStrategy = oldstrategy
1430
1468
tree_b = self.make_branch_and_tree('tree_b')
1431
1469
repo_b = tree_b.branch.repository
1433
1471
serializer = BundleSerializerV4('4')
1434
1472
serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1460
1492
:return: The in-memory bundle
1462
from bzrlib.bundle import serializer
1494
from ..bundle import serializer
1463
1495
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1464
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1496
new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1465
1497
# We are going to be replacing some text to set the executable bit on a
1466
1498
# file. Make sure the text replacement actually works correctly.
1467
1499
self.assertContainsRe(new_text, '(?m)B244\n\ni 1\n<inventory')
1468
1500
new_text = new_text.replace('<file file_id="exe-1"',
1469
1501
'<file executable="y" file_id="exe-1"')
1470
1502
new_text = new_text.replace('B244', 'B259')
1471
bundle_txt = StringIO()
1503
bundle_txt = BytesIO()
1472
1504
bundle_txt.write(serializer._get_bundle_header('4'))
1473
1505
bundle_txt.write('\n')
1474
1506
bundle_txt.write(new_text.encode('bz2'))
1480
1512
def make_merged_branch(self):
1481
1513
builder = self.make_branch_builder('source')
1482
1514
builder.start_series()
1483
builder.build_snapshot('a@cset-0-1', None, [
1515
builder.build_snapshot(None, [
1484
1516
('add', ('', 'root-id', 'directory', None)),
1485
1517
('add', ('file', 'file-id', 'file', 'original content\n')),
1487
builder.build_snapshot('a@cset-0-2a', ['a@cset-0-1'], [
1518
], revision_id='a@cset-0-1')
1519
builder.build_snapshot(['a@cset-0-1'], [
1488
1520
('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')),
1521
], revision_id='a@cset-0-2a')
1522
builder.build_snapshot(['a@cset-0-1'], [
1523
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1524
], revision_id='a@cset-0-2b')
1525
builder.build_snapshot(['a@cset-0-2a', 'a@cset-0-2b'], [
1526
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1527
], revision_id='a@cset-0-3')
1496
1528
builder.finish_series()
1497
1529
self.b1 = builder.get_branch()
1498
1530
self.b1.lock_read()
1625
1657
def test_creating_bundle_preserves_chk_pages(self):
1626
1658
self.make_merged_branch()
1627
target = self.b1.bzrdir.sprout('target',
1659
target = self.b1.controldir.sprout('target',
1628
1660
revision_id='a@cset-0-2a').open_branch()
1629
1661
bundle_txt, rev_ids = self.create_bundle_text('a@cset-0-2a',
1655
1687
wt.commit('add two', rev_id='a@cset-0-2',
1656
1688
revprops={'branch-nick':'test'})
1658
bundle_txt = StringIO()
1690
bundle_txt = BytesIO()
1659
1691
rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
1660
1692
'a@cset-0-1', bundle_txt, self.format)
1661
self.assertEqual(set(['a@cset-0-2']), set(rev_ids))
1693
self.assertEqual({'a@cset-0-2'}, set(rev_ids))
1662
1694
bundle_txt.seek(0, 0)
1663
1695
return bundle_txt
1708
1740
# creates a blank line at the end, and fails if that
1709
1741
# line is stripped
1710
1742
self.assertEqual('\n\n', raw[-2:])
1711
bundle_txt = StringIO(raw[:-1])
1743
bundle_txt = BytesIO(raw[:-1])
1713
1745
bundle = read_bundle(bundle_txt)
1714
1746
self.check_valid(bundle)
1725
1757
def test_trailing_text(self):
1726
1758
bundle_txt = self.build_test_bundle()
1728
bundle_txt = StringIO(bundle_txt.getvalue() +
1729
"Some trailing\nrandom\ntext\n")
1760
bundle_txt = BytesIO(
1761
bundle_txt.getvalue() + b"Some trailing\nrandom\ntext\n")
1731
1763
bundle = read_bundle(bundle_txt)
1732
1764
self.check_valid(bundle)
1750
1782
fileobj.seek(0)
1751
1783
reader = v4.BundleReader(fileobj, stream_input=True)
1752
1784
record_iter = reader.iter_records()
1753
record = record_iter.next()
1785
record = next(record_iter)
1754
1786
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1755
1787
'info', None, None), record)
1756
record = record_iter.next()
1788
record = next(record_iter)
1757
1789
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1758
1790
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1761
1793
def test_roundtrip_record_memory_hungry(self):
1762
fileobj = StringIO()
1763
1795
writer = v4.BundleWriter(fileobj)
1765
1797
writer.add_info_record(foo='bar')
1769
1801
fileobj.seek(0)
1770
1802
reader = v4.BundleReader(fileobj, stream_input=False)
1771
1803
record_iter = reader.iter_records()
1772
record = record_iter.next()
1804
record = next(record_iter)
1773
1805
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1774
1806
'info', None, None), record)
1775
record = record_iter.next()
1807
record = next(record_iter)
1776
1808
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1777
1809
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1803
1835
fileobj.seek(0)
1804
1836
record_iter = v4.BundleReader(fileobj).iter_records()
1805
record = record_iter.next()
1837
record = next(record_iter)
1806
1838
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1807
1839
'info', None, None), record)
1808
self.assertRaises(errors.BadBundle, record_iter.next)
1840
self.assertRaises(errors.BadBundle, next, record_iter)
1811
1843
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
1828
1860
def test_infinite_redirects_are_not_a_bundle(self):
1829
1861
"""If a URL causes TooManyRedirections then NotABundle is raised.
1831
from bzrlib.tests.blackbox.test_push import RedirectingMemoryServer
1863
from .blackbox.test_push import RedirectingMemoryServer
1832
1864
server = RedirectingMemoryServer()
1833
1865
self.start_server(server)
1834
1866
url = server.get_url() + 'infinite-loop'
1839
1871
bundle, then the ConnectionReset error should be propagated.
1841
1873
# Instantiate a server that will provoke a ConnectionReset
1842
sock_server = _DisconnectingTCPServer()
1874
sock_server = DisconnectingServer()
1843
1875
self.start_server(sock_server)
1844
1876
# We don't really care what the url is since the server will close the
1845
1877
# connection without interpreting it
1847
1879
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)
1882
class DisconnectingHandler(socketserver.BaseRequestHandler):
1883
"""A request handler that immediately closes any connection made to it."""
1886
self.request.close()
1889
class DisconnectingServer(test_server.TestingTCPServerInAThread):
1892
super(DisconnectingServer, self).__init__(
1894
test_server.TestingTCPServer,
1895
DisconnectingHandler)
1868
1897
def get_url(self):
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:
1898
"""Return the url of the server"""
1899
return "bzr://%s:%d/" % self.server.server_address
added
removed
breezy/tests/test_bundle.py
