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
23
import SocketServer as socketserver
31
revision as _mod_revision,
39
from ..bundle import read_mergeable_from_url
40
from ..bundle.apply_bundle import install_bundle, merge_bundle
41
from ..bundle.bundle_data import BundleTree
42
from ..directory_service import directories
43
from ..bundle.serializer import write_bundle, read_bundle, v09, v4
44
from ..bundle.serializer.v08 import BundleSerializerV08
45
from ..bundle.serializer.v09 import BundleSerializerV09
46
from ..bundle.serializer.v4 import BundleSerializerV4
47
from ..bzr import knitrepo
54
from ..transform import TreeTransform
57
def get_text(vf, key):
58
"""Get the fulltext for a given revision id that is present in the vf"""
59
stream = vf.get_record_stream([key], 'unordered', True)
61
return record.get_bytes_as('fulltext')
64
def get_inventory_text(repo, revision_id):
65
"""Get the fulltext for the inventory at revision id"""
68
return get_text(repo.inventories, (revision_id,))
73
class MockTree(object):
76
from ..bzr.inventory import InventoryDirectory, ROOT_ID
78
self.paths = {ROOT_ID: ""}
79
self.ids = {"": ROOT_ID}
81
self.root = InventoryDirectory(ROOT_ID, '', None)
83
inventory = property(lambda x:x)
84
root_inventory = property(lambda x:x)
86
def get_root_id(self):
87
return self.root.file_id
89
def all_file_ids(self):
90
return set(self.paths.keys())
92
def all_versioned_paths(self):
93
return set(self.paths.values())
95
def is_executable(self, path, file_id):
96
# Not all the files are executable.
99
def __getitem__(self, file_id):
100
if file_id == self.root.file_id:
103
return self.make_entry(file_id, self.paths[file_id])
105
def parent_id(self, file_id):
106
parent_dir = os.path.dirname(self.paths[file_id])
109
return self.ids[parent_dir]
111
def iter_entries(self):
112
for path, file_id in self.ids.items():
113
yield path, self[file_id]
115
def kind(self, path, file_id=None):
117
file_id = self.path2id(path)
118
if file_id in self.contents:
124
def make_entry(self, file_id, path):
125
from ..bzr.inventory import (InventoryFile, InventoryDirectory,
127
name = os.path.basename(path)
128
kind = self.kind(path, file_id)
129
parent_id = self.parent_id(file_id)
130
text_sha_1, text_size = self.contents_stats(path, file_id)
131
if kind == 'directory':
132
ie = InventoryDirectory(file_id, name, parent_id)
134
ie = InventoryFile(file_id, name, parent_id)
135
ie.text_sha1 = text_sha_1
136
ie.text_size = text_size
137
elif kind == 'symlink':
138
ie = InventoryLink(file_id, name, parent_id)
140
raise errors.BzrError('unknown kind %r' % kind)
143
def add_dir(self, file_id, path):
144
self.paths[file_id] = path
145
self.ids[path] = file_id
147
def add_file(self, file_id, path, contents):
148
self.add_dir(file_id, path)
149
self.contents[file_id] = contents
151
def path2id(self, path):
152
return self.ids.get(path)
154
def id2path(self, file_id):
155
return self.paths.get(file_id)
157
def has_id(self, file_id):
158
return self.id2path(file_id) is not None
160
def get_file(self, path, file_id=None):
162
file_id = self.path2id(path)
165
result.write(self.contents[file_id])
167
raise errors.NoSuchFile(path)
171
def get_file_revision(self, path, file_id=None):
173
file_id = self.path2id(path)
174
return self.inventory[file_id].revision
176
def get_file_size(self, path, file_id=None):
178
file_id = self.path2id(path)
179
return self.inventory[file_id].text_size
181
def get_file_sha1(self, path, file_id=None):
183
file_id = self.path2id(path)
184
return self.inventory[file_id].text_sha1
186
def contents_stats(self, path, file_id):
187
if file_id not in self.contents:
189
text_sha1 = osutils.sha_file(self.get_file(path, file_id))
190
return text_sha1, len(self.contents[file_id])
193
class BTreeTester(tests.TestCase):
194
"""A simple unittest tester for the BundleTree class."""
196
def make_tree_1(self):
198
mtree.add_dir(b"a", "grandparent")
199
mtree.add_dir(b"b", "grandparent/parent")
200
mtree.add_file(b"c", "grandparent/parent/file", b"Hello\n")
201
mtree.add_dir(b"d", "grandparent/alt_parent")
202
return BundleTree(mtree, ''), mtree
204
def test_renames(self):
205
"""Ensure that file renames have the proper effect on children"""
206
btree = self.make_tree_1()[0]
207
self.assertEqual(btree.old_path("grandparent"), "grandparent")
208
self.assertEqual(btree.old_path("grandparent/parent"),
209
"grandparent/parent")
210
self.assertEqual(btree.old_path("grandparent/parent/file"),
211
"grandparent/parent/file")
213
self.assertEqual(btree.id2path(b"a"), "grandparent")
214
self.assertEqual(btree.id2path(b"b"), "grandparent/parent")
215
self.assertEqual(btree.id2path(b"c"), "grandparent/parent/file")
217
self.assertEqual(btree.path2id("grandparent"), b"a")
218
self.assertEqual(btree.path2id("grandparent/parent"), b"b")
219
self.assertEqual(btree.path2id("grandparent/parent/file"), b"c")
221
self.assertIs(btree.path2id("grandparent2"), None)
222
self.assertIs(btree.path2id("grandparent2/parent"), None)
223
self.assertIs(btree.path2id("grandparent2/parent/file"), None)
225
btree.note_rename("grandparent", "grandparent2")
226
self.assertIs(btree.old_path("grandparent"), None)
227
self.assertIs(btree.old_path("grandparent/parent"), None)
228
self.assertIs(btree.old_path("grandparent/parent/file"), None)
230
self.assertEqual(btree.id2path(b"a"), "grandparent2")
231
self.assertEqual(btree.id2path(b"b"), "grandparent2/parent")
232
self.assertEqual(btree.id2path(b"c"), "grandparent2/parent/file")
234
self.assertEqual(btree.path2id("grandparent2"), b"a")
235
self.assertEqual(btree.path2id("grandparent2/parent"), b"b")
236
self.assertEqual(btree.path2id("grandparent2/parent/file"), b"c")
238
self.assertTrue(btree.path2id("grandparent") is None)
239
self.assertTrue(btree.path2id("grandparent/parent") is None)
240
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
242
btree.note_rename("grandparent/parent", "grandparent2/parent2")
243
self.assertEqual(btree.id2path(b"a"), "grandparent2")
244
self.assertEqual(btree.id2path(b"b"), "grandparent2/parent2")
245
self.assertEqual(btree.id2path(b"c"), "grandparent2/parent2/file")
247
self.assertEqual(btree.path2id("grandparent2"), b"a")
248
self.assertEqual(btree.path2id("grandparent2/parent2"), b"b")
249
self.assertEqual(btree.path2id("grandparent2/parent2/file"), b"c")
251
self.assertTrue(btree.path2id("grandparent2/parent") is None)
252
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
254
btree.note_rename("grandparent/parent/file",
255
"grandparent2/parent2/file2")
256
self.assertEqual(btree.id2path(b"a"), "grandparent2")
257
self.assertEqual(btree.id2path(b"b"), "grandparent2/parent2")
258
self.assertEqual(btree.id2path(b"c"), "grandparent2/parent2/file2")
260
self.assertEqual(btree.path2id("grandparent2"), b"a")
261
self.assertEqual(btree.path2id("grandparent2/parent2"), b"b")
262
self.assertEqual(btree.path2id("grandparent2/parent2/file2"), b"c")
264
self.assertTrue(btree.path2id("grandparent2/parent2/file") is None)
266
def test_moves(self):
267
"""Ensure that file moves have the proper effect on children"""
268
btree = self.make_tree_1()[0]
269
btree.note_rename("grandparent/parent/file",
270
"grandparent/alt_parent/file")
271
self.assertEqual(btree.id2path(b"c"), "grandparent/alt_parent/file")
272
self.assertEqual(btree.path2id("grandparent/alt_parent/file"), b"c")
273
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
275
def unified_diff(self, old, new):
277
diff.internal_diff("old", old, "new", new, out)
281
def make_tree_2(self):
282
btree = self.make_tree_1()[0]
283
btree.note_rename("grandparent/parent/file",
284
"grandparent/alt_parent/file")
285
self.assertTrue(btree.id2path(b"e") is None)
286
self.assertFalse(btree.is_versioned("grandparent/parent/file"))
287
btree.note_id(b"e", "grandparent/parent/file")
291
"""File/inventory adds"""
292
btree = self.make_tree_2()
293
add_patch = self.unified_diff([], ["Extra cheese\n"])
294
btree.note_patch("grandparent/parent/file", add_patch)
295
btree.note_id(b'f', 'grandparent/parent/symlink', kind='symlink')
296
btree.note_target('grandparent/parent/symlink', 'venus')
297
self.adds_test(btree)
299
def adds_test(self, btree):
300
self.assertEqual(btree.id2path(b"e"), "grandparent/parent/file")
301
self.assertEqual(btree.path2id("grandparent/parent/file"), b"e")
302
with btree.get_file("grandparent/parent/file") as f:
303
self.assertEqual(f.read(), b"Extra cheese\n")
305
btree.get_symlink_target('grandparent/parent/symlink'), 'venus')
307
def test_adds2(self):
308
"""File/inventory adds, with patch-compatibile renames"""
309
btree = self.make_tree_2()
310
btree.contents_by_id = False
311
add_patch = self.unified_diff(["Hello\n"], ["Extra cheese\n"])
312
btree.note_patch("grandparent/parent/file", add_patch)
313
btree.note_id(b'f', 'grandparent/parent/symlink', kind='symlink')
314
btree.note_target('grandparent/parent/symlink', 'venus')
315
self.adds_test(btree)
317
def make_tree_3(self):
318
btree, mtree = self.make_tree_1()
319
mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
320
btree.note_rename("grandparent/parent/file",
321
"grandparent/alt_parent/file")
322
btree.note_rename("grandparent/parent/topping",
323
"grandparent/alt_parent/stopping")
326
def get_file_test(self, btree):
327
with btree.get_file(btree.id2path(b"e")) as f:
328
self.assertEqual(f.read(), b"Lemon\n")
329
with btree.get_file(btree.id2path(b"c")) as f:
330
self.assertEqual(f.read(), b"Hello\n")
332
def test_get_file(self):
333
"""Get file contents"""
334
btree = self.make_tree_3()
335
mod_patch = self.unified_diff(["Anchovies\n"], ["Lemon\n"])
336
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
337
self.get_file_test(btree)
339
def test_get_file2(self):
340
"""Get file contents, with patch-compatible renames"""
341
btree = self.make_tree_3()
342
btree.contents_by_id = False
343
mod_patch = self.unified_diff([], ["Lemon\n"])
344
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
345
mod_patch = self.unified_diff([], ["Hello\n"])
346
btree.note_patch("grandparent/alt_parent/file", mod_patch)
347
self.get_file_test(btree)
349
def test_delete(self):
351
btree = self.make_tree_1()[0]
352
with btree.get_file(btree.id2path(b"c")) as f:
353
self.assertEqual(f.read(), b"Hello\n")
354
btree.note_deletion("grandparent/parent/file")
355
self.assertTrue(btree.id2path(b"c") is None)
356
self.assertFalse(btree.is_versioned("grandparent/parent/file"))
358
def sorted_ids(self, tree):
359
ids = sorted(tree.all_file_ids())
362
def test_iteration(self):
363
"""Ensure that iteration through ids works properly"""
364
btree = self.make_tree_1()[0]
365
self.assertEqual(self.sorted_ids(btree),
366
[inventory.ROOT_ID, b'a', b'b', b'c', b'd'])
367
btree.note_deletion("grandparent/parent/file")
368
btree.note_id(b"e", "grandparent/alt_parent/fool", kind="directory")
369
btree.note_last_changed("grandparent/alt_parent/fool",
371
self.assertEqual(self.sorted_ids(btree),
372
[inventory.ROOT_ID, b'a', b'b', b'd', b'e'])
375
class BundleTester1(tests.TestCaseWithTransport):
377
def test_mismatched_bundle(self):
378
format = bzrdir.BzrDirMetaFormat1()
379
format.repository_format = knitrepo.RepositoryFormatKnit3()
380
serializer = BundleSerializerV08('0.8')
381
b = self.make_branch('.', format=format)
382
self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
383
b.repository, [], {}, BytesIO())
385
def test_matched_bundle(self):
386
"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
387
format = bzrdir.BzrDirMetaFormat1()
388
format.repository_format = knitrepo.RepositoryFormatKnit3()
389
serializer = BundleSerializerV09('0.9')
390
b = self.make_branch('.', format=format)
391
serializer.write(b.repository, [], {}, BytesIO())
393
def test_mismatched_model(self):
394
"""Try copying a bundle from knit2 to knit1"""
395
format = bzrdir.BzrDirMetaFormat1()
396
format.repository_format = knitrepo.RepositoryFormatKnit3()
397
source = self.make_branch_and_tree('source', format=format)
398
source.commit('one', rev_id=b'one-id')
399
source.commit('two', rev_id=b'two-id')
401
write_bundle(source.branch.repository, b'two-id', b'null:', text,
405
format = bzrdir.BzrDirMetaFormat1()
406
format.repository_format = knitrepo.RepositoryFormatKnit1()
407
target = self.make_branch('target', format=format)
408
self.assertRaises(errors.IncompatibleRevision, install_bundle,
409
target.repository, read_bundle(text))
412
class BundleTester(object):
414
def bzrdir_format(self):
415
format = bzrdir.BzrDirMetaFormat1()
416
format.repository_format = knitrepo.RepositoryFormatKnit1()
419
def make_branch_and_tree(self, path, format=None):
421
format = self.bzrdir_format()
422
return tests.TestCaseWithTransport.make_branch_and_tree(
425
def make_branch(self, path, format=None):
427
format = self.bzrdir_format()
428
return tests.TestCaseWithTransport.make_branch(self, path, format)
430
def create_bundle_text(self, base_rev_id, rev_id):
431
bundle_txt = BytesIO()
432
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
433
bundle_txt, format=self.format)
435
self.assertEqual(bundle_txt.readline(),
436
b'# Bazaar revision bundle v%s\n' % self.format.encode('ascii'))
437
self.assertEqual(bundle_txt.readline(), b'#\n')
439
rev = self.b1.repository.get_revision(rev_id)
440
self.assertEqual(bundle_txt.readline().decode('utf-8'),
443
return bundle_txt, rev_ids
445
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
446
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
447
Make sure that the text generated is valid, and that it
448
can be applied against the base, and generate the same information.
450
:return: The in-memory bundle
452
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
454
# This should also validate the generated bundle
455
bundle = read_bundle(bundle_txt)
456
repository = self.b1.repository
457
for bundle_rev in bundle.real_revisions:
458
# These really should have already been checked when we read the
459
# bundle, since it computes the sha1 hash for the revision, which
460
# only will match if everything is okay, but lets be explicit about
462
branch_rev = repository.get_revision(bundle_rev.revision_id)
463
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
464
'timestamp', 'timezone', 'message', 'committer',
465
'parent_ids', 'properties'):
466
self.assertEqual(getattr(branch_rev, a),
467
getattr(bundle_rev, a))
468
self.assertEqual(len(branch_rev.parent_ids),
469
len(bundle_rev.parent_ids))
470
self.assertEqual(rev_ids,
471
[r.revision_id for r in bundle.real_revisions])
472
self.valid_apply_bundle(base_rev_id, bundle,
473
checkout_dir=checkout_dir)
477
def get_invalid_bundle(self, base_rev_id, rev_id):
478
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
479
Munge the text so that it's invalid.
481
:return: The in-memory bundle
483
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
484
new_text = bundle_txt.getvalue().replace('executable:no',
486
bundle_txt = BytesIO(new_text)
487
bundle = read_bundle(bundle_txt)
488
self.valid_apply_bundle(base_rev_id, bundle)
491
def test_non_bundle(self):
492
self.assertRaises(errors.NotABundle,
493
read_bundle, BytesIO(b'#!/bin/sh\n'))
495
def test_malformed(self):
496
self.assertRaises(errors.BadBundle, read_bundle,
497
BytesIO(b'# Bazaar revision bundle v'))
499
def test_crlf_bundle(self):
501
read_bundle(BytesIO(b'# Bazaar revision bundle v0.8\r\n'))
502
except errors.BadBundle:
503
# It is currently permitted for bundles with crlf line endings to
504
# make read_bundle raise a BadBundle, but this should be fixed.
505
# Anything else, especially NotABundle, is an error.
508
def get_checkout(self, rev_id, checkout_dir=None):
509
"""Get a new tree, with the specified revision in it.
512
if checkout_dir is None:
513
checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
515
if not os.path.exists(checkout_dir):
516
os.mkdir(checkout_dir)
517
tree = self.make_branch_and_tree(checkout_dir)
519
ancestors = write_bundle(self.b1.repository, rev_id, b'null:', s,
522
self.assertIsInstance(s.getvalue(), bytes)
523
install_bundle(tree.branch.repository, read_bundle(s))
524
for ancestor in ancestors:
525
old = self.b1.repository.revision_tree(ancestor)
526
new = tree.branch.repository.revision_tree(ancestor)
530
# Check that there aren't any inventory level changes
531
delta = new.changes_from(old)
532
self.assertFalse(delta.has_changed(),
533
'Revision %s not copied correctly.'
536
# Now check that the file contents are all correct
537
for path in old.all_versioned_paths():
539
old_file = old.get_file(path)
540
except errors.NoSuchFile:
543
old_file.read(), new.get_file(path).read())
547
if not _mod_revision.is_null(rev_id):
548
tree.branch.generate_revision_history(rev_id)
550
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
551
self.assertFalse(delta.has_changed(),
552
'Working tree has modifications: %s' % delta)
555
def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
556
"""Get the base revision, apply the changes, and make
557
sure everything matches the builtin branch.
559
to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
562
self._valid_apply_bundle(base_rev_id, info, to_tree)
566
def _valid_apply_bundle(self, base_rev_id, info, to_tree):
567
original_parents = to_tree.get_parent_ids()
568
repository = to_tree.branch.repository
569
original_parents = to_tree.get_parent_ids()
570
self.assertIs(repository.has_revision(base_rev_id), True)
571
for rev in info.real_revisions:
572
self.assertTrue(not repository.has_revision(rev.revision_id),
573
'Revision {%s} present before applying bundle'
575
merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
577
for rev in info.real_revisions:
578
self.assertTrue(repository.has_revision(rev.revision_id),
579
'Missing revision {%s} after applying bundle'
582
self.assertTrue(to_tree.branch.repository.has_revision(info.target))
583
# Do we also want to verify that all the texts have been added?
585
self.assertEqual(original_parents + [info.target],
586
to_tree.get_parent_ids())
588
rev = info.real_revisions[-1]
589
base_tree = self.b1.repository.revision_tree(rev.revision_id)
590
to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
592
# TODO: make sure the target tree is identical to base tree
593
# we might also check the working tree.
595
base_files = list(base_tree.list_files())
596
to_files = list(to_tree.list_files())
597
self.assertEqual(len(base_files), len(to_files))
598
for base_file, to_file in zip(base_files, to_files):
599
self.assertEqual(base_file, to_file)
601
for path, status, kind, fileid, entry in base_files:
602
# Check that the meta information is the same
603
self.assertEqual(base_tree.get_file_size(path, fileid),
604
to_tree.get_file_size(to_tree.id2path(fileid)))
605
self.assertEqual(base_tree.get_file_sha1(path, fileid),
606
to_tree.get_file_sha1(to_tree.id2path(fileid)))
607
# Check that the contents are the same
608
# This is pretty expensive
609
# self.assertEqual(base_tree.get_file(fileid).read(),
610
# to_tree.get_file(fileid).read())
612
def test_bundle(self):
613
self.tree1 = self.make_branch_and_tree('b1')
614
self.b1 = self.tree1.branch
616
self.build_tree_contents([('b1/one', b'one\n')])
617
self.tree1.add('one', b'one-id')
618
self.tree1.set_root_id(b'root-id')
619
self.tree1.commit('add one', rev_id=b'a@cset-0-1')
621
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-1')
623
# Make sure we can handle files with spaces, tabs, other
628
, 'b1/dir/filein subdir.c'
629
, 'b1/dir/WithCaps.txt'
630
, 'b1/dir/ pre space'
633
, 'b1/sub/sub/nonempty.txt'
635
self.build_tree_contents([('b1/sub/sub/emptyfile.txt', b''),
636
('b1/dir/nolastnewline.txt', b'bloop')])
637
tt = TreeTransform(self.tree1)
638
tt.new_file('executable', tt.root, [b'#!/bin/sh\n'], b'exe-1', True)
640
# have to fix length of file-id so that we can predictably rewrite
641
# a (length-prefixed) record containing it later.
642
self.tree1.add('with space.txt', b'withspace-id')
645
, 'dir/filein subdir.c'
648
, 'dir/nolastnewline.txt'
651
, 'sub/sub/nonempty.txt'
652
, 'sub/sub/emptyfile.txt'
654
self.tree1.commit('add whitespace', rev_id=b'a@cset-0-2')
656
bundle = self.get_valid_bundle(b'a@cset-0-1', b'a@cset-0-2')
658
# Check a rollup bundle
659
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-2')
663
['sub/sub/nonempty.txt'
664
, 'sub/sub/emptyfile.txt'
667
tt = TreeTransform(self.tree1)
668
trans_id = tt.trans_id_tree_path('executable')
669
tt.set_executability(False, trans_id)
671
self.tree1.commit('removed', rev_id=b'a@cset-0-3')
673
bundle = self.get_valid_bundle(b'a@cset-0-2', b'a@cset-0-3')
674
self.assertRaises((errors.TestamentMismatch,
675
errors.VersionedFileInvalidChecksum,
676
errors.BadBundle), self.get_invalid_bundle,
677
b'a@cset-0-2', b'a@cset-0-3')
678
# Check a rollup bundle
679
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-3')
681
# Now move the directory
682
self.tree1.rename_one('dir', 'sub/dir')
683
self.tree1.commit('rename dir', rev_id=b'a@cset-0-4')
685
bundle = self.get_valid_bundle(b'a@cset-0-3', b'a@cset-0-4')
686
# Check a rollup bundle
687
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-4')
690
with open('b1/sub/dir/WithCaps.txt', 'ab') as f: f.write(b'\nAdding some text\n')
691
with open('b1/sub/dir/ pre space', 'ab') as f: f.write(
692
b'\r\nAdding some\r\nDOS format lines\r\n')
693
with open('b1/sub/dir/nolastnewline.txt', 'ab') as f: f.write(b'\n')
694
self.tree1.rename_one('sub/dir/ pre space',
696
self.tree1.commit('Modified files', rev_id=b'a@cset-0-5')
697
bundle = self.get_valid_bundle(b'a@cset-0-4', b'a@cset-0-5')
699
self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
700
self.tree1.rename_one('with space.txt', 'WithCaps.txt')
701
self.tree1.rename_one('temp', 'with space.txt')
702
self.tree1.commit(u'swap filenames', rev_id=b'a@cset-0-6',
704
bundle = self.get_valid_bundle(b'a@cset-0-5', b'a@cset-0-6')
705
other = self.get_checkout(b'a@cset-0-5')
706
tree1_inv = get_inventory_text(self.tree1.branch.repository,
708
tree2_inv = get_inventory_text(other.branch.repository,
710
self.assertEqualDiff(tree1_inv, tree2_inv)
711
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
712
other.commit('rename file', rev_id=b'a@cset-0-6b')
713
self.tree1.merge_from_branch(other.branch)
714
self.tree1.commit(u'Merge', rev_id=b'a@cset-0-7',
716
bundle = self.get_valid_bundle(b'a@cset-0-6', b'a@cset-0-7')
718
def _test_symlink_bundle(self, link_name, link_target, new_link_target):
721
self.requireFeature(features.SymlinkFeature)
722
self.tree1 = self.make_branch_and_tree('b1')
723
self.b1 = self.tree1.branch
725
tt = TreeTransform(self.tree1)
726
tt.new_symlink(link_name, tt.root, link_target, link_id)
728
self.tree1.commit('add symlink', rev_id=b'l@cset-0-1')
729
bundle = self.get_valid_bundle(b'null:', b'l@cset-0-1')
730
if getattr(bundle, 'revision_tree', None) is not None:
731
# Not all bundle formats supports revision_tree
732
bund_tree = bundle.revision_tree(self.b1.repository, b'l@cset-0-1')
733
self.assertEqual(link_target, bund_tree.get_symlink_target(link_name))
735
tt = TreeTransform(self.tree1)
736
trans_id = tt.trans_id_tree_path(link_name)
737
tt.adjust_path('link2', tt.root, trans_id)
738
tt.delete_contents(trans_id)
739
tt.create_symlink(new_link_target, trans_id)
741
self.tree1.commit('rename and change symlink', rev_id=b'l@cset-0-2')
742
bundle = self.get_valid_bundle(b'l@cset-0-1', b'l@cset-0-2')
743
if getattr(bundle, 'revision_tree', None) is not None:
744
# Not all bundle formats supports revision_tree
745
bund_tree = bundle.revision_tree(self.b1.repository, b'l@cset-0-2')
746
self.assertEqual(new_link_target,
747
bund_tree.get_symlink_target('link2'))
749
tt = TreeTransform(self.tree1)
750
trans_id = tt.trans_id_tree_path('link2')
751
tt.delete_contents(trans_id)
752
tt.create_symlink('jupiter', trans_id)
754
self.tree1.commit('just change symlink target', rev_id=b'l@cset-0-3')
755
bundle = self.get_valid_bundle(b'l@cset-0-2', b'l@cset-0-3')
757
tt = TreeTransform(self.tree1)
758
trans_id = tt.trans_id_tree_path('link2')
759
tt.delete_contents(trans_id)
761
self.tree1.commit('Delete symlink', rev_id=b'l@cset-0-4')
762
bundle = self.get_valid_bundle(b'l@cset-0-3', b'l@cset-0-4')
764
def test_symlink_bundle(self):
765
self._test_symlink_bundle('link', 'bar/foo', 'mars')
767
def test_unicode_symlink_bundle(self):
768
self.requireFeature(features.UnicodeFilenameFeature)
769
self._test_symlink_bundle(u'\N{Euro Sign}link',
770
u'bar/\N{Euro Sign}foo',
771
u'mars\N{Euro Sign}')
773
def test_binary_bundle(self):
774
self.tree1 = self.make_branch_and_tree('b1')
775
self.b1 = self.tree1.branch
776
tt = TreeTransform(self.tree1)
779
tt.new_file('file', tt.root, [b'\x00\n\x00\r\x01\n\x02\r\xff'], b'binary-1')
780
tt.new_file('file2', tt.root, [b'\x01\n\x02\r\x03\n\x04\r\xff'],
783
self.tree1.commit('add binary', rev_id=b'b@cset-0-1')
784
self.get_valid_bundle(b'null:', b'b@cset-0-1')
787
tt = TreeTransform(self.tree1)
788
trans_id = tt.trans_id_tree_path('file')
789
tt.delete_contents(trans_id)
791
self.tree1.commit('delete binary', rev_id=b'b@cset-0-2')
792
self.get_valid_bundle(b'b@cset-0-1', b'b@cset-0-2')
795
tt = TreeTransform(self.tree1)
796
trans_id = tt.trans_id_tree_path('file2')
797
tt.adjust_path('file3', tt.root, trans_id)
798
tt.delete_contents(trans_id)
799
tt.create_file([b'file\rcontents\x00\n\x00'], trans_id)
801
self.tree1.commit('rename and modify binary', rev_id=b'b@cset-0-3')
802
self.get_valid_bundle(b'b@cset-0-2', b'b@cset-0-3')
805
tt = TreeTransform(self.tree1)
806
trans_id = tt.trans_id_tree_path('file3')
807
tt.delete_contents(trans_id)
808
tt.create_file([b'\x00file\rcontents'], trans_id)
810
self.tree1.commit('just modify binary', rev_id=b'b@cset-0-4')
811
self.get_valid_bundle(b'b@cset-0-3', b'b@cset-0-4')
814
self.get_valid_bundle(b'null:', b'b@cset-0-4')
816
def test_last_modified(self):
817
self.tree1 = self.make_branch_and_tree('b1')
818
self.b1 = self.tree1.branch
819
tt = TreeTransform(self.tree1)
820
tt.new_file('file', tt.root, [b'file'], b'file')
822
self.tree1.commit('create file', rev_id=b'a@lmod-0-1')
824
tt = TreeTransform(self.tree1)
825
trans_id = tt.trans_id_tree_path('file')
826
tt.delete_contents(trans_id)
827
tt.create_file([b'file2'], trans_id)
829
self.tree1.commit('modify text', rev_id=b'a@lmod-0-2a')
831
other = self.get_checkout(b'a@lmod-0-1')
832
tt = TreeTransform(other)
833
trans_id = tt.trans_id_tree_path('file2')
834
tt.delete_contents(trans_id)
835
tt.create_file([b'file2'], trans_id)
837
other.commit('modify text in another tree', rev_id=b'a@lmod-0-2b')
838
self.tree1.merge_from_branch(other.branch)
839
self.tree1.commit(u'Merge', rev_id=b'a@lmod-0-3',
841
self.tree1.commit(u'Merge', rev_id=b'a@lmod-0-4')
842
bundle = self.get_valid_bundle(b'a@lmod-0-2a', b'a@lmod-0-4')
844
def test_hide_history(self):
845
self.tree1 = self.make_branch_and_tree('b1')
846
self.b1 = self.tree1.branch
848
with open('b1/one', 'wb') as f: f.write(b'one\n')
849
self.tree1.add('one')
850
self.tree1.commit('add file', rev_id=b'a@cset-0-1')
851
with open('b1/one', 'wb') as f: f.write(b'two\n')
852
self.tree1.commit('modify', rev_id=b'a@cset-0-2')
853
with open('b1/one', 'wb') as f: f.write(b'three\n')
854
self.tree1.commit('modify', rev_id=b'a@cset-0-3')
855
bundle_file = BytesIO()
856
rev_ids = write_bundle(self.tree1.branch.repository, b'a@cset-0-3',
857
b'a@cset-0-1', bundle_file, format=self.format)
858
self.assertNotContainsRe(bundle_file.getvalue(), b'\btwo\b')
859
self.assertContainsRe(self.get_raw(bundle_file), b'one')
860
self.assertContainsRe(self.get_raw(bundle_file), b'three')
862
def test_bundle_same_basis(self):
863
"""Ensure using the basis as the target doesn't cause an error"""
864
self.tree1 = self.make_branch_and_tree('b1')
865
self.tree1.commit('add file', rev_id=b'a@cset-0-1')
866
bundle_file = BytesIO()
867
rev_ids = write_bundle(self.tree1.branch.repository, b'a@cset-0-1',
868
b'a@cset-0-1', bundle_file)
871
def get_raw(bundle_file):
872
return bundle_file.getvalue()
874
def test_unicode_bundle(self):
875
self.requireFeature(features.UnicodeFilenameFeature)
876
# Handle international characters
878
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
880
self.tree1 = self.make_branch_and_tree('b1')
881
self.b1 = self.tree1.branch
884
u'With international man of mystery\n'
885
u'William Dod\xe9\n').encode('utf-8'))
888
self.tree1.add([u'with Dod\N{Euro Sign}'], [b'withdod-id'])
889
self.tree1.commit(u'i18n commit from William Dod\xe9',
890
rev_id=b'i18n-1', committer=u'William Dod\xe9')
893
bundle = self.get_valid_bundle(b'null:', b'i18n-1')
896
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
897
f.write(u'Modified \xb5\n'.encode('utf8'))
899
self.tree1.commit(u'modified', rev_id=b'i18n-2')
901
bundle = self.get_valid_bundle(b'i18n-1', b'i18n-2')
904
self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
905
self.tree1.commit(u'renamed, the new i18n man', rev_id=b'i18n-3',
906
committer=u'Erik B\xe5gfors')
908
bundle = self.get_valid_bundle(b'i18n-2', b'i18n-3')
911
self.tree1.remove([u'B\N{Euro Sign}gfors'])
912
self.tree1.commit(u'removed', rev_id=b'i18n-4')
914
bundle = self.get_valid_bundle(b'i18n-3', b'i18n-4')
917
bundle = self.get_valid_bundle(b'null:', b'i18n-4')
920
def test_whitespace_bundle(self):
921
if sys.platform in ('win32', 'cygwin'):
922
raise tests.TestSkipped('Windows doesn\'t support filenames'
923
' with tabs or trailing spaces')
924
self.tree1 = self.make_branch_and_tree('b1')
925
self.b1 = self.tree1.branch
927
self.build_tree(['b1/trailing space '])
928
self.tree1.add(['trailing space '])
929
# TODO: jam 20060701 Check for handling files with '\t' characters
930
# once we actually support them
933
self.tree1.commit('funky whitespace', rev_id=b'white-1')
935
bundle = self.get_valid_bundle(b'null:', b'white-1')
938
with open('b1/trailing space ', 'ab') as f: f.write(b'add some text\n')
939
self.tree1.commit('add text', rev_id=b'white-2')
941
bundle = self.get_valid_bundle(b'white-1', b'white-2')
944
self.tree1.rename_one('trailing space ', ' start and end space ')
945
self.tree1.commit('rename', rev_id=b'white-3')
947
bundle = self.get_valid_bundle(b'white-2', b'white-3')
950
self.tree1.remove([' start and end space '])
951
self.tree1.commit('removed', rev_id=b'white-4')
953
bundle = self.get_valid_bundle(b'white-3', b'white-4')
955
# Now test a complet roll-up
956
bundle = self.get_valid_bundle(b'null:', b'white-4')
958
def test_alt_timezone_bundle(self):
959
self.tree1 = self.make_branch_and_memory_tree('b1')
960
self.b1 = self.tree1.branch
961
builder = treebuilder.TreeBuilder()
963
self.tree1.lock_write()
964
builder.start_tree(self.tree1)
965
builder.build(['newfile'])
966
builder.finish_tree()
968
# Asia/Colombo offset = 5 hours 30 minutes
969
self.tree1.commit('non-hour offset timezone', rev_id=b'tz-1',
970
timezone=19800, timestamp=1152544886.0)
972
bundle = self.get_valid_bundle(b'null:', b'tz-1')
974
rev = bundle.revisions[0]
975
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
976
self.assertEqual(19800, rev.timezone)
977
self.assertEqual(1152544886.0, rev.timestamp)
980
def test_bundle_root_id(self):
981
self.tree1 = self.make_branch_and_tree('b1')
982
self.b1 = self.tree1.branch
983
self.tree1.commit('message', rev_id=b'revid1')
984
bundle = self.get_valid_bundle(b'null:', b'revid1')
985
tree = self.get_bundle_tree(bundle, b'revid1')
986
root_revision = tree.get_file_revision(u'', tree.get_root_id())
987
self.assertEqual(b'revid1', root_revision)
989
def test_install_revisions(self):
990
self.tree1 = self.make_branch_and_tree('b1')
991
self.b1 = self.tree1.branch
992
self.tree1.commit('message', rev_id=b'rev2a')
993
bundle = self.get_valid_bundle(b'null:', b'rev2a')
994
branch2 = self.make_branch('b2')
995
self.assertFalse(branch2.repository.has_revision(b'rev2a'))
996
target_revision = bundle.install_revisions(branch2.repository)
997
self.assertTrue(branch2.repository.has_revision(b'rev2a'))
998
self.assertEqual(b'rev2a', target_revision)
1000
def test_bundle_empty_property(self):
1001
"""Test serializing revision properties with an empty value."""
1002
tree = self.make_branch_and_memory_tree('tree')
1004
self.addCleanup(tree.unlock)
1005
tree.add([''], [b'TREE_ROOT'])
1006
tree.commit('One', revprops={u'one': 'two', u'empty': ''}, rev_id=b'rev1')
1007
self.b1 = tree.branch
1008
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1009
bundle = read_bundle(bundle_sio)
1010
revision_info = bundle.revisions[0]
1011
self.assertEqual(b'rev1', revision_info.revision_id)
1012
rev = revision_info.as_revision()
1013
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1016
def test_bundle_sorted_properties(self):
1017
"""For stability the writer should write properties in sorted order."""
1018
tree = self.make_branch_and_memory_tree('tree')
1020
self.addCleanup(tree.unlock)
1022
tree.add([''], [b'TREE_ROOT'])
1023
tree.commit('One', rev_id=b'rev1',
1024
revprops={u'a':'4', u'b':'3', u'c':'2', u'd':'1'})
1025
self.b1 = tree.branch
1026
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1027
bundle = read_bundle(bundle_sio)
1028
revision_info = bundle.revisions[0]
1029
self.assertEqual(b'rev1', revision_info.revision_id)
1030
rev = revision_info.as_revision()
1031
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1032
'd':'1'}, rev.properties)
1034
def test_bundle_unicode_properties(self):
1035
"""We should be able to round trip a non-ascii property."""
1036
tree = self.make_branch_and_memory_tree('tree')
1038
self.addCleanup(tree.unlock)
1040
tree.add([''], [b'TREE_ROOT'])
1041
# Revisions themselves do not require anything about revision property
1042
# keys, other than that they are a basestring, and do not contain
1044
# However, Testaments assert than they are str(), and thus should not
1046
tree.commit('One', rev_id=b'rev1',
1047
revprops={u'omega':u'\u03a9', u'alpha':u'\u03b1'})
1048
self.b1 = tree.branch
1049
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1050
bundle = read_bundle(bundle_sio)
1051
revision_info = bundle.revisions[0]
1052
self.assertEqual(b'rev1', revision_info.revision_id)
1053
rev = revision_info.as_revision()
1054
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1055
'alpha':u'\u03b1'}, rev.properties)
1057
def test_bundle_with_ghosts(self):
1058
tree = self.make_branch_and_tree('tree')
1059
self.b1 = tree.branch
1060
self.build_tree_contents([('tree/file', b'content1')])
1063
self.build_tree_contents([('tree/file', b'content2')])
1064
tree.add_parent_tree_id(b'ghost')
1065
tree.commit('rev2', rev_id=b'rev2')
1066
bundle = self.get_valid_bundle(b'null:', b'rev2')
1068
def make_simple_tree(self, format=None):
1069
tree = self.make_branch_and_tree('b1', format=format)
1070
self.b1 = tree.branch
1071
self.build_tree(['b1/file'])
1075
def test_across_serializers(self):
1076
tree = self.make_simple_tree('knit')
1077
tree.commit('hello', rev_id=b'rev1')
1078
tree.commit('hello', rev_id=b'rev2')
1079
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
1080
repo = self.make_repository('repo', format='dirstate-with-subtree')
1081
bundle.install_revisions(repo)
1082
inv_text = repo._get_inventory_xml(b'rev2')
1083
self.assertNotContainsRe(inv_text, b'format="5"')
1084
self.assertContainsRe(inv_text, b'format="7"')
1086
def make_repo_with_installed_revisions(self):
1087
tree = self.make_simple_tree('knit')
1088
tree.commit('hello', rev_id=b'rev1')
1089
tree.commit('hello', rev_id=b'rev2')
1090
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
1091
repo = self.make_repository('repo', format='dirstate-with-subtree')
1092
bundle.install_revisions(repo)
1095
def test_across_models(self):
1096
repo = self.make_repo_with_installed_revisions()
1097
inv = repo.get_inventory(b'rev2')
1098
self.assertEqual(b'rev2', inv.root.revision)
1099
root_id = inv.root.file_id
1101
self.addCleanup(repo.unlock)
1102
self.assertEqual({(root_id, b'rev1'):(),
1103
(root_id, b'rev2'):((root_id, b'rev1'),)},
1104
repo.texts.get_parent_map([(root_id, b'rev1'), (root_id, b'rev2')]))
1106
def test_inv_hash_across_serializers(self):
1107
repo = self.make_repo_with_installed_revisions()
1108
recorded_inv_sha1 = repo.get_revision(b'rev2').inventory_sha1
1109
xml = repo._get_inventory_xml(b'rev2')
1110
self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
1112
def test_across_models_incompatible(self):
1113
tree = self.make_simple_tree('dirstate-with-subtree')
1114
tree.commit('hello', rev_id=b'rev1')
1115
tree.commit('hello', rev_id=b'rev2')
1117
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
1118
except errors.IncompatibleBundleFormat:
1119
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1120
repo = self.make_repository('repo', format='knit')
1121
bundle.install_revisions(repo)
1123
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
1124
self.assertRaises(errors.IncompatibleRevision,
1125
bundle.install_revisions, repo)
1127
def test_get_merge_request(self):
1128
tree = self.make_simple_tree()
1129
tree.commit('hello', rev_id=b'rev1')
1130
tree.commit('hello', rev_id=b'rev2')
1131
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
1132
result = bundle.get_merge_request(tree.branch.repository)
1133
self.assertEqual((None, b'rev1', 'inapplicable'), result)
1135
def test_with_subtree(self):
1136
tree = self.make_branch_and_tree('tree',
1137
format='dirstate-with-subtree')
1138
self.b1 = tree.branch
1139
subtree = self.make_branch_and_tree('tree/subtree',
1140
format='dirstate-with-subtree')
1142
tree.commit('hello', rev_id=b'rev1')
1144
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
1145
except errors.IncompatibleBundleFormat:
1146
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1147
if isinstance(bundle, v09.BundleInfo09):
1148
raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
1149
repo = self.make_repository('repo', format='knit')
1150
self.assertRaises(errors.IncompatibleRevision,
1151
bundle.install_revisions, repo)
1152
repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1153
bundle.install_revisions(repo2)
1155
def test_revision_id_with_slash(self):
1156
self.tree1 = self.make_branch_and_tree('tree')
1157
self.b1 = self.tree1.branch
1159
self.tree1.commit('Revision/id/with/slashes', rev_id=b'rev/id')
1161
raise tests.TestSkipped(
1162
"Repository doesn't support revision ids with slashes")
1163
bundle = self.get_valid_bundle(b'null:', b'rev/id')
1165
def test_skip_file(self):
1166
"""Make sure we don't accidentally write to the wrong versionedfile"""
1167
self.tree1 = self.make_branch_and_tree('tree')
1168
self.b1 = self.tree1.branch
1169
# rev1 is not present in bundle, done by fetch
1170
self.build_tree_contents([('tree/file2', b'contents1')])
1171
self.tree1.add('file2', b'file2-id')
1172
self.tree1.commit('rev1', rev_id=b'reva')
1173
self.build_tree_contents([('tree/file3', b'contents2')])
1174
# rev2 is present in bundle, and done by fetch
1175
# having file1 in the bunle causes file1's versionedfile to be opened.
1176
self.tree1.add('file3', b'file3-id')
1177
self.tree1.commit('rev2')
1178
# Updating file2 should not cause an attempt to add to file1's vf
1179
target = self.tree1.controldir.sprout('target').open_workingtree()
1180
self.build_tree_contents([('tree/file2', b'contents3')])
1181
self.tree1.commit('rev3', rev_id=b'rev3')
1182
bundle = self.get_valid_bundle(b'reva', b'rev3')
1183
if getattr(bundle, 'get_bundle_reader', None) is None:
1184
raise tests.TestSkipped('Bundle format cannot provide reader')
1185
# be sure that file1 comes before file2
1186
for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1187
if f == b'file3-id':
1189
self.assertNotEqual(f, b'file2-id')
1190
bundle.install_revisions(target.branch.repository)
1193
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
1197
def test_bundle_empty_property(self):
1198
"""Test serializing revision properties with an empty value."""
1199
tree = self.make_branch_and_memory_tree('tree')
1201
self.addCleanup(tree.unlock)
1202
tree.add([''], [b'TREE_ROOT'])
1203
tree.commit('One', revprops={u'one':'two', u'empty':''}, rev_id=b'rev1')
1204
self.b1 = tree.branch
1205
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1206
self.assertContainsRe(bundle_sio.getvalue(),
1208
b'# branch-nick: tree\n'
1212
bundle = read_bundle(bundle_sio)
1213
revision_info = bundle.revisions[0]
1214
self.assertEqual('rev1', revision_info.revision_id)
1215
rev = revision_info.as_revision()
1216
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1219
def get_bundle_tree(self, bundle, revision_id):
1220
repository = self.make_repository('repo')
1221
return bundle.revision_tree(repository, b'revid1')
1223
def test_bundle_empty_property_alt(self):
1224
"""Test serializing revision properties with an empty value.
1226
Older readers had a bug when reading an empty property.
1227
They assumed that all keys ended in ': \n'. However they would write an
1228
empty value as ':\n'. This tests make sure that all newer bzr versions
1229
can handle th second form.
1231
tree = self.make_branch_and_memory_tree('tree')
1233
self.addCleanup(tree.unlock)
1234
tree.add([''], [b'TREE_ROOT'])
1235
tree.commit('One', revprops={u'one':'two', u'empty':''}, rev_id=b'rev1')
1236
self.b1 = tree.branch
1237
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1238
txt = bundle_sio.getvalue()
1239
loc = txt.find(b'# empty: ') + len(b'# empty:')
1240
# Create a new bundle, which strips the trailing space after empty
1241
bundle_sio = BytesIO(txt[:loc] + txt[loc+1:])
1243
self.assertContainsRe(bundle_sio.getvalue(),
1245
b'# branch-nick: tree\n'
1249
bundle = read_bundle(bundle_sio)
1250
revision_info = bundle.revisions[0]
1251
self.assertEqual('rev1', revision_info.revision_id)
1252
rev = revision_info.as_revision()
1253
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1256
def test_bundle_sorted_properties(self):
1257
"""For stability the writer should write properties in sorted order."""
1258
tree = self.make_branch_and_memory_tree('tree')
1260
self.addCleanup(tree.unlock)
1262
tree.add([''], [b'TREE_ROOT'])
1263
tree.commit('One', rev_id=b'rev1',
1264
revprops={u'a':'4', u'b':'3', u'c':'2', u'd':'1'})
1265
self.b1 = tree.branch
1266
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1267
self.assertContainsRe(bundle_sio.getvalue(),
1271
b'# branch-nick: tree\n'
1275
bundle = read_bundle(bundle_sio)
1276
revision_info = bundle.revisions[0]
1277
self.assertEqual('rev1', revision_info.revision_id)
1278
rev = revision_info.as_revision()
1279
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1280
'd':'1'}, rev.properties)
1282
def test_bundle_unicode_properties(self):
1283
"""We should be able to round trip a non-ascii property."""
1284
tree = self.make_branch_and_memory_tree('tree')
1286
self.addCleanup(tree.unlock)
1288
tree.add([''], [b'TREE_ROOT'])
1289
# Revisions themselves do not require anything about revision property
1290
# keys, other than that they are a basestring, and do not contain
1292
# However, Testaments assert than they are str(), and thus should not
1294
tree.commit('One', rev_id=b'rev1',
1295
revprops={u'omega':u'\u03a9', u'alpha':u'\u03b1'})
1296
self.b1 = tree.branch
1297
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1298
self.assertContainsRe(bundle_sio.getvalue(),
1300
b'# alpha: \xce\xb1\n'
1301
b'# branch-nick: tree\n'
1302
b'# omega: \xce\xa9\n'
1304
bundle = read_bundle(bundle_sio)
1305
revision_info = bundle.revisions[0]
1306
self.assertEqual(b'rev1', revision_info.revision_id)
1307
rev = revision_info.as_revision()
1308
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1309
'alpha':u'\u03b1'}, rev.properties)
1312
class V09BundleKnit2Tester(V08BundleTester):
1316
def bzrdir_format(self):
1317
format = bzrdir.BzrDirMetaFormat1()
1318
format.repository_format = knitrepo.RepositoryFormatKnit3()
1322
class V09BundleKnit1Tester(V08BundleTester):
1326
def bzrdir_format(self):
1327
format = bzrdir.BzrDirMetaFormat1()
1328
format.repository_format = knitrepo.RepositoryFormatKnit1()
1332
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
1336
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1337
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1338
Make sure that the text generated is valid, and that it
1339
can be applied against the base, and generate the same information.
1341
:return: The in-memory bundle
1343
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1345
# This should also validate the generated bundle
1346
bundle = read_bundle(bundle_txt)
1347
repository = self.b1.repository
1348
for bundle_rev in bundle.real_revisions:
1349
# These really should have already been checked when we read the
1350
# bundle, since it computes the sha1 hash for the revision, which
1351
# only will match if everything is okay, but lets be explicit about
1353
branch_rev = repository.get_revision(bundle_rev.revision_id)
1354
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1355
'timestamp', 'timezone', 'message', 'committer',
1356
'parent_ids', 'properties'):
1357
self.assertEqual(getattr(branch_rev, a),
1358
getattr(bundle_rev, a))
1359
self.assertEqual(len(branch_rev.parent_ids),
1360
len(bundle_rev.parent_ids))
1361
self.assertEqual(set(rev_ids),
1362
{r.revision_id for r in bundle.real_revisions})
1363
self.valid_apply_bundle(base_rev_id, bundle,
1364
checkout_dir=checkout_dir)
1368
def get_invalid_bundle(self, base_rev_id, rev_id):
1369
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1370
Munge the text so that it's invalid.
1372
:return: The in-memory bundle
1374
from ..bundle import serializer
1375
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1376
new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1377
new_text = new_text.replace(b'<file file_id="exe-1"',
1378
b'<file executable="y" file_id="exe-1"')
1379
new_text = new_text.replace(b'B260', b'B275')
1380
bundle_txt = BytesIO()
1381
bundle_txt.write(serializer._get_bundle_header('4'))
1382
bundle_txt.write(b'\n')
1383
bundle_txt.write(bz2.compress(new_text))
1385
bundle = read_bundle(bundle_txt)
1386
self.valid_apply_bundle(base_rev_id, bundle)
1389
def create_bundle_text(self, base_rev_id, rev_id):
1390
bundle_txt = BytesIO()
1391
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1392
bundle_txt, format=self.format)
1394
self.assertEqual(bundle_txt.readline(),
1395
b'# Bazaar revision bundle v%s\n' % self.format.encode('ascii'))
1396
self.assertEqual(bundle_txt.readline(), b'#\n')
1397
rev = self.b1.repository.get_revision(rev_id)
1399
return bundle_txt, rev_ids
1401
def get_bundle_tree(self, bundle, revision_id):
1402
repository = self.make_repository('repo')
1403
bundle.install_revisions(repository)
1404
return repository.revision_tree(revision_id)
1406
def test_creation(self):
1407
tree = self.make_branch_and_tree('tree')
1408
self.build_tree_contents([('tree/file', b'contents1\nstatic\n')])
1409
tree.add('file', b'fileid-2')
1410
tree.commit('added file', rev_id=b'rev1')
1411
self.build_tree_contents([('tree/file', b'contents2\nstatic\n')])
1412
tree.commit('changed file', rev_id=b'rev2')
1414
serializer = BundleSerializerV4('1.0')
1415
serializer.write(tree.branch.repository, [b'rev1', b'rev2'], {}, s)
1417
tree2 = self.make_branch_and_tree('target')
1418
target_repo = tree2.branch.repository
1419
install_bundle(target_repo, serializer.read(s))
1420
target_repo.lock_read()
1421
self.addCleanup(target_repo.unlock)
1422
# Turn the 'iterators_of_bytes' back into simple strings for comparison
1423
repo_texts = dict((i, b''.join(content)) for i, content
1424
in target_repo.iter_files_bytes(
1425
[(b'fileid-2', b'rev1', '1'),
1426
(b'fileid-2', b'rev2', '2')]))
1427
self.assertEqual({'1':b'contents1\nstatic\n',
1428
'2':b'contents2\nstatic\n'},
1430
rtree = target_repo.revision_tree(b'rev2')
1431
inventory_vf = target_repo.inventories
1432
# If the inventory store has a graph, it must match the revision graph.
1434
[inventory_vf.get_parent_map([(b'rev2',)])[(b'rev2',)]],
1435
[None, ((b'rev1',),)])
1436
self.assertEqual('changed file',
1437
target_repo.get_revision(b'rev2').message)
1440
def get_raw(bundle_file):
1442
line = bundle_file.readline()
1443
line = bundle_file.readline()
1444
lines = bundle_file.readlines()
1445
return bz2.decompress(b''.join(lines))
1447
def test_copy_signatures(self):
1448
tree_a = self.make_branch_and_tree('tree_a')
1450
import breezy.commit as commit
1451
oldstrategy = breezy.gpg.GPGStrategy
1452
branch = tree_a.branch
1453
repo_a = branch.repository
1454
tree_a.commit("base", allow_pointless=True, rev_id=b'A')
1455
self.assertFalse(branch.repository.has_signature_for_revision_id(b'A'))
1457
from ..testament import Testament
1458
# monkey patch gpg signing mechanism
1459
breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
1460
new_config = test_commit.MustSignConfig()
1461
commit.Commit(config_stack=new_config).commit(message="base",
1462
allow_pointless=True,
1464
working_tree=tree_a)
1466
return breezy.gpg.LoopbackGPGStrategy(None).sign(text)
1467
self.assertTrue(repo_a.has_signature_for_revision_id(b'B'))
1469
breezy.gpg.GPGStrategy = oldstrategy
1470
tree_b = self.make_branch_and_tree('tree_b')
1471
repo_b = tree_b.branch.repository
1473
serializer = BundleSerializerV4('4')
1474
serializer.write(tree_a.branch.repository, [b'A', b'B'], {}, s)
1476
install_bundle(repo_b, serializer.read(s))
1477
self.assertTrue(repo_b.has_signature_for_revision_id(b'B'))
1478
self.assertEqual(repo_b.get_signature_text(b'B'),
1479
repo_a.get_signature_text(b'B'))
1481
# ensure repeat installs are harmless
1482
install_bundle(repo_b, serializer.read(s))
1485
class V4_2aBundleTester(V4BundleTester):
1487
def bzrdir_format(self):
1490
def get_invalid_bundle(self, base_rev_id, rev_id):
1491
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1492
Munge the text so that it's invalid.
1494
:return: The in-memory bundle
1496
from ..bundle import serializer
1497
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1498
new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1499
# We are going to be replacing some text to set the executable bit on a
1500
# file. Make sure the text replacement actually works correctly.
1501
self.assertContainsRe(new_text, b'(?m)B244\n\ni 1\n<inventory')
1502
new_text = new_text.replace(b'<file file_id="exe-1"',
1503
b'<file executable="y" file_id="exe-1"')
1504
new_text = new_text.replace(b'B244', b'B259')
1505
bundle_txt = BytesIO()
1506
bundle_txt.write(serializer._get_bundle_header('4'))
1507
bundle_txt.write(b'\n')
1508
bundle_txt.write(bz2.compress(new_text))
1510
bundle = read_bundle(bundle_txt)
1511
self.valid_apply_bundle(base_rev_id, bundle)
1514
def make_merged_branch(self):
1515
builder = self.make_branch_builder('source')
1516
builder.start_series()
1517
builder.build_snapshot(None, [
1518
('add', ('', b'root-id', 'directory', None)),
1519
('add', ('file', b'file-id', 'file', b'original content\n')),
1520
], revision_id=b'a@cset-0-1')
1521
builder.build_snapshot([b'a@cset-0-1'], [
1522
('modify', ('file', b'new-content\n')),
1523
], revision_id=b'a@cset-0-2a')
1524
builder.build_snapshot([b'a@cset-0-1'], [
1525
('add', ('other-file', b'file2-id', 'file', b'file2-content\n')),
1526
], revision_id=b'a@cset-0-2b')
1527
builder.build_snapshot([b'a@cset-0-2a', b'a@cset-0-2b'], [
1528
('add', ('other-file', b'file2-id', 'file', b'file2-content\n')),
1529
], revision_id=b'a@cset-0-3')
1530
builder.finish_series()
1531
self.b1 = builder.get_branch()
1533
self.addCleanup(self.b1.unlock)
1535
def make_bundle_just_inventories(self, base_revision_id,
1539
writer = v4.BundleWriteOperation(base_revision_id, target_revision_id,
1540
self.b1.repository, sio)
1541
writer.bundle.begin()
1542
writer._add_inventory_mpdiffs_from_serializer(revision_ids)
1547
def test_single_inventory_multiple_parents_as_xml(self):
1548
self.make_merged_branch()
1549
sio = self.make_bundle_just_inventories(b'a@cset-0-1', b'a@cset-0-3',
1551
reader = v4.BundleReader(sio, stream_input=False)
1552
records = list(reader.iter_records())
1553
self.assertEqual(1, len(records))
1554
(bytes, metadata, repo_kind, revision_id,
1555
file_id) = records[0]
1556
self.assertIs(None, file_id)
1557
self.assertEqual(b'a@cset-0-3', revision_id)
1558
self.assertEqual('inventory', repo_kind)
1559
self.assertEqual({b'parents': [b'a@cset-0-2a', b'a@cset-0-2b'],
1560
b'sha1': b'09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1561
b'storage_kind': b'mpdiff',
1563
# We should have an mpdiff that takes some lines from both parents.
1564
self.assertEqualDiff(
1566
b'<inventory format="10" revision_id="a@cset-0-3">\n'
1569
b'c 1 3 3 2\n', bytes)
1571
def test_single_inv_no_parents_as_xml(self):
1572
self.make_merged_branch()
1573
sio = self.make_bundle_just_inventories(b'null:', b'a@cset-0-1',
1575
reader = v4.BundleReader(sio, stream_input=False)
1576
records = list(reader.iter_records())
1577
self.assertEqual(1, len(records))
1578
(bytes, metadata, repo_kind, revision_id,
1579
file_id) = records[0]
1580
self.assertIs(None, file_id)
1581
self.assertEqual(b'a@cset-0-1', revision_id)
1582
self.assertEqual('inventory', repo_kind)
1583
self.assertEqual({b'parents': [],
1584
b'sha1': b'a13f42b142d544aac9b085c42595d304150e31a2',
1585
b'storage_kind': b'mpdiff',
1587
# We should have an mpdiff that takes some lines from both parents.
1588
self.assertEqualDiff(
1590
b'<inventory format="10" revision_id="a@cset-0-1">\n'
1591
b'<directory file_id="root-id" name=""'
1592
b' revision="a@cset-0-1" />\n'
1593
b'<file file_id="file-id" name="file" parent_id="root-id"'
1594
b' revision="a@cset-0-1"'
1595
b' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
1596
b' text_size="17" />\n'
1600
def test_multiple_inventories_as_xml(self):
1601
self.make_merged_branch()
1602
sio = self.make_bundle_just_inventories(b'a@cset-0-1', b'a@cset-0-3',
1603
[b'a@cset-0-2a', b'a@cset-0-2b', b'a@cset-0-3'])
1604
reader = v4.BundleReader(sio, stream_input=False)
1605
records = list(reader.iter_records())
1606
self.assertEqual(3, len(records))
1607
revision_ids = [rev_id for b, m, k, rev_id, f in records]
1608
self.assertEqual([b'a@cset-0-2a', b'a@cset-0-2b', b'a@cset-0-3'],
1610
metadata_2a = records[0][1]
1611
self.assertEqual({b'parents': [b'a@cset-0-1'],
1612
b'sha1': b'1e105886d62d510763e22885eec733b66f5f09bf',
1613
b'storage_kind': b'mpdiff',
1615
metadata_2b = records[1][1]
1616
self.assertEqual({b'parents': [b'a@cset-0-1'],
1617
b'sha1': b'f03f12574bdb5ed2204c28636c98a8547544ccd8',
1618
b'storage_kind': b'mpdiff',
1620
metadata_3 = records[2][1]
1621
self.assertEqual({b'parents': [b'a@cset-0-2a', b'a@cset-0-2b'],
1622
b'sha1': b'09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1623
b'storage_kind': b'mpdiff',
1625
bytes_2a = records[0][0]
1626
self.assertEqualDiff(
1628
b'<inventory format="10" revision_id="a@cset-0-2a">\n'
1632
b'<file file_id="file-id" name="file" parent_id="root-id"'
1633
b' revision="a@cset-0-2a"'
1634
b' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
1635
b' text_size="12" />\n'
1637
b'c 0 3 3 1\n', bytes_2a)
1638
bytes_2b = records[1][0]
1639
self.assertEqualDiff(
1641
b'<inventory format="10" revision_id="a@cset-0-2b">\n'
1645
b'<file file_id="file2-id" name="other-file" parent_id="root-id"'
1646
b' revision="a@cset-0-2b"'
1647
b' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
1648
b' text_size="14" />\n'
1650
b'c 0 3 4 1\n', bytes_2b)
1651
bytes_3 = records[2][0]
1652
self.assertEqualDiff(
1654
b'<inventory format="10" revision_id="a@cset-0-3">\n'
1657
b'c 1 3 3 2\n', bytes_3)
1659
def test_creating_bundle_preserves_chk_pages(self):
1660
self.make_merged_branch()
1661
target = self.b1.controldir.sprout('target',
1662
revision_id=b'a@cset-0-2a').open_branch()
1663
bundle_txt, rev_ids = self.create_bundle_text(b'a@cset-0-2a',
1665
self.assertEqual([b'a@cset-0-2b', b'a@cset-0-3'], rev_ids)
1666
bundle = read_bundle(bundle_txt)
1668
self.addCleanup(target.unlock)
1669
install_bundle(target.repository, bundle)
1670
inv1 = next(self.b1.repository.inventories.get_record_stream([
1671
(b'a@cset-0-3',)], 'unordered',
1672
True)).get_bytes_as('fulltext')
1673
inv2 = next(target.repository.inventories.get_record_stream([
1674
(b'a@cset-0-3',)], 'unordered',
1675
True)).get_bytes_as('fulltext')
1676
self.assertEqualDiff(inv1, inv2)
1679
class MungedBundleTester(object):
1681
def build_test_bundle(self):
1682
wt = self.make_branch_and_tree('b1')
1684
self.build_tree(['b1/one'])
1686
wt.commit('add one', rev_id=b'a@cset-0-1')
1687
self.build_tree(['b1/two'])
1689
wt.commit('add two', rev_id=b'a@cset-0-2',
1690
revprops={u'branch-nick':'test'})
1692
bundle_txt = BytesIO()
1693
rev_ids = write_bundle(wt.branch.repository, b'a@cset-0-2',
1694
b'a@cset-0-1', bundle_txt, self.format)
1695
self.assertEqual({b'a@cset-0-2'}, set(rev_ids))
1696
bundle_txt.seek(0, 0)
1699
def check_valid(self, bundle):
1700
"""Check that after whatever munging, the final object is valid."""
1701
self.assertEqual([b'a@cset-0-2'],
1702
[r.revision_id for r in bundle.real_revisions])
1704
def test_extra_whitespace(self):
1705
bundle_txt = self.build_test_bundle()
1707
# Seek to the end of the file
1708
# Adding one extra newline used to give us
1709
# TypeError: float() argument must be a string or a number
1710
bundle_txt.seek(0, 2)
1711
bundle_txt.write(b'\n')
1714
bundle = read_bundle(bundle_txt)
1715
self.check_valid(bundle)
1717
def test_extra_whitespace_2(self):
1718
bundle_txt = self.build_test_bundle()
1720
# Seek to the end of the file
1721
# Adding two extra newlines used to give us
1722
# MalformedPatches: The first line of all patches should be ...
1723
bundle_txt.seek(0, 2)
1724
bundle_txt.write(b'\n\n')
1727
bundle = read_bundle(bundle_txt)
1728
self.check_valid(bundle)
1731
class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
1735
def test_missing_trailing_whitespace(self):
1736
bundle_txt = self.build_test_bundle()
1738
# Remove a trailing newline, it shouldn't kill the parser
1739
raw = bundle_txt.getvalue()
1740
# The contents of the bundle don't have to be this, but this
1741
# test is concerned with the exact case where the serializer
1742
# creates a blank line at the end, and fails if that
1744
self.assertEqual(b'\n\n', raw[-2:])
1745
bundle_txt = BytesIO(raw[:-1])
1747
bundle = read_bundle(bundle_txt)
1748
self.check_valid(bundle)
1750
def test_opening_text(self):
1751
bundle_txt = self.build_test_bundle()
1753
bundle_txt = BytesIO(
1754
b"Some random\nemail comments\n" + bundle_txt.getvalue())
1756
bundle = read_bundle(bundle_txt)
1757
self.check_valid(bundle)
1759
def test_trailing_text(self):
1760
bundle_txt = self.build_test_bundle()
1762
bundle_txt = BytesIO(
1763
bundle_txt.getvalue() + b"Some trailing\nrandom\ntext\n")
1765
bundle = read_bundle(bundle_txt)
1766
self.check_valid(bundle)
1769
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
1774
class TestBundleWriterReader(tests.TestCase):
1776
def test_roundtrip_record(self):
1778
writer = v4.BundleWriter(fileobj)
1780
writer.add_info_record({b'foo': b'bar'})
1781
writer._add_record("Record body", {b'parents': [b'1', b'3'],
1782
b'storage_kind': b'fulltext'}, 'file', b'revid', b'fileid')
1785
reader = v4.BundleReader(fileobj, stream_input=True)
1786
record_iter = reader.iter_records()
1787
record = next(record_iter)
1788
self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
1789
'info', None, None), record)
1790
record = next(record_iter)
1791
self.assertEqual(("Record body", {b'storage_kind': b'fulltext',
1792
b'parents': [b'1', b'3']}, 'file', b'revid', b'fileid'),
1795
def test_roundtrip_record_memory_hungry(self):
1797
writer = v4.BundleWriter(fileobj)
1799
writer.add_info_record({b'foo': b'bar'})
1800
writer._add_record("Record body", {b'parents': [b'1', b'3'],
1801
b'storage_kind': b'fulltext'}, 'file', b'revid', b'fileid')
1804
reader = v4.BundleReader(fileobj, stream_input=False)
1805
record_iter = reader.iter_records()
1806
record = next(record_iter)
1807
self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
1808
'info', None, None), record)
1809
record = next(record_iter)
1810
self.assertEqual(("Record body", {b'storage_kind': b'fulltext',
1811
b'parents': [b'1', b'3']}, 'file', b'revid', b'fileid'),
1814
def test_encode_name(self):
1815
self.assertEqual(b'revision/rev1',
1816
v4.BundleWriter.encode_name('revision', b'rev1'))
1817
self.assertEqual(b'file/rev//1/file-id-1',
1818
v4.BundleWriter.encode_name('file', b'rev/1', b'file-id-1'))
1819
self.assertEqual(b'info',
1820
v4.BundleWriter.encode_name('info', None, None))
1822
def test_decode_name(self):
1823
self.assertEqual(('revision', b'rev1', None),
1824
v4.BundleReader.decode_name(b'revision/rev1'))
1825
self.assertEqual(('file', b'rev/1', b'file-id-1'),
1826
v4.BundleReader.decode_name(b'file/rev//1/file-id-1'))
1827
self.assertEqual(('info', None, None),
1828
v4.BundleReader.decode_name(b'info'))
1830
def test_too_many_names(self):
1832
writer = v4.BundleWriter(fileobj)
1834
writer.add_info_record({b'foo': b'bar'})
1835
writer._container.add_bytes_record(b'blah', [b'two', b'names'])
1838
record_iter = v4.BundleReader(fileobj).iter_records()
1839
record = next(record_iter)
1840
self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
1841
'info', None, None), record)
1842
self.assertRaises(errors.BadBundle, next, record_iter)
1845
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
1847
def test_read_mergeable_skips_local(self):
1848
"""A local bundle named like the URL should not be read.
1850
out, wt = test_read_bundle.create_bundle_file(self)
1851
class FooService(object):
1852
"""A directory service that always returns source"""
1854
def look_up(self, name, url):
1856
directories.register('foo:', FooService, 'Testing directory service')
1857
self.addCleanup(directories.remove, 'foo:')
1858
self.build_tree_contents([('./foo:bar', out.getvalue())])
1859
self.assertRaises(errors.NotABundle, read_mergeable_from_url,
1862
def test_infinite_redirects_are_not_a_bundle(self):
1863
"""If a URL causes TooManyRedirections then NotABundle is raised.
1865
from .blackbox.test_push import RedirectingMemoryServer
1866
server = RedirectingMemoryServer()
1867
self.start_server(server)
1868
url = server.get_url() + 'infinite-loop'
1869
self.assertRaises(errors.NotABundle, read_mergeable_from_url, url)
1871
def test_smart_server_connection_reset(self):
1872
"""If a smart server connection fails during the attempt to read a
1873
bundle, then the ConnectionReset error should be propagated.
1875
# Instantiate a server that will provoke a ConnectionReset
1876
sock_server = DisconnectingServer()
1877
self.start_server(sock_server)
1878
# We don't really care what the url is since the server will close the
1879
# connection without interpreting it
1880
url = sock_server.get_url()
1881
self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1884
class DisconnectingHandler(socketserver.BaseRequestHandler):
1885
"""A request handler that immediately closes any connection made to it."""
1888
self.request.close()
1891
class DisconnectingServer(test_server.TestingTCPServerInAThread):
1894
super(DisconnectingServer, self).__init__(
1896
test_server.TestingTCPServer,
1897
DisconnectingHandler)
1900
"""Return the url of the server"""
1901
return "bzr://%s:%d/" % self.server.server_address
added
removed
breezy/tests/test_bundle.py
