1
# Copyright (C) 2005-2013, 2016 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
from io import BytesIO
27
revision as _mod_revision,
35
from ..bundle.apply_bundle import install_bundle, merge_bundle
36
from ..bundle.bundle_data import BundleTree
37
from ..bundle.serializer import write_bundle, read_bundle, v09, v4
38
from ..bundle.serializer.v08 import BundleSerializerV08
39
from ..bundle.serializer.v09 import BundleSerializerV09
40
from ..bundle.serializer.v4 import BundleSerializerV4
41
from ..bzr import knitrepo
46
from ..transform import TreeTransform
47
from ..tree import find_previous_path
50
def get_text(vf, key):
51
"""Get the fulltext for a given revision id that is present in the vf"""
52
stream = vf.get_record_stream([key], 'unordered', True)
54
return record.get_bytes_as('fulltext')
57
def get_inventory_text(repo, revision_id):
58
"""Get the fulltext for the inventory at revision id"""
59
with repo.lock_read():
60
return get_text(repo.inventories, (revision_id,))
63
class MockTree(object):
66
from ..bzr.inventory import InventoryDirectory, ROOT_ID
68
self.paths = {ROOT_ID: ""}
69
self.ids = {"": ROOT_ID}
71
self.root = InventoryDirectory(ROOT_ID, '', None)
73
inventory = property(lambda x: x)
74
root_inventory = property(lambda x: x)
76
def get_root_id(self):
77
return self.root.file_id
79
def all_file_ids(self):
80
return set(self.paths.keys())
82
def all_versioned_paths(self):
83
return set(self.paths.values())
85
def is_executable(self, path):
86
# Not all the files are executable.
89
def __getitem__(self, file_id):
90
if file_id == self.root.file_id:
93
return self.make_entry(file_id, self.paths[file_id])
95
def get_entry_by_path(self, path):
96
return self[self.path2id(path)]
98
def parent_id(self, file_id):
99
parent_dir = os.path.dirname(self.paths[file_id])
102
return self.ids[parent_dir]
104
def iter_entries(self):
105
for path, file_id in self.ids.items():
106
yield path, self[file_id]
108
def kind(self, path):
109
if path in self.contents:
115
def make_entry(self, file_id, path):
116
from ..bzr.inventory import (InventoryFile, InventoryDirectory,
118
if not isinstance(file_id, bytes):
119
raise TypeError(file_id)
120
name = os.path.basename(path)
121
kind = self.kind(path)
122
parent_id = self.parent_id(file_id)
123
text_sha_1, text_size = self.contents_stats(path)
124
if kind == 'directory':
125
ie = InventoryDirectory(file_id, name, parent_id)
127
ie = InventoryFile(file_id, name, parent_id)
128
ie.text_sha1 = text_sha_1
129
ie.text_size = text_size
130
elif kind == 'symlink':
131
ie = InventoryLink(file_id, name, parent_id)
133
raise errors.BzrError('unknown kind %r' % kind)
136
def add_dir(self, file_id, path):
137
if not isinstance(file_id, bytes):
138
raise TypeError(file_id)
139
self.paths[file_id] = path
140
self.ids[path] = file_id
142
def add_file(self, file_id, path, contents):
143
if not isinstance(file_id, bytes):
144
raise TypeError(file_id)
145
self.add_dir(file_id, path)
146
self.contents[path] = contents
148
def path2id(self, path):
149
return self.ids.get(path)
151
def id2path(self, file_id):
152
return self.paths.get(file_id)
154
def has_id(self, file_id):
155
return self.id2path(file_id) is not None
157
def get_file(self, path):
160
result.write(self.contents[path])
162
raise errors.NoSuchFile(path)
166
def get_file_revision(self, path):
167
return self.inventory.get_entry_by_path(path).revision
169
def get_file_size(self, path):
170
return self.inventory.get_entry_by_path(path).text_size
172
def get_file_sha1(self, path, file_id=None):
173
return self.inventory.get_entry_by_path(path).text_sha1
175
def contents_stats(self, path):
176
if path not in self.contents:
178
text_sha1 = osutils.sha_file(self.get_file(path))
179
return text_sha1, len(self.contents[path])
182
class BTreeTester(tests.TestCase):
183
"""A simple unittest tester for the BundleTree class."""
185
def make_tree_1(self):
187
mtree.add_dir(b"a", "grandparent")
188
mtree.add_dir(b"b", "grandparent/parent")
189
mtree.add_file(b"c", "grandparent/parent/file", b"Hello\n")
190
mtree.add_dir(b"d", "grandparent/alt_parent")
191
return BundleTree(mtree, b''), mtree
193
def test_renames(self):
194
"""Ensure that file renames have the proper effect on children"""
195
btree = self.make_tree_1()[0]
196
self.assertEqual(btree.old_path("grandparent"), "grandparent")
197
self.assertEqual(btree.old_path("grandparent/parent"),
198
"grandparent/parent")
199
self.assertEqual(btree.old_path("grandparent/parent/file"),
200
"grandparent/parent/file")
202
self.assertEqual(btree.id2path(b"a"), "grandparent")
203
self.assertEqual(btree.id2path(b"b"), "grandparent/parent")
204
self.assertEqual(btree.id2path(b"c"), "grandparent/parent/file")
206
self.assertEqual(btree.path2id("grandparent"), b"a")
207
self.assertEqual(btree.path2id("grandparent/parent"), b"b")
208
self.assertEqual(btree.path2id("grandparent/parent/file"), b"c")
210
self.assertIs(btree.path2id("grandparent2"), None)
211
self.assertIs(btree.path2id("grandparent2/parent"), None)
212
self.assertIs(btree.path2id("grandparent2/parent/file"), None)
214
btree.note_rename("grandparent", "grandparent2")
215
self.assertIs(btree.old_path("grandparent"), None)
216
self.assertIs(btree.old_path("grandparent/parent"), None)
217
self.assertIs(btree.old_path("grandparent/parent/file"), None)
219
self.assertEqual(btree.id2path(b"a"), "grandparent2")
220
self.assertEqual(btree.id2path(b"b"), "grandparent2/parent")
221
self.assertEqual(btree.id2path(b"c"), "grandparent2/parent/file")
223
self.assertEqual(btree.path2id("grandparent2"), b"a")
224
self.assertEqual(btree.path2id("grandparent2/parent"), b"b")
225
self.assertEqual(btree.path2id("grandparent2/parent/file"), b"c")
227
self.assertTrue(btree.path2id("grandparent") is None)
228
self.assertTrue(btree.path2id("grandparent/parent") is None)
229
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
231
btree.note_rename("grandparent/parent", "grandparent2/parent2")
232
self.assertEqual(btree.id2path(b"a"), "grandparent2")
233
self.assertEqual(btree.id2path(b"b"), "grandparent2/parent2")
234
self.assertEqual(btree.id2path(b"c"), "grandparent2/parent2/file")
236
self.assertEqual(btree.path2id("grandparent2"), b"a")
237
self.assertEqual(btree.path2id("grandparent2/parent2"), b"b")
238
self.assertEqual(btree.path2id("grandparent2/parent2/file"), b"c")
240
self.assertTrue(btree.path2id("grandparent2/parent") is None)
241
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
243
btree.note_rename("grandparent/parent/file",
244
"grandparent2/parent2/file2")
245
self.assertEqual(btree.id2path(b"a"), "grandparent2")
246
self.assertEqual(btree.id2path(b"b"), "grandparent2/parent2")
247
self.assertEqual(btree.id2path(b"c"), "grandparent2/parent2/file2")
249
self.assertEqual(btree.path2id("grandparent2"), b"a")
250
self.assertEqual(btree.path2id("grandparent2/parent2"), b"b")
251
self.assertEqual(btree.path2id("grandparent2/parent2/file2"), b"c")
253
self.assertTrue(btree.path2id("grandparent2/parent2/file") is None)
255
def test_moves(self):
256
"""Ensure that file moves have the proper effect on children"""
257
btree = self.make_tree_1()[0]
258
btree.note_rename("grandparent/parent/file",
259
"grandparent/alt_parent/file")
260
self.assertEqual(btree.id2path(b"c"), "grandparent/alt_parent/file")
261
self.assertEqual(btree.path2id("grandparent/alt_parent/file"), b"c")
262
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
264
def unified_diff(self, old, new):
266
diff.internal_diff("old", old, "new", new, out)
270
def make_tree_2(self):
271
btree = self.make_tree_1()[0]
272
btree.note_rename("grandparent/parent/file",
273
"grandparent/alt_parent/file")
274
self.assertTrue(btree.id2path(b"e") is None)
275
self.assertFalse(btree.is_versioned("grandparent/parent/file"))
276
btree.note_id(b"e", "grandparent/parent/file")
280
"""File/inventory adds"""
281
btree = self.make_tree_2()
282
add_patch = self.unified_diff([], [b"Extra cheese\n"])
283
btree.note_patch("grandparent/parent/file", add_patch)
284
btree.note_id(b'f', 'grandparent/parent/symlink', kind='symlink')
285
btree.note_target('grandparent/parent/symlink', 'venus')
286
self.adds_test(btree)
288
def adds_test(self, btree):
289
self.assertEqual(btree.id2path(b"e"), "grandparent/parent/file")
290
self.assertEqual(btree.path2id("grandparent/parent/file"), b"e")
291
with btree.get_file("grandparent/parent/file") as f:
292
self.assertEqual(f.read(), b"Extra cheese\n")
294
btree.get_symlink_target('grandparent/parent/symlink'), 'venus')
296
def test_adds2(self):
297
"""File/inventory adds, with patch-compatibile renames"""
298
btree = self.make_tree_2()
299
btree.contents_by_id = False
300
add_patch = self.unified_diff([b"Hello\n"], [b"Extra cheese\n"])
301
btree.note_patch("grandparent/parent/file", add_patch)
302
btree.note_id(b'f', 'grandparent/parent/symlink', kind='symlink')
303
btree.note_target('grandparent/parent/symlink', 'venus')
304
self.adds_test(btree)
306
def make_tree_3(self):
307
btree, mtree = self.make_tree_1()
308
mtree.add_file(b"e", "grandparent/parent/topping", b"Anchovies\n")
309
btree.note_rename("grandparent/parent/file",
310
"grandparent/alt_parent/file")
311
btree.note_rename("grandparent/parent/topping",
312
"grandparent/alt_parent/stopping")
315
def get_file_test(self, btree):
316
with btree.get_file(btree.id2path(b"e")) as f:
317
self.assertEqual(f.read(), b"Lemon\n")
318
with btree.get_file(btree.id2path(b"c")) as f:
319
self.assertEqual(f.read(), b"Hello\n")
321
def test_get_file(self):
322
"""Get file contents"""
323
btree = self.make_tree_3()
324
mod_patch = self.unified_diff([b"Anchovies\n"], [b"Lemon\n"])
325
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
326
self.get_file_test(btree)
328
def test_get_file2(self):
329
"""Get file contents, with patch-compatible renames"""
330
btree = self.make_tree_3()
331
btree.contents_by_id = False
332
mod_patch = self.unified_diff([], [b"Lemon\n"])
333
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
334
mod_patch = self.unified_diff([], [b"Hello\n"])
335
btree.note_patch("grandparent/alt_parent/file", mod_patch)
336
self.get_file_test(btree)
338
def test_delete(self):
340
btree = self.make_tree_1()[0]
341
with btree.get_file(btree.id2path(b"c")) as f:
342
self.assertEqual(f.read(), b"Hello\n")
343
btree.note_deletion("grandparent/parent/file")
344
self.assertTrue(btree.id2path(b"c") is None)
345
self.assertFalse(btree.is_versioned("grandparent/parent/file"))
347
def sorted_ids(self, tree):
348
ids = sorted(tree.all_file_ids())
351
def test_iteration(self):
352
"""Ensure that iteration through ids works properly"""
353
btree = self.make_tree_1()[0]
354
self.assertEqual(self.sorted_ids(btree),
355
[inventory.ROOT_ID, b'a', b'b', b'c', b'd'])
356
btree.note_deletion("grandparent/parent/file")
357
btree.note_id(b"e", "grandparent/alt_parent/fool", kind="directory")
358
btree.note_last_changed("grandparent/alt_parent/fool",
360
self.assertEqual(self.sorted_ids(btree),
361
[inventory.ROOT_ID, b'a', b'b', b'd', b'e'])
364
class BundleTester1(tests.TestCaseWithTransport):
366
def test_mismatched_bundle(self):
367
format = bzrdir.BzrDirMetaFormat1()
368
format.repository_format = knitrepo.RepositoryFormatKnit3()
369
serializer = BundleSerializerV08('0.8')
370
b = self.make_branch('.', format=format)
371
self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
372
b.repository, [], {}, BytesIO())
374
def test_matched_bundle(self):
375
"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
376
format = bzrdir.BzrDirMetaFormat1()
377
format.repository_format = knitrepo.RepositoryFormatKnit3()
378
serializer = BundleSerializerV09('0.9')
379
b = self.make_branch('.', format=format)
380
serializer.write(b.repository, [], {}, BytesIO())
382
def test_mismatched_model(self):
383
"""Try copying a bundle from knit2 to knit1"""
384
format = bzrdir.BzrDirMetaFormat1()
385
format.repository_format = knitrepo.RepositoryFormatKnit3()
386
source = self.make_branch_and_tree('source', format=format)
387
source.commit('one', rev_id=b'one-id')
388
source.commit('two', rev_id=b'two-id')
390
write_bundle(source.branch.repository, b'two-id', b'null:', text,
394
format = bzrdir.BzrDirMetaFormat1()
395
format.repository_format = knitrepo.RepositoryFormatKnit1()
396
target = self.make_branch('target', format=format)
397
self.assertRaises(errors.IncompatibleRevision, install_bundle,
398
target.repository, read_bundle(text))
401
class BundleTester(object):
403
def bzrdir_format(self):
404
format = bzrdir.BzrDirMetaFormat1()
405
format.repository_format = knitrepo.RepositoryFormatKnit1()
408
def make_branch_and_tree(self, path, format=None):
410
format = self.bzrdir_format()
411
return tests.TestCaseWithTransport.make_branch_and_tree(
414
def make_branch(self, path, format=None):
416
format = self.bzrdir_format()
417
return tests.TestCaseWithTransport.make_branch(self, path, format)
419
def create_bundle_text(self, base_rev_id, rev_id):
420
bundle_txt = BytesIO()
421
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
422
bundle_txt, format=self.format)
424
self.assertEqual(bundle_txt.readline(),
425
b'# Bazaar revision bundle v%s\n' % self.format.encode('ascii'))
426
self.assertEqual(bundle_txt.readline(), b'#\n')
428
rev = self.b1.repository.get_revision(rev_id)
429
self.assertEqual(bundle_txt.readline().decode('utf-8'),
432
return bundle_txt, rev_ids
434
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
435
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
436
Make sure that the text generated is valid, and that it
437
can be applied against the base, and generate the same information.
439
:return: The in-memory bundle
441
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
443
# This should also validate the generated bundle
444
bundle = read_bundle(bundle_txt)
445
repository = self.b1.repository
446
for bundle_rev in bundle.real_revisions:
447
# These really should have already been checked when we read the
448
# bundle, since it computes the sha1 hash for the revision, which
449
# only will match if everything is okay, but lets be explicit about
451
branch_rev = repository.get_revision(bundle_rev.revision_id)
452
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
453
'timestamp', 'timezone', 'message', 'committer',
454
'parent_ids', 'properties'):
455
self.assertEqual(getattr(branch_rev, a),
456
getattr(bundle_rev, a))
457
self.assertEqual(len(branch_rev.parent_ids),
458
len(bundle_rev.parent_ids))
459
self.assertEqual(rev_ids,
460
[r.revision_id for r in bundle.real_revisions])
461
self.valid_apply_bundle(base_rev_id, bundle, checkout_dir=checkout_dir)
465
def get_invalid_bundle(self, base_rev_id, rev_id):
466
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
467
Munge the text so that it's invalid.
469
:return: The in-memory bundle
471
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
472
new_text = bundle_txt.getvalue().replace(b'executable:no',
474
bundle_txt = BytesIO(new_text)
475
bundle = read_bundle(bundle_txt)
476
self.valid_apply_bundle(base_rev_id, bundle)
479
def test_non_bundle(self):
480
self.assertRaises(errors.NotABundle,
481
read_bundle, BytesIO(b'#!/bin/sh\n'))
483
def test_malformed(self):
484
self.assertRaises(errors.BadBundle, read_bundle,
485
BytesIO(b'# Bazaar revision bundle v'))
487
def test_crlf_bundle(self):
489
read_bundle(BytesIO(b'# Bazaar revision bundle v0.8\r\n'))
490
except errors.BadBundle:
491
# It is currently permitted for bundles with crlf line endings to
492
# make read_bundle raise a BadBundle, but this should be fixed.
493
# Anything else, especially NotABundle, is an error.
496
def get_checkout(self, rev_id, checkout_dir=None):
497
"""Get a new tree, with the specified revision in it.
500
if checkout_dir is None:
501
checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
503
if not os.path.exists(checkout_dir):
504
os.mkdir(checkout_dir)
505
tree = self.make_branch_and_tree(checkout_dir)
507
ancestors = write_bundle(self.b1.repository, rev_id, b'null:', s,
510
self.assertIsInstance(s.getvalue(), bytes)
511
install_bundle(tree.branch.repository, read_bundle(s))
512
for ancestor in ancestors:
513
old = self.b1.repository.revision_tree(ancestor)
514
new = tree.branch.repository.revision_tree(ancestor)
518
# Check that there aren't any inventory level changes
519
delta = new.changes_from(old)
520
self.assertFalse(delta.has_changed(),
521
'Revision %s not copied correctly.'
524
# Now check that the file contents are all correct
525
for path in old.all_versioned_paths():
527
old_file = old.get_file(path)
528
except errors.NoSuchFile:
531
old_file.read(), new.get_file(path).read())
535
if not _mod_revision.is_null(rev_id):
536
tree.branch.generate_revision_history(rev_id)
538
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
539
self.assertFalse(delta.has_changed(),
540
'Working tree has modifications: %s' % delta)
543
def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
544
"""Get the base revision, apply the changes, and make
545
sure everything matches the builtin branch.
547
to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
550
self._valid_apply_bundle(base_rev_id, info, to_tree)
554
def _valid_apply_bundle(self, base_rev_id, info, to_tree):
555
original_parents = to_tree.get_parent_ids()
556
repository = to_tree.branch.repository
557
original_parents = to_tree.get_parent_ids()
558
self.assertIs(repository.has_revision(base_rev_id), True)
559
for rev in info.real_revisions:
560
self.assertTrue(not repository.has_revision(rev.revision_id),
561
'Revision {%s} present before applying bundle'
563
merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
565
for rev in info.real_revisions:
566
self.assertTrue(repository.has_revision(rev.revision_id),
567
'Missing revision {%s} after applying bundle'
570
self.assertTrue(to_tree.branch.repository.has_revision(info.target))
571
# Do we also want to verify that all the texts have been added?
573
self.assertEqual(original_parents + [info.target],
574
to_tree.get_parent_ids())
576
rev = info.real_revisions[-1]
577
base_tree = self.b1.repository.revision_tree(rev.revision_id)
578
to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
580
# TODO: make sure the target tree is identical to base tree
581
# we might also check the working tree.
583
base_files = list(base_tree.list_files())
584
to_files = list(to_tree.list_files())
585
self.assertEqual(len(base_files), len(to_files))
586
for base_file, to_file in zip(base_files, to_files):
587
self.assertEqual(base_file, to_file)
589
for path, status, kind, entry in base_files:
590
# Check that the meta information is the same
591
to_path = find_previous_path(base_tree, to_tree, path)
593
base_tree.get_file_size(path),
594
to_tree.get_file_size(to_path))
596
base_tree.get_file_sha1(path),
597
to_tree.get_file_sha1(to_path))
598
# Check that the contents are the same
599
# This is pretty expensive
600
# self.assertEqual(base_tree.get_file(fileid).read(),
601
# to_tree.get_file(fileid).read())
603
def test_bundle(self):
604
self.tree1 = self.make_branch_and_tree('b1')
605
self.b1 = self.tree1.branch
607
self.build_tree_contents([('b1/one', b'one\n')])
608
self.tree1.add('one', b'one-id')
609
self.tree1.set_root_id(b'root-id')
610
self.tree1.commit('add one', rev_id=b'a@cset-0-1')
612
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-1')
614
# Make sure we can handle files with spaces, tabs, other
617
'b1/with space.txt', 'b1/dir/', 'b1/dir/filein subdir.c', 'b1/dir/WithCaps.txt', 'b1/dir/ pre space', 'b1/sub/', 'b1/sub/sub/', 'b1/sub/sub/nonempty.txt'
619
self.build_tree_contents([('b1/sub/sub/emptyfile.txt', b''),
620
('b1/dir/nolastnewline.txt', b'bloop')])
621
tt = TreeTransform(self.tree1)
622
tt.new_file('executable', tt.root, [b'#!/bin/sh\n'], b'exe-1', True)
624
# have to fix length of file-id so that we can predictably rewrite
625
# a (length-prefixed) record containing it later.
626
self.tree1.add('with space.txt', b'withspace-id')
628
'dir', 'dir/filein subdir.c', 'dir/WithCaps.txt', 'dir/ pre space', 'dir/nolastnewline.txt', 'sub', 'sub/sub', 'sub/sub/nonempty.txt', 'sub/sub/emptyfile.txt'
630
self.tree1.commit('add whitespace', rev_id=b'a@cset-0-2')
632
bundle = self.get_valid_bundle(b'a@cset-0-1', b'a@cset-0-2')
634
# Check a rollup bundle
635
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-2')
639
['sub/sub/nonempty.txt', 'sub/sub/emptyfile.txt', 'sub/sub'
641
tt = TreeTransform(self.tree1)
642
trans_id = tt.trans_id_tree_path('executable')
643
tt.set_executability(False, trans_id)
645
self.tree1.commit('removed', rev_id=b'a@cset-0-3')
647
bundle = self.get_valid_bundle(b'a@cset-0-2', b'a@cset-0-3')
648
self.assertRaises((errors.TestamentMismatch,
649
errors.VersionedFileInvalidChecksum,
650
errors.BadBundle), self.get_invalid_bundle,
651
b'a@cset-0-2', b'a@cset-0-3')
652
# Check a rollup bundle
653
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-3')
655
# Now move the directory
656
self.tree1.rename_one('dir', 'sub/dir')
657
self.tree1.commit('rename dir', rev_id=b'a@cset-0-4')
659
bundle = self.get_valid_bundle(b'a@cset-0-3', b'a@cset-0-4')
660
# Check a rollup bundle
661
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-4')
664
with open('b1/sub/dir/WithCaps.txt', 'ab') as f:
665
f.write(b'\nAdding some text\n')
666
with open('b1/sub/dir/ pre space', 'ab') as f:
668
b'\r\nAdding some\r\nDOS format lines\r\n')
669
with open('b1/sub/dir/nolastnewline.txt', 'ab') as f:
671
self.tree1.rename_one('sub/dir/ pre space',
673
self.tree1.commit('Modified files', rev_id=b'a@cset-0-5')
674
bundle = self.get_valid_bundle(b'a@cset-0-4', b'a@cset-0-5')
676
self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
677
self.tree1.rename_one('with space.txt', 'WithCaps.txt')
678
self.tree1.rename_one('temp', 'with space.txt')
679
self.tree1.commit(u'swap filenames', rev_id=b'a@cset-0-6',
681
bundle = self.get_valid_bundle(b'a@cset-0-5', b'a@cset-0-6')
682
other = self.get_checkout(b'a@cset-0-5')
683
tree1_inv = get_inventory_text(self.tree1.branch.repository,
685
tree2_inv = get_inventory_text(other.branch.repository,
687
self.assertEqualDiff(tree1_inv, tree2_inv)
688
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
689
other.commit('rename file', rev_id=b'a@cset-0-6b')
690
self.tree1.merge_from_branch(other.branch)
691
self.tree1.commit(u'Merge', rev_id=b'a@cset-0-7',
693
bundle = self.get_valid_bundle(b'a@cset-0-6', b'a@cset-0-7')
695
def _test_symlink_bundle(self, link_name, link_target, new_link_target):
698
self.requireFeature(features.SymlinkFeature)
699
self.tree1 = self.make_branch_and_tree('b1')
700
self.b1 = self.tree1.branch
702
tt = TreeTransform(self.tree1)
703
tt.new_symlink(link_name, tt.root, link_target, link_id)
705
self.tree1.commit('add symlink', rev_id=b'l@cset-0-1')
706
bundle = self.get_valid_bundle(b'null:', b'l@cset-0-1')
707
if getattr(bundle, 'revision_tree', None) is not None:
708
# Not all bundle formats supports revision_tree
709
bund_tree = bundle.revision_tree(self.b1.repository, b'l@cset-0-1')
711
link_target, bund_tree.get_symlink_target(link_name))
713
tt = TreeTransform(self.tree1)
714
trans_id = tt.trans_id_tree_path(link_name)
715
tt.adjust_path('link2', tt.root, trans_id)
716
tt.delete_contents(trans_id)
717
tt.create_symlink(new_link_target, trans_id)
719
self.tree1.commit('rename and change symlink', rev_id=b'l@cset-0-2')
720
bundle = self.get_valid_bundle(b'l@cset-0-1', b'l@cset-0-2')
721
if getattr(bundle, 'revision_tree', None) is not None:
722
# Not all bundle formats supports revision_tree
723
bund_tree = bundle.revision_tree(self.b1.repository, b'l@cset-0-2')
724
self.assertEqual(new_link_target,
725
bund_tree.get_symlink_target('link2'))
727
tt = TreeTransform(self.tree1)
728
trans_id = tt.trans_id_tree_path('link2')
729
tt.delete_contents(trans_id)
730
tt.create_symlink('jupiter', trans_id)
732
self.tree1.commit('just change symlink target', rev_id=b'l@cset-0-3')
733
bundle = self.get_valid_bundle(b'l@cset-0-2', b'l@cset-0-3')
735
tt = TreeTransform(self.tree1)
736
trans_id = tt.trans_id_tree_path('link2')
737
tt.delete_contents(trans_id)
739
self.tree1.commit('Delete symlink', rev_id=b'l@cset-0-4')
740
bundle = self.get_valid_bundle(b'l@cset-0-3', b'l@cset-0-4')
742
def test_symlink_bundle(self):
743
self._test_symlink_bundle('link', 'bar/foo', 'mars')
745
def test_unicode_symlink_bundle(self):
746
self.requireFeature(features.UnicodeFilenameFeature)
747
self._test_symlink_bundle(u'\N{Euro Sign}link',
748
u'bar/\N{Euro Sign}foo',
749
u'mars\N{Euro Sign}')
751
def test_binary_bundle(self):
752
self.tree1 = self.make_branch_and_tree('b1')
753
self.b1 = self.tree1.branch
754
tt = TreeTransform(self.tree1)
757
tt.new_file('file', tt.root, [
758
b'\x00\n\x00\r\x01\n\x02\r\xff'], b'binary-1')
759
tt.new_file('file2', tt.root, [b'\x01\n\x02\r\x03\n\x04\r\xff'],
762
self.tree1.commit('add binary', rev_id=b'b@cset-0-1')
763
self.get_valid_bundle(b'null:', b'b@cset-0-1')
766
tt = TreeTransform(self.tree1)
767
trans_id = tt.trans_id_tree_path('file')
768
tt.delete_contents(trans_id)
770
self.tree1.commit('delete binary', rev_id=b'b@cset-0-2')
771
self.get_valid_bundle(b'b@cset-0-1', b'b@cset-0-2')
774
tt = TreeTransform(self.tree1)
775
trans_id = tt.trans_id_tree_path('file2')
776
tt.adjust_path('file3', tt.root, trans_id)
777
tt.delete_contents(trans_id)
778
tt.create_file([b'file\rcontents\x00\n\x00'], trans_id)
780
self.tree1.commit('rename and modify binary', rev_id=b'b@cset-0-3')
781
self.get_valid_bundle(b'b@cset-0-2', b'b@cset-0-3')
784
tt = TreeTransform(self.tree1)
785
trans_id = tt.trans_id_tree_path('file3')
786
tt.delete_contents(trans_id)
787
tt.create_file([b'\x00file\rcontents'], trans_id)
789
self.tree1.commit('just modify binary', rev_id=b'b@cset-0-4')
790
self.get_valid_bundle(b'b@cset-0-3', b'b@cset-0-4')
793
self.get_valid_bundle(b'null:', b'b@cset-0-4')
795
def test_last_modified(self):
796
self.tree1 = self.make_branch_and_tree('b1')
797
self.b1 = self.tree1.branch
798
tt = TreeTransform(self.tree1)
799
tt.new_file('file', tt.root, [b'file'], b'file')
801
self.tree1.commit('create file', rev_id=b'a@lmod-0-1')
803
tt = TreeTransform(self.tree1)
804
trans_id = tt.trans_id_tree_path('file')
805
tt.delete_contents(trans_id)
806
tt.create_file([b'file2'], trans_id)
808
self.tree1.commit('modify text', rev_id=b'a@lmod-0-2a')
810
other = self.get_checkout(b'a@lmod-0-1')
811
tt = TreeTransform(other)
812
trans_id = tt.trans_id_tree_path('file2')
813
tt.delete_contents(trans_id)
814
tt.create_file([b'file2'], trans_id)
816
other.commit('modify text in another tree', rev_id=b'a@lmod-0-2b')
817
self.tree1.merge_from_branch(other.branch)
818
self.tree1.commit(u'Merge', rev_id=b'a@lmod-0-3',
820
self.tree1.commit(u'Merge', rev_id=b'a@lmod-0-4')
821
bundle = self.get_valid_bundle(b'a@lmod-0-2a', b'a@lmod-0-4')
823
def test_hide_history(self):
824
self.tree1 = self.make_branch_and_tree('b1')
825
self.b1 = self.tree1.branch
827
with open('b1/one', 'wb') as f:
829
self.tree1.add('one')
830
self.tree1.commit('add file', rev_id=b'a@cset-0-1')
831
with open('b1/one', 'wb') as f:
833
self.tree1.commit('modify', rev_id=b'a@cset-0-2')
834
with open('b1/one', 'wb') as f:
836
self.tree1.commit('modify', rev_id=b'a@cset-0-3')
837
bundle_file = BytesIO()
838
rev_ids = write_bundle(self.tree1.branch.repository, b'a@cset-0-3',
839
b'a@cset-0-1', bundle_file, format=self.format)
840
self.assertNotContainsRe(bundle_file.getvalue(), b'\btwo\b')
841
self.assertContainsRe(self.get_raw(bundle_file), b'one')
842
self.assertContainsRe(self.get_raw(bundle_file), b'three')
844
def test_bundle_same_basis(self):
845
"""Ensure using the basis as the target doesn't cause an error"""
846
self.tree1 = self.make_branch_and_tree('b1')
847
self.tree1.commit('add file', rev_id=b'a@cset-0-1')
848
bundle_file = BytesIO()
849
rev_ids = write_bundle(self.tree1.branch.repository, b'a@cset-0-1',
850
b'a@cset-0-1', bundle_file)
853
def get_raw(bundle_file):
854
return bundle_file.getvalue()
856
def test_unicode_bundle(self):
857
self.requireFeature(features.UnicodeFilenameFeature)
858
# Handle international characters
860
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
862
self.tree1 = self.make_branch_and_tree('b1')
863
self.b1 = self.tree1.branch
866
u'With international man of mystery\n'
867
u'William Dod\xe9\n').encode('utf-8'))
870
self.tree1.add([u'with Dod\N{Euro Sign}'], [b'withdod-id'])
871
self.tree1.commit(u'i18n commit from William Dod\xe9',
872
rev_id=b'i18n-1', committer=u'William Dod\xe9')
875
bundle = self.get_valid_bundle(b'null:', b'i18n-1')
878
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
879
f.write(u'Modified \xb5\n'.encode('utf8'))
881
self.tree1.commit(u'modified', rev_id=b'i18n-2')
883
bundle = self.get_valid_bundle(b'i18n-1', b'i18n-2')
886
self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
887
self.tree1.commit(u'renamed, the new i18n man', rev_id=b'i18n-3',
888
committer=u'Erik B\xe5gfors')
890
bundle = self.get_valid_bundle(b'i18n-2', b'i18n-3')
893
self.tree1.remove([u'B\N{Euro Sign}gfors'])
894
self.tree1.commit(u'removed', rev_id=b'i18n-4')
896
bundle = self.get_valid_bundle(b'i18n-3', b'i18n-4')
899
bundle = self.get_valid_bundle(b'null:', b'i18n-4')
901
def test_whitespace_bundle(self):
902
if sys.platform in ('win32', 'cygwin'):
903
raise tests.TestSkipped('Windows doesn\'t support filenames'
904
' with tabs or trailing spaces')
905
self.tree1 = self.make_branch_and_tree('b1')
906
self.b1 = self.tree1.branch
908
self.build_tree(['b1/trailing space '])
909
self.tree1.add(['trailing space '])
910
# TODO: jam 20060701 Check for handling files with '\t' characters
911
# once we actually support them
914
self.tree1.commit('funky whitespace', rev_id=b'white-1')
916
bundle = self.get_valid_bundle(b'null:', b'white-1')
919
with open('b1/trailing space ', 'ab') as f:
920
f.write(b'add some text\n')
921
self.tree1.commit('add text', rev_id=b'white-2')
923
bundle = self.get_valid_bundle(b'white-1', b'white-2')
926
self.tree1.rename_one('trailing space ', ' start and end space ')
927
self.tree1.commit('rename', rev_id=b'white-3')
929
bundle = self.get_valid_bundle(b'white-2', b'white-3')
932
self.tree1.remove([' start and end space '])
933
self.tree1.commit('removed', rev_id=b'white-4')
935
bundle = self.get_valid_bundle(b'white-3', b'white-4')
937
# Now test a complet roll-up
938
bundle = self.get_valid_bundle(b'null:', b'white-4')
940
def test_alt_timezone_bundle(self):
941
self.tree1 = self.make_branch_and_memory_tree('b1')
942
self.b1 = self.tree1.branch
943
builder = treebuilder.TreeBuilder()
945
self.tree1.lock_write()
946
builder.start_tree(self.tree1)
947
builder.build(['newfile'])
948
builder.finish_tree()
950
# Asia/Colombo offset = 5 hours 30 minutes
951
self.tree1.commit('non-hour offset timezone', rev_id=b'tz-1',
952
timezone=19800, timestamp=1152544886.0)
954
bundle = self.get_valid_bundle(b'null:', b'tz-1')
956
rev = bundle.revisions[0]
957
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
958
self.assertEqual(19800, rev.timezone)
959
self.assertEqual(1152544886.0, rev.timestamp)
962
def test_bundle_root_id(self):
963
self.tree1 = self.make_branch_and_tree('b1')
964
self.b1 = self.tree1.branch
965
self.tree1.commit('message', rev_id=b'revid1')
966
bundle = self.get_valid_bundle(b'null:', b'revid1')
967
tree = self.get_bundle_tree(bundle, b'revid1')
968
root_revision = tree.get_file_revision(u'')
969
self.assertEqual(b'revid1', root_revision)
971
def test_install_revisions(self):
972
self.tree1 = self.make_branch_and_tree('b1')
973
self.b1 = self.tree1.branch
974
self.tree1.commit('message', rev_id=b'rev2a')
975
bundle = self.get_valid_bundle(b'null:', b'rev2a')
976
branch2 = self.make_branch('b2')
977
self.assertFalse(branch2.repository.has_revision(b'rev2a'))
978
target_revision = bundle.install_revisions(branch2.repository)
979
self.assertTrue(branch2.repository.has_revision(b'rev2a'))
980
self.assertEqual(b'rev2a', target_revision)
982
def test_bundle_empty_property(self):
983
"""Test serializing revision properties with an empty value."""
984
tree = self.make_branch_and_memory_tree('tree')
986
self.addCleanup(tree.unlock)
987
tree.add([''], [b'TREE_ROOT'])
988
tree.commit('One', revprops={u'one': 'two',
989
u'empty': ''}, rev_id=b'rev1')
990
self.b1 = tree.branch
991
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
992
bundle = read_bundle(bundle_sio)
993
revision_info = bundle.revisions[0]
994
self.assertEqual(b'rev1', revision_info.revision_id)
995
rev = revision_info.as_revision()
996
self.assertEqual({'branch-nick': 'tree', 'empty': '', 'one': 'two'},
999
def test_bundle_sorted_properties(self):
1000
"""For stability the writer should write properties in sorted order."""
1001
tree = self.make_branch_and_memory_tree('tree')
1003
self.addCleanup(tree.unlock)
1005
tree.add([''], [b'TREE_ROOT'])
1006
tree.commit('One', rev_id=b'rev1',
1007
revprops={u'a': '4', u'b': '3', u'c': '2', u'd': '1'})
1008
self.b1 = tree.branch
1009
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1010
bundle = read_bundle(bundle_sio)
1011
revision_info = bundle.revisions[0]
1012
self.assertEqual(b'rev1', revision_info.revision_id)
1013
rev = revision_info.as_revision()
1014
self.assertEqual({'branch-nick': 'tree', 'a': '4', 'b': '3', 'c': '2',
1015
'd': '1'}, rev.properties)
1017
def test_bundle_unicode_properties(self):
1018
"""We should be able to round trip a non-ascii property."""
1019
tree = self.make_branch_and_memory_tree('tree')
1021
self.addCleanup(tree.unlock)
1023
tree.add([''], [b'TREE_ROOT'])
1024
# Revisions themselves do not require anything about revision property
1025
# keys, other than that they are a basestring, and do not contain
1027
# However, Testaments assert than they are str(), and thus should not
1029
tree.commit('One', rev_id=b'rev1',
1030
revprops={u'omega': u'\u03a9', u'alpha': u'\u03b1'})
1031
self.b1 = tree.branch
1032
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1033
bundle = read_bundle(bundle_sio)
1034
revision_info = bundle.revisions[0]
1035
self.assertEqual(b'rev1', revision_info.revision_id)
1036
rev = revision_info.as_revision()
1037
self.assertEqual({'branch-nick': 'tree', 'omega': u'\u03a9',
1038
'alpha': u'\u03b1'}, rev.properties)
1040
def test_bundle_with_ghosts(self):
1041
tree = self.make_branch_and_tree('tree')
1042
self.b1 = tree.branch
1043
self.build_tree_contents([('tree/file', b'content1')])
1046
self.build_tree_contents([('tree/file', b'content2')])
1047
tree.add_parent_tree_id(b'ghost')
1048
tree.commit('rev2', rev_id=b'rev2')
1049
bundle = self.get_valid_bundle(b'null:', b'rev2')
1051
def make_simple_tree(self, format=None):
1052
tree = self.make_branch_and_tree('b1', format=format)
1053
self.b1 = tree.branch
1054
self.build_tree(['b1/file'])
1058
def test_across_serializers(self):
1059
tree = self.make_simple_tree('knit')
1060
tree.commit('hello', rev_id=b'rev1')
1061
tree.commit('hello', rev_id=b'rev2')
1062
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
1063
repo = self.make_repository('repo', format='dirstate-with-subtree')
1064
bundle.install_revisions(repo)
1065
inv_text = repo._get_inventory_xml(b'rev2')
1066
self.assertNotContainsRe(inv_text, b'format="5"')
1067
self.assertContainsRe(inv_text, b'format="7"')
1069
def make_repo_with_installed_revisions(self):
1070
tree = self.make_simple_tree('knit')
1071
tree.commit('hello', rev_id=b'rev1')
1072
tree.commit('hello', rev_id=b'rev2')
1073
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
1074
repo = self.make_repository('repo', format='dirstate-with-subtree')
1075
bundle.install_revisions(repo)
1078
def test_across_models(self):
1079
repo = self.make_repo_with_installed_revisions()
1080
inv = repo.get_inventory(b'rev2')
1081
self.assertEqual(b'rev2', inv.root.revision)
1082
root_id = inv.root.file_id
1084
self.addCleanup(repo.unlock)
1085
self.assertEqual({(root_id, b'rev1'): (),
1086
(root_id, b'rev2'): ((root_id, b'rev1'),)},
1087
repo.texts.get_parent_map([(root_id, b'rev1'), (root_id, b'rev2')]))
1089
def test_inv_hash_across_serializers(self):
1090
repo = self.make_repo_with_installed_revisions()
1091
recorded_inv_sha1 = repo.get_revision(b'rev2').inventory_sha1
1092
xml = repo._get_inventory_xml(b'rev2')
1093
self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
1095
def test_across_models_incompatible(self):
1096
tree = self.make_simple_tree('dirstate-with-subtree')
1097
tree.commit('hello', rev_id=b'rev1')
1098
tree.commit('hello', rev_id=b'rev2')
1100
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
1101
except errors.IncompatibleBundleFormat:
1102
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1103
repo = self.make_repository('repo', format='knit')
1104
bundle.install_revisions(repo)
1106
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
1107
self.assertRaises(errors.IncompatibleRevision,
1108
bundle.install_revisions, repo)
1110
def test_get_merge_request(self):
1111
tree = self.make_simple_tree()
1112
tree.commit('hello', rev_id=b'rev1')
1113
tree.commit('hello', rev_id=b'rev2')
1114
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
1115
result = bundle.get_merge_request(tree.branch.repository)
1116
self.assertEqual((None, b'rev1', 'inapplicable'), result)
1118
def test_with_subtree(self):
1119
tree = self.make_branch_and_tree('tree',
1120
format='dirstate-with-subtree')
1121
self.b1 = tree.branch
1122
subtree = self.make_branch_and_tree('tree/subtree',
1123
format='dirstate-with-subtree')
1125
tree.commit('hello', rev_id=b'rev1')
1127
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
1128
except errors.IncompatibleBundleFormat:
1129
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1130
if isinstance(bundle, v09.BundleInfo09):
1131
raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
1132
repo = self.make_repository('repo', format='knit')
1133
self.assertRaises(errors.IncompatibleRevision,
1134
bundle.install_revisions, repo)
1135
repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1136
bundle.install_revisions(repo2)
1138
def test_revision_id_with_slash(self):
1139
self.tree1 = self.make_branch_and_tree('tree')
1140
self.b1 = self.tree1.branch
1142
self.tree1.commit('Revision/id/with/slashes', rev_id=b'rev/id')
1144
raise tests.TestSkipped(
1145
"Repository doesn't support revision ids with slashes")
1146
bundle = self.get_valid_bundle(b'null:', b'rev/id')
1148
def test_skip_file(self):
1149
"""Make sure we don't accidentally write to the wrong versionedfile"""
1150
self.tree1 = self.make_branch_and_tree('tree')
1151
self.b1 = self.tree1.branch
1152
# rev1 is not present in bundle, done by fetch
1153
self.build_tree_contents([('tree/file2', b'contents1')])
1154
self.tree1.add('file2', b'file2-id')
1155
self.tree1.commit('rev1', rev_id=b'reva')
1156
self.build_tree_contents([('tree/file3', b'contents2')])
1157
# rev2 is present in bundle, and done by fetch
1158
# having file1 in the bunle causes file1's versionedfile to be opened.
1159
self.tree1.add('file3', b'file3-id')
1160
rev2 = self.tree1.commit('rev2')
1161
# Updating file2 should not cause an attempt to add to file1's vf
1162
target = self.tree1.controldir.sprout('target').open_workingtree()
1163
self.build_tree_contents([('tree/file2', b'contents3')])
1164
self.tree1.commit('rev3', rev_id=b'rev3')
1165
bundle = self.get_valid_bundle(b'reva', b'rev3')
1166
if getattr(bundle, 'get_bundle_reader', None) is None:
1167
raise tests.TestSkipped('Bundle format cannot provide reader')
1169
(f, r) for b, m, k, r, f in bundle.get_bundle_reader().iter_records()
1172
{(b'file2-id', b'rev3'), (b'file3-id', rev2)}, file_ids)
1173
bundle.install_revisions(target.branch.repository)
1176
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
1180
def test_bundle_empty_property(self):
1181
"""Test serializing revision properties with an empty value."""
1182
tree = self.make_branch_and_memory_tree('tree')
1184
self.addCleanup(tree.unlock)
1185
tree.add([''], [b'TREE_ROOT'])
1186
tree.commit('One', revprops={u'one': 'two',
1187
u'empty': ''}, rev_id=b'rev1')
1188
self.b1 = tree.branch
1189
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1190
self.assertContainsRe(bundle_sio.getvalue(),
1192
b'# branch-nick: tree\n'
1196
bundle = read_bundle(bundle_sio)
1197
revision_info = bundle.revisions[0]
1198
self.assertEqual(b'rev1', revision_info.revision_id)
1199
rev = revision_info.as_revision()
1200
self.assertEqual({'branch-nick': 'tree', 'empty': '', 'one': 'two'},
1203
def get_bundle_tree(self, bundle, revision_id):
1204
repository = self.make_repository('repo')
1205
return bundle.revision_tree(repository, b'revid1')
1207
def test_bundle_empty_property_alt(self):
1208
"""Test serializing revision properties with an empty value.
1210
Older readers had a bug when reading an empty property.
1211
They assumed that all keys ended in ': \n'. However they would write an
1212
empty value as ':\n'. This tests make sure that all newer bzr versions
1213
can handle th second form.
1215
tree = self.make_branch_and_memory_tree('tree')
1217
self.addCleanup(tree.unlock)
1218
tree.add([''], [b'TREE_ROOT'])
1219
tree.commit('One', revprops={u'one': 'two',
1220
u'empty': ''}, rev_id=b'rev1')
1221
self.b1 = tree.branch
1222
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1223
txt = bundle_sio.getvalue()
1224
loc = txt.find(b'# empty: ') + len(b'# empty:')
1225
# Create a new bundle, which strips the trailing space after empty
1226
bundle_sio = BytesIO(txt[:loc] + txt[loc + 1:])
1228
self.assertContainsRe(bundle_sio.getvalue(),
1230
b'# branch-nick: tree\n'
1234
bundle = read_bundle(bundle_sio)
1235
revision_info = bundle.revisions[0]
1236
self.assertEqual(b'rev1', revision_info.revision_id)
1237
rev = revision_info.as_revision()
1238
self.assertEqual({'branch-nick': 'tree', 'empty': '', 'one': 'two'},
1241
def test_bundle_sorted_properties(self):
1242
"""For stability the writer should write properties in sorted order."""
1243
tree = self.make_branch_and_memory_tree('tree')
1245
self.addCleanup(tree.unlock)
1247
tree.add([''], [b'TREE_ROOT'])
1248
tree.commit('One', rev_id=b'rev1',
1249
revprops={u'a': '4', u'b': '3', u'c': '2', u'd': '1'})
1250
self.b1 = tree.branch
1251
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1252
self.assertContainsRe(bundle_sio.getvalue(),
1256
b'# branch-nick: tree\n'
1260
bundle = read_bundle(bundle_sio)
1261
revision_info = bundle.revisions[0]
1262
self.assertEqual(b'rev1', revision_info.revision_id)
1263
rev = revision_info.as_revision()
1264
self.assertEqual({'branch-nick': 'tree', 'a': '4', 'b': '3', 'c': '2',
1265
'd': '1'}, rev.properties)
1267
def test_bundle_unicode_properties(self):
1268
"""We should be able to round trip a non-ascii property."""
1269
tree = self.make_branch_and_memory_tree('tree')
1271
self.addCleanup(tree.unlock)
1273
tree.add([''], [b'TREE_ROOT'])
1274
# Revisions themselves do not require anything about revision property
1275
# keys, other than that they are a basestring, and do not contain
1277
# However, Testaments assert than they are str(), and thus should not
1279
tree.commit('One', rev_id=b'rev1',
1280
revprops={u'omega': u'\u03a9', u'alpha': u'\u03b1'})
1281
self.b1 = tree.branch
1282
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1283
self.assertContainsRe(bundle_sio.getvalue(),
1285
b'# alpha: \xce\xb1\n'
1286
b'# branch-nick: tree\n'
1287
b'# omega: \xce\xa9\n'
1289
bundle = read_bundle(bundle_sio)
1290
revision_info = bundle.revisions[0]
1291
self.assertEqual(b'rev1', revision_info.revision_id)
1292
rev = revision_info.as_revision()
1293
self.assertEqual({'branch-nick': 'tree', 'omega': u'\u03a9',
1294
'alpha': u'\u03b1'}, rev.properties)
1297
class V09BundleKnit2Tester(V08BundleTester):
1301
def bzrdir_format(self):
1302
format = bzrdir.BzrDirMetaFormat1()
1303
format.repository_format = knitrepo.RepositoryFormatKnit3()
1307
class V09BundleKnit1Tester(V08BundleTester):
1311
def bzrdir_format(self):
1312
format = bzrdir.BzrDirMetaFormat1()
1313
format.repository_format = knitrepo.RepositoryFormatKnit1()
1317
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
1321
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1322
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1323
Make sure that the text generated is valid, and that it
1324
can be applied against the base, and generate the same information.
1326
:return: The in-memory bundle
1328
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1330
# This should also validate the generated bundle
1331
bundle = read_bundle(bundle_txt)
1332
repository = self.b1.repository
1333
for bundle_rev in bundle.real_revisions:
1334
# These really should have already been checked when we read the
1335
# bundle, since it computes the sha1 hash for the revision, which
1336
# only will match if everything is okay, but lets be explicit about
1338
branch_rev = repository.get_revision(bundle_rev.revision_id)
1339
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1340
'timestamp', 'timezone', 'message', 'committer',
1341
'parent_ids', 'properties'):
1342
self.assertEqual(getattr(branch_rev, a),
1343
getattr(bundle_rev, a))
1344
self.assertEqual(len(branch_rev.parent_ids),
1345
len(bundle_rev.parent_ids))
1346
self.assertEqual(set(rev_ids),
1347
{r.revision_id for r in bundle.real_revisions})
1348
self.valid_apply_bundle(base_rev_id, bundle,
1349
checkout_dir=checkout_dir)
1353
def get_invalid_bundle(self, base_rev_id, rev_id):
1354
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1355
Munge the text so that it's invalid.
1357
:return: The in-memory bundle
1359
from ..bundle import serializer
1360
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1361
new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1362
new_text = new_text.replace(b'<file file_id="exe-1"',
1363
b'<file executable="y" file_id="exe-1"')
1364
new_text = new_text.replace(b'B260', b'B275')
1365
bundle_txt = BytesIO()
1366
bundle_txt.write(serializer._get_bundle_header('4'))
1367
bundle_txt.write(b'\n')
1368
bundle_txt.write(bz2.compress(new_text))
1370
bundle = read_bundle(bundle_txt)
1371
self.valid_apply_bundle(base_rev_id, bundle)
1374
def create_bundle_text(self, base_rev_id, rev_id):
1375
bundle_txt = BytesIO()
1376
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1377
bundle_txt, format=self.format)
1379
self.assertEqual(bundle_txt.readline(),
1380
b'# Bazaar revision bundle v%s\n' % self.format.encode('ascii'))
1381
self.assertEqual(bundle_txt.readline(), b'#\n')
1382
rev = self.b1.repository.get_revision(rev_id)
1384
return bundle_txt, rev_ids
1386
def get_bundle_tree(self, bundle, revision_id):
1387
repository = self.make_repository('repo')
1388
bundle.install_revisions(repository)
1389
return repository.revision_tree(revision_id)
1391
def test_creation(self):
1392
tree = self.make_branch_and_tree('tree')
1393
self.build_tree_contents([('tree/file', b'contents1\nstatic\n')])
1394
tree.add('file', b'fileid-2')
1395
tree.commit('added file', rev_id=b'rev1')
1396
self.build_tree_contents([('tree/file', b'contents2\nstatic\n')])
1397
tree.commit('changed file', rev_id=b'rev2')
1399
serializer = BundleSerializerV4('1.0')
1400
with tree.lock_read():
1401
serializer.write_bundle(
1402
tree.branch.repository, b'rev2', b'null:', s)
1404
tree2 = self.make_branch_and_tree('target')
1405
target_repo = tree2.branch.repository
1406
install_bundle(target_repo, serializer.read(s))
1407
target_repo.lock_read()
1408
self.addCleanup(target_repo.unlock)
1409
# Turn the 'iterators_of_bytes' back into simple strings for comparison
1410
repo_texts = dict((i, b''.join(content)) for i, content
1411
in target_repo.iter_files_bytes(
1412
[(b'fileid-2', b'rev1', '1'),
1413
(b'fileid-2', b'rev2', '2')]))
1414
self.assertEqual({'1': b'contents1\nstatic\n',
1415
'2': b'contents2\nstatic\n'},
1417
rtree = target_repo.revision_tree(b'rev2')
1418
inventory_vf = target_repo.inventories
1419
# If the inventory store has a graph, it must match the revision graph.
1421
[inventory_vf.get_parent_map([(b'rev2',)])[(b'rev2',)]],
1422
[None, ((b'rev1',),)])
1423
self.assertEqual('changed file',
1424
target_repo.get_revision(b'rev2').message)
1427
def get_raw(bundle_file):
1429
line = bundle_file.readline()
1430
line = bundle_file.readline()
1431
lines = bundle_file.readlines()
1432
return bz2.decompress(b''.join(lines))
1434
def test_copy_signatures(self):
1435
tree_a = self.make_branch_and_tree('tree_a')
1437
import breezy.commit as commit
1438
oldstrategy = breezy.gpg.GPGStrategy
1439
branch = tree_a.branch
1440
repo_a = branch.repository
1441
tree_a.commit("base", allow_pointless=True, rev_id=b'A')
1442
self.assertFalse(branch.repository.has_signature_for_revision_id(b'A'))
1444
from ..bzr.testament import Testament
1445
# monkey patch gpg signing mechanism
1446
breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
1447
new_config = test_commit.MustSignConfig()
1448
commit.Commit(config_stack=new_config).commit(message="base",
1449
allow_pointless=True,
1451
working_tree=tree_a)
1454
return breezy.gpg.LoopbackGPGStrategy(None).sign(text)
1455
self.assertTrue(repo_a.has_signature_for_revision_id(b'B'))
1457
breezy.gpg.GPGStrategy = oldstrategy
1458
tree_b = self.make_branch_and_tree('tree_b')
1459
repo_b = tree_b.branch.repository
1461
serializer = BundleSerializerV4('4')
1462
with tree_a.lock_read():
1463
serializer.write_bundle(
1464
tree_a.branch.repository, b'B', b'null:', s)
1466
install_bundle(repo_b, serializer.read(s))
1467
self.assertTrue(repo_b.has_signature_for_revision_id(b'B'))
1468
self.assertEqual(repo_b.get_signature_text(b'B'),
1469
repo_a.get_signature_text(b'B'))
1471
# ensure repeat installs are harmless
1472
install_bundle(repo_b, serializer.read(s))
1475
class V4_2aBundleTester(V4BundleTester):
1477
def bzrdir_format(self):
1480
def get_invalid_bundle(self, base_rev_id, rev_id):
1481
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1482
Munge the text so that it's invalid.
1484
:return: The in-memory bundle
1486
from ..bundle import serializer
1487
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1488
new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1489
# We are going to be replacing some text to set the executable bit on a
1490
# file. Make sure the text replacement actually works correctly.
1491
self.assertContainsRe(new_text, b'(?m)B244\n\ni 1\n<inventory')
1492
new_text = new_text.replace(b'<file file_id="exe-1"',
1493
b'<file executable="y" file_id="exe-1"')
1494
new_text = new_text.replace(b'B244', b'B259')
1495
bundle_txt = BytesIO()
1496
bundle_txt.write(serializer._get_bundle_header('4'))
1497
bundle_txt.write(b'\n')
1498
bundle_txt.write(bz2.compress(new_text))
1500
bundle = read_bundle(bundle_txt)
1501
self.valid_apply_bundle(base_rev_id, bundle)
1504
def make_merged_branch(self):
1505
builder = self.make_branch_builder('source')
1506
builder.start_series()
1507
builder.build_snapshot(None, [
1508
('add', ('', b'root-id', 'directory', None)),
1509
('add', ('file', b'file-id', 'file', b'original content\n')),
1510
], revision_id=b'a@cset-0-1')
1511
builder.build_snapshot([b'a@cset-0-1'], [
1512
('modify', ('file', b'new-content\n')),
1513
], revision_id=b'a@cset-0-2a')
1514
builder.build_snapshot([b'a@cset-0-1'], [
1515
('add', ('other-file', b'file2-id', 'file', b'file2-content\n')),
1516
], revision_id=b'a@cset-0-2b')
1517
builder.build_snapshot([b'a@cset-0-2a', b'a@cset-0-2b'], [
1518
('add', ('other-file', b'file2-id', 'file', b'file2-content\n')),
1519
], revision_id=b'a@cset-0-3')
1520
builder.finish_series()
1521
self.b1 = builder.get_branch()
1523
self.addCleanup(self.b1.unlock)
1525
def make_bundle_just_inventories(self, base_revision_id,
1529
writer = v4.BundleWriteOperation(base_revision_id, target_revision_id,
1530
self.b1.repository, sio)
1531
writer.bundle.begin()
1532
writer._add_inventory_mpdiffs_from_serializer(revision_ids)
1537
def test_single_inventory_multiple_parents_as_xml(self):
1538
self.make_merged_branch()
1539
sio = self.make_bundle_just_inventories(b'a@cset-0-1', b'a@cset-0-3',
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(b'a@cset-0-3', revision_id)
1548
self.assertEqual('inventory', repo_kind)
1549
self.assertEqual({b'parents': [b'a@cset-0-2a', b'a@cset-0-2b'],
1550
b'sha1': b'09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1551
b'storage_kind': b'mpdiff',
1553
# We should have an mpdiff that takes some lines from both parents.
1554
self.assertEqualDiff(
1556
b'<inventory format="10" revision_id="a@cset-0-3">\n'
1559
b'c 1 3 3 2\n', bytes)
1561
def test_single_inv_no_parents_as_xml(self):
1562
self.make_merged_branch()
1563
sio = self.make_bundle_just_inventories(b'null:', b'a@cset-0-1',
1565
reader = v4.BundleReader(sio, stream_input=False)
1566
records = list(reader.iter_records())
1567
self.assertEqual(1, len(records))
1568
(bytes, metadata, repo_kind, revision_id,
1569
file_id) = records[0]
1570
self.assertIs(None, file_id)
1571
self.assertEqual(b'a@cset-0-1', revision_id)
1572
self.assertEqual('inventory', repo_kind)
1573
self.assertEqual({b'parents': [],
1574
b'sha1': b'a13f42b142d544aac9b085c42595d304150e31a2',
1575
b'storage_kind': b'mpdiff',
1577
# We should have an mpdiff that takes some lines from both parents.
1578
self.assertEqualDiff(
1580
b'<inventory format="10" revision_id="a@cset-0-1">\n'
1581
b'<directory file_id="root-id" name=""'
1582
b' revision="a@cset-0-1" />\n'
1583
b'<file file_id="file-id" name="file" parent_id="root-id"'
1584
b' revision="a@cset-0-1"'
1585
b' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
1586
b' text_size="17" />\n'
1590
def test_multiple_inventories_as_xml(self):
1591
self.make_merged_branch()
1592
sio = self.make_bundle_just_inventories(b'a@cset-0-1', b'a@cset-0-3',
1593
[b'a@cset-0-2a', b'a@cset-0-2b', b'a@cset-0-3'])
1594
reader = v4.BundleReader(sio, stream_input=False)
1595
records = list(reader.iter_records())
1596
self.assertEqual(3, len(records))
1597
revision_ids = [rev_id for b, m, k, rev_id, f in records]
1598
self.assertEqual([b'a@cset-0-2a', b'a@cset-0-2b', b'a@cset-0-3'],
1600
metadata_2a = records[0][1]
1601
self.assertEqual({b'parents': [b'a@cset-0-1'],
1602
b'sha1': b'1e105886d62d510763e22885eec733b66f5f09bf',
1603
b'storage_kind': b'mpdiff',
1605
metadata_2b = records[1][1]
1606
self.assertEqual({b'parents': [b'a@cset-0-1'],
1607
b'sha1': b'f03f12574bdb5ed2204c28636c98a8547544ccd8',
1608
b'storage_kind': b'mpdiff',
1610
metadata_3 = records[2][1]
1611
self.assertEqual({b'parents': [b'a@cset-0-2a', b'a@cset-0-2b'],
1612
b'sha1': b'09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1613
b'storage_kind': b'mpdiff',
1615
bytes_2a = records[0][0]
1616
self.assertEqualDiff(
1618
b'<inventory format="10" revision_id="a@cset-0-2a">\n'
1622
b'<file file_id="file-id" name="file" parent_id="root-id"'
1623
b' revision="a@cset-0-2a"'
1624
b' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
1625
b' text_size="12" />\n'
1627
b'c 0 3 3 1\n', bytes_2a)
1628
bytes_2b = records[1][0]
1629
self.assertEqualDiff(
1631
b'<inventory format="10" revision_id="a@cset-0-2b">\n'
1635
b'<file file_id="file2-id" name="other-file" parent_id="root-id"'
1636
b' revision="a@cset-0-2b"'
1637
b' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
1638
b' text_size="14" />\n'
1640
b'c 0 3 4 1\n', bytes_2b)
1641
bytes_3 = records[2][0]
1642
self.assertEqualDiff(
1644
b'<inventory format="10" revision_id="a@cset-0-3">\n'
1647
b'c 1 3 3 2\n', bytes_3)
1649
def test_creating_bundle_preserves_chk_pages(self):
1650
self.make_merged_branch()
1651
target = self.b1.controldir.sprout('target',
1652
revision_id=b'a@cset-0-2a').open_branch()
1653
bundle_txt, rev_ids = self.create_bundle_text(b'a@cset-0-2a',
1655
self.assertEqual(set([b'a@cset-0-2b', b'a@cset-0-3']), set(rev_ids))
1656
bundle = read_bundle(bundle_txt)
1658
self.addCleanup(target.unlock)
1659
install_bundle(target.repository, bundle)
1660
inv1 = next(self.b1.repository.inventories.get_record_stream([
1661
(b'a@cset-0-3',)], 'unordered',
1662
True)).get_bytes_as('fulltext')
1663
inv2 = next(target.repository.inventories.get_record_stream([
1664
(b'a@cset-0-3',)], 'unordered',
1665
True)).get_bytes_as('fulltext')
1666
self.assertEqualDiff(inv1, inv2)
1669
class MungedBundleTester(object):
1671
def build_test_bundle(self):
1672
wt = self.make_branch_and_tree('b1')
1674
self.build_tree(['b1/one'])
1676
wt.commit('add one', rev_id=b'a@cset-0-1')
1677
self.build_tree(['b1/two'])
1679
wt.commit('add two', rev_id=b'a@cset-0-2',
1680
revprops={u'branch-nick': 'test'})
1682
bundle_txt = BytesIO()
1683
rev_ids = write_bundle(wt.branch.repository, b'a@cset-0-2',
1684
b'a@cset-0-1', bundle_txt, self.format)
1685
self.assertEqual({b'a@cset-0-2'}, set(rev_ids))
1686
bundle_txt.seek(0, 0)
1689
def check_valid(self, bundle):
1690
"""Check that after whatever munging, the final object is valid."""
1691
self.assertEqual([b'a@cset-0-2'],
1692
[r.revision_id for r in bundle.real_revisions])
1694
def test_extra_whitespace(self):
1695
bundle_txt = self.build_test_bundle()
1697
# Seek to the end of the file
1698
# Adding one extra newline used to give us
1699
# TypeError: float() argument must be a string or a number
1700
bundle_txt.seek(0, 2)
1701
bundle_txt.write(b'\n')
1704
bundle = read_bundle(bundle_txt)
1705
self.check_valid(bundle)
1707
def test_extra_whitespace_2(self):
1708
bundle_txt = self.build_test_bundle()
1710
# Seek to the end of the file
1711
# Adding two extra newlines used to give us
1712
# MalformedPatches: The first line of all patches should be ...
1713
bundle_txt.seek(0, 2)
1714
bundle_txt.write(b'\n\n')
1717
bundle = read_bundle(bundle_txt)
1718
self.check_valid(bundle)
1721
class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
1725
def test_missing_trailing_whitespace(self):
1726
bundle_txt = self.build_test_bundle()
1728
# Remove a trailing newline, it shouldn't kill the parser
1729
raw = bundle_txt.getvalue()
1730
# The contents of the bundle don't have to be this, but this
1731
# test is concerned with the exact case where the serializer
1732
# creates a blank line at the end, and fails if that
1734
self.assertEqual(b'\n\n', raw[-2:])
1735
bundle_txt = BytesIO(raw[:-1])
1737
bundle = read_bundle(bundle_txt)
1738
self.check_valid(bundle)
1740
def test_opening_text(self):
1741
bundle_txt = self.build_test_bundle()
1743
bundle_txt = BytesIO(
1744
b"Some random\nemail comments\n" + bundle_txt.getvalue())
1746
bundle = read_bundle(bundle_txt)
1747
self.check_valid(bundle)
1749
def test_trailing_text(self):
1750
bundle_txt = self.build_test_bundle()
1752
bundle_txt = BytesIO(
1753
bundle_txt.getvalue() + b"Some trailing\nrandom\ntext\n")
1755
bundle = read_bundle(bundle_txt)
1756
self.check_valid(bundle)
1759
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
1764
class TestBundleWriterReader(tests.TestCase):
1766
def test_roundtrip_record(self):
1768
writer = v4.BundleWriter(fileobj)
1770
writer.add_info_record({b'foo': b'bar'})
1771
writer._add_record(b"Record body", {b'parents': [b'1', b'3'],
1772
b'storage_kind': b'fulltext'}, 'file', b'revid', b'fileid')
1775
reader = v4.BundleReader(fileobj, stream_input=True)
1776
record_iter = reader.iter_records()
1777
record = next(record_iter)
1778
self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
1779
'info', None, None), record)
1780
record = next(record_iter)
1781
self.assertEqual((b"Record body", {b'storage_kind': b'fulltext',
1782
b'parents': [b'1', b'3']}, 'file', b'revid', b'fileid'),
1785
def test_roundtrip_record_memory_hungry(self):
1787
writer = v4.BundleWriter(fileobj)
1789
writer.add_info_record({b'foo': b'bar'})
1790
writer._add_record(b"Record body", {b'parents': [b'1', b'3'],
1791
b'storage_kind': b'fulltext'}, 'file', b'revid', b'fileid')
1794
reader = v4.BundleReader(fileobj, stream_input=False)
1795
record_iter = reader.iter_records()
1796
record = next(record_iter)
1797
self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
1798
'info', None, None), record)
1799
record = next(record_iter)
1800
self.assertEqual((b"Record body", {b'storage_kind': b'fulltext',
1801
b'parents': [b'1', b'3']}, 'file', b'revid', b'fileid'),
1804
def test_encode_name(self):
1805
self.assertEqual(b'revision/rev1',
1806
v4.BundleWriter.encode_name('revision', b'rev1'))
1807
self.assertEqual(b'file/rev//1/file-id-1',
1808
v4.BundleWriter.encode_name('file', b'rev/1', b'file-id-1'))
1809
self.assertEqual(b'info',
1810
v4.BundleWriter.encode_name('info', None, None))
1812
def test_decode_name(self):
1813
self.assertEqual(('revision', b'rev1', None),
1814
v4.BundleReader.decode_name(b'revision/rev1'))
1815
self.assertEqual(('file', b'rev/1', b'file-id-1'),
1816
v4.BundleReader.decode_name(b'file/rev//1/file-id-1'))
1817
self.assertEqual(('info', None, None),
1818
v4.BundleReader.decode_name(b'info'))
1820
def test_too_many_names(self):
1822
writer = v4.BundleWriter(fileobj)
1824
writer.add_info_record({b'foo': b'bar'})
1825
writer._container.add_bytes_record(b'blah', [(b'two', ), (b'names', )])
1828
record_iter = v4.BundleReader(fileobj).iter_records()
1829
record = next(record_iter)
1830
self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
1831
'info', None, None), record)
1832
self.assertRaises(errors.BadBundle, next, record_iter)
added
removed
breezy/tests/test_bundle.py
