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
31
revision as _mod_revision,
35
from bzrlib.bundle import read_mergeable_from_url
36
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
37
from bzrlib.bundle.bundle_data import BundleTree
38
from bzrlib.directory_service import directories
39
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
40
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
41
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
42
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
43
from bzrlib.repofmt import knitrepo
44
from bzrlib.tests import (
50
from bzrlib.transform import TreeTransform
53
def get_text(vf, key):
54
"""Get the fulltext for a given revision id that is present in the vf"""
55
stream = vf.get_record_stream([key], 'unordered', True)
56
record = stream.next()
57
return record.get_bytes_as('fulltext')
60
def get_inventory_text(repo, revision_id):
61
"""Get the fulltext for the inventory at revision id"""
64
return get_text(repo.inventories, (revision_id,))
69
class MockTree(object):
72
from bzrlib.inventory import InventoryDirectory, ROOT_ID
74
self.paths = {ROOT_ID: ""}
75
self.ids = {"": ROOT_ID}
77
self.root = InventoryDirectory(ROOT_ID, '', None)
79
inventory = property(lambda x:x)
81
def all_file_ids(self):
82
return set(self.paths.keys())
84
def __getitem__(self, file_id):
85
if file_id == self.root.file_id:
88
return self.make_entry(file_id, self.paths[file_id])
90
def parent_id(self, file_id):
91
parent_dir = os.path.dirname(self.paths[file_id])
94
return self.ids[parent_dir]
96
def iter_entries(self):
97
for path, file_id in self.ids.iteritems():
98
yield path, self[file_id]
100
def get_file_kind(self, file_id):
101
if file_id in self.contents:
107
def make_entry(self, file_id, path):
108
from bzrlib.inventory import (InventoryEntry, InventoryFile
109
, InventoryDirectory, InventoryLink)
110
name = os.path.basename(path)
111
kind = self.get_file_kind(file_id)
112
parent_id = self.parent_id(file_id)
113
text_sha_1, text_size = self.contents_stats(file_id)
114
if kind == 'directory':
115
ie = InventoryDirectory(file_id, name, parent_id)
117
ie = InventoryFile(file_id, name, parent_id)
118
ie.text_sha1 = text_sha_1
119
ie.text_size = text_size
120
elif kind == 'symlink':
121
ie = InventoryLink(file_id, name, parent_id)
123
raise errors.BzrError('unknown kind %r' % kind)
126
def add_dir(self, file_id, path):
127
self.paths[file_id] = path
128
self.ids[path] = file_id
130
def add_file(self, file_id, path, contents):
131
self.add_dir(file_id, path)
132
self.contents[file_id] = contents
134
def path2id(self, path):
135
return self.ids.get(path)
137
def id2path(self, file_id):
138
return self.paths.get(file_id)
140
def has_id(self, file_id):
141
return self.id2path(file_id) is not None
143
def get_file(self, file_id):
145
result.write(self.contents[file_id])
149
def get_file_revision(self, file_id):
150
return self.inventory[file_id].revision
152
def contents_stats(self, file_id):
153
if file_id not in self.contents:
155
text_sha1 = osutils.sha_file(self.get_file(file_id))
156
return text_sha1, len(self.contents[file_id])
159
class BTreeTester(tests.TestCase):
160
"""A simple unittest tester for the BundleTree class."""
162
def make_tree_1(self):
164
mtree.add_dir("a", "grandparent")
165
mtree.add_dir("b", "grandparent/parent")
166
mtree.add_file("c", "grandparent/parent/file", "Hello\n")
167
mtree.add_dir("d", "grandparent/alt_parent")
168
return BundleTree(mtree, ''), mtree
170
def test_renames(self):
171
"""Ensure that file renames have the proper effect on children"""
172
btree = self.make_tree_1()[0]
173
self.assertEqual(btree.old_path("grandparent"), "grandparent")
174
self.assertEqual(btree.old_path("grandparent/parent"),
175
"grandparent/parent")
176
self.assertEqual(btree.old_path("grandparent/parent/file"),
177
"grandparent/parent/file")
179
self.assertEqual(btree.id2path("a"), "grandparent")
180
self.assertEqual(btree.id2path("b"), "grandparent/parent")
181
self.assertEqual(btree.id2path("c"), "grandparent/parent/file")
183
self.assertEqual(btree.path2id("grandparent"), "a")
184
self.assertEqual(btree.path2id("grandparent/parent"), "b")
185
self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
187
self.assertTrue(btree.path2id("grandparent2") is None)
188
self.assertTrue(btree.path2id("grandparent2/parent") is None)
189
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
191
btree.note_rename("grandparent", "grandparent2")
192
self.assertTrue(btree.old_path("grandparent") is None)
193
self.assertTrue(btree.old_path("grandparent/parent") is None)
194
self.assertTrue(btree.old_path("grandparent/parent/file") is None)
196
self.assertEqual(btree.id2path("a"), "grandparent2")
197
self.assertEqual(btree.id2path("b"), "grandparent2/parent")
198
self.assertEqual(btree.id2path("c"), "grandparent2/parent/file")
200
self.assertEqual(btree.path2id("grandparent2"), "a")
201
self.assertEqual(btree.path2id("grandparent2/parent"), "b")
202
self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
204
self.assertTrue(btree.path2id("grandparent") is None)
205
self.assertTrue(btree.path2id("grandparent/parent") is None)
206
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
208
btree.note_rename("grandparent/parent", "grandparent2/parent2")
209
self.assertEqual(btree.id2path("a"), "grandparent2")
210
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
211
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file")
213
self.assertEqual(btree.path2id("grandparent2"), "a")
214
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
215
self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
217
self.assertTrue(btree.path2id("grandparent2/parent") is None)
218
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
220
btree.note_rename("grandparent/parent/file",
221
"grandparent2/parent2/file2")
222
self.assertEqual(btree.id2path("a"), "grandparent2")
223
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
224
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file2")
226
self.assertEqual(btree.path2id("grandparent2"), "a")
227
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
228
self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
230
self.assertTrue(btree.path2id("grandparent2/parent2/file") is None)
232
def test_moves(self):
233
"""Ensure that file moves have the proper effect on children"""
234
btree = self.make_tree_1()[0]
235
btree.note_rename("grandparent/parent/file",
236
"grandparent/alt_parent/file")
237
self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
238
self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
239
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
241
def unified_diff(self, old, new):
243
diff.internal_diff("old", old, "new", new, out)
247
def make_tree_2(self):
248
btree = self.make_tree_1()[0]
249
btree.note_rename("grandparent/parent/file",
250
"grandparent/alt_parent/file")
251
self.assertTrue(btree.id2path("e") is None)
252
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
253
btree.note_id("e", "grandparent/parent/file")
257
"""File/inventory adds"""
258
btree = self.make_tree_2()
259
add_patch = self.unified_diff([], ["Extra cheese\n"])
260
btree.note_patch("grandparent/parent/file", add_patch)
261
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
262
btree.note_target('grandparent/parent/symlink', 'venus')
263
self.adds_test(btree)
265
def adds_test(self, btree):
266
self.assertEqual(btree.id2path("e"), "grandparent/parent/file")
267
self.assertEqual(btree.path2id("grandparent/parent/file"), "e")
268
self.assertEqual(btree.get_file("e").read(), "Extra cheese\n")
269
self.assertEqual(btree.get_symlink_target('f'), 'venus')
271
def test_adds2(self):
272
"""File/inventory adds, with patch-compatibile renames"""
273
btree = self.make_tree_2()
274
btree.contents_by_id = False
275
add_patch = self.unified_diff(["Hello\n"], ["Extra cheese\n"])
276
btree.note_patch("grandparent/parent/file", add_patch)
277
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
278
btree.note_target('grandparent/parent/symlink', 'venus')
279
self.adds_test(btree)
281
def make_tree_3(self):
282
btree, mtree = self.make_tree_1()
283
mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
284
btree.note_rename("grandparent/parent/file",
285
"grandparent/alt_parent/file")
286
btree.note_rename("grandparent/parent/topping",
287
"grandparent/alt_parent/stopping")
290
def get_file_test(self, btree):
291
self.assertEqual(btree.get_file("e").read(), "Lemon\n")
292
self.assertEqual(btree.get_file("c").read(), "Hello\n")
294
def test_get_file(self):
295
"""Get file contents"""
296
btree = self.make_tree_3()
297
mod_patch = self.unified_diff(["Anchovies\n"], ["Lemon\n"])
298
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
299
self.get_file_test(btree)
301
def test_get_file2(self):
302
"""Get file contents, with patch-compatibile renames"""
303
btree = self.make_tree_3()
304
btree.contents_by_id = False
305
mod_patch = self.unified_diff([], ["Lemon\n"])
306
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
307
mod_patch = self.unified_diff([], ["Hello\n"])
308
btree.note_patch("grandparent/alt_parent/file", mod_patch)
309
self.get_file_test(btree)
311
def test_delete(self):
313
btree = self.make_tree_1()[0]
314
self.assertEqual(btree.get_file("c").read(), "Hello\n")
315
btree.note_deletion("grandparent/parent/file")
316
self.assertTrue(btree.id2path("c") is None)
317
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
319
def sorted_ids(self, tree):
324
def test_iteration(self):
325
"""Ensure that iteration through ids works properly"""
326
btree = self.make_tree_1()[0]
327
self.assertEqual(self.sorted_ids(btree),
328
[inventory.ROOT_ID, 'a', 'b', 'c', 'd'])
329
btree.note_deletion("grandparent/parent/file")
330
btree.note_id("e", "grandparent/alt_parent/fool", kind="directory")
331
btree.note_last_changed("grandparent/alt_parent/fool",
333
self.assertEqual(self.sorted_ids(btree),
334
[inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
337
class BundleTester1(tests.TestCaseWithTransport):
339
def test_mismatched_bundle(self):
340
format = bzrdir.BzrDirMetaFormat1()
341
format.repository_format = knitrepo.RepositoryFormatKnit3()
342
serializer = BundleSerializerV08('0.8')
343
b = self.make_branch('.', format=format)
344
self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
345
b.repository, [], {}, StringIO())
347
def test_matched_bundle(self):
348
"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
349
format = bzrdir.BzrDirMetaFormat1()
350
format.repository_format = knitrepo.RepositoryFormatKnit3()
351
serializer = BundleSerializerV09('0.9')
352
b = self.make_branch('.', format=format)
353
serializer.write(b.repository, [], {}, StringIO())
355
def test_mismatched_model(self):
356
"""Try copying a bundle from knit2 to knit1"""
357
format = bzrdir.BzrDirMetaFormat1()
358
format.repository_format = knitrepo.RepositoryFormatKnit3()
359
source = self.make_branch_and_tree('source', format=format)
360
source.commit('one', rev_id='one-id')
361
source.commit('two', rev_id='two-id')
363
write_bundle(source.branch.repository, 'two-id', 'null:', text,
367
format = bzrdir.BzrDirMetaFormat1()
368
format.repository_format = knitrepo.RepositoryFormatKnit1()
369
target = self.make_branch('target', format=format)
370
self.assertRaises(errors.IncompatibleRevision, install_bundle,
371
target.repository, read_bundle(text))
374
class BundleTester(object):
376
def bzrdir_format(self):
377
format = bzrdir.BzrDirMetaFormat1()
378
format.repository_format = knitrepo.RepositoryFormatKnit1()
381
def make_branch_and_tree(self, path, format=None):
383
format = self.bzrdir_format()
384
return tests.TestCaseWithTransport.make_branch_and_tree(
387
def make_branch(self, path, format=None):
389
format = self.bzrdir_format()
390
return tests.TestCaseWithTransport.make_branch(self, path, format)
392
def create_bundle_text(self, base_rev_id, rev_id):
393
bundle_txt = StringIO()
394
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
395
bundle_txt, format=self.format)
397
self.assertEqual(bundle_txt.readline(),
398
'# Bazaar revision bundle v%s\n' % self.format)
399
self.assertEqual(bundle_txt.readline(), '#\n')
401
rev = self.b1.repository.get_revision(rev_id)
402
self.assertEqual(bundle_txt.readline().decode('utf-8'),
405
return bundle_txt, rev_ids
407
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
408
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
409
Make sure that the text generated is valid, and that it
410
can be applied against the base, and generate the same information.
412
:return: The in-memory bundle
414
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
416
# This should also validate the generated bundle
417
bundle = read_bundle(bundle_txt)
418
repository = self.b1.repository
419
for bundle_rev in bundle.real_revisions:
420
# These really should have already been checked when we read the
421
# bundle, since it computes the sha1 hash for the revision, which
422
# only will match if everything is okay, but lets be explicit about
424
branch_rev = repository.get_revision(bundle_rev.revision_id)
425
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
426
'timestamp', 'timezone', 'message', 'committer',
427
'parent_ids', 'properties'):
428
self.assertEqual(getattr(branch_rev, a),
429
getattr(bundle_rev, a))
430
self.assertEqual(len(branch_rev.parent_ids),
431
len(bundle_rev.parent_ids))
432
self.assertEqual(rev_ids,
433
[r.revision_id for r in bundle.real_revisions])
434
self.valid_apply_bundle(base_rev_id, bundle,
435
checkout_dir=checkout_dir)
439
def get_invalid_bundle(self, base_rev_id, rev_id):
440
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
441
Munge the text so that it's invalid.
443
:return: The in-memory bundle
445
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
446
new_text = bundle_txt.getvalue().replace('executable:no',
448
bundle_txt = StringIO(new_text)
449
bundle = read_bundle(bundle_txt)
450
self.valid_apply_bundle(base_rev_id, bundle)
453
def test_non_bundle(self):
454
self.assertRaises(errors.NotABundle,
455
read_bundle, StringIO('#!/bin/sh\n'))
457
def test_malformed(self):
458
self.assertRaises(errors.BadBundle, read_bundle,
459
StringIO('# Bazaar revision bundle v'))
461
def test_crlf_bundle(self):
463
read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
464
except errors.BadBundle:
465
# It is currently permitted for bundles with crlf line endings to
466
# make read_bundle raise a BadBundle, but this should be fixed.
467
# Anything else, especially NotABundle, is an error.
470
def get_checkout(self, rev_id, checkout_dir=None):
471
"""Get a new tree, with the specified revision in it.
474
if checkout_dir is None:
475
checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
477
if not os.path.exists(checkout_dir):
478
os.mkdir(checkout_dir)
479
tree = self.make_branch_and_tree(checkout_dir)
481
ancestors = write_bundle(self.b1.repository, rev_id, 'null:', s,
484
self.assertIsInstance(s.getvalue(), str)
485
install_bundle(tree.branch.repository, read_bundle(s))
486
for ancestor in ancestors:
487
old = self.b1.repository.revision_tree(ancestor)
488
new = tree.branch.repository.revision_tree(ancestor)
492
# Check that there aren't any inventory level changes
493
delta = new.changes_from(old)
494
self.assertFalse(delta.has_changed(),
495
'Revision %s not copied correctly.'
498
# Now check that the file contents are all correct
499
for inventory_id in old.all_file_ids():
501
old_file = old.get_file(inventory_id)
502
except errors.NoSuchFile:
506
self.assertEqual(old_file.read(),
507
new.get_file(inventory_id).read())
511
if not _mod_revision.is_null(rev_id):
512
tree.branch.generate_revision_history(rev_id)
514
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
515
self.assertFalse(delta.has_changed(),
516
'Working tree has modifications: %s' % delta)
519
def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
520
"""Get the base revision, apply the changes, and make
521
sure everything matches the builtin branch.
523
to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
526
self._valid_apply_bundle(base_rev_id, info, to_tree)
530
def _valid_apply_bundle(self, base_rev_id, info, to_tree):
531
original_parents = to_tree.get_parent_ids()
532
repository = to_tree.branch.repository
533
original_parents = to_tree.get_parent_ids()
534
self.assertIs(repository.has_revision(base_rev_id), True)
535
for rev in info.real_revisions:
536
self.assert_(not repository.has_revision(rev.revision_id),
537
'Revision {%s} present before applying bundle'
539
merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
541
for rev in info.real_revisions:
542
self.assert_(repository.has_revision(rev.revision_id),
543
'Missing revision {%s} after applying bundle'
546
self.assert_(to_tree.branch.repository.has_revision(info.target))
547
# Do we also want to verify that all the texts have been added?
549
self.assertEqual(original_parents + [info.target],
550
to_tree.get_parent_ids())
552
rev = info.real_revisions[-1]
553
base_tree = self.b1.repository.revision_tree(rev.revision_id)
554
to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
556
# TODO: make sure the target tree is identical to base tree
557
# we might also check the working tree.
559
base_files = list(base_tree.list_files())
560
to_files = list(to_tree.list_files())
561
self.assertEqual(len(base_files), len(to_files))
562
for base_file, to_file in zip(base_files, to_files):
563
self.assertEqual(base_file, to_file)
565
for path, status, kind, fileid, entry in base_files:
566
# Check that the meta information is the same
567
self.assertEqual(base_tree.get_file_size(fileid),
568
to_tree.get_file_size(fileid))
569
self.assertEqual(base_tree.get_file_sha1(fileid),
570
to_tree.get_file_sha1(fileid))
571
# Check that the contents are the same
572
# This is pretty expensive
573
# self.assertEqual(base_tree.get_file(fileid).read(),
574
# to_tree.get_file(fileid).read())
576
def test_bundle(self):
577
self.tree1 = self.make_branch_and_tree('b1')
578
self.b1 = self.tree1.branch
580
self.build_tree_contents([('b1/one', 'one\n')])
581
self.tree1.add('one', 'one-id')
582
self.tree1.set_root_id('root-id')
583
self.tree1.commit('add one', rev_id='a@cset-0-1')
585
bundle = self.get_valid_bundle('null:', 'a@cset-0-1')
587
# Make sure we can handle files with spaces, tabs, other
592
, 'b1/dir/filein subdir.c'
593
, 'b1/dir/WithCaps.txt'
594
, 'b1/dir/ pre space'
597
, 'b1/sub/sub/nonempty.txt'
599
self.build_tree_contents([('b1/sub/sub/emptyfile.txt', ''),
600
('b1/dir/nolastnewline.txt', 'bloop')])
601
tt = TreeTransform(self.tree1)
602
tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
604
# have to fix length of file-id so that we can predictably rewrite
605
# a (length-prefixed) record containing it later.
606
self.tree1.add('with space.txt', 'withspace-id')
609
, 'dir/filein subdir.c'
612
, 'dir/nolastnewline.txt'
615
, 'sub/sub/nonempty.txt'
616
, 'sub/sub/emptyfile.txt'
618
self.tree1.commit('add whitespace', rev_id='a@cset-0-2')
620
bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
622
# Check a rollup bundle
623
bundle = self.get_valid_bundle('null:', 'a@cset-0-2')
627
['sub/sub/nonempty.txt'
628
, 'sub/sub/emptyfile.txt'
631
tt = TreeTransform(self.tree1)
632
trans_id = tt.trans_id_tree_file_id('exe-1')
633
tt.set_executability(False, trans_id)
635
self.tree1.commit('removed', rev_id='a@cset-0-3')
637
bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
638
self.assertRaises((errors.TestamentMismatch,
639
errors.VersionedFileInvalidChecksum,
640
errors.BadBundle), self.get_invalid_bundle,
641
'a@cset-0-2', 'a@cset-0-3')
642
# Check a rollup bundle
643
bundle = self.get_valid_bundle('null:', 'a@cset-0-3')
645
# Now move the directory
646
self.tree1.rename_one('dir', 'sub/dir')
647
self.tree1.commit('rename dir', rev_id='a@cset-0-4')
649
bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
650
# Check a rollup bundle
651
bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
654
open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
655
open('b1/sub/dir/ pre space', 'ab').write(
656
'\r\nAdding some\r\nDOS format lines\r\n')
657
open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
658
self.tree1.rename_one('sub/dir/ pre space',
660
self.tree1.commit('Modified files', rev_id='a@cset-0-5')
661
bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
663
self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
664
self.tree1.rename_one('with space.txt', 'WithCaps.txt')
665
self.tree1.rename_one('temp', 'with space.txt')
666
self.tree1.commit(u'swap filenames', rev_id='a@cset-0-6',
668
bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
669
other = self.get_checkout('a@cset-0-5')
670
tree1_inv = get_inventory_text(self.tree1.branch.repository,
672
tree2_inv = get_inventory_text(other.branch.repository,
674
self.assertEqualDiff(tree1_inv, tree2_inv)
675
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
676
other.commit('rename file', rev_id='a@cset-0-6b')
677
self.tree1.merge_from_branch(other.branch)
678
self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
680
bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
682
def _test_symlink_bundle(self, link_name, link_target, new_link_target):
685
self.requireFeature(features.SymlinkFeature)
686
self.tree1 = self.make_branch_and_tree('b1')
687
self.b1 = self.tree1.branch
689
tt = TreeTransform(self.tree1)
690
tt.new_symlink(link_name, tt.root, link_target, link_id)
692
self.tree1.commit('add symlink', rev_id='l@cset-0-1')
693
bundle = self.get_valid_bundle('null:', 'l@cset-0-1')
694
if getattr(bundle ,'revision_tree', None) is not None:
695
# Not all bundle formats supports revision_tree
696
bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-1')
697
self.assertEqual(link_target, bund_tree.get_symlink_target(link_id))
699
tt = TreeTransform(self.tree1)
700
trans_id = tt.trans_id_tree_file_id(link_id)
701
tt.adjust_path('link2', tt.root, trans_id)
702
tt.delete_contents(trans_id)
703
tt.create_symlink(new_link_target, trans_id)
705
self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
706
bundle = self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
707
if getattr(bundle ,'revision_tree', None) is not None:
708
# Not all bundle formats supports revision_tree
709
bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-2')
710
self.assertEqual(new_link_target,
711
bund_tree.get_symlink_target(link_id))
713
tt = TreeTransform(self.tree1)
714
trans_id = tt.trans_id_tree_file_id(link_id)
715
tt.delete_contents(trans_id)
716
tt.create_symlink('jupiter', trans_id)
718
self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
719
bundle = self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
721
tt = TreeTransform(self.tree1)
722
trans_id = tt.trans_id_tree_file_id(link_id)
723
tt.delete_contents(trans_id)
725
self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
726
bundle = self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
728
def test_symlink_bundle(self):
729
self._test_symlink_bundle('link', 'bar/foo', 'mars')
731
def test_unicode_symlink_bundle(self):
732
self.requireFeature(features.UnicodeFilenameFeature)
733
self._test_symlink_bundle(u'\N{Euro Sign}link',
734
u'bar/\N{Euro Sign}foo',
735
u'mars\N{Euro Sign}')
737
def test_binary_bundle(self):
738
self.tree1 = self.make_branch_and_tree('b1')
739
self.b1 = self.tree1.branch
740
tt = TreeTransform(self.tree1)
743
tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
744
tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
747
self.tree1.commit('add binary', rev_id='b@cset-0-1')
748
self.get_valid_bundle('null:', 'b@cset-0-1')
751
tt = TreeTransform(self.tree1)
752
trans_id = tt.trans_id_tree_file_id('binary-1')
753
tt.delete_contents(trans_id)
755
self.tree1.commit('delete binary', rev_id='b@cset-0-2')
756
self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
759
tt = TreeTransform(self.tree1)
760
trans_id = tt.trans_id_tree_file_id('binary-2')
761
tt.adjust_path('file3', tt.root, trans_id)
762
tt.delete_contents(trans_id)
763
tt.create_file('file\rcontents\x00\n\x00', trans_id)
765
self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
766
self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
769
tt = TreeTransform(self.tree1)
770
trans_id = tt.trans_id_tree_file_id('binary-2')
771
tt.delete_contents(trans_id)
772
tt.create_file('\x00file\rcontents', trans_id)
774
self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
775
self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
778
self.get_valid_bundle('null:', 'b@cset-0-4')
780
def test_last_modified(self):
781
self.tree1 = self.make_branch_and_tree('b1')
782
self.b1 = self.tree1.branch
783
tt = TreeTransform(self.tree1)
784
tt.new_file('file', tt.root, 'file', 'file')
786
self.tree1.commit('create file', rev_id='a@lmod-0-1')
788
tt = TreeTransform(self.tree1)
789
trans_id = tt.trans_id_tree_file_id('file')
790
tt.delete_contents(trans_id)
791
tt.create_file('file2', trans_id)
793
self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
795
other = self.get_checkout('a@lmod-0-1')
796
tt = TreeTransform(other)
797
trans_id = tt.trans_id_tree_file_id('file')
798
tt.delete_contents(trans_id)
799
tt.create_file('file2', trans_id)
801
other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
802
self.tree1.merge_from_branch(other.branch)
803
self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
805
self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
806
bundle = self.get_valid_bundle('a@lmod-0-2a', 'a@lmod-0-4')
808
def test_hide_history(self):
809
self.tree1 = self.make_branch_and_tree('b1')
810
self.b1 = self.tree1.branch
812
open('b1/one', 'wb').write('one\n')
813
self.tree1.add('one')
814
self.tree1.commit('add file', rev_id='a@cset-0-1')
815
open('b1/one', 'wb').write('two\n')
816
self.tree1.commit('modify', rev_id='a@cset-0-2')
817
open('b1/one', 'wb').write('three\n')
818
self.tree1.commit('modify', rev_id='a@cset-0-3')
819
bundle_file = StringIO()
820
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
821
'a@cset-0-1', bundle_file, format=self.format)
822
self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
823
self.assertContainsRe(self.get_raw(bundle_file), 'one')
824
self.assertContainsRe(self.get_raw(bundle_file), 'three')
826
def test_bundle_same_basis(self):
827
"""Ensure using the basis as the target doesn't cause an error"""
828
self.tree1 = self.make_branch_and_tree('b1')
829
self.tree1.commit('add file', rev_id='a@cset-0-1')
830
bundle_file = StringIO()
831
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
832
'a@cset-0-1', bundle_file)
835
def get_raw(bundle_file):
836
return bundle_file.getvalue()
838
def test_unicode_bundle(self):
839
self.requireFeature(features.UnicodeFilenameFeature)
840
# Handle international characters
842
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
844
self.tree1 = self.make_branch_and_tree('b1')
845
self.b1 = self.tree1.branch
848
u'With international man of mystery\n'
849
u'William Dod\xe9\n').encode('utf-8'))
852
self.tree1.add([u'with Dod\N{Euro Sign}'], ['withdod-id'])
853
self.tree1.commit(u'i18n commit from William Dod\xe9',
854
rev_id='i18n-1', committer=u'William Dod\xe9')
857
bundle = self.get_valid_bundle('null:', 'i18n-1')
860
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
861
f.write(u'Modified \xb5\n'.encode('utf8'))
863
self.tree1.commit(u'modified', rev_id='i18n-2')
865
bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
868
self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
869
self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
870
committer=u'Erik B\xe5gfors')
872
bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
875
self.tree1.remove([u'B\N{Euro Sign}gfors'])
876
self.tree1.commit(u'removed', rev_id='i18n-4')
878
bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
881
bundle = self.get_valid_bundle('null:', 'i18n-4')
884
def test_whitespace_bundle(self):
885
if sys.platform in ('win32', 'cygwin'):
886
raise tests.TestSkipped('Windows doesn\'t support filenames'
887
' with tabs or trailing spaces')
888
self.tree1 = self.make_branch_and_tree('b1')
889
self.b1 = self.tree1.branch
891
self.build_tree(['b1/trailing space '])
892
self.tree1.add(['trailing space '])
893
# TODO: jam 20060701 Check for handling files with '\t' characters
894
# once we actually support them
897
self.tree1.commit('funky whitespace', rev_id='white-1')
899
bundle = self.get_valid_bundle('null:', 'white-1')
902
open('b1/trailing space ', 'ab').write('add some text\n')
903
self.tree1.commit('add text', rev_id='white-2')
905
bundle = self.get_valid_bundle('white-1', 'white-2')
908
self.tree1.rename_one('trailing space ', ' start and end space ')
909
self.tree1.commit('rename', rev_id='white-3')
911
bundle = self.get_valid_bundle('white-2', 'white-3')
914
self.tree1.remove([' start and end space '])
915
self.tree1.commit('removed', rev_id='white-4')
917
bundle = self.get_valid_bundle('white-3', 'white-4')
919
# Now test a complet roll-up
920
bundle = self.get_valid_bundle('null:', 'white-4')
922
def test_alt_timezone_bundle(self):
923
self.tree1 = self.make_branch_and_memory_tree('b1')
924
self.b1 = self.tree1.branch
925
builder = treebuilder.TreeBuilder()
927
self.tree1.lock_write()
928
builder.start_tree(self.tree1)
929
builder.build(['newfile'])
930
builder.finish_tree()
932
# Asia/Colombo offset = 5 hours 30 minutes
933
self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
934
timezone=19800, timestamp=1152544886.0)
936
bundle = self.get_valid_bundle('null:', 'tz-1')
938
rev = bundle.revisions[0]
939
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
940
self.assertEqual(19800, rev.timezone)
941
self.assertEqual(1152544886.0, rev.timestamp)
944
def test_bundle_root_id(self):
945
self.tree1 = self.make_branch_and_tree('b1')
946
self.b1 = self.tree1.branch
947
self.tree1.commit('message', rev_id='revid1')
948
bundle = self.get_valid_bundle('null:', 'revid1')
949
tree = self.get_bundle_tree(bundle, 'revid1')
950
self.assertEqual('revid1', tree.inventory.root.revision)
952
def test_install_revisions(self):
953
self.tree1 = self.make_branch_and_tree('b1')
954
self.b1 = self.tree1.branch
955
self.tree1.commit('message', rev_id='rev2a')
956
bundle = self.get_valid_bundle('null:', 'rev2a')
957
branch2 = self.make_branch('b2')
958
self.assertFalse(branch2.repository.has_revision('rev2a'))
959
target_revision = bundle.install_revisions(branch2.repository)
960
self.assertTrue(branch2.repository.has_revision('rev2a'))
961
self.assertEqual('rev2a', target_revision)
963
def test_bundle_empty_property(self):
964
"""Test serializing revision properties with an empty value."""
965
tree = self.make_branch_and_memory_tree('tree')
967
self.addCleanup(tree.unlock)
968
tree.add([''], ['TREE_ROOT'])
969
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
970
self.b1 = tree.branch
971
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
972
bundle = read_bundle(bundle_sio)
973
revision_info = bundle.revisions[0]
974
self.assertEqual('rev1', revision_info.revision_id)
975
rev = revision_info.as_revision()
976
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
979
def test_bundle_sorted_properties(self):
980
"""For stability the writer should write properties in sorted order."""
981
tree = self.make_branch_and_memory_tree('tree')
983
self.addCleanup(tree.unlock)
985
tree.add([''], ['TREE_ROOT'])
986
tree.commit('One', rev_id='rev1',
987
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
988
self.b1 = tree.branch
989
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
990
bundle = read_bundle(bundle_sio)
991
revision_info = bundle.revisions[0]
992
self.assertEqual('rev1', revision_info.revision_id)
993
rev = revision_info.as_revision()
994
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
995
'd':'1'}, rev.properties)
997
def test_bundle_unicode_properties(self):
998
"""We should be able to round trip a non-ascii property."""
999
tree = self.make_branch_and_memory_tree('tree')
1001
self.addCleanup(tree.unlock)
1003
tree.add([''], ['TREE_ROOT'])
1004
# Revisions themselves do not require anything about revision property
1005
# keys, other than that they are a basestring, and do not contain
1007
# However, Testaments assert than they are str(), and thus should not
1009
tree.commit('One', rev_id='rev1',
1010
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1011
self.b1 = tree.branch
1012
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1013
bundle = read_bundle(bundle_sio)
1014
revision_info = bundle.revisions[0]
1015
self.assertEqual('rev1', revision_info.revision_id)
1016
rev = revision_info.as_revision()
1017
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1018
'alpha':u'\u03b1'}, rev.properties)
1020
def test_bundle_with_ghosts(self):
1021
tree = self.make_branch_and_tree('tree')
1022
self.b1 = tree.branch
1023
self.build_tree_contents([('tree/file', 'content1')])
1026
self.build_tree_contents([('tree/file', 'content2')])
1027
tree.add_parent_tree_id('ghost')
1028
tree.commit('rev2', rev_id='rev2')
1029
bundle = self.get_valid_bundle('null:', 'rev2')
1031
def make_simple_tree(self, format=None):
1032
tree = self.make_branch_and_tree('b1', format=format)
1033
self.b1 = tree.branch
1034
self.build_tree(['b1/file'])
1038
def test_across_serializers(self):
1039
tree = self.make_simple_tree('knit')
1040
tree.commit('hello', rev_id='rev1')
1041
tree.commit('hello', rev_id='rev2')
1042
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1043
repo = self.make_repository('repo', format='dirstate-with-subtree')
1044
bundle.install_revisions(repo)
1045
inv_text = repo._get_inventory_xml('rev2')
1046
self.assertNotContainsRe(inv_text, 'format="5"')
1047
self.assertContainsRe(inv_text, 'format="7"')
1049
def make_repo_with_installed_revisions(self):
1050
tree = self.make_simple_tree('knit')
1051
tree.commit('hello', rev_id='rev1')
1052
tree.commit('hello', rev_id='rev2')
1053
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1054
repo = self.make_repository('repo', format='dirstate-with-subtree')
1055
bundle.install_revisions(repo)
1058
def test_across_models(self):
1059
repo = self.make_repo_with_installed_revisions()
1060
inv = repo.get_inventory('rev2')
1061
self.assertEqual('rev2', inv.root.revision)
1062
root_id = inv.root.file_id
1064
self.addCleanup(repo.unlock)
1065
self.assertEqual({(root_id, 'rev1'):(),
1066
(root_id, 'rev2'):((root_id, 'rev1'),)},
1067
repo.texts.get_parent_map([(root_id, 'rev1'), (root_id, 'rev2')]))
1069
def test_inv_hash_across_serializers(self):
1070
repo = self.make_repo_with_installed_revisions()
1071
recorded_inv_sha1 = repo.get_revision('rev2').inventory_sha1
1072
xml = repo._get_inventory_xml('rev2')
1073
self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
1075
def test_across_models_incompatible(self):
1076
tree = self.make_simple_tree('dirstate-with-subtree')
1077
tree.commit('hello', rev_id='rev1')
1078
tree.commit('hello', rev_id='rev2')
1080
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1081
except errors.IncompatibleBundleFormat:
1082
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1083
repo = self.make_repository('repo', format='knit')
1084
bundle.install_revisions(repo)
1086
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1087
self.assertRaises(errors.IncompatibleRevision,
1088
bundle.install_revisions, repo)
1090
def test_get_merge_request(self):
1091
tree = self.make_simple_tree()
1092
tree.commit('hello', rev_id='rev1')
1093
tree.commit('hello', rev_id='rev2')
1094
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1095
result = bundle.get_merge_request(tree.branch.repository)
1096
self.assertEqual((None, 'rev1', 'inapplicable'), result)
1098
def test_with_subtree(self):
1099
tree = self.make_branch_and_tree('tree',
1100
format='dirstate-with-subtree')
1101
self.b1 = tree.branch
1102
subtree = self.make_branch_and_tree('tree/subtree',
1103
format='dirstate-with-subtree')
1105
tree.commit('hello', rev_id='rev1')
1107
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1108
except errors.IncompatibleBundleFormat:
1109
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1110
if isinstance(bundle, v09.BundleInfo09):
1111
raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
1112
repo = self.make_repository('repo', format='knit')
1113
self.assertRaises(errors.IncompatibleRevision,
1114
bundle.install_revisions, repo)
1115
repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1116
bundle.install_revisions(repo2)
1118
def test_revision_id_with_slash(self):
1119
self.tree1 = self.make_branch_and_tree('tree')
1120
self.b1 = self.tree1.branch
1122
self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
1124
raise tests.TestSkipped(
1125
"Repository doesn't support revision ids with slashes")
1126
bundle = self.get_valid_bundle('null:', 'rev/id')
1128
def test_skip_file(self):
1129
"""Make sure we don't accidentally write to the wrong versionedfile"""
1130
self.tree1 = self.make_branch_and_tree('tree')
1131
self.b1 = self.tree1.branch
1132
# rev1 is not present in bundle, done by fetch
1133
self.build_tree_contents([('tree/file2', 'contents1')])
1134
self.tree1.add('file2', 'file2-id')
1135
self.tree1.commit('rev1', rev_id='reva')
1136
self.build_tree_contents([('tree/file3', 'contents2')])
1137
# rev2 is present in bundle, and done by fetch
1138
# having file1 in the bunle causes file1's versionedfile to be opened.
1139
self.tree1.add('file3', 'file3-id')
1140
self.tree1.commit('rev2')
1141
# Updating file2 should not cause an attempt to add to file1's vf
1142
target = self.tree1.bzrdir.sprout('target').open_workingtree()
1143
self.build_tree_contents([('tree/file2', 'contents3')])
1144
self.tree1.commit('rev3', rev_id='rev3')
1145
bundle = self.get_valid_bundle('reva', 'rev3')
1146
if getattr(bundle, 'get_bundle_reader', None) is None:
1147
raise tests.TestSkipped('Bundle format cannot provide reader')
1148
# be sure that file1 comes before file2
1149
for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1152
self.assertNotEqual(f, 'file2-id')
1153
bundle.install_revisions(target.branch.repository)
1156
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
1160
def test_bundle_empty_property(self):
1161
"""Test serializing revision properties with an empty value."""
1162
tree = self.make_branch_and_memory_tree('tree')
1164
self.addCleanup(tree.unlock)
1165
tree.add([''], ['TREE_ROOT'])
1166
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1167
self.b1 = tree.branch
1168
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1169
self.assertContainsRe(bundle_sio.getvalue(),
1171
'# branch-nick: tree\n'
1175
bundle = read_bundle(bundle_sio)
1176
revision_info = bundle.revisions[0]
1177
self.assertEqual('rev1', revision_info.revision_id)
1178
rev = revision_info.as_revision()
1179
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1182
def get_bundle_tree(self, bundle, revision_id):
1183
repository = self.make_repository('repo')
1184
return bundle.revision_tree(repository, 'revid1')
1186
def test_bundle_empty_property_alt(self):
1187
"""Test serializing revision properties with an empty value.
1189
Older readers had a bug when reading an empty property.
1190
They assumed that all keys ended in ': \n'. However they would write an
1191
empty value as ':\n'. This tests make sure that all newer bzr versions
1192
can handle th second form.
1194
tree = self.make_branch_and_memory_tree('tree')
1196
self.addCleanup(tree.unlock)
1197
tree.add([''], ['TREE_ROOT'])
1198
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1199
self.b1 = tree.branch
1200
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1201
txt = bundle_sio.getvalue()
1202
loc = txt.find('# empty: ') + len('# empty:')
1203
# Create a new bundle, which strips the trailing space after empty
1204
bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
1206
self.assertContainsRe(bundle_sio.getvalue(),
1208
'# branch-nick: tree\n'
1212
bundle = read_bundle(bundle_sio)
1213
revision_info = bundle.revisions[0]
1214
self.assertEqual('rev1', revision_info.revision_id)
1215
rev = revision_info.as_revision()
1216
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1219
def test_bundle_sorted_properties(self):
1220
"""For stability the writer should write properties in sorted order."""
1221
tree = self.make_branch_and_memory_tree('tree')
1223
self.addCleanup(tree.unlock)
1225
tree.add([''], ['TREE_ROOT'])
1226
tree.commit('One', rev_id='rev1',
1227
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1228
self.b1 = tree.branch
1229
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1230
self.assertContainsRe(bundle_sio.getvalue(),
1234
'# branch-nick: tree\n'
1238
bundle = read_bundle(bundle_sio)
1239
revision_info = bundle.revisions[0]
1240
self.assertEqual('rev1', revision_info.revision_id)
1241
rev = revision_info.as_revision()
1242
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1243
'd':'1'}, rev.properties)
1245
def test_bundle_unicode_properties(self):
1246
"""We should be able to round trip a non-ascii property."""
1247
tree = self.make_branch_and_memory_tree('tree')
1249
self.addCleanup(tree.unlock)
1251
tree.add([''], ['TREE_ROOT'])
1252
# Revisions themselves do not require anything about revision property
1253
# keys, other than that they are a basestring, and do not contain
1255
# However, Testaments assert than they are str(), and thus should not
1257
tree.commit('One', rev_id='rev1',
1258
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1259
self.b1 = tree.branch
1260
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1261
self.assertContainsRe(bundle_sio.getvalue(),
1263
'# alpha: \xce\xb1\n'
1264
'# branch-nick: tree\n'
1265
'# omega: \xce\xa9\n'
1267
bundle = read_bundle(bundle_sio)
1268
revision_info = bundle.revisions[0]
1269
self.assertEqual('rev1', revision_info.revision_id)
1270
rev = revision_info.as_revision()
1271
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1272
'alpha':u'\u03b1'}, rev.properties)
1275
class V09BundleKnit2Tester(V08BundleTester):
1279
def bzrdir_format(self):
1280
format = bzrdir.BzrDirMetaFormat1()
1281
format.repository_format = knitrepo.RepositoryFormatKnit3()
1285
class V09BundleKnit1Tester(V08BundleTester):
1289
def bzrdir_format(self):
1290
format = bzrdir.BzrDirMetaFormat1()
1291
format.repository_format = knitrepo.RepositoryFormatKnit1()
1295
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
1299
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1300
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1301
Make sure that the text generated is valid, and that it
1302
can be applied against the base, and generate the same information.
1304
:return: The in-memory bundle
1306
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1308
# This should also validate the generated bundle
1309
bundle = read_bundle(bundle_txt)
1310
repository = self.b1.repository
1311
for bundle_rev in bundle.real_revisions:
1312
# These really should have already been checked when we read the
1313
# bundle, since it computes the sha1 hash for the revision, which
1314
# only will match if everything is okay, but lets be explicit about
1316
branch_rev = repository.get_revision(bundle_rev.revision_id)
1317
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1318
'timestamp', 'timezone', 'message', 'committer',
1319
'parent_ids', 'properties'):
1320
self.assertEqual(getattr(branch_rev, a),
1321
getattr(bundle_rev, a))
1322
self.assertEqual(len(branch_rev.parent_ids),
1323
len(bundle_rev.parent_ids))
1324
self.assertEqual(set(rev_ids),
1325
set([r.revision_id for r in bundle.real_revisions]))
1326
self.valid_apply_bundle(base_rev_id, bundle,
1327
checkout_dir=checkout_dir)
1331
def get_invalid_bundle(self, base_rev_id, rev_id):
1332
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1333
Munge the text so that it's invalid.
1335
:return: The in-memory bundle
1337
from bzrlib.bundle import serializer
1338
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1339
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1340
new_text = new_text.replace('<file file_id="exe-1"',
1341
'<file executable="y" file_id="exe-1"')
1342
new_text = new_text.replace('B260', 'B275')
1343
bundle_txt = StringIO()
1344
bundle_txt.write(serializer._get_bundle_header('4'))
1345
bundle_txt.write('\n')
1346
bundle_txt.write(new_text.encode('bz2'))
1348
bundle = read_bundle(bundle_txt)
1349
self.valid_apply_bundle(base_rev_id, bundle)
1352
def create_bundle_text(self, base_rev_id, rev_id):
1353
bundle_txt = StringIO()
1354
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1355
bundle_txt, format=self.format)
1357
self.assertEqual(bundle_txt.readline(),
1358
'# Bazaar revision bundle v%s\n' % self.format)
1359
self.assertEqual(bundle_txt.readline(), '#\n')
1360
rev = self.b1.repository.get_revision(rev_id)
1362
return bundle_txt, rev_ids
1364
def get_bundle_tree(self, bundle, revision_id):
1365
repository = self.make_repository('repo')
1366
bundle.install_revisions(repository)
1367
return repository.revision_tree(revision_id)
1369
def test_creation(self):
1370
tree = self.make_branch_and_tree('tree')
1371
self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
1372
tree.add('file', 'fileid-2')
1373
tree.commit('added file', rev_id='rev1')
1374
self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
1375
tree.commit('changed file', rev_id='rev2')
1377
serializer = BundleSerializerV4('1.0')
1378
serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
1380
tree2 = self.make_branch_and_tree('target')
1381
target_repo = tree2.branch.repository
1382
install_bundle(target_repo, serializer.read(s))
1383
target_repo.lock_read()
1384
self.addCleanup(target_repo.unlock)
1385
# Turn the 'iterators_of_bytes' back into simple strings for comparison
1386
repo_texts = dict((i, ''.join(content)) for i, content
1387
in target_repo.iter_files_bytes(
1388
[('fileid-2', 'rev1', '1'),
1389
('fileid-2', 'rev2', '2')]))
1390
self.assertEqual({'1':'contents1\nstatic\n',
1391
'2':'contents2\nstatic\n'},
1393
rtree = target_repo.revision_tree('rev2')
1394
inventory_vf = target_repo.inventories
1395
# If the inventory store has a graph, it must match the revision graph.
1397
[inventory_vf.get_parent_map([('rev2',)])[('rev2',)]],
1398
[None, (('rev1',),)])
1399
self.assertEqual('changed file',
1400
target_repo.get_revision('rev2').message)
1403
def get_raw(bundle_file):
1405
line = bundle_file.readline()
1406
line = bundle_file.readline()
1407
lines = bundle_file.readlines()
1408
return ''.join(lines).decode('bz2')
1410
def test_copy_signatures(self):
1411
tree_a = self.make_branch_and_tree('tree_a')
1413
import bzrlib.commit as commit
1414
oldstrategy = bzrlib.gpg.GPGStrategy
1415
branch = tree_a.branch
1416
repo_a = branch.repository
1417
tree_a.commit("base", allow_pointless=True, rev_id='A')
1418
self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
1420
from bzrlib.testament import Testament
1421
# monkey patch gpg signing mechanism
1422
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1423
new_config = test_commit.MustSignConfig(branch)
1424
commit.Commit(config=new_config).commit(message="base",
1425
allow_pointless=True,
1427
working_tree=tree_a)
1429
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1430
self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1432
bzrlib.gpg.GPGStrategy = oldstrategy
1433
tree_b = self.make_branch_and_tree('tree_b')
1434
repo_b = tree_b.branch.repository
1436
serializer = BundleSerializerV4('4')
1437
serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1439
install_bundle(repo_b, serializer.read(s))
1440
self.assertTrue(repo_b.has_signature_for_revision_id('B'))
1441
self.assertEqual(repo_b.get_signature_text('B'),
1442
repo_a.get_signature_text('B'))
1444
# ensure repeat installs are harmless
1445
install_bundle(repo_b, serializer.read(s))
1448
class V4_2aBundleTester(V4BundleTester):
1450
def bzrdir_format(self):
1453
def get_invalid_bundle(self, base_rev_id, rev_id):
1454
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1455
Munge the text so that it's invalid.
1457
:return: The in-memory bundle
1459
from bzrlib.bundle import serializer
1460
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1461
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1462
# We are going to be replacing some text to set the executable bit on a
1463
# file. Make sure the text replacement actually works correctly.
1464
self.assertContainsRe(new_text, '(?m)B244\n\ni 1\n<inventory')
1465
new_text = new_text.replace('<file file_id="exe-1"',
1466
'<file executable="y" file_id="exe-1"')
1467
new_text = new_text.replace('B244', 'B259')
1468
bundle_txt = StringIO()
1469
bundle_txt.write(serializer._get_bundle_header('4'))
1470
bundle_txt.write('\n')
1471
bundle_txt.write(new_text.encode('bz2'))
1473
bundle = read_bundle(bundle_txt)
1474
self.valid_apply_bundle(base_rev_id, bundle)
1477
def make_merged_branch(self):
1478
builder = self.make_branch_builder('source')
1479
builder.start_series()
1480
builder.build_snapshot('a@cset-0-1', None, [
1481
('add', ('', 'root-id', 'directory', None)),
1482
('add', ('file', 'file-id', 'file', 'original content\n')),
1484
builder.build_snapshot('a@cset-0-2a', ['a@cset-0-1'], [
1485
('modify', ('file-id', 'new-content\n')),
1487
builder.build_snapshot('a@cset-0-2b', ['a@cset-0-1'], [
1488
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1490
builder.build_snapshot('a@cset-0-3', ['a@cset-0-2a', 'a@cset-0-2b'], [
1491
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1493
builder.finish_series()
1494
self.b1 = builder.get_branch()
1496
self.addCleanup(self.b1.unlock)
1498
def make_bundle_just_inventories(self, base_revision_id,
1502
writer = v4.BundleWriteOperation(base_revision_id, target_revision_id,
1503
self.b1.repository, sio)
1504
writer.bundle.begin()
1505
writer._add_inventory_mpdiffs_from_serializer(revision_ids)
1510
def test_single_inventory_multiple_parents_as_xml(self):
1511
self.make_merged_branch()
1512
sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1514
reader = v4.BundleReader(sio, stream_input=False)
1515
records = list(reader.iter_records())
1516
self.assertEqual(1, len(records))
1517
(bytes, metadata, repo_kind, revision_id,
1518
file_id) = records[0]
1519
self.assertIs(None, file_id)
1520
self.assertEqual('a@cset-0-3', revision_id)
1521
self.assertEqual('inventory', repo_kind)
1522
self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1523
'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1524
'storage_kind': 'mpdiff',
1526
# We should have an mpdiff that takes some lines from both parents.
1527
self.assertEqualDiff(
1529
'<inventory format="10" revision_id="a@cset-0-3">\n'
1532
'c 1 3 3 2\n', bytes)
1534
def test_single_inv_no_parents_as_xml(self):
1535
self.make_merged_branch()
1536
sio = self.make_bundle_just_inventories('null:', 'a@cset-0-1',
1538
reader = v4.BundleReader(sio, stream_input=False)
1539
records = list(reader.iter_records())
1540
self.assertEqual(1, len(records))
1541
(bytes, metadata, repo_kind, revision_id,
1542
file_id) = records[0]
1543
self.assertIs(None, file_id)
1544
self.assertEqual('a@cset-0-1', revision_id)
1545
self.assertEqual('inventory', repo_kind)
1546
self.assertEqual({'parents': [],
1547
'sha1': 'a13f42b142d544aac9b085c42595d304150e31a2',
1548
'storage_kind': 'mpdiff',
1550
# We should have an mpdiff that takes some lines from both parents.
1551
self.assertEqualDiff(
1553
'<inventory format="10" revision_id="a@cset-0-1">\n'
1554
'<directory file_id="root-id" name=""'
1555
' revision="a@cset-0-1" />\n'
1556
'<file file_id="file-id" name="file" parent_id="root-id"'
1557
' revision="a@cset-0-1"'
1558
' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
1559
' text_size="17" />\n'
1563
def test_multiple_inventories_as_xml(self):
1564
self.make_merged_branch()
1565
sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1566
['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'])
1567
reader = v4.BundleReader(sio, stream_input=False)
1568
records = list(reader.iter_records())
1569
self.assertEqual(3, len(records))
1570
revision_ids = [rev_id for b, m, k, rev_id, f in records]
1571
self.assertEqual(['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'],
1573
metadata_2a = records[0][1]
1574
self.assertEqual({'parents': ['a@cset-0-1'],
1575
'sha1': '1e105886d62d510763e22885eec733b66f5f09bf',
1576
'storage_kind': 'mpdiff',
1578
metadata_2b = records[1][1]
1579
self.assertEqual({'parents': ['a@cset-0-1'],
1580
'sha1': 'f03f12574bdb5ed2204c28636c98a8547544ccd8',
1581
'storage_kind': 'mpdiff',
1583
metadata_3 = records[2][1]
1584
self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1585
'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1586
'storage_kind': 'mpdiff',
1588
bytes_2a = records[0][0]
1589
self.assertEqualDiff(
1591
'<inventory format="10" revision_id="a@cset-0-2a">\n'
1595
'<file file_id="file-id" name="file" parent_id="root-id"'
1596
' revision="a@cset-0-2a"'
1597
' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
1598
' text_size="12" />\n'
1600
'c 0 3 3 1\n', bytes_2a)
1601
bytes_2b = records[1][0]
1602
self.assertEqualDiff(
1604
'<inventory format="10" revision_id="a@cset-0-2b">\n'
1608
'<file file_id="file2-id" name="other-file" parent_id="root-id"'
1609
' revision="a@cset-0-2b"'
1610
' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
1611
' text_size="14" />\n'
1613
'c 0 3 4 1\n', bytes_2b)
1614
bytes_3 = records[2][0]
1615
self.assertEqualDiff(
1617
'<inventory format="10" revision_id="a@cset-0-3">\n'
1620
'c 1 3 3 2\n', bytes_3)
1622
def test_creating_bundle_preserves_chk_pages(self):
1623
self.make_merged_branch()
1624
target = self.b1.bzrdir.sprout('target',
1625
revision_id='a@cset-0-2a').open_branch()
1626
bundle_txt, rev_ids = self.create_bundle_text('a@cset-0-2a',
1628
self.assertEqual(['a@cset-0-2b', 'a@cset-0-3'], rev_ids)
1629
bundle = read_bundle(bundle_txt)
1631
self.addCleanup(target.unlock)
1632
install_bundle(target.repository, bundle)
1633
inv1 = self.b1.repository.inventories.get_record_stream([
1634
('a@cset-0-3',)], 'unordered',
1635
True).next().get_bytes_as('fulltext')
1636
inv2 = target.repository.inventories.get_record_stream([
1637
('a@cset-0-3',)], 'unordered',
1638
True).next().get_bytes_as('fulltext')
1639
self.assertEqualDiff(inv1, inv2)
1642
class MungedBundleTester(object):
1644
def build_test_bundle(self):
1645
wt = self.make_branch_and_tree('b1')
1647
self.build_tree(['b1/one'])
1649
wt.commit('add one', rev_id='a@cset-0-1')
1650
self.build_tree(['b1/two'])
1652
wt.commit('add two', rev_id='a@cset-0-2',
1653
revprops={'branch-nick':'test'})
1655
bundle_txt = StringIO()
1656
rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
1657
'a@cset-0-1', bundle_txt, self.format)
1658
self.assertEqual(set(['a@cset-0-2']), set(rev_ids))
1659
bundle_txt.seek(0, 0)
1662
def check_valid(self, bundle):
1663
"""Check that after whatever munging, the final object is valid."""
1664
self.assertEqual(['a@cset-0-2'],
1665
[r.revision_id for r in bundle.real_revisions])
1667
def test_extra_whitespace(self):
1668
bundle_txt = self.build_test_bundle()
1670
# Seek to the end of the file
1671
# Adding one extra newline used to give us
1672
# TypeError: float() argument must be a string or a number
1673
bundle_txt.seek(0, 2)
1674
bundle_txt.write('\n')
1677
bundle = read_bundle(bundle_txt)
1678
self.check_valid(bundle)
1680
def test_extra_whitespace_2(self):
1681
bundle_txt = self.build_test_bundle()
1683
# Seek to the end of the file
1684
# Adding two extra newlines used to give us
1685
# MalformedPatches: The first line of all patches should be ...
1686
bundle_txt.seek(0, 2)
1687
bundle_txt.write('\n\n')
1690
bundle = read_bundle(bundle_txt)
1691
self.check_valid(bundle)
1694
class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
1698
def test_missing_trailing_whitespace(self):
1699
bundle_txt = self.build_test_bundle()
1701
# Remove a trailing newline, it shouldn't kill the parser
1702
raw = bundle_txt.getvalue()
1703
# The contents of the bundle don't have to be this, but this
1704
# test is concerned with the exact case where the serializer
1705
# creates a blank line at the end, and fails if that
1707
self.assertEqual('\n\n', raw[-2:])
1708
bundle_txt = StringIO(raw[:-1])
1710
bundle = read_bundle(bundle_txt)
1711
self.check_valid(bundle)
1713
def test_opening_text(self):
1714
bundle_txt = self.build_test_bundle()
1716
bundle_txt = StringIO("Some random\nemail comments\n"
1717
+ bundle_txt.getvalue())
1719
bundle = read_bundle(bundle_txt)
1720
self.check_valid(bundle)
1722
def test_trailing_text(self):
1723
bundle_txt = self.build_test_bundle()
1725
bundle_txt = StringIO(bundle_txt.getvalue() +
1726
"Some trailing\nrandom\ntext\n")
1728
bundle = read_bundle(bundle_txt)
1729
self.check_valid(bundle)
1732
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
1737
class TestBundleWriterReader(tests.TestCase):
1739
def test_roundtrip_record(self):
1740
fileobj = StringIO()
1741
writer = v4.BundleWriter(fileobj)
1743
writer.add_info_record(foo='bar')
1744
writer._add_record("Record body", {'parents': ['1', '3'],
1745
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1748
reader = v4.BundleReader(fileobj, stream_input=True)
1749
record_iter = reader.iter_records()
1750
record = record_iter.next()
1751
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1752
'info', None, None), record)
1753
record = record_iter.next()
1754
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1755
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1758
def test_roundtrip_record_memory_hungry(self):
1759
fileobj = StringIO()
1760
writer = v4.BundleWriter(fileobj)
1762
writer.add_info_record(foo='bar')
1763
writer._add_record("Record body", {'parents': ['1', '3'],
1764
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1767
reader = v4.BundleReader(fileobj, stream_input=False)
1768
record_iter = reader.iter_records()
1769
record = record_iter.next()
1770
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1771
'info', None, None), record)
1772
record = record_iter.next()
1773
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1774
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1777
def test_encode_name(self):
1778
self.assertEqual('revision/rev1',
1779
v4.BundleWriter.encode_name('revision', 'rev1'))
1780
self.assertEqual('file/rev//1/file-id-1',
1781
v4.BundleWriter.encode_name('file', 'rev/1', 'file-id-1'))
1782
self.assertEqual('info',
1783
v4.BundleWriter.encode_name('info', None, None))
1785
def test_decode_name(self):
1786
self.assertEqual(('revision', 'rev1', None),
1787
v4.BundleReader.decode_name('revision/rev1'))
1788
self.assertEqual(('file', 'rev/1', 'file-id-1'),
1789
v4.BundleReader.decode_name('file/rev//1/file-id-1'))
1790
self.assertEqual(('info', None, None),
1791
v4.BundleReader.decode_name('info'))
1793
def test_too_many_names(self):
1794
fileobj = StringIO()
1795
writer = v4.BundleWriter(fileobj)
1797
writer.add_info_record(foo='bar')
1798
writer._container.add_bytes_record('blah', ['two', 'names'])
1801
record_iter = v4.BundleReader(fileobj).iter_records()
1802
record = record_iter.next()
1803
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1804
'info', None, None), record)
1805
self.assertRaises(errors.BadBundle, record_iter.next)
1808
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
1810
def test_read_mergeable_skips_local(self):
1811
"""A local bundle named like the URL should not be read.
1813
out, wt = test_read_bundle.create_bundle_file(self)
1814
class FooService(object):
1815
"""A directory service that always returns source"""
1817
def look_up(self, name, url):
1819
directories.register('foo:', FooService, 'Testing directory service')
1820
self.addCleanup(directories.remove, 'foo:')
1821
self.build_tree_contents([('./foo:bar', out.getvalue())])
1822
self.assertRaises(errors.NotABundle, read_mergeable_from_url,
1825
def test_infinite_redirects_are_not_a_bundle(self):
1826
"""If a URL causes TooManyRedirections then NotABundle is raised.
1828
from bzrlib.tests.blackbox.test_push import RedirectingMemoryServer
1829
server = RedirectingMemoryServer()
1830
self.start_server(server)
1831
url = server.get_url() + 'infinite-loop'
1832
self.assertRaises(errors.NotABundle, read_mergeable_from_url, url)
1834
def test_smart_server_connection_reset(self):
1835
"""If a smart server connection fails during the attempt to read a
1836
bundle, then the ConnectionReset error should be propagated.
1838
# Instantiate a server that will provoke a ConnectionReset
1839
sock_server = DisconnectingServer()
1840
self.start_server(sock_server)
1841
# We don't really care what the url is since the server will close the
1842
# connection without interpreting it
1843
url = sock_server.get_url()
1844
self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1847
class DisconnectingHandler(SocketServer.BaseRequestHandler):
1848
"""A request handler that immediately closes any connection made to it."""
1851
self.request.close()
1854
class DisconnectingServer(test_server.TestingTCPServerInAThread):
1857
super(DisconnectingServer, self).__init__(
1859
test_server.TestingTCPServer,
1860
DisconnectingHandler)
1863
"""Return the url of the server"""
1864
return "bzr://%s:%d/" % self.server.server_address
added
removed
bzrlib/tests/test_bundle.py
