1
# Copyright (C) 2005-2011 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
17
from cStringIO import StringIO
29
revision as _mod_revision,
33
from bzrlib.bundle import read_mergeable_from_url
34
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
35
from bzrlib.bundle.bundle_data import BundleTree
36
from bzrlib.directory_service import directories
37
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
38
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
39
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
40
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
41
from bzrlib.repofmt import knitrepo
42
from bzrlib.tests import (
48
from bzrlib.transform import TreeTransform
51
def get_text(vf, key):
52
"""Get the fulltext for a given revision id that is present in the vf"""
53
stream = vf.get_record_stream([key], 'unordered', True)
54
record = stream.next()
55
return record.get_bytes_as('fulltext')
58
def get_inventory_text(repo, revision_id):
59
"""Get the fulltext for the inventory at revision id"""
62
return get_text(repo.inventories, (revision_id,))
67
class MockTree(object):
70
from bzrlib.inventory import InventoryDirectory, ROOT_ID
72
self.paths = {ROOT_ID: ""}
73
self.ids = {"": ROOT_ID}
75
self.root = InventoryDirectory(ROOT_ID, '', None)
77
inventory = property(lambda x:x)
78
root_inventory = property(lambda x:x)
80
def get_root_id(self):
81
return self.root.file_id
83
def all_file_ids(self):
84
return set(self.paths.keys())
86
def is_executable(self, file_id):
87
# Not all the files are executable.
90
def __getitem__(self, file_id):
91
if file_id == self.root.file_id:
94
return self.make_entry(file_id, self.paths[file_id])
96
def parent_id(self, file_id):
97
parent_dir = os.path.dirname(self.paths[file_id])
100
return self.ids[parent_dir]
102
def iter_entries(self):
103
for path, file_id in self.ids.iteritems():
104
yield path, self[file_id]
106
def kind(self, file_id):
107
if file_id in self.contents:
113
def make_entry(self, file_id, path):
114
from bzrlib.inventory import (InventoryEntry, InventoryFile
115
, InventoryDirectory, InventoryLink)
116
name = os.path.basename(path)
117
kind = self.kind(file_id)
118
parent_id = self.parent_id(file_id)
119
text_sha_1, text_size = self.contents_stats(file_id)
120
if kind == 'directory':
121
ie = InventoryDirectory(file_id, name, parent_id)
123
ie = InventoryFile(file_id, name, parent_id)
124
ie.text_sha1 = text_sha_1
125
ie.text_size = text_size
126
elif kind == 'symlink':
127
ie = InventoryLink(file_id, name, parent_id)
129
raise errors.BzrError('unknown kind %r' % kind)
132
def add_dir(self, file_id, path):
133
self.paths[file_id] = path
134
self.ids[path] = file_id
136
def add_file(self, file_id, path, contents):
137
self.add_dir(file_id, path)
138
self.contents[file_id] = contents
140
def path2id(self, path):
141
return self.ids.get(path)
143
def id2path(self, file_id):
144
return self.paths.get(file_id)
146
def has_id(self, file_id):
147
return self.id2path(file_id) is not None
149
def get_file(self, file_id):
151
result.write(self.contents[file_id])
155
def get_file_revision(self, file_id):
156
return self.inventory[file_id].revision
158
def contents_stats(self, file_id):
159
if file_id not in self.contents:
161
text_sha1 = osutils.sha_file(self.get_file(file_id))
162
return text_sha1, len(self.contents[file_id])
165
class BTreeTester(tests.TestCase):
166
"""A simple unittest tester for the BundleTree class."""
168
def make_tree_1(self):
170
mtree.add_dir("a", "grandparent")
171
mtree.add_dir("b", "grandparent/parent")
172
mtree.add_file("c", "grandparent/parent/file", "Hello\n")
173
mtree.add_dir("d", "grandparent/alt_parent")
174
return BundleTree(mtree, ''), mtree
176
def test_renames(self):
177
"""Ensure that file renames have the proper effect on children"""
178
btree = self.make_tree_1()[0]
179
self.assertEqual(btree.old_path("grandparent"), "grandparent")
180
self.assertEqual(btree.old_path("grandparent/parent"),
181
"grandparent/parent")
182
self.assertEqual(btree.old_path("grandparent/parent/file"),
183
"grandparent/parent/file")
185
self.assertEqual(btree.id2path("a"), "grandparent")
186
self.assertEqual(btree.id2path("b"), "grandparent/parent")
187
self.assertEqual(btree.id2path("c"), "grandparent/parent/file")
189
self.assertEqual(btree.path2id("grandparent"), "a")
190
self.assertEqual(btree.path2id("grandparent/parent"), "b")
191
self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
193
self.assertTrue(btree.path2id("grandparent2") is None)
194
self.assertTrue(btree.path2id("grandparent2/parent") is None)
195
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
197
btree.note_rename("grandparent", "grandparent2")
198
self.assertTrue(btree.old_path("grandparent") is None)
199
self.assertTrue(btree.old_path("grandparent/parent") is None)
200
self.assertTrue(btree.old_path("grandparent/parent/file") is None)
202
self.assertEqual(btree.id2path("a"), "grandparent2")
203
self.assertEqual(btree.id2path("b"), "grandparent2/parent")
204
self.assertEqual(btree.id2path("c"), "grandparent2/parent/file")
206
self.assertEqual(btree.path2id("grandparent2"), "a")
207
self.assertEqual(btree.path2id("grandparent2/parent"), "b")
208
self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
210
self.assertTrue(btree.path2id("grandparent") is None)
211
self.assertTrue(btree.path2id("grandparent/parent") is None)
212
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
214
btree.note_rename("grandparent/parent", "grandparent2/parent2")
215
self.assertEqual(btree.id2path("a"), "grandparent2")
216
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
217
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file")
219
self.assertEqual(btree.path2id("grandparent2"), "a")
220
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
221
self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
223
self.assertTrue(btree.path2id("grandparent2/parent") is None)
224
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
226
btree.note_rename("grandparent/parent/file",
227
"grandparent2/parent2/file2")
228
self.assertEqual(btree.id2path("a"), "grandparent2")
229
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
230
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file2")
232
self.assertEqual(btree.path2id("grandparent2"), "a")
233
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
234
self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
236
self.assertTrue(btree.path2id("grandparent2/parent2/file") is None)
238
def test_moves(self):
239
"""Ensure that file moves have the proper effect on children"""
240
btree = self.make_tree_1()[0]
241
btree.note_rename("grandparent/parent/file",
242
"grandparent/alt_parent/file")
243
self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
244
self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
245
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
247
def unified_diff(self, old, new):
249
diff.internal_diff("old", old, "new", new, out)
253
def make_tree_2(self):
254
btree = self.make_tree_1()[0]
255
btree.note_rename("grandparent/parent/file",
256
"grandparent/alt_parent/file")
257
self.assertTrue(btree.id2path("e") is None)
258
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
259
btree.note_id("e", "grandparent/parent/file")
263
"""File/inventory adds"""
264
btree = self.make_tree_2()
265
add_patch = self.unified_diff([], ["Extra cheese\n"])
266
btree.note_patch("grandparent/parent/file", add_patch)
267
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
268
btree.note_target('grandparent/parent/symlink', 'venus')
269
self.adds_test(btree)
271
def adds_test(self, btree):
272
self.assertEqual(btree.id2path("e"), "grandparent/parent/file")
273
self.assertEqual(btree.path2id("grandparent/parent/file"), "e")
274
self.assertEqual(btree.get_file("e").read(), "Extra cheese\n")
275
self.assertEqual(btree.get_symlink_target('f'), 'venus')
277
def test_adds2(self):
278
"""File/inventory adds, with patch-compatibile renames"""
279
btree = self.make_tree_2()
280
btree.contents_by_id = False
281
add_patch = self.unified_diff(["Hello\n"], ["Extra cheese\n"])
282
btree.note_patch("grandparent/parent/file", add_patch)
283
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
284
btree.note_target('grandparent/parent/symlink', 'venus')
285
self.adds_test(btree)
287
def make_tree_3(self):
288
btree, mtree = self.make_tree_1()
289
mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
290
btree.note_rename("grandparent/parent/file",
291
"grandparent/alt_parent/file")
292
btree.note_rename("grandparent/parent/topping",
293
"grandparent/alt_parent/stopping")
296
def get_file_test(self, btree):
297
self.assertEqual(btree.get_file("e").read(), "Lemon\n")
298
self.assertEqual(btree.get_file("c").read(), "Hello\n")
300
def test_get_file(self):
301
"""Get file contents"""
302
btree = self.make_tree_3()
303
mod_patch = self.unified_diff(["Anchovies\n"], ["Lemon\n"])
304
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
305
self.get_file_test(btree)
307
def test_get_file2(self):
308
"""Get file contents, with patch-compatibile renames"""
309
btree = self.make_tree_3()
310
btree.contents_by_id = False
311
mod_patch = self.unified_diff([], ["Lemon\n"])
312
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
313
mod_patch = self.unified_diff([], ["Hello\n"])
314
btree.note_patch("grandparent/alt_parent/file", mod_patch)
315
self.get_file_test(btree)
317
def test_delete(self):
319
btree = self.make_tree_1()[0]
320
self.assertEqual(btree.get_file("c").read(), "Hello\n")
321
btree.note_deletion("grandparent/parent/file")
322
self.assertTrue(btree.id2path("c") is None)
323
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
325
def sorted_ids(self, tree):
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, 'a', 'b', 'c', 'd'])
335
btree.note_deletion("grandparent/parent/file")
336
btree.note_id("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, 'a', 'b', 'd', '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, [], {}, StringIO())
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, [], {}, StringIO())
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='one-id')
367
source.commit('two', rev_id='two-id')
369
write_bundle(source.branch.repository, 'two-id', '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 = StringIO()
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
'# Bazaar revision bundle v%s\n' % self.format)
405
self.assertEqual(bundle_txt.readline(), '#\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,
441
checkout_dir=checkout_dir)
445
def get_invalid_bundle(self, base_rev_id, rev_id):
446
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
447
Munge the text so that it's invalid.
449
:return: The in-memory bundle
451
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
452
new_text = bundle_txt.getvalue().replace('executable:no',
454
bundle_txt = StringIO(new_text)
455
bundle = read_bundle(bundle_txt)
456
self.valid_apply_bundle(base_rev_id, bundle)
459
def test_non_bundle(self):
460
self.assertRaises(errors.NotABundle,
461
read_bundle, StringIO('#!/bin/sh\n'))
463
def test_malformed(self):
464
self.assertRaises(errors.BadBundle, read_bundle,
465
StringIO('# Bazaar revision bundle v'))
467
def test_crlf_bundle(self):
469
read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
470
except errors.BadBundle:
471
# It is currently permitted for bundles with crlf line endings to
472
# make read_bundle raise a BadBundle, but this should be fixed.
473
# Anything else, especially NotABundle, is an error.
476
def get_checkout(self, rev_id, checkout_dir=None):
477
"""Get a new tree, with the specified revision in it.
480
if checkout_dir is None:
481
checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
483
if not os.path.exists(checkout_dir):
484
os.mkdir(checkout_dir)
485
tree = self.make_branch_and_tree(checkout_dir)
487
ancestors = write_bundle(self.b1.repository, rev_id, 'null:', s,
490
self.assertIsInstance(s.getvalue(), str)
491
install_bundle(tree.branch.repository, read_bundle(s))
492
for ancestor in ancestors:
493
old = self.b1.repository.revision_tree(ancestor)
494
new = tree.branch.repository.revision_tree(ancestor)
498
# Check that there aren't any inventory level changes
499
delta = new.changes_from(old)
500
self.assertFalse(delta.has_changed(),
501
'Revision %s not copied correctly.'
504
# Now check that the file contents are all correct
505
for inventory_id in old.all_file_ids():
507
old_file = old.get_file(inventory_id)
508
except errors.NoSuchFile:
512
self.assertEqual(old_file.read(),
513
new.get_file(inventory_id).read())
517
if not _mod_revision.is_null(rev_id):
518
tree.branch.generate_revision_history(rev_id)
520
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
521
self.assertFalse(delta.has_changed(),
522
'Working tree has modifications: %s' % delta)
525
def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
526
"""Get the base revision, apply the changes, and make
527
sure everything matches the builtin branch.
529
to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
532
self._valid_apply_bundle(base_rev_id, info, to_tree)
536
def _valid_apply_bundle(self, base_rev_id, info, to_tree):
537
original_parents = to_tree.get_parent_ids()
538
repository = to_tree.branch.repository
539
original_parents = to_tree.get_parent_ids()
540
self.assertIs(repository.has_revision(base_rev_id), True)
541
for rev in info.real_revisions:
542
self.assert_(not repository.has_revision(rev.revision_id),
543
'Revision {%s} present before applying bundle'
545
merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
547
for rev in info.real_revisions:
548
self.assert_(repository.has_revision(rev.revision_id),
549
'Missing revision {%s} after applying bundle'
552
self.assert_(to_tree.branch.repository.has_revision(info.target))
553
# Do we also want to verify that all the texts have been added?
555
self.assertEqual(original_parents + [info.target],
556
to_tree.get_parent_ids())
558
rev = info.real_revisions[-1]
559
base_tree = self.b1.repository.revision_tree(rev.revision_id)
560
to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
562
# TODO: make sure the target tree is identical to base tree
563
# we might also check the working tree.
565
base_files = list(base_tree.list_files())
566
to_files = list(to_tree.list_files())
567
self.assertEqual(len(base_files), len(to_files))
568
for base_file, to_file in zip(base_files, to_files):
569
self.assertEqual(base_file, to_file)
571
for path, status, kind, fileid, entry in base_files:
572
# Check that the meta information is the same
573
self.assertEqual(base_tree.get_file_size(fileid),
574
to_tree.get_file_size(fileid))
575
self.assertEqual(base_tree.get_file_sha1(fileid),
576
to_tree.get_file_sha1(fileid))
577
# Check that the contents are the same
578
# This is pretty expensive
579
# self.assertEqual(base_tree.get_file(fileid).read(),
580
# to_tree.get_file(fileid).read())
582
def test_bundle(self):
583
self.tree1 = self.make_branch_and_tree('b1')
584
self.b1 = self.tree1.branch
586
self.build_tree_contents([('b1/one', 'one\n')])
587
self.tree1.add('one', 'one-id')
588
self.tree1.set_root_id('root-id')
589
self.tree1.commit('add one', rev_id='a@cset-0-1')
591
bundle = self.get_valid_bundle('null:', 'a@cset-0-1')
593
# Make sure we can handle files with spaces, tabs, other
598
, 'b1/dir/filein subdir.c'
599
, 'b1/dir/WithCaps.txt'
600
, 'b1/dir/ pre space'
603
, 'b1/sub/sub/nonempty.txt'
605
self.build_tree_contents([('b1/sub/sub/emptyfile.txt', ''),
606
('b1/dir/nolastnewline.txt', 'bloop')])
607
tt = TreeTransform(self.tree1)
608
tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
610
# have to fix length of file-id so that we can predictably rewrite
611
# a (length-prefixed) record containing it later.
612
self.tree1.add('with space.txt', 'withspace-id')
615
, 'dir/filein subdir.c'
618
, 'dir/nolastnewline.txt'
621
, 'sub/sub/nonempty.txt'
622
, 'sub/sub/emptyfile.txt'
624
self.tree1.commit('add whitespace', rev_id='a@cset-0-2')
626
bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
628
# Check a rollup bundle
629
bundle = self.get_valid_bundle('null:', 'a@cset-0-2')
633
['sub/sub/nonempty.txt'
634
, 'sub/sub/emptyfile.txt'
637
tt = TreeTransform(self.tree1)
638
trans_id = tt.trans_id_tree_file_id('exe-1')
639
tt.set_executability(False, trans_id)
641
self.tree1.commit('removed', rev_id='a@cset-0-3')
643
bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
644
self.assertRaises((errors.TestamentMismatch,
645
errors.VersionedFileInvalidChecksum,
646
errors.BadBundle), self.get_invalid_bundle,
647
'a@cset-0-2', 'a@cset-0-3')
648
# Check a rollup bundle
649
bundle = self.get_valid_bundle('null:', 'a@cset-0-3')
651
# Now move the directory
652
self.tree1.rename_one('dir', 'sub/dir')
653
self.tree1.commit('rename dir', rev_id='a@cset-0-4')
655
bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
656
# Check a rollup bundle
657
bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
660
with open('b1/sub/dir/WithCaps.txt', 'ab') as f: f.write('\nAdding some text\n')
661
with open('b1/sub/dir/ pre space', 'ab') as f: f.write(
662
'\r\nAdding some\r\nDOS format lines\r\n')
663
with open('b1/sub/dir/nolastnewline.txt', 'ab') as f: f.write('\n')
664
self.tree1.rename_one('sub/dir/ pre space',
666
self.tree1.commit('Modified files', rev_id='a@cset-0-5')
667
bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
669
self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
670
self.tree1.rename_one('with space.txt', 'WithCaps.txt')
671
self.tree1.rename_one('temp', 'with space.txt')
672
self.tree1.commit(u'swap filenames', rev_id='a@cset-0-6',
674
bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
675
other = self.get_checkout('a@cset-0-5')
676
tree1_inv = get_inventory_text(self.tree1.branch.repository,
678
tree2_inv = get_inventory_text(other.branch.repository,
680
self.assertEqualDiff(tree1_inv, tree2_inv)
681
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
682
other.commit('rename file', rev_id='a@cset-0-6b')
683
self.tree1.merge_from_branch(other.branch)
684
self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
686
bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
688
def _test_symlink_bundle(self, link_name, link_target, new_link_target):
691
self.requireFeature(features.SymlinkFeature)
692
self.tree1 = self.make_branch_and_tree('b1')
693
self.b1 = self.tree1.branch
695
tt = TreeTransform(self.tree1)
696
tt.new_symlink(link_name, tt.root, link_target, link_id)
698
self.tree1.commit('add symlink', rev_id='l@cset-0-1')
699
bundle = self.get_valid_bundle('null:', 'l@cset-0-1')
700
if getattr(bundle ,'revision_tree', None) is not None:
701
# Not all bundle formats supports revision_tree
702
bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-1')
703
self.assertEqual(link_target, bund_tree.get_symlink_target(link_id))
705
tt = TreeTransform(self.tree1)
706
trans_id = tt.trans_id_tree_file_id(link_id)
707
tt.adjust_path('link2', tt.root, trans_id)
708
tt.delete_contents(trans_id)
709
tt.create_symlink(new_link_target, trans_id)
711
self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
712
bundle = self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
713
if getattr(bundle ,'revision_tree', None) is not None:
714
# Not all bundle formats supports revision_tree
715
bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-2')
716
self.assertEqual(new_link_target,
717
bund_tree.get_symlink_target(link_id))
719
tt = TreeTransform(self.tree1)
720
trans_id = tt.trans_id_tree_file_id(link_id)
721
tt.delete_contents(trans_id)
722
tt.create_symlink('jupiter', trans_id)
724
self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
725
bundle = self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
727
tt = TreeTransform(self.tree1)
728
trans_id = tt.trans_id_tree_file_id(link_id)
729
tt.delete_contents(trans_id)
731
self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
732
bundle = self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
734
def test_symlink_bundle(self):
735
self._test_symlink_bundle('link', 'bar/foo', 'mars')
737
def test_unicode_symlink_bundle(self):
738
self.requireFeature(features.UnicodeFilenameFeature)
739
self._test_symlink_bundle(u'\N{Euro Sign}link',
740
u'bar/\N{Euro Sign}foo',
741
u'mars\N{Euro Sign}')
743
def test_binary_bundle(self):
744
self.tree1 = self.make_branch_and_tree('b1')
745
self.b1 = self.tree1.branch
746
tt = TreeTransform(self.tree1)
749
tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
750
tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
753
self.tree1.commit('add binary', rev_id='b@cset-0-1')
754
self.get_valid_bundle('null:', 'b@cset-0-1')
757
tt = TreeTransform(self.tree1)
758
trans_id = tt.trans_id_tree_file_id('binary-1')
759
tt.delete_contents(trans_id)
761
self.tree1.commit('delete binary', rev_id='b@cset-0-2')
762
self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
765
tt = TreeTransform(self.tree1)
766
trans_id = tt.trans_id_tree_file_id('binary-2')
767
tt.adjust_path('file3', tt.root, trans_id)
768
tt.delete_contents(trans_id)
769
tt.create_file('file\rcontents\x00\n\x00', trans_id)
771
self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
772
self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
775
tt = TreeTransform(self.tree1)
776
trans_id = tt.trans_id_tree_file_id('binary-2')
777
tt.delete_contents(trans_id)
778
tt.create_file('\x00file\rcontents', trans_id)
780
self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
781
self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
784
self.get_valid_bundle('null:', 'b@cset-0-4')
786
def test_last_modified(self):
787
self.tree1 = self.make_branch_and_tree('b1')
788
self.b1 = self.tree1.branch
789
tt = TreeTransform(self.tree1)
790
tt.new_file('file', tt.root, 'file', 'file')
792
self.tree1.commit('create file', rev_id='a@lmod-0-1')
794
tt = TreeTransform(self.tree1)
795
trans_id = tt.trans_id_tree_file_id('file')
796
tt.delete_contents(trans_id)
797
tt.create_file('file2', trans_id)
799
self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
801
other = self.get_checkout('a@lmod-0-1')
802
tt = TreeTransform(other)
803
trans_id = tt.trans_id_tree_file_id('file')
804
tt.delete_contents(trans_id)
805
tt.create_file('file2', trans_id)
807
other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
808
self.tree1.merge_from_branch(other.branch)
809
self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
811
self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
812
bundle = self.get_valid_bundle('a@lmod-0-2a', 'a@lmod-0-4')
814
def test_hide_history(self):
815
self.tree1 = self.make_branch_and_tree('b1')
816
self.b1 = self.tree1.branch
818
with open('b1/one', 'wb') as f: f.write('one\n')
819
self.tree1.add('one')
820
self.tree1.commit('add file', rev_id='a@cset-0-1')
821
with open('b1/one', 'wb') as f: f.write('two\n')
822
self.tree1.commit('modify', rev_id='a@cset-0-2')
823
with open('b1/one', 'wb') as f: f.write('three\n')
824
self.tree1.commit('modify', rev_id='a@cset-0-3')
825
bundle_file = StringIO()
826
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
827
'a@cset-0-1', bundle_file, format=self.format)
828
self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
829
self.assertContainsRe(self.get_raw(bundle_file), 'one')
830
self.assertContainsRe(self.get_raw(bundle_file), 'three')
832
def test_bundle_same_basis(self):
833
"""Ensure using the basis as the target doesn't cause an error"""
834
self.tree1 = self.make_branch_and_tree('b1')
835
self.tree1.commit('add file', rev_id='a@cset-0-1')
836
bundle_file = StringIO()
837
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
838
'a@cset-0-1', bundle_file)
841
def get_raw(bundle_file):
842
return bundle_file.getvalue()
844
def test_unicode_bundle(self):
845
self.requireFeature(features.UnicodeFilenameFeature)
846
# Handle international characters
848
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
850
self.tree1 = self.make_branch_and_tree('b1')
851
self.b1 = self.tree1.branch
854
u'With international man of mystery\n'
855
u'William Dod\xe9\n').encode('utf-8'))
858
self.tree1.add([u'with Dod\N{Euro Sign}'], ['withdod-id'])
859
self.tree1.commit(u'i18n commit from William Dod\xe9',
860
rev_id='i18n-1', committer=u'William Dod\xe9')
863
bundle = self.get_valid_bundle('null:', 'i18n-1')
866
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
867
f.write(u'Modified \xb5\n'.encode('utf8'))
869
self.tree1.commit(u'modified', rev_id='i18n-2')
871
bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
874
self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
875
self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
876
committer=u'Erik B\xe5gfors')
878
bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
881
self.tree1.remove([u'B\N{Euro Sign}gfors'])
882
self.tree1.commit(u'removed', rev_id='i18n-4')
884
bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
887
bundle = self.get_valid_bundle('null:', 'i18n-4')
890
def test_whitespace_bundle(self):
891
if sys.platform in ('win32', 'cygwin'):
892
raise tests.TestSkipped('Windows doesn\'t support filenames'
893
' with tabs or trailing spaces')
894
self.tree1 = self.make_branch_and_tree('b1')
895
self.b1 = self.tree1.branch
897
self.build_tree(['b1/trailing space '])
898
self.tree1.add(['trailing space '])
899
# TODO: jam 20060701 Check for handling files with '\t' characters
900
# once we actually support them
903
self.tree1.commit('funky whitespace', rev_id='white-1')
905
bundle = self.get_valid_bundle('null:', 'white-1')
908
with open('b1/trailing space ', 'ab') as f: f.write('add some text\n')
909
self.tree1.commit('add text', rev_id='white-2')
911
bundle = self.get_valid_bundle('white-1', 'white-2')
914
self.tree1.rename_one('trailing space ', ' start and end space ')
915
self.tree1.commit('rename', rev_id='white-3')
917
bundle = self.get_valid_bundle('white-2', 'white-3')
920
self.tree1.remove([' start and end space '])
921
self.tree1.commit('removed', rev_id='white-4')
923
bundle = self.get_valid_bundle('white-3', 'white-4')
925
# Now test a complet roll-up
926
bundle = self.get_valid_bundle('null:', 'white-4')
928
def test_alt_timezone_bundle(self):
929
self.tree1 = self.make_branch_and_memory_tree('b1')
930
self.b1 = self.tree1.branch
931
builder = treebuilder.TreeBuilder()
933
self.tree1.lock_write()
934
builder.start_tree(self.tree1)
935
builder.build(['newfile'])
936
builder.finish_tree()
938
# Asia/Colombo offset = 5 hours 30 minutes
939
self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
940
timezone=19800, timestamp=1152544886.0)
942
bundle = self.get_valid_bundle('null:', 'tz-1')
944
rev = bundle.revisions[0]
945
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
946
self.assertEqual(19800, rev.timezone)
947
self.assertEqual(1152544886.0, rev.timestamp)
950
def test_bundle_root_id(self):
951
self.tree1 = self.make_branch_and_tree('b1')
952
self.b1 = self.tree1.branch
953
self.tree1.commit('message', rev_id='revid1')
954
bundle = self.get_valid_bundle('null:', 'revid1')
955
tree = self.get_bundle_tree(bundle, 'revid1')
956
root_revision = tree.get_file_revision(tree.get_root_id())
957
self.assertEqual('revid1', root_revision)
959
def test_install_revisions(self):
960
self.tree1 = self.make_branch_and_tree('b1')
961
self.b1 = self.tree1.branch
962
self.tree1.commit('message', rev_id='rev2a')
963
bundle = self.get_valid_bundle('null:', 'rev2a')
964
branch2 = self.make_branch('b2')
965
self.assertFalse(branch2.repository.has_revision('rev2a'))
966
target_revision = bundle.install_revisions(branch2.repository)
967
self.assertTrue(branch2.repository.has_revision('rev2a'))
968
self.assertEqual('rev2a', target_revision)
970
def test_bundle_empty_property(self):
971
"""Test serializing revision properties with an empty value."""
972
tree = self.make_branch_and_memory_tree('tree')
974
self.addCleanup(tree.unlock)
975
tree.add([''], ['TREE_ROOT'])
976
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
977
self.b1 = tree.branch
978
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
979
bundle = read_bundle(bundle_sio)
980
revision_info = bundle.revisions[0]
981
self.assertEqual('rev1', revision_info.revision_id)
982
rev = revision_info.as_revision()
983
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
986
def test_bundle_sorted_properties(self):
987
"""For stability the writer should write properties in sorted order."""
988
tree = self.make_branch_and_memory_tree('tree')
990
self.addCleanup(tree.unlock)
992
tree.add([''], ['TREE_ROOT'])
993
tree.commit('One', rev_id='rev1',
994
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
995
self.b1 = tree.branch
996
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
997
bundle = read_bundle(bundle_sio)
998
revision_info = bundle.revisions[0]
999
self.assertEqual('rev1', revision_info.revision_id)
1000
rev = revision_info.as_revision()
1001
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1002
'd':'1'}, rev.properties)
1004
def test_bundle_unicode_properties(self):
1005
"""We should be able to round trip a non-ascii property."""
1006
tree = self.make_branch_and_memory_tree('tree')
1008
self.addCleanup(tree.unlock)
1010
tree.add([''], ['TREE_ROOT'])
1011
# Revisions themselves do not require anything about revision property
1012
# keys, other than that they are a basestring, and do not contain
1014
# However, Testaments assert than they are str(), and thus should not
1016
tree.commit('One', rev_id='rev1',
1017
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1018
self.b1 = tree.branch
1019
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1020
bundle = read_bundle(bundle_sio)
1021
revision_info = bundle.revisions[0]
1022
self.assertEqual('rev1', revision_info.revision_id)
1023
rev = revision_info.as_revision()
1024
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1025
'alpha':u'\u03b1'}, rev.properties)
1027
def test_bundle_with_ghosts(self):
1028
tree = self.make_branch_and_tree('tree')
1029
self.b1 = tree.branch
1030
self.build_tree_contents([('tree/file', 'content1')])
1033
self.build_tree_contents([('tree/file', 'content2')])
1034
tree.add_parent_tree_id('ghost')
1035
tree.commit('rev2', rev_id='rev2')
1036
bundle = self.get_valid_bundle('null:', 'rev2')
1038
def make_simple_tree(self, format=None):
1039
tree = self.make_branch_and_tree('b1', format=format)
1040
self.b1 = tree.branch
1041
self.build_tree(['b1/file'])
1045
def test_across_serializers(self):
1046
tree = self.make_simple_tree('knit')
1047
tree.commit('hello', rev_id='rev1')
1048
tree.commit('hello', rev_id='rev2')
1049
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1050
repo = self.make_repository('repo', format='dirstate-with-subtree')
1051
bundle.install_revisions(repo)
1052
inv_text = repo._get_inventory_xml('rev2')
1053
self.assertNotContainsRe(inv_text, 'format="5"')
1054
self.assertContainsRe(inv_text, 'format="7"')
1056
def make_repo_with_installed_revisions(self):
1057
tree = self.make_simple_tree('knit')
1058
tree.commit('hello', rev_id='rev1')
1059
tree.commit('hello', rev_id='rev2')
1060
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1061
repo = self.make_repository('repo', format='dirstate-with-subtree')
1062
bundle.install_revisions(repo)
1065
def test_across_models(self):
1066
repo = self.make_repo_with_installed_revisions()
1067
inv = repo.get_inventory('rev2')
1068
self.assertEqual('rev2', inv.root.revision)
1069
root_id = inv.root.file_id
1071
self.addCleanup(repo.unlock)
1072
self.assertEqual({(root_id, 'rev1'):(),
1073
(root_id, 'rev2'):((root_id, 'rev1'),)},
1074
repo.texts.get_parent_map([(root_id, 'rev1'), (root_id, 'rev2')]))
1076
def test_inv_hash_across_serializers(self):
1077
repo = self.make_repo_with_installed_revisions()
1078
recorded_inv_sha1 = repo.get_revision('rev2').inventory_sha1
1079
xml = repo._get_inventory_xml('rev2')
1080
self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
1082
def test_across_models_incompatible(self):
1083
tree = self.make_simple_tree('dirstate-with-subtree')
1084
tree.commit('hello', rev_id='rev1')
1085
tree.commit('hello', rev_id='rev2')
1087
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1088
except errors.IncompatibleBundleFormat:
1089
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1090
repo = self.make_repository('repo', format='knit')
1091
bundle.install_revisions(repo)
1093
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1094
self.assertRaises(errors.IncompatibleRevision,
1095
bundle.install_revisions, repo)
1097
def test_get_merge_request(self):
1098
tree = self.make_simple_tree()
1099
tree.commit('hello', rev_id='rev1')
1100
tree.commit('hello', rev_id='rev2')
1101
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1102
result = bundle.get_merge_request(tree.branch.repository)
1103
self.assertEqual((None, 'rev1', 'inapplicable'), result)
1105
def test_with_subtree(self):
1106
tree = self.make_branch_and_tree('tree',
1107
format='dirstate-with-subtree')
1108
self.b1 = tree.branch
1109
subtree = self.make_branch_and_tree('tree/subtree',
1110
format='dirstate-with-subtree')
1112
tree.commit('hello', rev_id='rev1')
1114
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1115
except errors.IncompatibleBundleFormat:
1116
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1117
if isinstance(bundle, v09.BundleInfo09):
1118
raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
1119
repo = self.make_repository('repo', format='knit')
1120
self.assertRaises(errors.IncompatibleRevision,
1121
bundle.install_revisions, repo)
1122
repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1123
bundle.install_revisions(repo2)
1125
def test_revision_id_with_slash(self):
1126
self.tree1 = self.make_branch_and_tree('tree')
1127
self.b1 = self.tree1.branch
1129
self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
1131
raise tests.TestSkipped(
1132
"Repository doesn't support revision ids with slashes")
1133
bundle = self.get_valid_bundle('null:', 'rev/id')
1135
def test_skip_file(self):
1136
"""Make sure we don't accidentally write to the wrong versionedfile"""
1137
self.tree1 = self.make_branch_and_tree('tree')
1138
self.b1 = self.tree1.branch
1139
# rev1 is not present in bundle, done by fetch
1140
self.build_tree_contents([('tree/file2', 'contents1')])
1141
self.tree1.add('file2', 'file2-id')
1142
self.tree1.commit('rev1', rev_id='reva')
1143
self.build_tree_contents([('tree/file3', 'contents2')])
1144
# rev2 is present in bundle, and done by fetch
1145
# having file1 in the bunle causes file1's versionedfile to be opened.
1146
self.tree1.add('file3', 'file3-id')
1147
self.tree1.commit('rev2')
1148
# Updating file2 should not cause an attempt to add to file1's vf
1149
target = self.tree1.bzrdir.sprout('target').open_workingtree()
1150
self.build_tree_contents([('tree/file2', 'contents3')])
1151
self.tree1.commit('rev3', rev_id='rev3')
1152
bundle = self.get_valid_bundle('reva', 'rev3')
1153
if getattr(bundle, 'get_bundle_reader', None) is None:
1154
raise tests.TestSkipped('Bundle format cannot provide reader')
1155
# be sure that file1 comes before file2
1156
for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1159
self.assertNotEqual(f, 'file2-id')
1160
bundle.install_revisions(target.branch.repository)
1163
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
1167
def test_bundle_empty_property(self):
1168
"""Test serializing revision properties with an empty value."""
1169
tree = self.make_branch_and_memory_tree('tree')
1171
self.addCleanup(tree.unlock)
1172
tree.add([''], ['TREE_ROOT'])
1173
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1174
self.b1 = tree.branch
1175
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1176
self.assertContainsRe(bundle_sio.getvalue(),
1178
'# branch-nick: tree\n'
1182
bundle = read_bundle(bundle_sio)
1183
revision_info = bundle.revisions[0]
1184
self.assertEqual('rev1', revision_info.revision_id)
1185
rev = revision_info.as_revision()
1186
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1189
def get_bundle_tree(self, bundle, revision_id):
1190
repository = self.make_repository('repo')
1191
return bundle.revision_tree(repository, 'revid1')
1193
def test_bundle_empty_property_alt(self):
1194
"""Test serializing revision properties with an empty value.
1196
Older readers had a bug when reading an empty property.
1197
They assumed that all keys ended in ': \n'. However they would write an
1198
empty value as ':\n'. This tests make sure that all newer bzr versions
1199
can handle th second form.
1201
tree = self.make_branch_and_memory_tree('tree')
1203
self.addCleanup(tree.unlock)
1204
tree.add([''], ['TREE_ROOT'])
1205
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1206
self.b1 = tree.branch
1207
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1208
txt = bundle_sio.getvalue()
1209
loc = txt.find('# empty: ') + len('# empty:')
1210
# Create a new bundle, which strips the trailing space after empty
1211
bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
1213
self.assertContainsRe(bundle_sio.getvalue(),
1215
'# branch-nick: tree\n'
1219
bundle = read_bundle(bundle_sio)
1220
revision_info = bundle.revisions[0]
1221
self.assertEqual('rev1', revision_info.revision_id)
1222
rev = revision_info.as_revision()
1223
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1226
def test_bundle_sorted_properties(self):
1227
"""For stability the writer should write properties in sorted order."""
1228
tree = self.make_branch_and_memory_tree('tree')
1230
self.addCleanup(tree.unlock)
1232
tree.add([''], ['TREE_ROOT'])
1233
tree.commit('One', rev_id='rev1',
1234
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1235
self.b1 = tree.branch
1236
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1237
self.assertContainsRe(bundle_sio.getvalue(),
1241
'# branch-nick: tree\n'
1245
bundle = read_bundle(bundle_sio)
1246
revision_info = bundle.revisions[0]
1247
self.assertEqual('rev1', revision_info.revision_id)
1248
rev = revision_info.as_revision()
1249
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1250
'd':'1'}, rev.properties)
1252
def test_bundle_unicode_properties(self):
1253
"""We should be able to round trip a non-ascii property."""
1254
tree = self.make_branch_and_memory_tree('tree')
1256
self.addCleanup(tree.unlock)
1258
tree.add([''], ['TREE_ROOT'])
1259
# Revisions themselves do not require anything about revision property
1260
# keys, other than that they are a basestring, and do not contain
1262
# However, Testaments assert than they are str(), and thus should not
1264
tree.commit('One', rev_id='rev1',
1265
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1266
self.b1 = tree.branch
1267
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1268
self.assertContainsRe(bundle_sio.getvalue(),
1270
'# alpha: \xce\xb1\n'
1271
'# branch-nick: tree\n'
1272
'# omega: \xce\xa9\n'
1274
bundle = read_bundle(bundle_sio)
1275
revision_info = bundle.revisions[0]
1276
self.assertEqual('rev1', revision_info.revision_id)
1277
rev = revision_info.as_revision()
1278
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1279
'alpha':u'\u03b1'}, rev.properties)
1282
class V09BundleKnit2Tester(V08BundleTester):
1286
def bzrdir_format(self):
1287
format = bzrdir.BzrDirMetaFormat1()
1288
format.repository_format = knitrepo.RepositoryFormatKnit3()
1292
class V09BundleKnit1Tester(V08BundleTester):
1296
def bzrdir_format(self):
1297
format = bzrdir.BzrDirMetaFormat1()
1298
format.repository_format = knitrepo.RepositoryFormatKnit1()
1302
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
1306
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1307
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1308
Make sure that the text generated is valid, and that it
1309
can be applied against the base, and generate the same information.
1311
:return: The in-memory bundle
1313
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1315
# This should also validate the generated bundle
1316
bundle = read_bundle(bundle_txt)
1317
repository = self.b1.repository
1318
for bundle_rev in bundle.real_revisions:
1319
# These really should have already been checked when we read the
1320
# bundle, since it computes the sha1 hash for the revision, which
1321
# only will match if everything is okay, but lets be explicit about
1323
branch_rev = repository.get_revision(bundle_rev.revision_id)
1324
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1325
'timestamp', 'timezone', 'message', 'committer',
1326
'parent_ids', 'properties'):
1327
self.assertEqual(getattr(branch_rev, a),
1328
getattr(bundle_rev, a))
1329
self.assertEqual(len(branch_rev.parent_ids),
1330
len(bundle_rev.parent_ids))
1331
self.assertEqual(set(rev_ids),
1332
set([r.revision_id for r in bundle.real_revisions]))
1333
self.valid_apply_bundle(base_rev_id, bundle,
1334
checkout_dir=checkout_dir)
1338
def get_invalid_bundle(self, base_rev_id, rev_id):
1339
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1340
Munge the text so that it's invalid.
1342
:return: The in-memory bundle
1344
from bzrlib.bundle import serializer
1345
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1346
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1347
new_text = new_text.replace('<file file_id="exe-1"',
1348
'<file executable="y" file_id="exe-1"')
1349
new_text = new_text.replace('B260', 'B275')
1350
bundle_txt = StringIO()
1351
bundle_txt.write(serializer._get_bundle_header('4'))
1352
bundle_txt.write('\n')
1353
bundle_txt.write(new_text.encode('bz2'))
1355
bundle = read_bundle(bundle_txt)
1356
self.valid_apply_bundle(base_rev_id, bundle)
1359
def create_bundle_text(self, base_rev_id, rev_id):
1360
bundle_txt = StringIO()
1361
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1362
bundle_txt, format=self.format)
1364
self.assertEqual(bundle_txt.readline(),
1365
'# Bazaar revision bundle v%s\n' % self.format)
1366
self.assertEqual(bundle_txt.readline(), '#\n')
1367
rev = self.b1.repository.get_revision(rev_id)
1369
return bundle_txt, rev_ids
1371
def get_bundle_tree(self, bundle, revision_id):
1372
repository = self.make_repository('repo')
1373
bundle.install_revisions(repository)
1374
return repository.revision_tree(revision_id)
1376
def test_creation(self):
1377
tree = self.make_branch_and_tree('tree')
1378
self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
1379
tree.add('file', 'fileid-2')
1380
tree.commit('added file', rev_id='rev1')
1381
self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
1382
tree.commit('changed file', rev_id='rev2')
1384
serializer = BundleSerializerV4('1.0')
1385
serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
1387
tree2 = self.make_branch_and_tree('target')
1388
target_repo = tree2.branch.repository
1389
install_bundle(target_repo, serializer.read(s))
1390
target_repo.lock_read()
1391
self.addCleanup(target_repo.unlock)
1392
# Turn the 'iterators_of_bytes' back into simple strings for comparison
1393
repo_texts = dict((i, ''.join(content)) for i, content
1394
in target_repo.iter_files_bytes(
1395
[('fileid-2', 'rev1', '1'),
1396
('fileid-2', 'rev2', '2')]))
1397
self.assertEqual({'1':'contents1\nstatic\n',
1398
'2':'contents2\nstatic\n'},
1400
rtree = target_repo.revision_tree('rev2')
1401
inventory_vf = target_repo.inventories
1402
# If the inventory store has a graph, it must match the revision graph.
1404
[inventory_vf.get_parent_map([('rev2',)])[('rev2',)]],
1405
[None, (('rev1',),)])
1406
self.assertEqual('changed file',
1407
target_repo.get_revision('rev2').message)
1410
def get_raw(bundle_file):
1412
line = bundle_file.readline()
1413
line = bundle_file.readline()
1414
lines = bundle_file.readlines()
1415
return ''.join(lines).decode('bz2')
1417
def test_copy_signatures(self):
1418
tree_a = self.make_branch_and_tree('tree_a')
1420
import bzrlib.commit as commit
1421
oldstrategy = bzrlib.gpg.GPGStrategy
1422
branch = tree_a.branch
1423
repo_a = branch.repository
1424
tree_a.commit("base", allow_pointless=True, rev_id='A')
1425
self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
1427
from bzrlib.testament import Testament
1428
# monkey patch gpg signing mechanism
1429
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1430
new_config = test_commit.MustSignConfig()
1431
commit.Commit(config_stack=new_config).commit(message="base",
1432
allow_pointless=True,
1434
working_tree=tree_a)
1436
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1437
self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1439
bzrlib.gpg.GPGStrategy = oldstrategy
1440
tree_b = self.make_branch_and_tree('tree_b')
1441
repo_b = tree_b.branch.repository
1443
serializer = BundleSerializerV4('4')
1444
serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1446
install_bundle(repo_b, serializer.read(s))
1447
self.assertTrue(repo_b.has_signature_for_revision_id('B'))
1448
self.assertEqual(repo_b.get_signature_text('B'),
1449
repo_a.get_signature_text('B'))
1451
# ensure repeat installs are harmless
1452
install_bundle(repo_b, serializer.read(s))
1455
class V4_2aBundleTester(V4BundleTester):
1457
def bzrdir_format(self):
1460
def get_invalid_bundle(self, base_rev_id, rev_id):
1461
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1462
Munge the text so that it's invalid.
1464
:return: The in-memory bundle
1466
from bzrlib.bundle import serializer
1467
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1468
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1469
# We are going to be replacing some text to set the executable bit on a
1470
# file. Make sure the text replacement actually works correctly.
1471
self.assertContainsRe(new_text, '(?m)B244\n\ni 1\n<inventory')
1472
new_text = new_text.replace('<file file_id="exe-1"',
1473
'<file executable="y" file_id="exe-1"')
1474
new_text = new_text.replace('B244', 'B259')
1475
bundle_txt = StringIO()
1476
bundle_txt.write(serializer._get_bundle_header('4'))
1477
bundle_txt.write('\n')
1478
bundle_txt.write(new_text.encode('bz2'))
1480
bundle = read_bundle(bundle_txt)
1481
self.valid_apply_bundle(base_rev_id, bundle)
1484
def make_merged_branch(self):
1485
builder = self.make_branch_builder('source')
1486
builder.start_series()
1487
builder.build_snapshot('a@cset-0-1', None, [
1488
('add', ('', 'root-id', 'directory', None)),
1489
('add', ('file', 'file-id', 'file', 'original content\n')),
1491
builder.build_snapshot('a@cset-0-2a', ['a@cset-0-1'], [
1492
('modify', ('file-id', 'new-content\n')),
1494
builder.build_snapshot('a@cset-0-2b', ['a@cset-0-1'], [
1495
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1497
builder.build_snapshot('a@cset-0-3', ['a@cset-0-2a', 'a@cset-0-2b'], [
1498
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1500
builder.finish_series()
1501
self.b1 = builder.get_branch()
1503
self.addCleanup(self.b1.unlock)
1505
def make_bundle_just_inventories(self, base_revision_id,
1509
writer = v4.BundleWriteOperation(base_revision_id, target_revision_id,
1510
self.b1.repository, sio)
1511
writer.bundle.begin()
1512
writer._add_inventory_mpdiffs_from_serializer(revision_ids)
1517
def test_single_inventory_multiple_parents_as_xml(self):
1518
self.make_merged_branch()
1519
sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1521
reader = v4.BundleReader(sio, stream_input=False)
1522
records = list(reader.iter_records())
1523
self.assertEqual(1, len(records))
1524
(bytes, metadata, repo_kind, revision_id,
1525
file_id) = records[0]
1526
self.assertIs(None, file_id)
1527
self.assertEqual('a@cset-0-3', revision_id)
1528
self.assertEqual('inventory', repo_kind)
1529
self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1530
'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1531
'storage_kind': 'mpdiff',
1533
# We should have an mpdiff that takes some lines from both parents.
1534
self.assertEqualDiff(
1536
'<inventory format="10" revision_id="a@cset-0-3">\n'
1539
'c 1 3 3 2\n', bytes)
1541
def test_single_inv_no_parents_as_xml(self):
1542
self.make_merged_branch()
1543
sio = self.make_bundle_just_inventories('null:', 'a@cset-0-1',
1545
reader = v4.BundleReader(sio, stream_input=False)
1546
records = list(reader.iter_records())
1547
self.assertEqual(1, len(records))
1548
(bytes, metadata, repo_kind, revision_id,
1549
file_id) = records[0]
1550
self.assertIs(None, file_id)
1551
self.assertEqual('a@cset-0-1', revision_id)
1552
self.assertEqual('inventory', repo_kind)
1553
self.assertEqual({'parents': [],
1554
'sha1': 'a13f42b142d544aac9b085c42595d304150e31a2',
1555
'storage_kind': 'mpdiff',
1557
# We should have an mpdiff that takes some lines from both parents.
1558
self.assertEqualDiff(
1560
'<inventory format="10" revision_id="a@cset-0-1">\n'
1561
'<directory file_id="root-id" name=""'
1562
' revision="a@cset-0-1" />\n'
1563
'<file file_id="file-id" name="file" parent_id="root-id"'
1564
' revision="a@cset-0-1"'
1565
' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
1566
' text_size="17" />\n'
1570
def test_multiple_inventories_as_xml(self):
1571
self.make_merged_branch()
1572
sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1573
['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'])
1574
reader = v4.BundleReader(sio, stream_input=False)
1575
records = list(reader.iter_records())
1576
self.assertEqual(3, len(records))
1577
revision_ids = [rev_id for b, m, k, rev_id, f in records]
1578
self.assertEqual(['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'],
1580
metadata_2a = records[0][1]
1581
self.assertEqual({'parents': ['a@cset-0-1'],
1582
'sha1': '1e105886d62d510763e22885eec733b66f5f09bf',
1583
'storage_kind': 'mpdiff',
1585
metadata_2b = records[1][1]
1586
self.assertEqual({'parents': ['a@cset-0-1'],
1587
'sha1': 'f03f12574bdb5ed2204c28636c98a8547544ccd8',
1588
'storage_kind': 'mpdiff',
1590
metadata_3 = records[2][1]
1591
self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1592
'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1593
'storage_kind': 'mpdiff',
1595
bytes_2a = records[0][0]
1596
self.assertEqualDiff(
1598
'<inventory format="10" revision_id="a@cset-0-2a">\n'
1602
'<file file_id="file-id" name="file" parent_id="root-id"'
1603
' revision="a@cset-0-2a"'
1604
' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
1605
' text_size="12" />\n'
1607
'c 0 3 3 1\n', bytes_2a)
1608
bytes_2b = records[1][0]
1609
self.assertEqualDiff(
1611
'<inventory format="10" revision_id="a@cset-0-2b">\n'
1615
'<file file_id="file2-id" name="other-file" parent_id="root-id"'
1616
' revision="a@cset-0-2b"'
1617
' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
1618
' text_size="14" />\n'
1620
'c 0 3 4 1\n', bytes_2b)
1621
bytes_3 = records[2][0]
1622
self.assertEqualDiff(
1624
'<inventory format="10" revision_id="a@cset-0-3">\n'
1627
'c 1 3 3 2\n', bytes_3)
1629
def test_creating_bundle_preserves_chk_pages(self):
1630
self.make_merged_branch()
1631
target = self.b1.bzrdir.sprout('target',
1632
revision_id='a@cset-0-2a').open_branch()
1633
bundle_txt, rev_ids = self.create_bundle_text('a@cset-0-2a',
1635
self.assertEqual(['a@cset-0-2b', 'a@cset-0-3'], rev_ids)
1636
bundle = read_bundle(bundle_txt)
1638
self.addCleanup(target.unlock)
1639
install_bundle(target.repository, bundle)
1640
inv1 = self.b1.repository.inventories.get_record_stream([
1641
('a@cset-0-3',)], 'unordered',
1642
True).next().get_bytes_as('fulltext')
1643
inv2 = target.repository.inventories.get_record_stream([
1644
('a@cset-0-3',)], 'unordered',
1645
True).next().get_bytes_as('fulltext')
1646
self.assertEqualDiff(inv1, inv2)
1649
class MungedBundleTester(object):
1651
def build_test_bundle(self):
1652
wt = self.make_branch_and_tree('b1')
1654
self.build_tree(['b1/one'])
1656
wt.commit('add one', rev_id='a@cset-0-1')
1657
self.build_tree(['b1/two'])
1659
wt.commit('add two', rev_id='a@cset-0-2',
1660
revprops={'branch-nick':'test'})
1662
bundle_txt = StringIO()
1663
rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
1664
'a@cset-0-1', bundle_txt, self.format)
1665
self.assertEqual(set(['a@cset-0-2']), set(rev_ids))
1666
bundle_txt.seek(0, 0)
1669
def check_valid(self, bundle):
1670
"""Check that after whatever munging, the final object is valid."""
1671
self.assertEqual(['a@cset-0-2'],
1672
[r.revision_id for r in bundle.real_revisions])
1674
def test_extra_whitespace(self):
1675
bundle_txt = self.build_test_bundle()
1677
# Seek to the end of the file
1678
# Adding one extra newline used to give us
1679
# TypeError: float() argument must be a string or a number
1680
bundle_txt.seek(0, 2)
1681
bundle_txt.write('\n')
1684
bundle = read_bundle(bundle_txt)
1685
self.check_valid(bundle)
1687
def test_extra_whitespace_2(self):
1688
bundle_txt = self.build_test_bundle()
1690
# Seek to the end of the file
1691
# Adding two extra newlines used to give us
1692
# MalformedPatches: The first line of all patches should be ...
1693
bundle_txt.seek(0, 2)
1694
bundle_txt.write('\n\n')
1697
bundle = read_bundle(bundle_txt)
1698
self.check_valid(bundle)
1701
class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
1705
def test_missing_trailing_whitespace(self):
1706
bundle_txt = self.build_test_bundle()
1708
# Remove a trailing newline, it shouldn't kill the parser
1709
raw = bundle_txt.getvalue()
1710
# The contents of the bundle don't have to be this, but this
1711
# test is concerned with the exact case where the serializer
1712
# creates a blank line at the end, and fails if that
1714
self.assertEqual('\n\n', raw[-2:])
1715
bundle_txt = StringIO(raw[:-1])
1717
bundle = read_bundle(bundle_txt)
1718
self.check_valid(bundle)
1720
def test_opening_text(self):
1721
bundle_txt = self.build_test_bundle()
1723
bundle_txt = StringIO("Some random\nemail comments\n"
1724
+ bundle_txt.getvalue())
1726
bundle = read_bundle(bundle_txt)
1727
self.check_valid(bundle)
1729
def test_trailing_text(self):
1730
bundle_txt = self.build_test_bundle()
1732
bundle_txt = StringIO(bundle_txt.getvalue() +
1733
"Some trailing\nrandom\ntext\n")
1735
bundle = read_bundle(bundle_txt)
1736
self.check_valid(bundle)
1739
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
1744
class TestBundleWriterReader(tests.TestCase):
1746
def test_roundtrip_record(self):
1747
fileobj = StringIO()
1748
writer = v4.BundleWriter(fileobj)
1750
writer.add_info_record(foo='bar')
1751
writer._add_record("Record body", {'parents': ['1', '3'],
1752
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1755
reader = v4.BundleReader(fileobj, stream_input=True)
1756
record_iter = reader.iter_records()
1757
record = record_iter.next()
1758
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1759
'info', None, None), record)
1760
record = record_iter.next()
1761
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1762
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1765
def test_roundtrip_record_memory_hungry(self):
1766
fileobj = StringIO()
1767
writer = v4.BundleWriter(fileobj)
1769
writer.add_info_record(foo='bar')
1770
writer._add_record("Record body", {'parents': ['1', '3'],
1771
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1774
reader = v4.BundleReader(fileobj, stream_input=False)
1775
record_iter = reader.iter_records()
1776
record = record_iter.next()
1777
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1778
'info', None, None), record)
1779
record = record_iter.next()
1780
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1781
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1784
def test_encode_name(self):
1785
self.assertEqual('revision/rev1',
1786
v4.BundleWriter.encode_name('revision', 'rev1'))
1787
self.assertEqual('file/rev//1/file-id-1',
1788
v4.BundleWriter.encode_name('file', 'rev/1', 'file-id-1'))
1789
self.assertEqual('info',
1790
v4.BundleWriter.encode_name('info', None, None))
1792
def test_decode_name(self):
1793
self.assertEqual(('revision', 'rev1', None),
1794
v4.BundleReader.decode_name('revision/rev1'))
1795
self.assertEqual(('file', 'rev/1', 'file-id-1'),
1796
v4.BundleReader.decode_name('file/rev//1/file-id-1'))
1797
self.assertEqual(('info', None, None),
1798
v4.BundleReader.decode_name('info'))
1800
def test_too_many_names(self):
1801
fileobj = StringIO()
1802
writer = v4.BundleWriter(fileobj)
1804
writer.add_info_record(foo='bar')
1805
writer._container.add_bytes_record('blah', ['two', 'names'])
1808
record_iter = v4.BundleReader(fileobj).iter_records()
1809
record = record_iter.next()
1810
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1811
'info', None, None), record)
1812
self.assertRaises(errors.BadBundle, record_iter.next)
1815
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
1817
def test_read_mergeable_skips_local(self):
1818
"""A local bundle named like the URL should not be read.
1820
out, wt = test_read_bundle.create_bundle_file(self)
1821
class FooService(object):
1822
"""A directory service that always returns source"""
1824
def look_up(self, name, url):
1826
directories.register('foo:', FooService, 'Testing directory service')
1827
self.addCleanup(directories.remove, 'foo:')
1828
self.build_tree_contents([('./foo:bar', out.getvalue())])
1829
self.assertRaises(errors.NotABundle, read_mergeable_from_url,
1832
def test_infinite_redirects_are_not_a_bundle(self):
1833
"""If a URL causes TooManyRedirections then NotABundle is raised.
1835
from bzrlib.tests.blackbox.test_push import RedirectingMemoryServer
1836
server = RedirectingMemoryServer()
1837
self.start_server(server)
1838
url = server.get_url() + 'infinite-loop'
1839
self.assertRaises(errors.NotABundle, read_mergeable_from_url, url)
1841
def test_smart_server_connection_reset(self):
1842
"""If a smart server connection fails during the attempt to read a
1843
bundle, then the ConnectionReset error should be propagated.
1845
# Instantiate a server that will provoke a ConnectionReset
1846
sock_server = DisconnectingServer()
1847
self.start_server(sock_server)
1848
# We don't really care what the url is since the server will close the
1849
# connection without interpreting it
1850
url = sock_server.get_url()
1851
self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1854
class DisconnectingHandler(SocketServer.BaseRequestHandler):
1855
"""A request handler that immediately closes any connection made to it."""
1858
self.request.close()
1861
class DisconnectingServer(test_server.TestingTCPServerInAThread):
1864
super(DisconnectingServer, self).__init__(
1866
test_server.TestingTCPServer,
1867
DisconnectingHandler)
1870
"""Return the url of the server"""
1871
return "bzr://%s:%d/" % self.server.server_address
added
removed
bzrlib/tests/test_bundle.py
