1
# Copyright (C) 2004, 2005, 2006, 2007 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.bzrdir import BzrDir
39
from bzrlib.directory_service import directories
40
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
41
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
42
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
43
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
44
from bzrlib.branch import Branch
45
from bzrlib.repofmt import knitrepo
46
from bzrlib.tests import (
50
from bzrlib.transform import TreeTransform
53
class MockTree(object):
55
from bzrlib.inventory import InventoryDirectory, ROOT_ID
57
self.paths = {ROOT_ID: ""}
58
self.ids = {"": ROOT_ID}
60
self.root = InventoryDirectory(ROOT_ID, '', None)
62
inventory = property(lambda x:x)
65
return self.paths.iterkeys()
67
def __getitem__(self, file_id):
68
if file_id == self.root.file_id:
71
return self.make_entry(file_id, self.paths[file_id])
73
def parent_id(self, file_id):
74
parent_dir = os.path.dirname(self.paths[file_id])
77
return self.ids[parent_dir]
79
def iter_entries(self):
80
for path, file_id in self.ids.iteritems():
81
yield path, self[file_id]
83
def get_file_kind(self, file_id):
84
if file_id in self.contents:
90
def make_entry(self, file_id, path):
91
from bzrlib.inventory import (InventoryEntry, InventoryFile
92
, InventoryDirectory, InventoryLink)
93
name = os.path.basename(path)
94
kind = self.get_file_kind(file_id)
95
parent_id = self.parent_id(file_id)
96
text_sha_1, text_size = self.contents_stats(file_id)
97
if kind == 'directory':
98
ie = InventoryDirectory(file_id, name, parent_id)
100
ie = InventoryFile(file_id, name, parent_id)
101
elif kind == 'symlink':
102
ie = InventoryLink(file_id, name, parent_id)
104
raise errors.BzrError('unknown kind %r' % kind)
105
ie.text_sha1 = text_sha_1
106
ie.text_size = text_size
109
def add_dir(self, file_id, path):
110
self.paths[file_id] = path
111
self.ids[path] = file_id
113
def add_file(self, file_id, path, contents):
114
self.add_dir(file_id, path)
115
self.contents[file_id] = contents
117
def path2id(self, path):
118
return self.ids.get(path)
120
def id2path(self, file_id):
121
return self.paths.get(file_id)
123
def has_id(self, file_id):
124
return self.id2path(file_id) is not None
126
def get_file(self, file_id):
128
result.write(self.contents[file_id])
132
def contents_stats(self, file_id):
133
if file_id not in self.contents:
135
text_sha1 = osutils.sha_file(self.get_file(file_id))
136
return text_sha1, len(self.contents[file_id])
139
class BTreeTester(tests.TestCase):
140
"""A simple unittest tester for the BundleTree class."""
142
def make_tree_1(self):
144
mtree.add_dir("a", "grandparent")
145
mtree.add_dir("b", "grandparent/parent")
146
mtree.add_file("c", "grandparent/parent/file", "Hello\n")
147
mtree.add_dir("d", "grandparent/alt_parent")
148
return BundleTree(mtree, ''), mtree
150
def test_renames(self):
151
"""Ensure that file renames have the proper effect on children"""
152
btree = self.make_tree_1()[0]
153
self.assertEqual(btree.old_path("grandparent"), "grandparent")
154
self.assertEqual(btree.old_path("grandparent/parent"),
155
"grandparent/parent")
156
self.assertEqual(btree.old_path("grandparent/parent/file"),
157
"grandparent/parent/file")
159
self.assertEqual(btree.id2path("a"), "grandparent")
160
self.assertEqual(btree.id2path("b"), "grandparent/parent")
161
self.assertEqual(btree.id2path("c"), "grandparent/parent/file")
163
self.assertEqual(btree.path2id("grandparent"), "a")
164
self.assertEqual(btree.path2id("grandparent/parent"), "b")
165
self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
167
self.assertTrue(btree.path2id("grandparent2") is None)
168
self.assertTrue(btree.path2id("grandparent2/parent") is None)
169
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
171
btree.note_rename("grandparent", "grandparent2")
172
self.assertTrue(btree.old_path("grandparent") is None)
173
self.assertTrue(btree.old_path("grandparent/parent") is None)
174
self.assertTrue(btree.old_path("grandparent/parent/file") is None)
176
self.assertEqual(btree.id2path("a"), "grandparent2")
177
self.assertEqual(btree.id2path("b"), "grandparent2/parent")
178
self.assertEqual(btree.id2path("c"), "grandparent2/parent/file")
180
self.assertEqual(btree.path2id("grandparent2"), "a")
181
self.assertEqual(btree.path2id("grandparent2/parent"), "b")
182
self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
184
self.assertTrue(btree.path2id("grandparent") is None)
185
self.assertTrue(btree.path2id("grandparent/parent") is None)
186
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
188
btree.note_rename("grandparent/parent", "grandparent2/parent2")
189
self.assertEqual(btree.id2path("a"), "grandparent2")
190
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
191
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file")
193
self.assertEqual(btree.path2id("grandparent2"), "a")
194
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
195
self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
197
self.assertTrue(btree.path2id("grandparent2/parent") is None)
198
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
200
btree.note_rename("grandparent/parent/file",
201
"grandparent2/parent2/file2")
202
self.assertEqual(btree.id2path("a"), "grandparent2")
203
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
204
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file2")
206
self.assertEqual(btree.path2id("grandparent2"), "a")
207
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
208
self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
210
self.assertTrue(btree.path2id("grandparent2/parent2/file") is None)
212
def test_moves(self):
213
"""Ensure that file moves have the proper effect on children"""
214
btree = self.make_tree_1()[0]
215
btree.note_rename("grandparent/parent/file",
216
"grandparent/alt_parent/file")
217
self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
218
self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
219
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
221
def unified_diff(self, old, new):
223
diff.internal_diff("old", old, "new", new, out)
227
def make_tree_2(self):
228
btree = self.make_tree_1()[0]
229
btree.note_rename("grandparent/parent/file",
230
"grandparent/alt_parent/file")
231
self.assertTrue(btree.id2path("e") is None)
232
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
233
btree.note_id("e", "grandparent/parent/file")
237
"""File/inventory adds"""
238
btree = self.make_tree_2()
239
add_patch = self.unified_diff([], ["Extra cheese\n"])
240
btree.note_patch("grandparent/parent/file", add_patch)
241
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
242
btree.note_target('grandparent/parent/symlink', 'venus')
243
self.adds_test(btree)
245
def adds_test(self, btree):
246
self.assertEqual(btree.id2path("e"), "grandparent/parent/file")
247
self.assertEqual(btree.path2id("grandparent/parent/file"), "e")
248
self.assertEqual(btree.get_file("e").read(), "Extra cheese\n")
249
self.assertEqual(btree.get_symlink_target('f'), 'venus')
251
def test_adds2(self):
252
"""File/inventory adds, with patch-compatibile renames"""
253
btree = self.make_tree_2()
254
btree.contents_by_id = False
255
add_patch = self.unified_diff(["Hello\n"], ["Extra cheese\n"])
256
btree.note_patch("grandparent/parent/file", add_patch)
257
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
258
btree.note_target('grandparent/parent/symlink', 'venus')
259
self.adds_test(btree)
261
def make_tree_3(self):
262
btree, mtree = self.make_tree_1()
263
mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
264
btree.note_rename("grandparent/parent/file",
265
"grandparent/alt_parent/file")
266
btree.note_rename("grandparent/parent/topping",
267
"grandparent/alt_parent/stopping")
270
def get_file_test(self, btree):
271
self.assertEqual(btree.get_file("e").read(), "Lemon\n")
272
self.assertEqual(btree.get_file("c").read(), "Hello\n")
274
def test_get_file(self):
275
"""Get file contents"""
276
btree = self.make_tree_3()
277
mod_patch = self.unified_diff(["Anchovies\n"], ["Lemon\n"])
278
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
279
self.get_file_test(btree)
281
def test_get_file2(self):
282
"""Get file contents, with patch-compatibile renames"""
283
btree = self.make_tree_3()
284
btree.contents_by_id = False
285
mod_patch = self.unified_diff([], ["Lemon\n"])
286
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
287
mod_patch = self.unified_diff([], ["Hello\n"])
288
btree.note_patch("grandparent/alt_parent/file", mod_patch)
289
self.get_file_test(btree)
291
def test_delete(self):
293
btree = self.make_tree_1()[0]
294
self.assertEqual(btree.get_file("c").read(), "Hello\n")
295
btree.note_deletion("grandparent/parent/file")
296
self.assertTrue(btree.id2path("c") is None)
297
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
299
def sorted_ids(self, tree):
304
def test_iteration(self):
305
"""Ensure that iteration through ids works properly"""
306
btree = self.make_tree_1()[0]
307
self.assertEqual(self.sorted_ids(btree),
308
[inventory.ROOT_ID, 'a', 'b', 'c', 'd'])
309
btree.note_deletion("grandparent/parent/file")
310
btree.note_id("e", "grandparent/alt_parent/fool", kind="directory")
311
btree.note_last_changed("grandparent/alt_parent/fool",
313
self.assertEqual(self.sorted_ids(btree),
314
[inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
317
class BundleTester1(tests.TestCaseWithTransport):
319
def test_mismatched_bundle(self):
320
format = bzrdir.BzrDirMetaFormat1()
321
format.repository_format = knitrepo.RepositoryFormatKnit3()
322
serializer = BundleSerializerV08('0.8')
323
b = self.make_branch('.', format=format)
324
self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
325
b.repository, [], {}, StringIO())
327
def test_matched_bundle(self):
328
"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
329
format = bzrdir.BzrDirMetaFormat1()
330
format.repository_format = knitrepo.RepositoryFormatKnit3()
331
serializer = BundleSerializerV09('0.9')
332
b = self.make_branch('.', format=format)
333
serializer.write(b.repository, [], {}, StringIO())
335
def test_mismatched_model(self):
336
"""Try copying a bundle from knit2 to knit1"""
337
format = bzrdir.BzrDirMetaFormat1()
338
format.repository_format = knitrepo.RepositoryFormatKnit3()
339
source = self.make_branch_and_tree('source', format=format)
340
source.commit('one', rev_id='one-id')
341
source.commit('two', rev_id='two-id')
343
write_bundle(source.branch.repository, 'two-id', 'null:', text,
347
format = bzrdir.BzrDirMetaFormat1()
348
format.repository_format = knitrepo.RepositoryFormatKnit1()
349
target = self.make_branch('target', format=format)
350
self.assertRaises(errors.IncompatibleRevision, install_bundle,
351
target.repository, read_bundle(text))
354
class BundleTester(object):
356
def bzrdir_format(self):
357
format = bzrdir.BzrDirMetaFormat1()
358
format.repository_format = knitrepo.RepositoryFormatKnit1()
361
def make_branch_and_tree(self, path, format=None):
363
format = self.bzrdir_format()
364
return tests.TestCaseWithTransport.make_branch_and_tree(
367
def make_branch(self, path, format=None):
369
format = self.bzrdir_format()
370
return tests.TestCaseWithTransport.make_branch(self, path, format)
372
def create_bundle_text(self, base_rev_id, rev_id):
373
bundle_txt = StringIO()
374
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
375
bundle_txt, format=self.format)
377
self.assertEqual(bundle_txt.readline(),
378
'# Bazaar revision bundle v%s\n' % self.format)
379
self.assertEqual(bundle_txt.readline(), '#\n')
381
rev = self.b1.repository.get_revision(rev_id)
382
self.assertEqual(bundle_txt.readline().decode('utf-8'),
385
return bundle_txt, rev_ids
387
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
388
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
389
Make sure that the text generated is valid, and that it
390
can be applied against the base, and generate the same information.
392
:return: The in-memory bundle
394
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
396
# This should also validate the generated bundle
397
bundle = read_bundle(bundle_txt)
398
repository = self.b1.repository
399
for bundle_rev in bundle.real_revisions:
400
# These really should have already been checked when we read the
401
# bundle, since it computes the sha1 hash for the revision, which
402
# only will match if everything is okay, but lets be explicit about
404
branch_rev = repository.get_revision(bundle_rev.revision_id)
405
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
406
'timestamp', 'timezone', 'message', 'committer',
407
'parent_ids', 'properties'):
408
self.assertEqual(getattr(branch_rev, a),
409
getattr(bundle_rev, a))
410
self.assertEqual(len(branch_rev.parent_ids),
411
len(bundle_rev.parent_ids))
412
self.assertEqual(rev_ids,
413
[r.revision_id for r in bundle.real_revisions])
414
self.valid_apply_bundle(base_rev_id, bundle,
415
checkout_dir=checkout_dir)
419
def get_invalid_bundle(self, base_rev_id, rev_id):
420
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
421
Munge the text so that it's invalid.
423
:return: The in-memory bundle
425
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
426
new_text = bundle_txt.getvalue().replace('executable:no',
428
bundle_txt = StringIO(new_text)
429
bundle = read_bundle(bundle_txt)
430
self.valid_apply_bundle(base_rev_id, bundle)
433
def test_non_bundle(self):
434
self.assertRaises(errors.NotABundle,
435
read_bundle, StringIO('#!/bin/sh\n'))
437
def test_malformed(self):
438
self.assertRaises(errors.BadBundle, read_bundle,
439
StringIO('# Bazaar revision bundle v'))
441
def test_crlf_bundle(self):
443
read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
444
except errors.BadBundle:
445
# It is currently permitted for bundles with crlf line endings to
446
# make read_bundle raise a BadBundle, but this should be fixed.
447
# Anything else, especially NotABundle, is an error.
450
def get_checkout(self, rev_id, checkout_dir=None):
451
"""Get a new tree, with the specified revision in it.
454
if checkout_dir is None:
455
checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
457
if not os.path.exists(checkout_dir):
458
os.mkdir(checkout_dir)
459
tree = self.make_branch_and_tree(checkout_dir)
461
ancestors = write_bundle(self.b1.repository, rev_id, 'null:', s,
464
self.assertIsInstance(s.getvalue(), str)
465
install_bundle(tree.branch.repository, read_bundle(s))
466
for ancestor in ancestors:
467
old = self.b1.repository.revision_tree(ancestor)
468
new = tree.branch.repository.revision_tree(ancestor)
472
# Check that there aren't any inventory level changes
473
delta = new.changes_from(old)
474
self.assertFalse(delta.has_changed(),
475
'Revision %s not copied correctly.'
478
# Now check that the file contents are all correct
479
for inventory_id in old:
481
old_file = old.get_file(inventory_id)
482
except errors.NoSuchFile:
486
self.assertEqual(old_file.read(),
487
new.get_file(inventory_id).read())
491
if not _mod_revision.is_null(rev_id):
492
rh = self.b1.revision_history()
493
tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
495
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
496
self.assertFalse(delta.has_changed(),
497
'Working tree has modifications: %s' % delta)
500
def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
501
"""Get the base revision, apply the changes, and make
502
sure everything matches the builtin branch.
504
to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
507
self._valid_apply_bundle(base_rev_id, info, to_tree)
511
def _valid_apply_bundle(self, base_rev_id, info, to_tree):
512
original_parents = to_tree.get_parent_ids()
513
repository = to_tree.branch.repository
514
original_parents = to_tree.get_parent_ids()
515
self.assertIs(repository.has_revision(base_rev_id), True)
516
for rev in info.real_revisions:
517
self.assert_(not repository.has_revision(rev.revision_id),
518
'Revision {%s} present before applying bundle'
520
merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
522
for rev in info.real_revisions:
523
self.assert_(repository.has_revision(rev.revision_id),
524
'Missing revision {%s} after applying bundle'
527
self.assert_(to_tree.branch.repository.has_revision(info.target))
528
# Do we also want to verify that all the texts have been added?
530
self.assertEqual(original_parents + [info.target],
531
to_tree.get_parent_ids())
533
rev = info.real_revisions[-1]
534
base_tree = self.b1.repository.revision_tree(rev.revision_id)
535
to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
537
# TODO: make sure the target tree is identical to base tree
538
# we might also check the working tree.
540
base_files = list(base_tree.list_files())
541
to_files = list(to_tree.list_files())
542
self.assertEqual(len(base_files), len(to_files))
543
for base_file, to_file in zip(base_files, to_files):
544
self.assertEqual(base_file, to_file)
546
for path, status, kind, fileid, entry in base_files:
547
# Check that the meta information is the same
548
self.assertEqual(base_tree.get_file_size(fileid),
549
to_tree.get_file_size(fileid))
550
self.assertEqual(base_tree.get_file_sha1(fileid),
551
to_tree.get_file_sha1(fileid))
552
# Check that the contents are the same
553
# This is pretty expensive
554
# self.assertEqual(base_tree.get_file(fileid).read(),
555
# to_tree.get_file(fileid).read())
557
def test_bundle(self):
558
self.tree1 = self.make_branch_and_tree('b1')
559
self.b1 = self.tree1.branch
561
open('b1/one', 'wb').write('one\n')
562
self.tree1.add('one')
563
self.tree1.commit('add one', rev_id='a@cset-0-1')
565
bundle = self.get_valid_bundle('null:', 'a@cset-0-1')
567
# Make sure we can handle files with spaces, tabs, other
572
, 'b1/dir/filein subdir.c'
573
, 'b1/dir/WithCaps.txt'
574
, 'b1/dir/ pre space'
577
, 'b1/sub/sub/nonempty.txt'
579
open('b1/sub/sub/emptyfile.txt', 'wb').close()
580
open('b1/dir/nolastnewline.txt', 'wb').write('bloop')
581
tt = TreeTransform(self.tree1)
582
tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
584
# have to fix length of file-id so that we can predictably rewrite
585
# a (length-prefixed) record containing it later.
586
self.tree1.add('with space.txt', 'withspace-id')
589
, 'dir/filein subdir.c'
592
, 'dir/nolastnewline.txt'
595
, 'sub/sub/nonempty.txt'
596
, 'sub/sub/emptyfile.txt'
598
self.tree1.commit('add whitespace', rev_id='a@cset-0-2')
600
bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
602
# Check a rollup bundle
603
bundle = self.get_valid_bundle('null:', 'a@cset-0-2')
607
['sub/sub/nonempty.txt'
608
, 'sub/sub/emptyfile.txt'
611
tt = TreeTransform(self.tree1)
612
trans_id = tt.trans_id_tree_file_id('exe-1')
613
tt.set_executability(False, trans_id)
615
self.tree1.commit('removed', rev_id='a@cset-0-3')
617
bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
618
self.assertRaises((errors.TestamentMismatch,
619
errors.VersionedFileInvalidChecksum), self.get_invalid_bundle,
620
'a@cset-0-2', 'a@cset-0-3')
621
# Check a rollup bundle
622
bundle = self.get_valid_bundle('null:', 'a@cset-0-3')
624
# Now move the directory
625
self.tree1.rename_one('dir', 'sub/dir')
626
self.tree1.commit('rename dir', rev_id='a@cset-0-4')
628
bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
629
# Check a rollup bundle
630
bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
633
open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
634
open('b1/sub/dir/ pre space', 'ab').write(
635
'\r\nAdding some\r\nDOS format lines\r\n')
636
open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
637
self.tree1.rename_one('sub/dir/ pre space',
639
self.tree1.commit('Modified files', rev_id='a@cset-0-5')
640
bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
642
self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
643
self.tree1.rename_one('with space.txt', 'WithCaps.txt')
644
self.tree1.rename_one('temp', 'with space.txt')
645
self.tree1.commit(u'swap filenames', rev_id='a@cset-0-6',
647
bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
648
other = self.get_checkout('a@cset-0-5')
649
tree1_inv = self.tree1.branch.repository.get_inventory_xml(
651
tree2_inv = other.branch.repository.get_inventory_xml('a@cset-0-5')
652
self.assertEqualDiff(tree1_inv, tree2_inv)
653
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
654
other.commit('rename file', rev_id='a@cset-0-6b')
655
self.tree1.merge_from_branch(other.branch)
656
self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
658
bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
660
def _test_symlink_bundle(self, link_name, link_target, new_link_target):
663
self.requireFeature(tests.SymlinkFeature)
664
self.tree1 = self.make_branch_and_tree('b1')
665
self.b1 = self.tree1.branch
667
tt = TreeTransform(self.tree1)
668
tt.new_symlink(link_name, tt.root, link_target, link_id)
670
self.tree1.commit('add symlink', rev_id='l@cset-0-1')
671
bundle = self.get_valid_bundle('null:', 'l@cset-0-1')
672
if getattr(bundle ,'revision_tree', None) is not None:
673
# Not all bundle formats supports revision_tree
674
bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-1')
675
self.assertEqual(link_target, bund_tree.get_symlink_target(link_id))
677
tt = TreeTransform(self.tree1)
678
trans_id = tt.trans_id_tree_file_id(link_id)
679
tt.adjust_path('link2', tt.root, trans_id)
680
tt.delete_contents(trans_id)
681
tt.create_symlink(new_link_target, trans_id)
683
self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
684
bundle = self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
685
if getattr(bundle ,'revision_tree', None) is not None:
686
# Not all bundle formats supports revision_tree
687
bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-2')
688
self.assertEqual(new_link_target,
689
bund_tree.get_symlink_target(link_id))
691
tt = TreeTransform(self.tree1)
692
trans_id = tt.trans_id_tree_file_id(link_id)
693
tt.delete_contents(trans_id)
694
tt.create_symlink('jupiter', trans_id)
696
self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
697
bundle = self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
699
tt = TreeTransform(self.tree1)
700
trans_id = tt.trans_id_tree_file_id(link_id)
701
tt.delete_contents(trans_id)
703
self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
704
bundle = self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
706
def test_symlink_bundle(self):
707
self._test_symlink_bundle('link', 'bar/foo', 'mars')
709
def test_unicode_symlink_bundle(self):
710
self.requireFeature(tests.UnicodeFilenameFeature)
711
self._test_symlink_bundle(u'\N{Euro Sign}link',
712
u'bar/\N{Euro Sign}foo',
713
u'mars\N{Euro Sign}')
715
def test_binary_bundle(self):
716
self.tree1 = self.make_branch_and_tree('b1')
717
self.b1 = self.tree1.branch
718
tt = TreeTransform(self.tree1)
721
tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
722
tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
725
self.tree1.commit('add binary', rev_id='b@cset-0-1')
726
self.get_valid_bundle('null:', 'b@cset-0-1')
729
tt = TreeTransform(self.tree1)
730
trans_id = tt.trans_id_tree_file_id('binary-1')
731
tt.delete_contents(trans_id)
733
self.tree1.commit('delete binary', rev_id='b@cset-0-2')
734
self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
737
tt = TreeTransform(self.tree1)
738
trans_id = tt.trans_id_tree_file_id('binary-2')
739
tt.adjust_path('file3', tt.root, trans_id)
740
tt.delete_contents(trans_id)
741
tt.create_file('file\rcontents\x00\n\x00', trans_id)
743
self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
744
self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
747
tt = TreeTransform(self.tree1)
748
trans_id = tt.trans_id_tree_file_id('binary-2')
749
tt.delete_contents(trans_id)
750
tt.create_file('\x00file\rcontents', trans_id)
752
self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
753
self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
756
self.get_valid_bundle('null:', 'b@cset-0-4')
758
def test_last_modified(self):
759
self.tree1 = self.make_branch_and_tree('b1')
760
self.b1 = self.tree1.branch
761
tt = TreeTransform(self.tree1)
762
tt.new_file('file', tt.root, 'file', 'file')
764
self.tree1.commit('create file', rev_id='a@lmod-0-1')
766
tt = TreeTransform(self.tree1)
767
trans_id = tt.trans_id_tree_file_id('file')
768
tt.delete_contents(trans_id)
769
tt.create_file('file2', trans_id)
771
self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
773
other = self.get_checkout('a@lmod-0-1')
774
tt = TreeTransform(other)
775
trans_id = tt.trans_id_tree_file_id('file')
776
tt.delete_contents(trans_id)
777
tt.create_file('file2', trans_id)
779
other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
780
self.tree1.merge_from_branch(other.branch)
781
self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
783
self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
784
bundle = self.get_valid_bundle('a@lmod-0-2a', 'a@lmod-0-4')
786
def test_hide_history(self):
787
self.tree1 = self.make_branch_and_tree('b1')
788
self.b1 = self.tree1.branch
790
open('b1/one', 'wb').write('one\n')
791
self.tree1.add('one')
792
self.tree1.commit('add file', rev_id='a@cset-0-1')
793
open('b1/one', 'wb').write('two\n')
794
self.tree1.commit('modify', rev_id='a@cset-0-2')
795
open('b1/one', 'wb').write('three\n')
796
self.tree1.commit('modify', rev_id='a@cset-0-3')
797
bundle_file = StringIO()
798
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
799
'a@cset-0-1', bundle_file, format=self.format)
800
self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
801
self.assertContainsRe(self.get_raw(bundle_file), 'one')
802
self.assertContainsRe(self.get_raw(bundle_file), 'three')
804
def test_bundle_same_basis(self):
805
"""Ensure using the basis as the target doesn't cause an error"""
806
self.tree1 = self.make_branch_and_tree('b1')
807
self.tree1.commit('add file', rev_id='a@cset-0-1')
808
bundle_file = StringIO()
809
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
810
'a@cset-0-1', bundle_file)
813
def get_raw(bundle_file):
814
return bundle_file.getvalue()
816
def test_unicode_bundle(self):
817
self.requireFeature(tests.UnicodeFilenameFeature)
818
# Handle international characters
820
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
822
self.tree1 = self.make_branch_and_tree('b1')
823
self.b1 = self.tree1.branch
826
u'With international man of mystery\n'
827
u'William Dod\xe9\n').encode('utf-8'))
830
self.tree1.add([u'with Dod\N{Euro Sign}'], ['withdod-id'])
831
self.tree1.commit(u'i18n commit from William Dod\xe9',
832
rev_id='i18n-1', committer=u'William Dod\xe9')
835
bundle = self.get_valid_bundle('null:', 'i18n-1')
838
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
839
f.write(u'Modified \xb5\n'.encode('utf8'))
841
self.tree1.commit(u'modified', rev_id='i18n-2')
843
bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
846
self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
847
self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
848
committer=u'Erik B\xe5gfors')
850
bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
853
self.tree1.remove([u'B\N{Euro Sign}gfors'])
854
self.tree1.commit(u'removed', rev_id='i18n-4')
856
bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
859
bundle = self.get_valid_bundle('null:', 'i18n-4')
862
def test_whitespace_bundle(self):
863
if sys.platform in ('win32', 'cygwin'):
864
raise tests.TestSkipped('Windows doesn\'t support filenames'
865
' with tabs or trailing spaces')
866
self.tree1 = self.make_branch_and_tree('b1')
867
self.b1 = self.tree1.branch
869
self.build_tree(['b1/trailing space '])
870
self.tree1.add(['trailing space '])
871
# TODO: jam 20060701 Check for handling files with '\t' characters
872
# once we actually support them
875
self.tree1.commit('funky whitespace', rev_id='white-1')
877
bundle = self.get_valid_bundle('null:', 'white-1')
880
open('b1/trailing space ', 'ab').write('add some text\n')
881
self.tree1.commit('add text', rev_id='white-2')
883
bundle = self.get_valid_bundle('white-1', 'white-2')
886
self.tree1.rename_one('trailing space ', ' start and end space ')
887
self.tree1.commit('rename', rev_id='white-3')
889
bundle = self.get_valid_bundle('white-2', 'white-3')
892
self.tree1.remove([' start and end space '])
893
self.tree1.commit('removed', rev_id='white-4')
895
bundle = self.get_valid_bundle('white-3', 'white-4')
897
# Now test a complet roll-up
898
bundle = self.get_valid_bundle('null:', 'white-4')
900
def test_alt_timezone_bundle(self):
901
self.tree1 = self.make_branch_and_memory_tree('b1')
902
self.b1 = self.tree1.branch
903
builder = treebuilder.TreeBuilder()
905
self.tree1.lock_write()
906
builder.start_tree(self.tree1)
907
builder.build(['newfile'])
908
builder.finish_tree()
910
# Asia/Colombo offset = 5 hours 30 minutes
911
self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
912
timezone=19800, timestamp=1152544886.0)
914
bundle = self.get_valid_bundle('null:', 'tz-1')
916
rev = bundle.revisions[0]
917
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
918
self.assertEqual(19800, rev.timezone)
919
self.assertEqual(1152544886.0, rev.timestamp)
922
def test_bundle_root_id(self):
923
self.tree1 = self.make_branch_and_tree('b1')
924
self.b1 = self.tree1.branch
925
self.tree1.commit('message', rev_id='revid1')
926
bundle = self.get_valid_bundle('null:', 'revid1')
927
tree = self.get_bundle_tree(bundle, 'revid1')
928
self.assertEqual('revid1', tree.inventory.root.revision)
930
def test_install_revisions(self):
931
self.tree1 = self.make_branch_and_tree('b1')
932
self.b1 = self.tree1.branch
933
self.tree1.commit('message', rev_id='rev2a')
934
bundle = self.get_valid_bundle('null:', 'rev2a')
935
branch2 = self.make_branch('b2')
936
self.assertFalse(branch2.repository.has_revision('rev2a'))
937
target_revision = bundle.install_revisions(branch2.repository)
938
self.assertTrue(branch2.repository.has_revision('rev2a'))
939
self.assertEqual('rev2a', target_revision)
941
def test_bundle_empty_property(self):
942
"""Test serializing revision properties with an empty value."""
943
tree = self.make_branch_and_memory_tree('tree')
945
self.addCleanup(tree.unlock)
946
tree.add([''], ['TREE_ROOT'])
947
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
948
self.b1 = tree.branch
949
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
950
bundle = read_bundle(bundle_sio)
951
revision_info = bundle.revisions[0]
952
self.assertEqual('rev1', revision_info.revision_id)
953
rev = revision_info.as_revision()
954
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
957
def test_bundle_sorted_properties(self):
958
"""For stability the writer should write properties in sorted order."""
959
tree = self.make_branch_and_memory_tree('tree')
961
self.addCleanup(tree.unlock)
963
tree.add([''], ['TREE_ROOT'])
964
tree.commit('One', rev_id='rev1',
965
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
966
self.b1 = tree.branch
967
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
968
bundle = read_bundle(bundle_sio)
969
revision_info = bundle.revisions[0]
970
self.assertEqual('rev1', revision_info.revision_id)
971
rev = revision_info.as_revision()
972
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
973
'd':'1'}, rev.properties)
975
def test_bundle_unicode_properties(self):
976
"""We should be able to round trip a non-ascii property."""
977
tree = self.make_branch_and_memory_tree('tree')
979
self.addCleanup(tree.unlock)
981
tree.add([''], ['TREE_ROOT'])
982
# Revisions themselves do not require anything about revision property
983
# keys, other than that they are a basestring, and do not contain
985
# However, Testaments assert than they are str(), and thus should not
987
tree.commit('One', rev_id='rev1',
988
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
989
self.b1 = tree.branch
990
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
991
bundle = read_bundle(bundle_sio)
992
revision_info = bundle.revisions[0]
993
self.assertEqual('rev1', revision_info.revision_id)
994
rev = revision_info.as_revision()
995
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
996
'alpha':u'\u03b1'}, rev.properties)
998
def test_bundle_with_ghosts(self):
999
tree = self.make_branch_and_tree('tree')
1000
self.b1 = tree.branch
1001
self.build_tree_contents([('tree/file', 'content1')])
1004
self.build_tree_contents([('tree/file', 'content2')])
1005
tree.add_parent_tree_id('ghost')
1006
tree.commit('rev2', rev_id='rev2')
1007
bundle = self.get_valid_bundle('null:', 'rev2')
1009
def make_simple_tree(self, format=None):
1010
tree = self.make_branch_and_tree('b1', format=format)
1011
self.b1 = tree.branch
1012
self.build_tree(['b1/file'])
1016
def test_across_serializers(self):
1017
tree = self.make_simple_tree('knit')
1018
tree.commit('hello', rev_id='rev1')
1019
tree.commit('hello', rev_id='rev2')
1020
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1021
repo = self.make_repository('repo', format='dirstate-with-subtree')
1022
bundle.install_revisions(repo)
1023
inv_text = repo.get_inventory_xml('rev2')
1024
self.assertNotContainsRe(inv_text, 'format="5"')
1025
self.assertContainsRe(inv_text, 'format="7"')
1027
def make_repo_with_installed_revisions(self):
1028
tree = self.make_simple_tree('knit')
1029
tree.commit('hello', rev_id='rev1')
1030
tree.commit('hello', rev_id='rev2')
1031
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1032
repo = self.make_repository('repo', format='dirstate-with-subtree')
1033
bundle.install_revisions(repo)
1036
def test_across_models(self):
1037
repo = self.make_repo_with_installed_revisions()
1038
inv = repo.get_inventory('rev2')
1039
self.assertEqual('rev2', inv.root.revision)
1040
root_id = inv.root.file_id
1042
self.addCleanup(repo.unlock)
1043
self.assertEqual({(root_id, 'rev1'):(),
1044
(root_id, 'rev2'):((root_id, 'rev1'),)},
1045
repo.texts.get_parent_map([(root_id, 'rev1'), (root_id, 'rev2')]))
1047
def test_inv_hash_across_serializers(self):
1048
repo = self.make_repo_with_installed_revisions()
1049
recorded_inv_sha1 = repo.get_inventory_sha1('rev2')
1050
xml = repo.get_inventory_xml('rev2')
1051
self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
1053
def test_across_models_incompatible(self):
1054
tree = self.make_simple_tree('dirstate-with-subtree')
1055
tree.commit('hello', rev_id='rev1')
1056
tree.commit('hello', rev_id='rev2')
1058
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1059
except errors.IncompatibleBundleFormat:
1060
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1061
repo = self.make_repository('repo', format='knit')
1062
bundle.install_revisions(repo)
1064
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1065
self.assertRaises(errors.IncompatibleRevision,
1066
bundle.install_revisions, repo)
1068
def test_get_merge_request(self):
1069
tree = self.make_simple_tree()
1070
tree.commit('hello', rev_id='rev1')
1071
tree.commit('hello', rev_id='rev2')
1072
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1073
result = bundle.get_merge_request(tree.branch.repository)
1074
self.assertEqual((None, 'rev1', 'inapplicable'), result)
1076
def test_with_subtree(self):
1077
tree = self.make_branch_and_tree('tree',
1078
format='dirstate-with-subtree')
1079
self.b1 = tree.branch
1080
subtree = self.make_branch_and_tree('tree/subtree',
1081
format='dirstate-with-subtree')
1083
tree.commit('hello', rev_id='rev1')
1085
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1086
except errors.IncompatibleBundleFormat:
1087
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1088
if isinstance(bundle, v09.BundleInfo09):
1089
raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
1090
repo = self.make_repository('repo', format='knit')
1091
self.assertRaises(errors.IncompatibleRevision,
1092
bundle.install_revisions, repo)
1093
repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1094
bundle.install_revisions(repo2)
1096
def test_revision_id_with_slash(self):
1097
self.tree1 = self.make_branch_and_tree('tree')
1098
self.b1 = self.tree1.branch
1100
self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
1102
raise tests.TestSkipped(
1103
"Repository doesn't support revision ids with slashes")
1104
bundle = self.get_valid_bundle('null:', 'rev/id')
1106
def test_skip_file(self):
1107
"""Make sure we don't accidentally write to the wrong versionedfile"""
1108
self.tree1 = self.make_branch_and_tree('tree')
1109
self.b1 = self.tree1.branch
1110
# rev1 is not present in bundle, done by fetch
1111
self.build_tree_contents([('tree/file2', 'contents1')])
1112
self.tree1.add('file2', 'file2-id')
1113
self.tree1.commit('rev1', rev_id='reva')
1114
self.build_tree_contents([('tree/file3', 'contents2')])
1115
# rev2 is present in bundle, and done by fetch
1116
# having file1 in the bunle causes file1's versionedfile to be opened.
1117
self.tree1.add('file3', 'file3-id')
1118
self.tree1.commit('rev2')
1119
# Updating file2 should not cause an attempt to add to file1's vf
1120
target = self.tree1.bzrdir.sprout('target').open_workingtree()
1121
self.build_tree_contents([('tree/file2', 'contents3')])
1122
self.tree1.commit('rev3', rev_id='rev3')
1123
bundle = self.get_valid_bundle('reva', 'rev3')
1124
if getattr(bundle, 'get_bundle_reader', None) is None:
1125
raise tests.TestSkipped('Bundle format cannot provide reader')
1126
# be sure that file1 comes before file2
1127
for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1130
self.assertNotEqual(f, 'file2-id')
1131
bundle.install_revisions(target.branch.repository)
1134
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
1138
def test_bundle_empty_property(self):
1139
"""Test serializing revision properties with an empty value."""
1140
tree = self.make_branch_and_memory_tree('tree')
1142
self.addCleanup(tree.unlock)
1143
tree.add([''], ['TREE_ROOT'])
1144
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1145
self.b1 = tree.branch
1146
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1147
self.assertContainsRe(bundle_sio.getvalue(),
1149
'# branch-nick: tree\n'
1153
bundle = read_bundle(bundle_sio)
1154
revision_info = bundle.revisions[0]
1155
self.assertEqual('rev1', revision_info.revision_id)
1156
rev = revision_info.as_revision()
1157
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1160
def get_bundle_tree(self, bundle, revision_id):
1161
repository = self.make_repository('repo')
1162
return bundle.revision_tree(repository, 'revid1')
1164
def test_bundle_empty_property_alt(self):
1165
"""Test serializing revision properties with an empty value.
1167
Older readers had a bug when reading an empty property.
1168
They assumed that all keys ended in ': \n'. However they would write an
1169
empty value as ':\n'. This tests make sure that all newer bzr versions
1170
can handle th second form.
1172
tree = self.make_branch_and_memory_tree('tree')
1174
self.addCleanup(tree.unlock)
1175
tree.add([''], ['TREE_ROOT'])
1176
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1177
self.b1 = tree.branch
1178
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1179
txt = bundle_sio.getvalue()
1180
loc = txt.find('# empty: ') + len('# empty:')
1181
# Create a new bundle, which strips the trailing space after empty
1182
bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
1184
self.assertContainsRe(bundle_sio.getvalue(),
1186
'# branch-nick: tree\n'
1190
bundle = read_bundle(bundle_sio)
1191
revision_info = bundle.revisions[0]
1192
self.assertEqual('rev1', revision_info.revision_id)
1193
rev = revision_info.as_revision()
1194
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1197
def test_bundle_sorted_properties(self):
1198
"""For stability the writer should write properties in sorted order."""
1199
tree = self.make_branch_and_memory_tree('tree')
1201
self.addCleanup(tree.unlock)
1203
tree.add([''], ['TREE_ROOT'])
1204
tree.commit('One', rev_id='rev1',
1205
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1206
self.b1 = tree.branch
1207
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1208
self.assertContainsRe(bundle_sio.getvalue(),
1212
'# branch-nick: tree\n'
1216
bundle = read_bundle(bundle_sio)
1217
revision_info = bundle.revisions[0]
1218
self.assertEqual('rev1', revision_info.revision_id)
1219
rev = revision_info.as_revision()
1220
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1221
'd':'1'}, rev.properties)
1223
def test_bundle_unicode_properties(self):
1224
"""We should be able to round trip a non-ascii property."""
1225
tree = self.make_branch_and_memory_tree('tree')
1227
self.addCleanup(tree.unlock)
1229
tree.add([''], ['TREE_ROOT'])
1230
# Revisions themselves do not require anything about revision property
1231
# keys, other than that they are a basestring, and do not contain
1233
# However, Testaments assert than they are str(), and thus should not
1235
tree.commit('One', rev_id='rev1',
1236
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1237
self.b1 = tree.branch
1238
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1239
self.assertContainsRe(bundle_sio.getvalue(),
1241
'# alpha: \xce\xb1\n'
1242
'# branch-nick: tree\n'
1243
'# omega: \xce\xa9\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', 'omega':u'\u03a9',
1250
'alpha':u'\u03b1'}, rev.properties)
1253
class V09BundleKnit2Tester(V08BundleTester):
1257
def bzrdir_format(self):
1258
format = bzrdir.BzrDirMetaFormat1()
1259
format.repository_format = knitrepo.RepositoryFormatKnit3()
1263
class V09BundleKnit1Tester(V08BundleTester):
1267
def bzrdir_format(self):
1268
format = bzrdir.BzrDirMetaFormat1()
1269
format.repository_format = knitrepo.RepositoryFormatKnit1()
1273
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
1277
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1278
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1279
Make sure that the text generated is valid, and that it
1280
can be applied against the base, and generate the same information.
1282
:return: The in-memory bundle
1284
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1286
# This should also validate the generated bundle
1287
bundle = read_bundle(bundle_txt)
1288
repository = self.b1.repository
1289
for bundle_rev in bundle.real_revisions:
1290
# These really should have already been checked when we read the
1291
# bundle, since it computes the sha1 hash for the revision, which
1292
# only will match if everything is okay, but lets be explicit about
1294
branch_rev = repository.get_revision(bundle_rev.revision_id)
1295
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1296
'timestamp', 'timezone', 'message', 'committer',
1297
'parent_ids', 'properties'):
1298
self.assertEqual(getattr(branch_rev, a),
1299
getattr(bundle_rev, a))
1300
self.assertEqual(len(branch_rev.parent_ids),
1301
len(bundle_rev.parent_ids))
1302
self.assertEqual(set(rev_ids),
1303
set([r.revision_id for r in bundle.real_revisions]))
1304
self.valid_apply_bundle(base_rev_id, bundle,
1305
checkout_dir=checkout_dir)
1309
def get_invalid_bundle(self, base_rev_id, rev_id):
1310
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1311
Munge the text so that it's invalid.
1313
:return: The in-memory bundle
1315
from bzrlib.bundle import serializer
1316
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1317
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1318
new_text = new_text.replace('<file file_id="exe-1"',
1319
'<file executable="y" file_id="exe-1"')
1320
new_text = new_text.replace('B222', 'B237')
1321
bundle_txt = StringIO()
1322
bundle_txt.write(serializer._get_bundle_header('4'))
1323
bundle_txt.write('\n')
1324
bundle_txt.write(new_text.encode('bz2'))
1326
bundle = read_bundle(bundle_txt)
1327
self.valid_apply_bundle(base_rev_id, bundle)
1330
def create_bundle_text(self, base_rev_id, rev_id):
1331
bundle_txt = StringIO()
1332
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1333
bundle_txt, format=self.format)
1335
self.assertEqual(bundle_txt.readline(),
1336
'# Bazaar revision bundle v%s\n' % self.format)
1337
self.assertEqual(bundle_txt.readline(), '#\n')
1338
rev = self.b1.repository.get_revision(rev_id)
1340
return bundle_txt, rev_ids
1342
def get_bundle_tree(self, bundle, revision_id):
1343
repository = self.make_repository('repo')
1344
bundle.install_revisions(repository)
1345
return repository.revision_tree(revision_id)
1347
def test_creation(self):
1348
tree = self.make_branch_and_tree('tree')
1349
self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
1350
tree.add('file', 'fileid-2')
1351
tree.commit('added file', rev_id='rev1')
1352
self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
1353
tree.commit('changed file', rev_id='rev2')
1355
serializer = BundleSerializerV4('1.0')
1356
serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
1358
tree2 = self.make_branch_and_tree('target')
1359
target_repo = tree2.branch.repository
1360
install_bundle(target_repo, serializer.read(s))
1361
target_repo.lock_read()
1362
self.addCleanup(target_repo.unlock)
1363
# Turn the 'iterators_of_bytes' back into simple strings for comparison
1364
repo_texts = dict((i, ''.join(content)) for i, content
1365
in target_repo.iter_files_bytes(
1366
[('fileid-2', 'rev1', '1'),
1367
('fileid-2', 'rev2', '2')]))
1368
self.assertEqual({'1':'contents1\nstatic\n',
1369
'2':'contents2\nstatic\n'},
1371
rtree = target_repo.revision_tree('rev2')
1372
inventory_vf = target_repo.inventories
1373
# If the inventory store has a graph, it must match the revision graph.
1375
[inventory_vf.get_parent_map([('rev2',)])[('rev2',)]],
1376
[None, (('rev1',),)])
1377
self.assertEqual('changed file',
1378
target_repo.get_revision('rev2').message)
1381
def get_raw(bundle_file):
1383
line = bundle_file.readline()
1384
line = bundle_file.readline()
1385
lines = bundle_file.readlines()
1386
return ''.join(lines).decode('bz2')
1388
def test_copy_signatures(self):
1389
tree_a = self.make_branch_and_tree('tree_a')
1391
import bzrlib.commit as commit
1392
oldstrategy = bzrlib.gpg.GPGStrategy
1393
branch = tree_a.branch
1394
repo_a = branch.repository
1395
tree_a.commit("base", allow_pointless=True, rev_id='A')
1396
self.failIf(branch.repository.has_signature_for_revision_id('A'))
1398
from bzrlib.testament import Testament
1399
# monkey patch gpg signing mechanism
1400
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1401
new_config = test_commit.MustSignConfig(branch)
1402
commit.Commit(config=new_config).commit(message="base",
1403
allow_pointless=True,
1405
working_tree=tree_a)
1407
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1408
self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1410
bzrlib.gpg.GPGStrategy = oldstrategy
1411
tree_b = self.make_branch_and_tree('tree_b')
1412
repo_b = tree_b.branch.repository
1414
serializer = BundleSerializerV4('4')
1415
serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1417
install_bundle(repo_b, serializer.read(s))
1418
self.assertTrue(repo_b.has_signature_for_revision_id('B'))
1419
self.assertEqual(repo_b.get_signature_text('B'),
1420
repo_a.get_signature_text('B'))
1422
# ensure repeat installs are harmless
1423
install_bundle(repo_b, serializer.read(s))
1426
class V4WeaveBundleTester(V4BundleTester):
1428
def bzrdir_format(self):
1432
class MungedBundleTester(object):
1434
def build_test_bundle(self):
1435
wt = self.make_branch_and_tree('b1')
1437
self.build_tree(['b1/one'])
1439
wt.commit('add one', rev_id='a@cset-0-1')
1440
self.build_tree(['b1/two'])
1442
wt.commit('add two', rev_id='a@cset-0-2',
1443
revprops={'branch-nick':'test'})
1445
bundle_txt = StringIO()
1446
rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
1447
'a@cset-0-1', bundle_txt, self.format)
1448
self.assertEqual(set(['a@cset-0-2']), set(rev_ids))
1449
bundle_txt.seek(0, 0)
1452
def check_valid(self, bundle):
1453
"""Check that after whatever munging, the final object is valid."""
1454
self.assertEqual(['a@cset-0-2'],
1455
[r.revision_id for r in bundle.real_revisions])
1457
def test_extra_whitespace(self):
1458
bundle_txt = self.build_test_bundle()
1460
# Seek to the end of the file
1461
# Adding one extra newline used to give us
1462
# TypeError: float() argument must be a string or a number
1463
bundle_txt.seek(0, 2)
1464
bundle_txt.write('\n')
1467
bundle = read_bundle(bundle_txt)
1468
self.check_valid(bundle)
1470
def test_extra_whitespace_2(self):
1471
bundle_txt = self.build_test_bundle()
1473
# Seek to the end of the file
1474
# Adding two extra newlines used to give us
1475
# MalformedPatches: The first line of all patches should be ...
1476
bundle_txt.seek(0, 2)
1477
bundle_txt.write('\n\n')
1480
bundle = read_bundle(bundle_txt)
1481
self.check_valid(bundle)
1484
class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
1488
def test_missing_trailing_whitespace(self):
1489
bundle_txt = self.build_test_bundle()
1491
# Remove a trailing newline, it shouldn't kill the parser
1492
raw = bundle_txt.getvalue()
1493
# The contents of the bundle don't have to be this, but this
1494
# test is concerned with the exact case where the serializer
1495
# creates a blank line at the end, and fails if that
1497
self.assertEqual('\n\n', raw[-2:])
1498
bundle_txt = StringIO(raw[:-1])
1500
bundle = read_bundle(bundle_txt)
1501
self.check_valid(bundle)
1503
def test_opening_text(self):
1504
bundle_txt = self.build_test_bundle()
1506
bundle_txt = StringIO("Some random\nemail comments\n"
1507
+ bundle_txt.getvalue())
1509
bundle = read_bundle(bundle_txt)
1510
self.check_valid(bundle)
1512
def test_trailing_text(self):
1513
bundle_txt = self.build_test_bundle()
1515
bundle_txt = StringIO(bundle_txt.getvalue() +
1516
"Some trailing\nrandom\ntext\n")
1518
bundle = read_bundle(bundle_txt)
1519
self.check_valid(bundle)
1522
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
1527
class TestBundleWriterReader(tests.TestCase):
1529
def test_roundtrip_record(self):
1530
fileobj = StringIO()
1531
writer = v4.BundleWriter(fileobj)
1533
writer.add_info_record(foo='bar')
1534
writer._add_record("Record body", {'parents': ['1', '3'],
1535
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1538
reader = v4.BundleReader(fileobj, stream_input=True)
1539
record_iter = reader.iter_records()
1540
record = record_iter.next()
1541
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1542
'info', None, None), record)
1543
record = record_iter.next()
1544
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1545
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1548
def test_roundtrip_record_memory_hungry(self):
1549
fileobj = StringIO()
1550
writer = v4.BundleWriter(fileobj)
1552
writer.add_info_record(foo='bar')
1553
writer._add_record("Record body", {'parents': ['1', '3'],
1554
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1557
reader = v4.BundleReader(fileobj, stream_input=False)
1558
record_iter = reader.iter_records()
1559
record = record_iter.next()
1560
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1561
'info', None, None), record)
1562
record = record_iter.next()
1563
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1564
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1567
def test_encode_name(self):
1568
self.assertEqual('revision/rev1',
1569
v4.BundleWriter.encode_name('revision', 'rev1'))
1570
self.assertEqual('file/rev//1/file-id-1',
1571
v4.BundleWriter.encode_name('file', 'rev/1', 'file-id-1'))
1572
self.assertEqual('info',
1573
v4.BundleWriter.encode_name('info', None, None))
1575
def test_decode_name(self):
1576
self.assertEqual(('revision', 'rev1', None),
1577
v4.BundleReader.decode_name('revision/rev1'))
1578
self.assertEqual(('file', 'rev/1', 'file-id-1'),
1579
v4.BundleReader.decode_name('file/rev//1/file-id-1'))
1580
self.assertEqual(('info', None, None),
1581
v4.BundleReader.decode_name('info'))
1583
def test_too_many_names(self):
1584
fileobj = StringIO()
1585
writer = v4.BundleWriter(fileobj)
1587
writer.add_info_record(foo='bar')
1588
writer._container.add_bytes_record('blah', ['two', 'names'])
1591
record_iter = v4.BundleReader(fileobj).iter_records()
1592
record = record_iter.next()
1593
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1594
'info', None, None), record)
1595
self.assertRaises(errors.BadBundle, record_iter.next)
1598
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
1600
def test_read_mergeable_skips_local(self):
1601
"""A local bundle named like the URL should not be read.
1603
out, wt = test_read_bundle.create_bundle_file(self)
1604
class FooService(object):
1605
"""A directory service that always returns source"""
1607
def look_up(self, name, url):
1609
directories.register('foo:', FooService, 'Testing directory service')
1610
self.addCleanup(lambda: directories.remove('foo:'))
1611
self.build_tree_contents([('./foo:bar', out.getvalue())])
1612
self.assertRaises(errors.NotABundle, read_mergeable_from_url,
1615
def test_smart_server_connection_reset(self):
1616
"""If a smart server connection fails during the attempt to read a
1617
bundle, then the ConnectionReset error should be propagated.
1619
# Instantiate a server that will provoke a ConnectionReset
1620
sock_server = _DisconnectingTCPServer()
1622
self.addCleanup(sock_server.tearDown)
1623
# We don't really care what the url is since the server will close the
1624
# connection without interpreting it
1625
url = sock_server.get_url()
1626
self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1629
class _DisconnectingTCPServer(object):
1630
"""A TCP server that immediately closes any connection made to it."""
1633
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1634
self.sock.bind(('127.0.0.1', 0))
1636
self.port = self.sock.getsockname()[1]
1637
self.thread = threading.Thread(
1638
name='%s (port %d)' % (self.__class__.__name__, self.port),
1639
target=self.accept_and_close)
1642
def accept_and_close(self):
1643
conn, addr = self.sock.accept()
1644
conn.shutdown(socket.SHUT_RDWR)
1648
return 'bzr://127.0.0.1:%d/' % (self.port,)
1652
# make sure the thread dies by connecting to the listening socket,
1653
# just in case the test failed to do so.
1654
conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1655
conn.connect(self.sock.getsockname())
1657
except socket.error:
added
removed
bzrlib/tests/test_bundle.py
