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 ..bzr.bundle.apply_bundle import install_bundle, merge_bundle
36
from ..bzr.bundle.bundle_data import BundleTree
37
from ..bzr.bundle.serializer import write_bundle, read_bundle, v09, v4
38
from ..bzr.bundle.serializer.v08 import BundleSerializerV08
39
from ..bzr.bundle.serializer.v09 import BundleSerializerV09
40
from ..bzr.bundle.serializer.v4 import BundleSerializerV4
41
from ..bzr import knitrepo
46
from ..tree import InterTree
49
def get_text(vf, key):
50
"""Get the fulltext for a given revision id that is present in the vf"""
51
stream = vf.get_record_stream([key], 'unordered', True)
53
return record.get_bytes_as('fulltext')
56
def get_inventory_text(repo, revision_id):
57
"""Get the fulltext for the inventory at revision id"""
58
with repo.lock_read():
59
return get_text(repo.inventories, (revision_id,))
62
class MockTree(object):
65
from ..bzr.inventory import InventoryDirectory, ROOT_ID
67
self.paths = {ROOT_ID: ""}
68
self.ids = {"": ROOT_ID}
70
self.root = InventoryDirectory(ROOT_ID, '', None)
72
inventory = property(lambda x: x)
73
root_inventory = property(lambda x: x)
75
def get_root_id(self):
76
return self.root.file_id
78
def all_file_ids(self):
79
return set(self.paths.keys())
81
def all_versioned_paths(self):
82
return set(self.paths.values())
84
def is_executable(self, path):
85
# Not all the files are executable.
88
def __getitem__(self, file_id):
89
if file_id == self.root.file_id:
92
return self.make_entry(file_id, self.paths[file_id])
94
def get_entry_by_path(self, path):
95
return self[self.path2id(path)]
97
def parent_id(self, file_id):
98
parent_dir = os.path.dirname(self.paths[file_id])
101
return self.ids[parent_dir]
103
def iter_entries(self):
104
for path, file_id in self.ids.items():
105
yield path, self[file_id]
107
def kind(self, path):
108
if path in self.contents:
114
def make_entry(self, file_id, path):
115
from ..bzr.inventory import (InventoryFile, InventoryDirectory,
117
if not isinstance(file_id, bytes):
118
raise TypeError(file_id)
119
name = os.path.basename(path)
120
kind = self.kind(path)
121
parent_id = self.parent_id(file_id)
122
text_sha_1, text_size = self.contents_stats(path)
123
if kind == 'directory':
124
ie = InventoryDirectory(file_id, name, parent_id)
126
ie = InventoryFile(file_id, name, parent_id)
127
ie.text_sha1 = text_sha_1
128
ie.text_size = text_size
129
elif kind == 'symlink':
130
ie = InventoryLink(file_id, name, parent_id)
132
raise errors.BzrError('unknown kind %r' % kind)
135
def add_dir(self, file_id, path):
136
if not isinstance(file_id, bytes):
137
raise TypeError(file_id)
138
self.paths[file_id] = path
139
self.ids[path] = file_id
141
def add_file(self, file_id, path, contents):
142
if not isinstance(file_id, bytes):
143
raise TypeError(file_id)
144
self.add_dir(file_id, path)
145
self.contents[path] = contents
147
def path2id(self, path):
148
return self.ids.get(path)
150
def id2path(self, file_id, recurse='down'):
152
return self.paths[file_id]
154
raise errors.NoSuchId(file_id, self)
156
def get_file(self, path):
159
result.write(self.contents[path])
161
raise errors.NoSuchFile(path)
165
def get_file_revision(self, path):
166
return self.inventory.get_entry_by_path(path).revision
168
def get_file_size(self, path):
169
return self.inventory.get_entry_by_path(path).text_size
171
def get_file_sha1(self, path, file_id=None):
172
return self.inventory.get_entry_by_path(path).text_sha1
174
def contents_stats(self, path):
175
if path not in self.contents:
177
text_sha1 = osutils.sha_file(self.get_file(path))
178
return text_sha1, len(self.contents[path])
181
class BTreeTester(tests.TestCase):
182
"""A simple unittest tester for the BundleTree class."""
184
def make_tree_1(self):
186
mtree.add_dir(b"a", "grandparent")
187
mtree.add_dir(b"b", "grandparent/parent")
188
mtree.add_file(b"c", "grandparent/parent/file", b"Hello\n")
189
mtree.add_dir(b"d", "grandparent/alt_parent")
190
return BundleTree(mtree, b''), mtree
192
def test_renames(self):
193
"""Ensure that file renames have the proper effect on children"""
194
btree = self.make_tree_1()[0]
195
self.assertEqual(btree.old_path("grandparent"), "grandparent")
196
self.assertEqual(btree.old_path("grandparent/parent"),
197
"grandparent/parent")
198
self.assertEqual(btree.old_path("grandparent/parent/file"),
199
"grandparent/parent/file")
201
self.assertEqual(btree.id2path(b"a"), "grandparent")
202
self.assertEqual(btree.id2path(b"b"), "grandparent/parent")
203
self.assertEqual(btree.id2path(b"c"), "grandparent/parent/file")
205
self.assertEqual(btree.path2id("grandparent"), b"a")
206
self.assertEqual(btree.path2id("grandparent/parent"), b"b")
207
self.assertEqual(btree.path2id("grandparent/parent/file"), b"c")
209
self.assertIs(btree.path2id("grandparent2"), None)
210
self.assertIs(btree.path2id("grandparent2/parent"), None)
211
self.assertIs(btree.path2id("grandparent2/parent/file"), None)
213
btree.note_rename("grandparent", "grandparent2")
214
self.assertIs(btree.old_path("grandparent"), None)
215
self.assertIs(btree.old_path("grandparent/parent"), None)
216
self.assertIs(btree.old_path("grandparent/parent/file"), None)
218
self.assertEqual(btree.id2path(b"a"), "grandparent2")
219
self.assertEqual(btree.id2path(b"b"), "grandparent2/parent")
220
self.assertEqual(btree.id2path(b"c"), "grandparent2/parent/file")
222
self.assertEqual(btree.path2id("grandparent2"), b"a")
223
self.assertEqual(btree.path2id("grandparent2/parent"), b"b")
224
self.assertEqual(btree.path2id("grandparent2/parent/file"), b"c")
226
self.assertTrue(btree.path2id("grandparent") is None)
227
self.assertTrue(btree.path2id("grandparent/parent") is None)
228
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
230
btree.note_rename("grandparent/parent", "grandparent2/parent2")
231
self.assertEqual(btree.id2path(b"a"), "grandparent2")
232
self.assertEqual(btree.id2path(b"b"), "grandparent2/parent2")
233
self.assertEqual(btree.id2path(b"c"), "grandparent2/parent2/file")
235
self.assertEqual(btree.path2id("grandparent2"), b"a")
236
self.assertEqual(btree.path2id("grandparent2/parent2"), b"b")
237
self.assertEqual(btree.path2id("grandparent2/parent2/file"), b"c")
239
self.assertTrue(btree.path2id("grandparent2/parent") is None)
240
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
242
btree.note_rename("grandparent/parent/file",
243
"grandparent2/parent2/file2")
244
self.assertEqual(btree.id2path(b"a"), "grandparent2")
245
self.assertEqual(btree.id2path(b"b"), "grandparent2/parent2")
246
self.assertEqual(btree.id2path(b"c"), "grandparent2/parent2/file2")
248
self.assertEqual(btree.path2id("grandparent2"), b"a")
249
self.assertEqual(btree.path2id("grandparent2/parent2"), b"b")
250
self.assertEqual(btree.path2id("grandparent2/parent2/file2"), b"c")
252
self.assertTrue(btree.path2id("grandparent2/parent2/file") is None)
254
def test_moves(self):
255
"""Ensure that file moves have the proper effect on children"""
256
btree = self.make_tree_1()[0]
257
btree.note_rename("grandparent/parent/file",
258
"grandparent/alt_parent/file")
259
self.assertEqual(btree.id2path(b"c"), "grandparent/alt_parent/file")
260
self.assertEqual(btree.path2id("grandparent/alt_parent/file"), b"c")
261
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
263
def unified_diff(self, old, new):
265
diff.internal_diff("old", old, "new", new, out)
269
def make_tree_2(self):
270
btree = self.make_tree_1()[0]
271
btree.note_rename("grandparent/parent/file",
272
"grandparent/alt_parent/file")
273
self.assertRaises(errors.NoSuchId, btree.id2path, b"e")
274
self.assertFalse(btree.is_versioned("grandparent/parent/file"))
275
btree.note_id(b"e", "grandparent/parent/file")
279
"""File/inventory adds"""
280
btree = self.make_tree_2()
281
add_patch = self.unified_diff([], [b"Extra cheese\n"])
282
btree.note_patch("grandparent/parent/file", add_patch)
283
btree.note_id(b'f', 'grandparent/parent/symlink', kind='symlink')
284
btree.note_target('grandparent/parent/symlink', 'venus')
285
self.adds_test(btree)
287
def adds_test(self, btree):
288
self.assertEqual(btree.id2path(b"e"), "grandparent/parent/file")
289
self.assertEqual(btree.path2id("grandparent/parent/file"), b"e")
290
with btree.get_file("grandparent/parent/file") as f:
291
self.assertEqual(f.read(), b"Extra cheese\n")
293
btree.get_symlink_target('grandparent/parent/symlink'), 'venus')
295
def make_tree_3(self):
296
btree, mtree = self.make_tree_1()
297
mtree.add_file(b"e", "grandparent/parent/topping", b"Anchovies\n")
298
btree.note_rename("grandparent/parent/file",
299
"grandparent/alt_parent/file")
300
btree.note_rename("grandparent/parent/topping",
301
"grandparent/alt_parent/stopping")
304
def get_file_test(self, btree):
305
with btree.get_file(btree.id2path(b"e")) as f:
306
self.assertEqual(f.read(), b"Lemon\n")
307
with btree.get_file(btree.id2path(b"c")) as f:
308
self.assertEqual(f.read(), b"Hello\n")
310
def test_get_file(self):
311
"""Get file contents"""
312
btree = self.make_tree_3()
313
mod_patch = self.unified_diff([b"Anchovies\n"], [b"Lemon\n"])
314
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
315
self.get_file_test(btree)
317
def test_delete(self):
319
btree = self.make_tree_1()[0]
320
with btree.get_file(btree.id2path(b"c")) as f:
321
self.assertEqual(f.read(), b"Hello\n")
322
btree.note_deletion("grandparent/parent/file")
323
self.assertRaises(errors.NoSuchId, btree.id2path, b"c")
324
self.assertFalse(btree.is_versioned("grandparent/parent/file"))
326
def sorted_ids(self, tree):
327
ids = sorted(tree.all_file_ids())
330
def test_iteration(self):
331
"""Ensure that iteration through ids works properly"""
332
btree = self.make_tree_1()[0]
333
self.assertEqual(self.sorted_ids(btree),
334
[inventory.ROOT_ID, b'a', b'b', b'c', b'd'])
335
btree.note_deletion("grandparent/parent/file")
336
btree.note_id(b"e", "grandparent/alt_parent/fool", kind="directory")
337
btree.note_last_changed("grandparent/alt_parent/fool",
339
self.assertEqual(self.sorted_ids(btree),
340
[inventory.ROOT_ID, b'a', b'b', b'd', b'e'])
343
class BundleTester1(tests.TestCaseWithTransport):
345
def test_mismatched_bundle(self):
346
format = bzrdir.BzrDirMetaFormat1()
347
format.repository_format = knitrepo.RepositoryFormatKnit3()
348
serializer = BundleSerializerV08('0.8')
349
b = self.make_branch('.', format=format)
350
self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
351
b.repository, [], {}, BytesIO())
353
def test_matched_bundle(self):
354
"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
355
format = bzrdir.BzrDirMetaFormat1()
356
format.repository_format = knitrepo.RepositoryFormatKnit3()
357
serializer = BundleSerializerV09('0.9')
358
b = self.make_branch('.', format=format)
359
serializer.write(b.repository, [], {}, BytesIO())
361
def test_mismatched_model(self):
362
"""Try copying a bundle from knit2 to knit1"""
363
format = bzrdir.BzrDirMetaFormat1()
364
format.repository_format = knitrepo.RepositoryFormatKnit3()
365
source = self.make_branch_and_tree('source', format=format)
366
source.commit('one', rev_id=b'one-id')
367
source.commit('two', rev_id=b'two-id')
369
write_bundle(source.branch.repository, b'two-id', b'null:', text,
373
format = bzrdir.BzrDirMetaFormat1()
374
format.repository_format = knitrepo.RepositoryFormatKnit1()
375
target = self.make_branch('target', format=format)
376
self.assertRaises(errors.IncompatibleRevision, install_bundle,
377
target.repository, read_bundle(text))
380
class BundleTester(object):
382
def bzrdir_format(self):
383
format = bzrdir.BzrDirMetaFormat1()
384
format.repository_format = knitrepo.RepositoryFormatKnit1()
387
def make_branch_and_tree(self, path, format=None):
389
format = self.bzrdir_format()
390
return tests.TestCaseWithTransport.make_branch_and_tree(
393
def make_branch(self, path, format=None):
395
format = self.bzrdir_format()
396
return tests.TestCaseWithTransport.make_branch(self, path, format)
398
def create_bundle_text(self, base_rev_id, rev_id):
399
bundle_txt = BytesIO()
400
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
401
bundle_txt, format=self.format)
403
self.assertEqual(bundle_txt.readline(),
404
b'# Bazaar revision bundle v%s\n' % self.format.encode('ascii'))
405
self.assertEqual(bundle_txt.readline(), b'#\n')
407
rev = self.b1.repository.get_revision(rev_id)
408
self.assertEqual(bundle_txt.readline().decode('utf-8'),
411
return bundle_txt, rev_ids
413
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
414
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
415
Make sure that the text generated is valid, and that it
416
can be applied against the base, and generate the same information.
418
:return: The in-memory bundle
420
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
422
# This should also validate the generated bundle
423
bundle = read_bundle(bundle_txt)
424
repository = self.b1.repository
425
for bundle_rev in bundle.real_revisions:
426
# These really should have already been checked when we read the
427
# bundle, since it computes the sha1 hash for the revision, which
428
# only will match if everything is okay, but lets be explicit about
430
branch_rev = repository.get_revision(bundle_rev.revision_id)
431
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
432
'timestamp', 'timezone', 'message', 'committer',
433
'parent_ids', 'properties'):
434
self.assertEqual(getattr(branch_rev, a),
435
getattr(bundle_rev, a))
436
self.assertEqual(len(branch_rev.parent_ids),
437
len(bundle_rev.parent_ids))
438
self.assertEqual(rev_ids,
439
[r.revision_id for r in bundle.real_revisions])
440
self.valid_apply_bundle(base_rev_id, bundle, checkout_dir=checkout_dir)
444
def get_invalid_bundle(self, base_rev_id, rev_id):
445
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
446
Munge the text so that it's invalid.
448
:return: The in-memory bundle
450
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
451
new_text = bundle_txt.getvalue().replace(b'executable:no',
453
bundle_txt = BytesIO(new_text)
454
bundle = read_bundle(bundle_txt)
455
self.valid_apply_bundle(base_rev_id, bundle)
458
def test_non_bundle(self):
459
self.assertRaises(errors.NotABundle,
460
read_bundle, BytesIO(b'#!/bin/sh\n'))
462
def test_malformed(self):
463
self.assertRaises(errors.BadBundle, read_bundle,
464
BytesIO(b'# Bazaar revision bundle v'))
466
def test_crlf_bundle(self):
468
read_bundle(BytesIO(b'# Bazaar revision bundle v0.8\r\n'))
469
except errors.BadBundle:
470
# It is currently permitted for bundles with crlf line endings to
471
# make read_bundle raise a BadBundle, but this should be fixed.
472
# Anything else, especially NotABundle, is an error.
475
def get_checkout(self, rev_id, checkout_dir=None):
476
"""Get a new tree, with the specified revision in it.
479
if checkout_dir is None:
480
checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
482
if not os.path.exists(checkout_dir):
483
os.mkdir(checkout_dir)
484
tree = self.make_branch_and_tree(checkout_dir)
486
ancestors = write_bundle(self.b1.repository, rev_id, b'null:', s,
489
self.assertIsInstance(s.getvalue(), bytes)
490
install_bundle(tree.branch.repository, read_bundle(s))
491
for ancestor in ancestors:
492
old = self.b1.repository.revision_tree(ancestor)
493
new = tree.branch.repository.revision_tree(ancestor)
494
with old.lock_read(), new.lock_read():
495
# Check that there aren't any inventory level changes
496
delta = new.changes_from(old)
497
self.assertFalse(delta.has_changed(),
498
'Revision %s not copied correctly.'
501
# Now check that the file contents are all correct
502
for path in old.all_versioned_paths():
504
old_file = old.get_file(path)
505
except errors.NoSuchFile:
508
old_file.read(), new.get_file(path).read())
509
if not _mod_revision.is_null(rev_id):
510
tree.branch.generate_revision_history(rev_id)
512
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
513
self.assertFalse(delta.has_changed(),
514
'Working tree has modifications: %s' % delta)
517
def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
518
"""Get the base revision, apply the changes, and make
519
sure everything matches the builtin branch.
521
to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
524
self._valid_apply_bundle(base_rev_id, info, to_tree)
528
def _valid_apply_bundle(self, base_rev_id, info, to_tree):
529
original_parents = to_tree.get_parent_ids()
530
repository = to_tree.branch.repository
531
original_parents = to_tree.get_parent_ids()
532
self.assertIs(repository.has_revision(base_rev_id), True)
533
for rev in info.real_revisions:
534
self.assertTrue(not repository.has_revision(rev.revision_id),
535
'Revision {%s} present before applying bundle'
537
merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
539
for rev in info.real_revisions:
540
self.assertTrue(repository.has_revision(rev.revision_id),
541
'Missing revision {%s} after applying bundle'
544
self.assertTrue(to_tree.branch.repository.has_revision(info.target))
545
# Do we also want to verify that all the texts have been added?
547
self.assertEqual(original_parents + [info.target],
548
to_tree.get_parent_ids())
550
rev = info.real_revisions[-1]
551
base_tree = self.b1.repository.revision_tree(rev.revision_id)
552
to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
554
# TODO: make sure the target tree is identical to base tree
555
# we might also check the working tree.
557
base_files = list(base_tree.list_files())
558
to_files = list(to_tree.list_files())
559
self.assertEqual(len(base_files), len(to_files))
560
for base_file, to_file in zip(base_files, to_files):
561
self.assertEqual(base_file, to_file)
563
for path, status, kind, entry in base_files:
564
# Check that the meta information is the same
565
to_path = InterTree.get(base_tree, to_tree).find_target_path(path)
567
base_tree.get_file_size(path),
568
to_tree.get_file_size(to_path))
570
base_tree.get_file_sha1(path),
571
to_tree.get_file_sha1(to_path))
572
# Check that the contents are the same
573
# This is pretty expensive
574
# self.assertEqual(base_tree.get_file(fileid).read(),
575
# to_tree.get_file(fileid).read())
577
def test_bundle(self):
578
self.tree1 = self.make_branch_and_tree('b1')
579
self.b1 = self.tree1.branch
581
self.build_tree_contents([('b1/one', b'one\n')])
582
self.tree1.add('one', b'one-id')
583
self.tree1.set_root_id(b'root-id')
584
self.tree1.commit('add one', rev_id=b'a@cset-0-1')
586
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-1')
588
# Make sure we can handle files with spaces, tabs, other
591
'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'
593
self.build_tree_contents([('b1/sub/sub/emptyfile.txt', b''),
594
('b1/dir/nolastnewline.txt', b'bloop')])
595
tt = self.tree1.get_transform()
596
tt.new_file('executable', tt.root, [b'#!/bin/sh\n'], b'exe-1', True)
598
# have to fix length of file-id so that we can predictably rewrite
599
# a (length-prefixed) record containing it later.
600
self.tree1.add('with space.txt', b'withspace-id')
602
'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'
604
self.tree1.commit('add whitespace', rev_id=b'a@cset-0-2')
606
bundle = self.get_valid_bundle(b'a@cset-0-1', b'a@cset-0-2')
608
# Check a rollup bundle
609
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-2')
613
['sub/sub/nonempty.txt', 'sub/sub/emptyfile.txt', 'sub/sub'
615
tt = self.tree1.get_transform()
616
trans_id = tt.trans_id_tree_path('executable')
617
tt.set_executability(False, trans_id)
619
self.tree1.commit('removed', rev_id=b'a@cset-0-3')
621
bundle = self.get_valid_bundle(b'a@cset-0-2', b'a@cset-0-3')
622
self.assertRaises((errors.TestamentMismatch,
623
errors.VersionedFileInvalidChecksum,
624
errors.BadBundle), self.get_invalid_bundle,
625
b'a@cset-0-2', b'a@cset-0-3')
626
# Check a rollup bundle
627
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-3')
629
# Now move the directory
630
self.tree1.rename_one('dir', 'sub/dir')
631
self.tree1.commit('rename dir', rev_id=b'a@cset-0-4')
633
bundle = self.get_valid_bundle(b'a@cset-0-3', b'a@cset-0-4')
634
# Check a rollup bundle
635
bundle = self.get_valid_bundle(b'null:', b'a@cset-0-4')
638
with open('b1/sub/dir/WithCaps.txt', 'ab') as f:
639
f.write(b'\nAdding some text\n')
640
with open('b1/sub/dir/ pre space', 'ab') as f:
642
b'\r\nAdding some\r\nDOS format lines\r\n')
643
with open('b1/sub/dir/nolastnewline.txt', 'ab') as f:
645
self.tree1.rename_one('sub/dir/ pre space',
647
self.tree1.commit('Modified files', rev_id=b'a@cset-0-5')
648
bundle = self.get_valid_bundle(b'a@cset-0-4', b'a@cset-0-5')
650
self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
651
self.tree1.rename_one('with space.txt', 'WithCaps.txt')
652
self.tree1.rename_one('temp', 'with space.txt')
653
self.tree1.commit(u'swap filenames', rev_id=b'a@cset-0-6',
655
bundle = self.get_valid_bundle(b'a@cset-0-5', b'a@cset-0-6')
656
other = self.get_checkout(b'a@cset-0-5')
657
tree1_inv = get_inventory_text(self.tree1.branch.repository,
659
tree2_inv = get_inventory_text(other.branch.repository,
661
self.assertEqualDiff(tree1_inv, tree2_inv)
662
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
663
other.commit('rename file', rev_id=b'a@cset-0-6b')
664
self.tree1.merge_from_branch(other.branch)
665
self.tree1.commit(u'Merge', rev_id=b'a@cset-0-7',
667
bundle = self.get_valid_bundle(b'a@cset-0-6', b'a@cset-0-7')
669
def _test_symlink_bundle(self, link_name, link_target, new_link_target):
672
self.requireFeature(features.SymlinkFeature)
673
self.tree1 = self.make_branch_and_tree('b1')
674
self.b1 = self.tree1.branch
676
tt = self.tree1.get_transform()
677
tt.new_symlink(link_name, tt.root, link_target, link_id)
679
self.tree1.commit('add symlink', rev_id=b'l@cset-0-1')
680
bundle = self.get_valid_bundle(b'null:', b'l@cset-0-1')
681
if getattr(bundle, 'revision_tree', None) is not None:
682
# Not all bundle formats supports revision_tree
683
bund_tree = bundle.revision_tree(self.b1.repository, b'l@cset-0-1')
685
link_target, bund_tree.get_symlink_target(link_name))
687
tt = self.tree1.get_transform()
688
trans_id = tt.trans_id_tree_path(link_name)
689
tt.adjust_path('link2', tt.root, trans_id)
690
tt.delete_contents(trans_id)
691
tt.create_symlink(new_link_target, trans_id)
693
self.tree1.commit('rename and change symlink', rev_id=b'l@cset-0-2')
694
bundle = self.get_valid_bundle(b'l@cset-0-1', b'l@cset-0-2')
695
if getattr(bundle, 'revision_tree', None) is not None:
696
# Not all bundle formats supports revision_tree
697
bund_tree = bundle.revision_tree(self.b1.repository, b'l@cset-0-2')
698
self.assertEqual(new_link_target,
699
bund_tree.get_symlink_target('link2'))
701
tt = self.tree1.get_transform()
702
trans_id = tt.trans_id_tree_path('link2')
703
tt.delete_contents(trans_id)
704
tt.create_symlink('jupiter', trans_id)
706
self.tree1.commit('just change symlink target', rev_id=b'l@cset-0-3')
707
bundle = self.get_valid_bundle(b'l@cset-0-2', b'l@cset-0-3')
709
tt = self.tree1.get_transform()
710
trans_id = tt.trans_id_tree_path('link2')
711
tt.delete_contents(trans_id)
713
self.tree1.commit('Delete symlink', rev_id=b'l@cset-0-4')
714
bundle = self.get_valid_bundle(b'l@cset-0-3', b'l@cset-0-4')
716
def test_symlink_bundle(self):
717
self._test_symlink_bundle('link', 'bar/foo', 'mars')
719
def test_unicode_symlink_bundle(self):
720
self.requireFeature(features.UnicodeFilenameFeature)
721
self._test_symlink_bundle(u'\N{Euro Sign}link',
722
u'bar/\N{Euro Sign}foo',
723
u'mars\N{Euro Sign}')
725
def test_binary_bundle(self):
726
self.tree1 = self.make_branch_and_tree('b1')
727
self.b1 = self.tree1.branch
728
tt = self.tree1.get_transform()
731
tt.new_file('file', tt.root, [
732
b'\x00\n\x00\r\x01\n\x02\r\xff'], b'binary-1')
733
tt.new_file('file2', tt.root, [b'\x01\n\x02\r\x03\n\x04\r\xff'],
736
self.tree1.commit('add binary', rev_id=b'b@cset-0-1')
737
self.get_valid_bundle(b'null:', b'b@cset-0-1')
740
tt = self.tree1.get_transform()
741
trans_id = tt.trans_id_tree_path('file')
742
tt.delete_contents(trans_id)
744
self.tree1.commit('delete binary', rev_id=b'b@cset-0-2')
745
self.get_valid_bundle(b'b@cset-0-1', b'b@cset-0-2')
748
tt = self.tree1.get_transform()
749
trans_id = tt.trans_id_tree_path('file2')
750
tt.adjust_path('file3', tt.root, trans_id)
751
tt.delete_contents(trans_id)
752
tt.create_file([b'file\rcontents\x00\n\x00'], trans_id)
754
self.tree1.commit('rename and modify binary', rev_id=b'b@cset-0-3')
755
self.get_valid_bundle(b'b@cset-0-2', b'b@cset-0-3')
758
tt = self.tree1.get_transform()
759
trans_id = tt.trans_id_tree_path('file3')
760
tt.delete_contents(trans_id)
761
tt.create_file([b'\x00file\rcontents'], trans_id)
763
self.tree1.commit('just modify binary', rev_id=b'b@cset-0-4')
764
self.get_valid_bundle(b'b@cset-0-3', b'b@cset-0-4')
767
self.get_valid_bundle(b'null:', b'b@cset-0-4')
769
def test_last_modified(self):
770
self.tree1 = self.make_branch_and_tree('b1')
771
self.b1 = self.tree1.branch
772
tt = self.tree1.get_transform()
773
tt.new_file('file', tt.root, [b'file'], b'file')
775
self.tree1.commit('create file', rev_id=b'a@lmod-0-1')
777
tt = self.tree1.get_transform()
778
trans_id = tt.trans_id_tree_path('file')
779
tt.delete_contents(trans_id)
780
tt.create_file([b'file2'], trans_id)
782
self.tree1.commit('modify text', rev_id=b'a@lmod-0-2a')
784
other = self.get_checkout(b'a@lmod-0-1')
785
tt = other.get_transform()
786
trans_id = tt.trans_id_tree_path('file2')
787
tt.delete_contents(trans_id)
788
tt.create_file([b'file2'], trans_id)
790
other.commit('modify text in another tree', rev_id=b'a@lmod-0-2b')
791
self.tree1.merge_from_branch(other.branch)
792
self.tree1.commit(u'Merge', rev_id=b'a@lmod-0-3',
794
self.tree1.commit(u'Merge', rev_id=b'a@lmod-0-4')
795
bundle = self.get_valid_bundle(b'a@lmod-0-2a', b'a@lmod-0-4')
797
def test_hide_history(self):
798
self.tree1 = self.make_branch_and_tree('b1')
799
self.b1 = self.tree1.branch
801
with open('b1/one', 'wb') as f:
803
self.tree1.add('one')
804
self.tree1.commit('add file', rev_id=b'a@cset-0-1')
805
with open('b1/one', 'wb') as f:
807
self.tree1.commit('modify', rev_id=b'a@cset-0-2')
808
with open('b1/one', 'wb') as f:
810
self.tree1.commit('modify', rev_id=b'a@cset-0-3')
811
bundle_file = BytesIO()
812
rev_ids = write_bundle(self.tree1.branch.repository, b'a@cset-0-3',
813
b'a@cset-0-1', bundle_file, format=self.format)
814
self.assertNotContainsRe(bundle_file.getvalue(), b'\btwo\b')
815
self.assertContainsRe(self.get_raw(bundle_file), b'one')
816
self.assertContainsRe(self.get_raw(bundle_file), b'three')
818
def test_bundle_same_basis(self):
819
"""Ensure using the basis as the target doesn't cause an error"""
820
self.tree1 = self.make_branch_and_tree('b1')
821
self.tree1.commit('add file', rev_id=b'a@cset-0-1')
822
bundle_file = BytesIO()
823
rev_ids = write_bundle(self.tree1.branch.repository, b'a@cset-0-1',
824
b'a@cset-0-1', bundle_file)
827
def get_raw(bundle_file):
828
return bundle_file.getvalue()
830
def test_unicode_bundle(self):
831
self.requireFeature(features.UnicodeFilenameFeature)
832
# Handle international characters
834
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
836
self.tree1 = self.make_branch_and_tree('b1')
837
self.b1 = self.tree1.branch
840
u'With international man of mystery\n'
841
u'William Dod\xe9\n').encode('utf-8'))
844
self.tree1.add([u'with Dod\N{Euro Sign}'], [b'withdod-id'])
845
self.tree1.commit(u'i18n commit from William Dod\xe9',
846
rev_id=b'i18n-1', committer=u'William Dod\xe9')
849
bundle = self.get_valid_bundle(b'null:', b'i18n-1')
852
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
853
f.write(u'Modified \xb5\n'.encode('utf8'))
855
self.tree1.commit(u'modified', rev_id=b'i18n-2')
857
bundle = self.get_valid_bundle(b'i18n-1', b'i18n-2')
860
self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
861
self.tree1.commit(u'renamed, the new i18n man', rev_id=b'i18n-3',
862
committer=u'Erik B\xe5gfors')
864
bundle = self.get_valid_bundle(b'i18n-2', b'i18n-3')
867
self.tree1.remove([u'B\N{Euro Sign}gfors'])
868
self.tree1.commit(u'removed', rev_id=b'i18n-4')
870
bundle = self.get_valid_bundle(b'i18n-3', b'i18n-4')
873
bundle = self.get_valid_bundle(b'null:', b'i18n-4')
875
def test_whitespace_bundle(self):
876
if sys.platform in ('win32', 'cygwin'):
877
raise tests.TestSkipped('Windows doesn\'t support filenames'
878
' with tabs or trailing spaces')
879
self.tree1 = self.make_branch_and_tree('b1')
880
self.b1 = self.tree1.branch
882
self.build_tree(['b1/trailing space '])
883
self.tree1.add(['trailing space '])
884
# TODO: jam 20060701 Check for handling files with '\t' characters
885
# once we actually support them
888
self.tree1.commit('funky whitespace', rev_id=b'white-1')
890
bundle = self.get_valid_bundle(b'null:', b'white-1')
893
with open('b1/trailing space ', 'ab') as f:
894
f.write(b'add some text\n')
895
self.tree1.commit('add text', rev_id=b'white-2')
897
bundle = self.get_valid_bundle(b'white-1', b'white-2')
900
self.tree1.rename_one('trailing space ', ' start and end space ')
901
self.tree1.commit('rename', rev_id=b'white-3')
903
bundle = self.get_valid_bundle(b'white-2', b'white-3')
906
self.tree1.remove([' start and end space '])
907
self.tree1.commit('removed', rev_id=b'white-4')
909
bundle = self.get_valid_bundle(b'white-3', b'white-4')
911
# Now test a complet roll-up
912
bundle = self.get_valid_bundle(b'null:', b'white-4')
914
def test_alt_timezone_bundle(self):
915
self.tree1 = self.make_branch_and_memory_tree('b1')
916
self.b1 = self.tree1.branch
917
builder = treebuilder.TreeBuilder()
919
self.tree1.lock_write()
920
builder.start_tree(self.tree1)
921
builder.build(['newfile'])
922
builder.finish_tree()
924
# Asia/Colombo offset = 5 hours 30 minutes
925
self.tree1.commit('non-hour offset timezone', rev_id=b'tz-1',
926
timezone=19800, timestamp=1152544886.0)
928
bundle = self.get_valid_bundle(b'null:', b'tz-1')
930
rev = bundle.revisions[0]
931
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
932
self.assertEqual(19800, rev.timezone)
933
self.assertEqual(1152544886.0, rev.timestamp)
936
def test_bundle_root_id(self):
937
self.tree1 = self.make_branch_and_tree('b1')
938
self.b1 = self.tree1.branch
939
self.tree1.commit('message', rev_id=b'revid1')
940
bundle = self.get_valid_bundle(b'null:', b'revid1')
941
tree = self.get_bundle_tree(bundle, b'revid1')
942
root_revision = tree.get_file_revision(u'')
943
self.assertEqual(b'revid1', root_revision)
945
def test_install_revisions(self):
946
self.tree1 = self.make_branch_and_tree('b1')
947
self.b1 = self.tree1.branch
948
self.tree1.commit('message', rev_id=b'rev2a')
949
bundle = self.get_valid_bundle(b'null:', b'rev2a')
950
branch2 = self.make_branch('b2')
951
self.assertFalse(branch2.repository.has_revision(b'rev2a'))
952
target_revision = bundle.install_revisions(branch2.repository)
953
self.assertTrue(branch2.repository.has_revision(b'rev2a'))
954
self.assertEqual(b'rev2a', target_revision)
956
def test_bundle_empty_property(self):
957
"""Test serializing revision properties with an empty value."""
958
tree = self.make_branch_and_memory_tree('tree')
960
self.addCleanup(tree.unlock)
961
tree.add([''], [b'TREE_ROOT'])
962
tree.commit('One', revprops={u'one': 'two',
963
u'empty': ''}, rev_id=b'rev1')
964
self.b1 = tree.branch
965
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
966
bundle = read_bundle(bundle_sio)
967
revision_info = bundle.revisions[0]
968
self.assertEqual(b'rev1', revision_info.revision_id)
969
rev = revision_info.as_revision()
970
self.assertEqual({'branch-nick': 'tree', 'empty': '', 'one': 'two'},
973
def test_bundle_sorted_properties(self):
974
"""For stability the writer should write properties in sorted order."""
975
tree = self.make_branch_and_memory_tree('tree')
977
self.addCleanup(tree.unlock)
979
tree.add([''], [b'TREE_ROOT'])
980
tree.commit('One', rev_id=b'rev1',
981
revprops={u'a': '4', u'b': '3', u'c': '2', u'd': '1'})
982
self.b1 = tree.branch
983
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
984
bundle = read_bundle(bundle_sio)
985
revision_info = bundle.revisions[0]
986
self.assertEqual(b'rev1', revision_info.revision_id)
987
rev = revision_info.as_revision()
988
self.assertEqual({'branch-nick': 'tree', 'a': '4', 'b': '3', 'c': '2',
989
'd': '1'}, rev.properties)
991
def test_bundle_unicode_properties(self):
992
"""We should be able to round trip a non-ascii property."""
993
tree = self.make_branch_and_memory_tree('tree')
995
self.addCleanup(tree.unlock)
997
tree.add([''], [b'TREE_ROOT'])
998
# Revisions themselves do not require anything about revision property
999
# keys, other than that they are a basestring, and do not contain
1001
# However, Testaments assert than they are str(), and thus should not
1003
tree.commit('One', rev_id=b'rev1',
1004
revprops={u'omega': u'\u03a9', u'alpha': u'\u03b1'})
1005
self.b1 = tree.branch
1006
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1007
bundle = read_bundle(bundle_sio)
1008
revision_info = bundle.revisions[0]
1009
self.assertEqual(b'rev1', revision_info.revision_id)
1010
rev = revision_info.as_revision()
1011
self.assertEqual({'branch-nick': 'tree', 'omega': u'\u03a9',
1012
'alpha': u'\u03b1'}, rev.properties)
1014
def test_bundle_with_ghosts(self):
1015
tree = self.make_branch_and_tree('tree')
1016
self.b1 = tree.branch
1017
self.build_tree_contents([('tree/file', b'content1')])
1020
self.build_tree_contents([('tree/file', b'content2')])
1021
tree.add_parent_tree_id(b'ghost')
1022
tree.commit('rev2', rev_id=b'rev2')
1023
bundle = self.get_valid_bundle(b'null:', b'rev2')
1025
def make_simple_tree(self, format=None):
1026
tree = self.make_branch_and_tree('b1', format=format)
1027
self.b1 = tree.branch
1028
self.build_tree(['b1/file'])
1032
def test_across_serializers(self):
1033
tree = self.make_simple_tree('knit')
1034
tree.commit('hello', rev_id=b'rev1')
1035
tree.commit('hello', rev_id=b'rev2')
1036
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
1037
repo = self.make_repository('repo', format='dirstate-with-subtree')
1038
bundle.install_revisions(repo)
1039
inv_text = b''.join(repo._get_inventory_xml(b'rev2'))
1040
self.assertNotContainsRe(inv_text, b'format="5"')
1041
self.assertContainsRe(inv_text, b'format="7"')
1043
def make_repo_with_installed_revisions(self):
1044
tree = self.make_simple_tree('knit')
1045
tree.commit('hello', rev_id=b'rev1')
1046
tree.commit('hello', rev_id=b'rev2')
1047
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
1048
repo = self.make_repository('repo', format='dirstate-with-subtree')
1049
bundle.install_revisions(repo)
1052
def test_across_models(self):
1053
repo = self.make_repo_with_installed_revisions()
1054
inv = repo.get_inventory(b'rev2')
1055
self.assertEqual(b'rev2', inv.root.revision)
1056
root_id = inv.root.file_id
1058
self.addCleanup(repo.unlock)
1059
self.assertEqual({(root_id, b'rev1'): (),
1060
(root_id, b'rev2'): ((root_id, b'rev1'),)},
1061
repo.texts.get_parent_map([(root_id, b'rev1'), (root_id, b'rev2')]))
1063
def test_inv_hash_across_serializers(self):
1064
repo = self.make_repo_with_installed_revisions()
1065
recorded_inv_sha1 = repo.get_revision(b'rev2').inventory_sha1
1066
xml = b''.join(repo._get_inventory_xml(b'rev2'))
1067
self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
1069
def test_across_models_incompatible(self):
1070
tree = self.make_simple_tree('dirstate-with-subtree')
1071
tree.commit('hello', rev_id=b'rev1')
1072
tree.commit('hello', rev_id=b'rev2')
1074
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
1075
except errors.IncompatibleBundleFormat:
1076
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1077
repo = self.make_repository('repo', format='knit')
1078
bundle.install_revisions(repo)
1080
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev2')[0])
1081
self.assertRaises(errors.IncompatibleRevision,
1082
bundle.install_revisions, repo)
1084
def test_get_merge_request(self):
1085
tree = self.make_simple_tree()
1086
tree.commit('hello', rev_id=b'rev1')
1087
tree.commit('hello', rev_id=b'rev2')
1088
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
1089
result = bundle.get_merge_request(tree.branch.repository)
1090
self.assertEqual((None, b'rev1', 'inapplicable'), result)
1092
def test_with_subtree(self):
1093
tree = self.make_branch_and_tree('tree',
1094
format='dirstate-with-subtree')
1095
self.b1 = tree.branch
1096
subtree = self.make_branch_and_tree('tree/subtree',
1097
format='dirstate-with-subtree')
1099
tree.commit('hello', rev_id=b'rev1')
1101
bundle = read_bundle(self.create_bundle_text(b'null:', b'rev1')[0])
1102
except errors.IncompatibleBundleFormat:
1103
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1104
if isinstance(bundle, v09.BundleInfo09):
1105
raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
1106
repo = self.make_repository('repo', format='knit')
1107
self.assertRaises(errors.IncompatibleRevision,
1108
bundle.install_revisions, repo)
1109
repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1110
bundle.install_revisions(repo2)
1112
def test_revision_id_with_slash(self):
1113
self.tree1 = self.make_branch_and_tree('tree')
1114
self.b1 = self.tree1.branch
1116
self.tree1.commit('Revision/id/with/slashes', rev_id=b'rev/id')
1118
raise tests.TestSkipped(
1119
"Repository doesn't support revision ids with slashes")
1120
bundle = self.get_valid_bundle(b'null:', b'rev/id')
1122
def test_skip_file(self):
1123
"""Make sure we don't accidentally write to the wrong versionedfile"""
1124
self.tree1 = self.make_branch_and_tree('tree')
1125
self.b1 = self.tree1.branch
1126
# rev1 is not present in bundle, done by fetch
1127
self.build_tree_contents([('tree/file2', b'contents1')])
1128
self.tree1.add('file2', b'file2-id')
1129
self.tree1.commit('rev1', rev_id=b'reva')
1130
self.build_tree_contents([('tree/file3', b'contents2')])
1131
# rev2 is present in bundle, and done by fetch
1132
# having file1 in the bunle causes file1's versionedfile to be opened.
1133
self.tree1.add('file3', b'file3-id')
1134
rev2 = self.tree1.commit('rev2')
1135
# Updating file2 should not cause an attempt to add to file1's vf
1136
target = self.tree1.controldir.sprout('target').open_workingtree()
1137
self.build_tree_contents([('tree/file2', b'contents3')])
1138
self.tree1.commit('rev3', rev_id=b'rev3')
1139
bundle = self.get_valid_bundle(b'reva', b'rev3')
1140
if getattr(bundle, 'get_bundle_reader', None) is None:
1141
raise tests.TestSkipped('Bundle format cannot provide reader')
1143
(f, r) for b, m, k, r, f in bundle.get_bundle_reader().iter_records()
1146
{(b'file2-id', b'rev3'), (b'file3-id', rev2)}, file_ids)
1147
bundle.install_revisions(target.branch.repository)
1150
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
1154
def test_bundle_empty_property(self):
1155
"""Test serializing revision properties with an empty value."""
1156
tree = self.make_branch_and_memory_tree('tree')
1158
self.addCleanup(tree.unlock)
1159
tree.add([''], [b'TREE_ROOT'])
1160
tree.commit('One', revprops={u'one': 'two',
1161
u'empty': ''}, rev_id=b'rev1')
1162
self.b1 = tree.branch
1163
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1164
self.assertContainsRe(bundle_sio.getvalue(),
1166
b'# branch-nick: tree\n'
1170
bundle = read_bundle(bundle_sio)
1171
revision_info = bundle.revisions[0]
1172
self.assertEqual(b'rev1', revision_info.revision_id)
1173
rev = revision_info.as_revision()
1174
self.assertEqual({'branch-nick': 'tree', 'empty': '', 'one': 'two'},
1177
def get_bundle_tree(self, bundle, revision_id):
1178
repository = self.make_repository('repo')
1179
return bundle.revision_tree(repository, b'revid1')
1181
def test_bundle_empty_property_alt(self):
1182
"""Test serializing revision properties with an empty value.
1184
Older readers had a bug when reading an empty property.
1185
They assumed that all keys ended in ': \n'. However they would write an
1186
empty value as ':\n'. This tests make sure that all newer bzr versions
1187
can handle th second form.
1189
tree = self.make_branch_and_memory_tree('tree')
1191
self.addCleanup(tree.unlock)
1192
tree.add([''], [b'TREE_ROOT'])
1193
tree.commit('One', revprops={u'one': 'two',
1194
u'empty': ''}, rev_id=b'rev1')
1195
self.b1 = tree.branch
1196
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1197
txt = bundle_sio.getvalue()
1198
loc = txt.find(b'# empty: ') + len(b'# empty:')
1199
# Create a new bundle, which strips the trailing space after empty
1200
bundle_sio = BytesIO(txt[:loc] + txt[loc + 1:])
1202
self.assertContainsRe(bundle_sio.getvalue(),
1204
b'# branch-nick: tree\n'
1208
bundle = read_bundle(bundle_sio)
1209
revision_info = bundle.revisions[0]
1210
self.assertEqual(b'rev1', revision_info.revision_id)
1211
rev = revision_info.as_revision()
1212
self.assertEqual({'branch-nick': 'tree', 'empty': '', 'one': 'two'},
1215
def test_bundle_sorted_properties(self):
1216
"""For stability the writer should write properties in sorted order."""
1217
tree = self.make_branch_and_memory_tree('tree')
1219
self.addCleanup(tree.unlock)
1221
tree.add([''], [b'TREE_ROOT'])
1222
tree.commit('One', rev_id=b'rev1',
1223
revprops={u'a': '4', u'b': '3', u'c': '2', u'd': '1'})
1224
self.b1 = tree.branch
1225
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1226
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', 'a': '4', 'b': '3', 'c': '2',
1239
'd': '1'}, rev.properties)
1241
def test_bundle_unicode_properties(self):
1242
"""We should be able to round trip a non-ascii property."""
1243
tree = self.make_branch_and_memory_tree('tree')
1245
self.addCleanup(tree.unlock)
1247
tree.add([''], [b'TREE_ROOT'])
1248
# Revisions themselves do not require anything about revision property
1249
# keys, other than that they are a basestring, and do not contain
1251
# However, Testaments assert than they are str(), and thus should not
1253
tree.commit('One', rev_id=b'rev1',
1254
revprops={u'omega': u'\u03a9', u'alpha': u'\u03b1'})
1255
self.b1 = tree.branch
1256
bundle_sio, revision_ids = self.create_bundle_text(b'null:', b'rev1')
1257
self.assertContainsRe(bundle_sio.getvalue(),
1259
b'# alpha: \xce\xb1\n'
1260
b'# branch-nick: tree\n'
1261
b'# omega: \xce\xa9\n'
1263
bundle = read_bundle(bundle_sio)
1264
revision_info = bundle.revisions[0]
1265
self.assertEqual(b'rev1', revision_info.revision_id)
1266
rev = revision_info.as_revision()
1267
self.assertEqual({'branch-nick': 'tree', 'omega': u'\u03a9',
1268
'alpha': u'\u03b1'}, rev.properties)
1271
class V09BundleKnit2Tester(V08BundleTester):
1275
def bzrdir_format(self):
1276
format = bzrdir.BzrDirMetaFormat1()
1277
format.repository_format = knitrepo.RepositoryFormatKnit3()
1281
class V09BundleKnit1Tester(V08BundleTester):
1285
def bzrdir_format(self):
1286
format = bzrdir.BzrDirMetaFormat1()
1287
format.repository_format = knitrepo.RepositoryFormatKnit1()
1291
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
1295
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1296
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1297
Make sure that the text generated is valid, and that it
1298
can be applied against the base, and generate the same information.
1300
:return: The in-memory bundle
1302
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1304
# This should also validate the generated bundle
1305
bundle = read_bundle(bundle_txt)
1306
repository = self.b1.repository
1307
for bundle_rev in bundle.real_revisions:
1308
# These really should have already been checked when we read the
1309
# bundle, since it computes the sha1 hash for the revision, which
1310
# only will match if everything is okay, but lets be explicit about
1312
branch_rev = repository.get_revision(bundle_rev.revision_id)
1313
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1314
'timestamp', 'timezone', 'message', 'committer',
1315
'parent_ids', 'properties'):
1316
self.assertEqual(getattr(branch_rev, a),
1317
getattr(bundle_rev, a))
1318
self.assertEqual(len(branch_rev.parent_ids),
1319
len(bundle_rev.parent_ids))
1320
self.assertEqual(set(rev_ids),
1321
{r.revision_id for r in bundle.real_revisions})
1322
self.valid_apply_bundle(base_rev_id, bundle,
1323
checkout_dir=checkout_dir)
1327
def get_invalid_bundle(self, base_rev_id, rev_id):
1328
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1329
Munge the text so that it's invalid.
1331
:return: The in-memory bundle
1333
from ..bzr.bundle import serializer
1334
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1335
new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1336
new_text = new_text.replace(b'<file file_id="exe-1"',
1337
b'<file executable="y" file_id="exe-1"')
1338
new_text = new_text.replace(b'B260', b'B275')
1339
bundle_txt = BytesIO()
1340
bundle_txt.write(serializer._get_bundle_header('4'))
1341
bundle_txt.write(b'\n')
1342
bundle_txt.write(bz2.compress(new_text))
1344
bundle = read_bundle(bundle_txt)
1345
self.valid_apply_bundle(base_rev_id, bundle)
1348
def create_bundle_text(self, base_rev_id, rev_id):
1349
bundle_txt = BytesIO()
1350
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1351
bundle_txt, format=self.format)
1353
self.assertEqual(bundle_txt.readline(),
1354
b'# Bazaar revision bundle v%s\n' % self.format.encode('ascii'))
1355
self.assertEqual(bundle_txt.readline(), b'#\n')
1356
rev = self.b1.repository.get_revision(rev_id)
1358
return bundle_txt, rev_ids
1360
def get_bundle_tree(self, bundle, revision_id):
1361
repository = self.make_repository('repo')
1362
bundle.install_revisions(repository)
1363
return repository.revision_tree(revision_id)
1365
def test_creation(self):
1366
tree = self.make_branch_and_tree('tree')
1367
self.build_tree_contents([('tree/file', b'contents1\nstatic\n')])
1368
tree.add('file', b'fileid-2')
1369
tree.commit('added file', rev_id=b'rev1')
1370
self.build_tree_contents([('tree/file', b'contents2\nstatic\n')])
1371
tree.commit('changed file', rev_id=b'rev2')
1373
serializer = BundleSerializerV4('1.0')
1374
with tree.lock_read():
1375
serializer.write_bundle(
1376
tree.branch.repository, b'rev2', b'null:', s)
1378
tree2 = self.make_branch_and_tree('target')
1379
target_repo = tree2.branch.repository
1380
install_bundle(target_repo, serializer.read(s))
1381
target_repo.lock_read()
1382
self.addCleanup(target_repo.unlock)
1383
# Turn the 'iterators_of_bytes' back into simple strings for comparison
1384
repo_texts = dict((i, b''.join(content)) for i, content
1385
in target_repo.iter_files_bytes(
1386
[(b'fileid-2', b'rev1', '1'),
1387
(b'fileid-2', b'rev2', '2')]))
1388
self.assertEqual({'1': b'contents1\nstatic\n',
1389
'2': b'contents2\nstatic\n'},
1391
rtree = target_repo.revision_tree(b'rev2')
1392
inventory_vf = target_repo.inventories
1393
# If the inventory store has a graph, it must match the revision graph.
1395
[inventory_vf.get_parent_map([(b'rev2',)])[(b'rev2',)]],
1396
[None, ((b'rev1',),)])
1397
self.assertEqual('changed file',
1398
target_repo.get_revision(b'rev2').message)
1401
def get_raw(bundle_file):
1403
line = bundle_file.readline()
1404
line = bundle_file.readline()
1405
lines = bundle_file.readlines()
1406
return bz2.decompress(b''.join(lines))
1408
def test_copy_signatures(self):
1409
tree_a = self.make_branch_and_tree('tree_a')
1411
import breezy.commit as commit
1412
oldstrategy = breezy.gpg.GPGStrategy
1413
branch = tree_a.branch
1414
repo_a = branch.repository
1415
tree_a.commit("base", allow_pointless=True, rev_id=b'A')
1416
self.assertFalse(branch.repository.has_signature_for_revision_id(b'A'))
1418
from ..bzr.testament import Testament
1419
# monkey patch gpg signing mechanism
1420
breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
1421
new_config = test_commit.MustSignConfig()
1422
commit.Commit(config_stack=new_config).commit(message="base",
1423
allow_pointless=True,
1425
working_tree=tree_a)
1428
return breezy.gpg.LoopbackGPGStrategy(None).sign(text)
1429
self.assertTrue(repo_a.has_signature_for_revision_id(b'B'))
1431
breezy.gpg.GPGStrategy = oldstrategy
1432
tree_b = self.make_branch_and_tree('tree_b')
1433
repo_b = tree_b.branch.repository
1435
serializer = BundleSerializerV4('4')
1436
with tree_a.lock_read():
1437
serializer.write_bundle(
1438
tree_a.branch.repository, b'B', b'null:', s)
1440
install_bundle(repo_b, serializer.read(s))
1441
self.assertTrue(repo_b.has_signature_for_revision_id(b'B'))
1442
self.assertEqual(repo_b.get_signature_text(b'B'),
1443
repo_a.get_signature_text(b'B'))
1445
# ensure repeat installs are harmless
1446
install_bundle(repo_b, serializer.read(s))
1449
class V4_2aBundleTester(V4BundleTester):
1451
def bzrdir_format(self):
1454
def get_invalid_bundle(self, base_rev_id, rev_id):
1455
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1456
Munge the text so that it's invalid.
1458
:return: The in-memory bundle
1460
from ..bzr.bundle import serializer
1461
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1462
new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1463
# We are going to be replacing some text to set the executable bit on a
1464
# file. Make sure the text replacement actually works correctly.
1465
self.assertContainsRe(new_text, b'(?m)B244\n\ni 1\n<inventory')
1466
new_text = new_text.replace(b'<file file_id="exe-1"',
1467
b'<file executable="y" file_id="exe-1"')
1468
new_text = new_text.replace(b'B244', b'B259')
1469
bundle_txt = BytesIO()
1470
bundle_txt.write(serializer._get_bundle_header('4'))
1471
bundle_txt.write(b'\n')
1472
bundle_txt.write(bz2.compress(new_text))
1474
bundle = read_bundle(bundle_txt)
1475
self.valid_apply_bundle(base_rev_id, bundle)
1478
def make_merged_branch(self):
1479
builder = self.make_branch_builder('source')
1480
builder.start_series()
1481
builder.build_snapshot(None, [
1482
('add', ('', b'root-id', 'directory', None)),
1483
('add', ('file', b'file-id', 'file', b'original content\n')),
1484
], revision_id=b'a@cset-0-1')
1485
builder.build_snapshot([b'a@cset-0-1'], [
1486
('modify', ('file', b'new-content\n')),
1487
], revision_id=b'a@cset-0-2a')
1488
builder.build_snapshot([b'a@cset-0-1'], [
1489
('add', ('other-file', b'file2-id', 'file', b'file2-content\n')),
1490
], revision_id=b'a@cset-0-2b')
1491
builder.build_snapshot([b'a@cset-0-2a', b'a@cset-0-2b'], [
1492
('add', ('other-file', b'file2-id', 'file', b'file2-content\n')),
1493
], revision_id=b'a@cset-0-3')
1494
builder.finish_series()
1495
self.b1 = builder.get_branch()
1497
self.addCleanup(self.b1.unlock)
1499
def make_bundle_just_inventories(self, base_revision_id,
1503
writer = v4.BundleWriteOperation(base_revision_id, target_revision_id,
1504
self.b1.repository, sio)
1505
writer.bundle.begin()
1506
writer._add_inventory_mpdiffs_from_serializer(revision_ids)
1511
def test_single_inventory_multiple_parents_as_xml(self):
1512
self.make_merged_branch()
1513
sio = self.make_bundle_just_inventories(b'a@cset-0-1', b'a@cset-0-3',
1515
reader = v4.BundleReader(sio, stream_input=False)
1516
records = list(reader.iter_records())
1517
self.assertEqual(1, len(records))
1518
(bytes, metadata, repo_kind, revision_id,
1519
file_id) = records[0]
1520
self.assertIs(None, file_id)
1521
self.assertEqual(b'a@cset-0-3', revision_id)
1522
self.assertEqual('inventory', repo_kind)
1523
self.assertEqual({b'parents': [b'a@cset-0-2a', b'a@cset-0-2b'],
1524
b'sha1': b'09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1525
b'storage_kind': b'mpdiff',
1527
# We should have an mpdiff that takes some lines from both parents.
1528
self.assertEqualDiff(
1530
b'<inventory format="10" revision_id="a@cset-0-3">\n'
1533
b'c 1 3 3 2\n', bytes)
1535
def test_single_inv_no_parents_as_xml(self):
1536
self.make_merged_branch()
1537
sio = self.make_bundle_just_inventories(b'null:', b'a@cset-0-1',
1539
reader = v4.BundleReader(sio, stream_input=False)
1540
records = list(reader.iter_records())
1541
self.assertEqual(1, len(records))
1542
(bytes, metadata, repo_kind, revision_id,
1543
file_id) = records[0]
1544
self.assertIs(None, file_id)
1545
self.assertEqual(b'a@cset-0-1', revision_id)
1546
self.assertEqual('inventory', repo_kind)
1547
self.assertEqual({b'parents': [],
1548
b'sha1': b'a13f42b142d544aac9b085c42595d304150e31a2',
1549
b'storage_kind': b'mpdiff',
1551
# We should have an mpdiff that takes some lines from both parents.
1552
self.assertEqualDiff(
1554
b'<inventory format="10" revision_id="a@cset-0-1">\n'
1555
b'<directory file_id="root-id" name=""'
1556
b' revision="a@cset-0-1" />\n'
1557
b'<file file_id="file-id" name="file" parent_id="root-id"'
1558
b' revision="a@cset-0-1"'
1559
b' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
1560
b' text_size="17" />\n'
1564
def test_multiple_inventories_as_xml(self):
1565
self.make_merged_branch()
1566
sio = self.make_bundle_just_inventories(b'a@cset-0-1', b'a@cset-0-3',
1567
[b'a@cset-0-2a', b'a@cset-0-2b', b'a@cset-0-3'])
1568
reader = v4.BundleReader(sio, stream_input=False)
1569
records = list(reader.iter_records())
1570
self.assertEqual(3, len(records))
1571
revision_ids = [rev_id for b, m, k, rev_id, f in records]
1572
self.assertEqual([b'a@cset-0-2a', b'a@cset-0-2b', b'a@cset-0-3'],
1574
metadata_2a = records[0][1]
1575
self.assertEqual({b'parents': [b'a@cset-0-1'],
1576
b'sha1': b'1e105886d62d510763e22885eec733b66f5f09bf',
1577
b'storage_kind': b'mpdiff',
1579
metadata_2b = records[1][1]
1580
self.assertEqual({b'parents': [b'a@cset-0-1'],
1581
b'sha1': b'f03f12574bdb5ed2204c28636c98a8547544ccd8',
1582
b'storage_kind': b'mpdiff',
1584
metadata_3 = records[2][1]
1585
self.assertEqual({b'parents': [b'a@cset-0-2a', b'a@cset-0-2b'],
1586
b'sha1': b'09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1587
b'storage_kind': b'mpdiff',
1589
bytes_2a = records[0][0]
1590
self.assertEqualDiff(
1592
b'<inventory format="10" revision_id="a@cset-0-2a">\n'
1596
b'<file file_id="file-id" name="file" parent_id="root-id"'
1597
b' revision="a@cset-0-2a"'
1598
b' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
1599
b' text_size="12" />\n'
1601
b'c 0 3 3 1\n', bytes_2a)
1602
bytes_2b = records[1][0]
1603
self.assertEqualDiff(
1605
b'<inventory format="10" revision_id="a@cset-0-2b">\n'
1609
b'<file file_id="file2-id" name="other-file" parent_id="root-id"'
1610
b' revision="a@cset-0-2b"'
1611
b' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
1612
b' text_size="14" />\n'
1614
b'c 0 3 4 1\n', bytes_2b)
1615
bytes_3 = records[2][0]
1616
self.assertEqualDiff(
1618
b'<inventory format="10" revision_id="a@cset-0-3">\n'
1621
b'c 1 3 3 2\n', bytes_3)
1623
def test_creating_bundle_preserves_chk_pages(self):
1624
self.make_merged_branch()
1625
target = self.b1.controldir.sprout('target',
1626
revision_id=b'a@cset-0-2a').open_branch()
1627
bundle_txt, rev_ids = self.create_bundle_text(b'a@cset-0-2a',
1629
self.assertEqual(set([b'a@cset-0-2b', b'a@cset-0-3']), set(rev_ids))
1630
bundle = read_bundle(bundle_txt)
1632
self.addCleanup(target.unlock)
1633
install_bundle(target.repository, bundle)
1634
inv1 = next(self.b1.repository.inventories.get_record_stream([
1635
(b'a@cset-0-3',)], 'unordered',
1636
True)).get_bytes_as('fulltext')
1637
inv2 = next(target.repository.inventories.get_record_stream([
1638
(b'a@cset-0-3',)], 'unordered',
1639
True)).get_bytes_as('fulltext')
1640
self.assertEqualDiff(inv1, inv2)
1643
class MungedBundleTester(object):
1645
def build_test_bundle(self):
1646
wt = self.make_branch_and_tree('b1')
1648
self.build_tree(['b1/one'])
1650
wt.commit('add one', rev_id=b'a@cset-0-1')
1651
self.build_tree(['b1/two'])
1653
wt.commit('add two', rev_id=b'a@cset-0-2',
1654
revprops={u'branch-nick': 'test'})
1656
bundle_txt = BytesIO()
1657
rev_ids = write_bundle(wt.branch.repository, b'a@cset-0-2',
1658
b'a@cset-0-1', bundle_txt, self.format)
1659
self.assertEqual({b'a@cset-0-2'}, set(rev_ids))
1660
bundle_txt.seek(0, 0)
1663
def check_valid(self, bundle):
1664
"""Check that after whatever munging, the final object is valid."""
1665
self.assertEqual([b'a@cset-0-2'],
1666
[r.revision_id for r in bundle.real_revisions])
1668
def test_extra_whitespace(self):
1669
bundle_txt = self.build_test_bundle()
1671
# Seek to the end of the file
1672
# Adding one extra newline used to give us
1673
# TypeError: float() argument must be a string or a number
1674
bundle_txt.seek(0, 2)
1675
bundle_txt.write(b'\n')
1678
bundle = read_bundle(bundle_txt)
1679
self.check_valid(bundle)
1681
def test_extra_whitespace_2(self):
1682
bundle_txt = self.build_test_bundle()
1684
# Seek to the end of the file
1685
# Adding two extra newlines used to give us
1686
# MalformedPatches: The first line of all patches should be ...
1687
bundle_txt.seek(0, 2)
1688
bundle_txt.write(b'\n\n')
1691
bundle = read_bundle(bundle_txt)
1692
self.check_valid(bundle)
1695
class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
1699
def test_missing_trailing_whitespace(self):
1700
bundle_txt = self.build_test_bundle()
1702
# Remove a trailing newline, it shouldn't kill the parser
1703
raw = bundle_txt.getvalue()
1704
# The contents of the bundle don't have to be this, but this
1705
# test is concerned with the exact case where the serializer
1706
# creates a blank line at the end, and fails if that
1708
self.assertEqual(b'\n\n', raw[-2:])
1709
bundle_txt = BytesIO(raw[:-1])
1711
bundle = read_bundle(bundle_txt)
1712
self.check_valid(bundle)
1714
def test_opening_text(self):
1715
bundle_txt = self.build_test_bundle()
1717
bundle_txt = BytesIO(
1718
b"Some random\nemail comments\n" + bundle_txt.getvalue())
1720
bundle = read_bundle(bundle_txt)
1721
self.check_valid(bundle)
1723
def test_trailing_text(self):
1724
bundle_txt = self.build_test_bundle()
1726
bundle_txt = BytesIO(
1727
bundle_txt.getvalue() + b"Some trailing\nrandom\ntext\n")
1729
bundle = read_bundle(bundle_txt)
1730
self.check_valid(bundle)
1733
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
1738
class TestBundleWriterReader(tests.TestCase):
1740
def test_roundtrip_record(self):
1742
writer = v4.BundleWriter(fileobj)
1744
writer.add_info_record({b'foo': b'bar'})
1745
writer._add_record(b"Record body", {b'parents': [b'1', b'3'],
1746
b'storage_kind': b'fulltext'}, 'file', b'revid', b'fileid')
1749
reader = v4.BundleReader(fileobj, stream_input=True)
1750
record_iter = reader.iter_records()
1751
record = next(record_iter)
1752
self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
1753
'info', None, None), record)
1754
record = next(record_iter)
1755
self.assertEqual((b"Record body", {b'storage_kind': b'fulltext',
1756
b'parents': [b'1', b'3']}, 'file', b'revid', b'fileid'),
1759
def test_roundtrip_record_memory_hungry(self):
1761
writer = v4.BundleWriter(fileobj)
1763
writer.add_info_record({b'foo': b'bar'})
1764
writer._add_record(b"Record body", {b'parents': [b'1', b'3'],
1765
b'storage_kind': b'fulltext'}, 'file', b'revid', b'fileid')
1768
reader = v4.BundleReader(fileobj, stream_input=False)
1769
record_iter = reader.iter_records()
1770
record = next(record_iter)
1771
self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
1772
'info', None, None), record)
1773
record = next(record_iter)
1774
self.assertEqual((b"Record body", {b'storage_kind': b'fulltext',
1775
b'parents': [b'1', b'3']}, 'file', b'revid', b'fileid'),
1778
def test_encode_name(self):
1779
self.assertEqual(b'revision/rev1',
1780
v4.BundleWriter.encode_name('revision', b'rev1'))
1781
self.assertEqual(b'file/rev//1/file-id-1',
1782
v4.BundleWriter.encode_name('file', b'rev/1', b'file-id-1'))
1783
self.assertEqual(b'info',
1784
v4.BundleWriter.encode_name('info', None, None))
1786
def test_decode_name(self):
1787
self.assertEqual(('revision', b'rev1', None),
1788
v4.BundleReader.decode_name(b'revision/rev1'))
1789
self.assertEqual(('file', b'rev/1', b'file-id-1'),
1790
v4.BundleReader.decode_name(b'file/rev//1/file-id-1'))
1791
self.assertEqual(('info', None, None),
1792
v4.BundleReader.decode_name(b'info'))
1794
def test_too_many_names(self):
1796
writer = v4.BundleWriter(fileobj)
1798
writer.add_info_record({b'foo': b'bar'})
1799
writer._container.add_bytes_record([b'blah'], len(b'blah'), [(b'two', ), (b'names', )])
1802
record_iter = v4.BundleReader(fileobj).iter_records()
1803
record = next(record_iter)
1804
self.assertEqual((None, {b'foo': b'bar', b'storage_kind': b'header'},
1805
'info', None, None), record)
1806
self.assertRaises(errors.BadBundle, next, record_iter)
added
removed
breezy/tests/test_bundle.py
