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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from cStringIO import StringIO
27
revision as _mod_revision,
30
from bzrlib.bzrdir import BzrDir
31
from bzrlib.bundle import read_mergeable_from_url
32
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
33
from bzrlib.bundle.bundle_data import BundleTree
34
from bzrlib.directory_service import directories
35
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
36
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
37
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
38
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
39
from bzrlib.branch import Branch
40
from bzrlib.diff import internal_diff
41
from bzrlib.errors import (BzrError, TestamentMismatch, NotABundle, BadBundle,
43
from bzrlib.merge import Merge3Merger
44
from bzrlib.repofmt import knitrepo
45
from bzrlib.osutils import sha_file, sha_string
46
from bzrlib.tests import (
50
TestCaseWithTransport,
55
from bzrlib.transform import TreeTransform
58
class MockTree(object):
60
from bzrlib.inventory import InventoryDirectory, ROOT_ID
62
self.paths = {ROOT_ID: ""}
63
self.ids = {"": ROOT_ID}
65
self.root = InventoryDirectory(ROOT_ID, '', None)
67
inventory = property(lambda x:x)
70
return self.paths.iterkeys()
72
def __getitem__(self, file_id):
73
if file_id == self.root.file_id:
76
return self.make_entry(file_id, self.paths[file_id])
78
def parent_id(self, file_id):
79
parent_dir = os.path.dirname(self.paths[file_id])
82
return self.ids[parent_dir]
84
def iter_entries(self):
85
for path, file_id in self.ids.iteritems():
86
yield path, self[file_id]
88
def get_file_kind(self, file_id):
89
if file_id in self.contents:
95
def make_entry(self, file_id, path):
96
from bzrlib.inventory import (InventoryEntry, InventoryFile
97
, InventoryDirectory, InventoryLink)
98
name = os.path.basename(path)
99
kind = self.get_file_kind(file_id)
100
parent_id = self.parent_id(file_id)
101
text_sha_1, text_size = self.contents_stats(file_id)
102
if kind == 'directory':
103
ie = InventoryDirectory(file_id, name, parent_id)
105
ie = InventoryFile(file_id, name, parent_id)
106
elif kind == 'symlink':
107
ie = InventoryLink(file_id, name, parent_id)
109
raise BzrError('unknown kind %r' % kind)
110
ie.text_sha1 = text_sha_1
111
ie.text_size = text_size
114
def add_dir(self, file_id, path):
115
self.paths[file_id] = path
116
self.ids[path] = file_id
118
def add_file(self, file_id, path, contents):
119
self.add_dir(file_id, path)
120
self.contents[file_id] = contents
122
def path2id(self, path):
123
return self.ids.get(path)
125
def id2path(self, file_id):
126
return self.paths.get(file_id)
128
def has_id(self, file_id):
129
return self.id2path(file_id) is not None
131
def get_file(self, file_id):
133
result.write(self.contents[file_id])
137
def contents_stats(self, file_id):
138
if file_id not in self.contents:
140
text_sha1 = sha_file(self.get_file(file_id))
141
return text_sha1, len(self.contents[file_id])
144
class BTreeTester(TestCase):
145
"""A simple unittest tester for the BundleTree class."""
147
def make_tree_1(self):
149
mtree.add_dir("a", "grandparent")
150
mtree.add_dir("b", "grandparent/parent")
151
mtree.add_file("c", "grandparent/parent/file", "Hello\n")
152
mtree.add_dir("d", "grandparent/alt_parent")
153
return BundleTree(mtree, ''), mtree
155
def test_renames(self):
156
"""Ensure that file renames have the proper effect on children"""
157
btree = self.make_tree_1()[0]
158
self.assertEqual(btree.old_path("grandparent"), "grandparent")
159
self.assertEqual(btree.old_path("grandparent/parent"),
160
"grandparent/parent")
161
self.assertEqual(btree.old_path("grandparent/parent/file"),
162
"grandparent/parent/file")
164
self.assertEqual(btree.id2path("a"), "grandparent")
165
self.assertEqual(btree.id2path("b"), "grandparent/parent")
166
self.assertEqual(btree.id2path("c"), "grandparent/parent/file")
168
self.assertEqual(btree.path2id("grandparent"), "a")
169
self.assertEqual(btree.path2id("grandparent/parent"), "b")
170
self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
172
self.assertTrue(btree.path2id("grandparent2") is None)
173
self.assertTrue(btree.path2id("grandparent2/parent") is None)
174
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
176
btree.note_rename("grandparent", "grandparent2")
177
self.assertTrue(btree.old_path("grandparent") is None)
178
self.assertTrue(btree.old_path("grandparent/parent") is None)
179
self.assertTrue(btree.old_path("grandparent/parent/file") is None)
181
self.assertEqual(btree.id2path("a"), "grandparent2")
182
self.assertEqual(btree.id2path("b"), "grandparent2/parent")
183
self.assertEqual(btree.id2path("c"), "grandparent2/parent/file")
185
self.assertEqual(btree.path2id("grandparent2"), "a")
186
self.assertEqual(btree.path2id("grandparent2/parent"), "b")
187
self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
189
self.assertTrue(btree.path2id("grandparent") is None)
190
self.assertTrue(btree.path2id("grandparent/parent") is None)
191
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
193
btree.note_rename("grandparent/parent", "grandparent2/parent2")
194
self.assertEqual(btree.id2path("a"), "grandparent2")
195
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
196
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file")
198
self.assertEqual(btree.path2id("grandparent2"), "a")
199
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
200
self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
202
self.assertTrue(btree.path2id("grandparent2/parent") is None)
203
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
205
btree.note_rename("grandparent/parent/file",
206
"grandparent2/parent2/file2")
207
self.assertEqual(btree.id2path("a"), "grandparent2")
208
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
209
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file2")
211
self.assertEqual(btree.path2id("grandparent2"), "a")
212
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
213
self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
215
self.assertTrue(btree.path2id("grandparent2/parent2/file") is None)
217
def test_moves(self):
218
"""Ensure that file moves have the proper effect on children"""
219
btree = self.make_tree_1()[0]
220
btree.note_rename("grandparent/parent/file",
221
"grandparent/alt_parent/file")
222
self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
223
self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
224
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
226
def unified_diff(self, old, new):
228
internal_diff("old", old, "new", new, out)
232
def make_tree_2(self):
233
btree = self.make_tree_1()[0]
234
btree.note_rename("grandparent/parent/file",
235
"grandparent/alt_parent/file")
236
self.assertTrue(btree.id2path("e") is None)
237
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
238
btree.note_id("e", "grandparent/parent/file")
242
"""File/inventory adds"""
243
btree = self.make_tree_2()
244
add_patch = self.unified_diff([], ["Extra cheese\n"])
245
btree.note_patch("grandparent/parent/file", add_patch)
246
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
247
btree.note_target('grandparent/parent/symlink', 'venus')
248
self.adds_test(btree)
250
def adds_test(self, btree):
251
self.assertEqual(btree.id2path("e"), "grandparent/parent/file")
252
self.assertEqual(btree.path2id("grandparent/parent/file"), "e")
253
self.assertEqual(btree.get_file("e").read(), "Extra cheese\n")
254
self.assertEqual(btree.get_symlink_target('f'), 'venus')
256
def test_adds2(self):
257
"""File/inventory adds, with patch-compatibile renames"""
258
btree = self.make_tree_2()
259
btree.contents_by_id = False
260
add_patch = self.unified_diff(["Hello\n"], ["Extra cheese\n"])
261
btree.note_patch("grandparent/parent/file", add_patch)
262
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
263
btree.note_target('grandparent/parent/symlink', 'venus')
264
self.adds_test(btree)
266
def make_tree_3(self):
267
btree, mtree = self.make_tree_1()
268
mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
269
btree.note_rename("grandparent/parent/file",
270
"grandparent/alt_parent/file")
271
btree.note_rename("grandparent/parent/topping",
272
"grandparent/alt_parent/stopping")
275
def get_file_test(self, btree):
276
self.assertEqual(btree.get_file("e").read(), "Lemon\n")
277
self.assertEqual(btree.get_file("c").read(), "Hello\n")
279
def test_get_file(self):
280
"""Get file contents"""
281
btree = self.make_tree_3()
282
mod_patch = self.unified_diff(["Anchovies\n"], ["Lemon\n"])
283
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
284
self.get_file_test(btree)
286
def test_get_file2(self):
287
"""Get file contents, with patch-compatibile renames"""
288
btree = self.make_tree_3()
289
btree.contents_by_id = False
290
mod_patch = self.unified_diff([], ["Lemon\n"])
291
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
292
mod_patch = self.unified_diff([], ["Hello\n"])
293
btree.note_patch("grandparent/alt_parent/file", mod_patch)
294
self.get_file_test(btree)
296
def test_delete(self):
298
btree = self.make_tree_1()[0]
299
self.assertEqual(btree.get_file("c").read(), "Hello\n")
300
btree.note_deletion("grandparent/parent/file")
301
self.assertTrue(btree.id2path("c") is None)
302
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
304
def sorted_ids(self, tree):
309
def test_iteration(self):
310
"""Ensure that iteration through ids works properly"""
311
btree = self.make_tree_1()[0]
312
self.assertEqual(self.sorted_ids(btree),
313
[inventory.ROOT_ID, 'a', 'b', 'c', 'd'])
314
btree.note_deletion("grandparent/parent/file")
315
btree.note_id("e", "grandparent/alt_parent/fool", kind="directory")
316
btree.note_last_changed("grandparent/alt_parent/fool",
318
self.assertEqual(self.sorted_ids(btree),
319
[inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
322
class BundleTester1(TestCaseWithTransport):
324
def test_mismatched_bundle(self):
325
format = bzrdir.BzrDirMetaFormat1()
326
format.repository_format = knitrepo.RepositoryFormatKnit3()
327
serializer = BundleSerializerV08('0.8')
328
b = self.make_branch('.', format=format)
329
self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
330
b.repository, [], {}, StringIO())
332
def test_matched_bundle(self):
333
"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
334
format = bzrdir.BzrDirMetaFormat1()
335
format.repository_format = knitrepo.RepositoryFormatKnit3()
336
serializer = BundleSerializerV09('0.9')
337
b = self.make_branch('.', format=format)
338
serializer.write(b.repository, [], {}, StringIO())
340
def test_mismatched_model(self):
341
"""Try copying a bundle from knit2 to knit1"""
342
format = bzrdir.BzrDirMetaFormat1()
343
format.repository_format = knitrepo.RepositoryFormatKnit3()
344
source = self.make_branch_and_tree('source', format=format)
345
source.commit('one', rev_id='one-id')
346
source.commit('two', rev_id='two-id')
348
write_bundle(source.branch.repository, 'two-id', 'null:', text,
352
format = bzrdir.BzrDirMetaFormat1()
353
format.repository_format = knitrepo.RepositoryFormatKnit1()
354
target = self.make_branch('target', format=format)
355
self.assertRaises(errors.IncompatibleRevision, install_bundle,
356
target.repository, read_bundle(text))
359
class BundleTester(object):
361
def bzrdir_format(self):
362
format = bzrdir.BzrDirMetaFormat1()
363
format.repository_format = knitrepo.RepositoryFormatKnit1()
366
def make_branch_and_tree(self, path, format=None):
368
format = self.bzrdir_format()
369
return TestCaseWithTransport.make_branch_and_tree(self, path, format)
371
def make_branch(self, path, format=None):
373
format = self.bzrdir_format()
374
return TestCaseWithTransport.make_branch(self, path, format)
376
def create_bundle_text(self, base_rev_id, rev_id):
377
bundle_txt = StringIO()
378
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
379
bundle_txt, format=self.format)
381
self.assertEqual(bundle_txt.readline(),
382
'# Bazaar revision bundle v%s\n' % self.format)
383
self.assertEqual(bundle_txt.readline(), '#\n')
385
rev = self.b1.repository.get_revision(rev_id)
386
self.assertEqual(bundle_txt.readline().decode('utf-8'),
389
return bundle_txt, rev_ids
391
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
392
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
393
Make sure that the text generated is valid, and that it
394
can be applied against the base, and generate the same information.
396
:return: The in-memory bundle
398
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
400
# This should also validate the generated bundle
401
bundle = read_bundle(bundle_txt)
402
repository = self.b1.repository
403
for bundle_rev in bundle.real_revisions:
404
# These really should have already been checked when we read the
405
# bundle, since it computes the sha1 hash for the revision, which
406
# only will match if everything is okay, but lets be explicit about
408
branch_rev = repository.get_revision(bundle_rev.revision_id)
409
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
410
'timestamp', 'timezone', 'message', 'committer',
411
'parent_ids', 'properties'):
412
self.assertEqual(getattr(branch_rev, a),
413
getattr(bundle_rev, a))
414
self.assertEqual(len(branch_rev.parent_ids),
415
len(bundle_rev.parent_ids))
416
self.assertEqual(rev_ids,
417
[r.revision_id for r in bundle.real_revisions])
418
self.valid_apply_bundle(base_rev_id, bundle,
419
checkout_dir=checkout_dir)
423
def get_invalid_bundle(self, base_rev_id, rev_id):
424
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
425
Munge the text so that it's invalid.
427
:return: The in-memory bundle
429
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
430
new_text = bundle_txt.getvalue().replace('executable:no',
432
bundle_txt = StringIO(new_text)
433
bundle = read_bundle(bundle_txt)
434
self.valid_apply_bundle(base_rev_id, bundle)
437
def test_non_bundle(self):
438
self.assertRaises(NotABundle, read_bundle, StringIO('#!/bin/sh\n'))
440
def test_malformed(self):
441
self.assertRaises(BadBundle, read_bundle,
442
StringIO('# Bazaar revision bundle v'))
444
def test_crlf_bundle(self):
446
read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
448
# It is currently permitted for bundles with crlf line endings to
449
# make read_bundle raise a BadBundle, but this should be fixed.
450
# Anything else, especially NotABundle, is an error.
453
def get_checkout(self, rev_id, checkout_dir=None):
454
"""Get a new tree, with the specified revision in it.
457
if checkout_dir is None:
458
checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
460
if not os.path.exists(checkout_dir):
461
os.mkdir(checkout_dir)
462
tree = self.make_branch_and_tree(checkout_dir)
464
ancestors = write_bundle(self.b1.repository, rev_id, 'null:', s,
467
self.assertIsInstance(s.getvalue(), str)
468
install_bundle(tree.branch.repository, read_bundle(s))
469
for ancestor in ancestors:
470
old = self.b1.repository.revision_tree(ancestor)
471
new = tree.branch.repository.revision_tree(ancestor)
475
# Check that there aren't any inventory level changes
476
delta = new.changes_from(old)
477
self.assertFalse(delta.has_changed(),
478
'Revision %s not copied correctly.'
481
# Now check that the file contents are all correct
482
for inventory_id in old:
484
old_file = old.get_file(inventory_id)
489
self.assertEqual(old_file.read(),
490
new.get_file(inventory_id).read())
494
if not _mod_revision.is_null(rev_id):
495
rh = self.b1.revision_history()
496
tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
498
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
499
self.assertFalse(delta.has_changed(),
500
'Working tree has modifications: %s' % delta)
503
def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
504
"""Get the base revision, apply the changes, and make
505
sure everything matches the builtin branch.
507
to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
510
self._valid_apply_bundle(base_rev_id, info, to_tree)
514
def _valid_apply_bundle(self, base_rev_id, info, to_tree):
515
original_parents = to_tree.get_parent_ids()
516
repository = to_tree.branch.repository
517
original_parents = to_tree.get_parent_ids()
518
self.assertIs(repository.has_revision(base_rev_id), True)
519
for rev in info.real_revisions:
520
self.assert_(not repository.has_revision(rev.revision_id),
521
'Revision {%s} present before applying bundle'
523
merge_bundle(info, to_tree, True, Merge3Merger, False, False)
525
for rev in info.real_revisions:
526
self.assert_(repository.has_revision(rev.revision_id),
527
'Missing revision {%s} after applying bundle'
530
self.assert_(to_tree.branch.repository.has_revision(info.target))
531
# Do we also want to verify that all the texts have been added?
533
self.assertEqual(original_parents + [info.target],
534
to_tree.get_parent_ids())
536
rev = info.real_revisions[-1]
537
base_tree = self.b1.repository.revision_tree(rev.revision_id)
538
to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
540
# TODO: make sure the target tree is identical to base tree
541
# we might also check the working tree.
543
base_files = list(base_tree.list_files())
544
to_files = list(to_tree.list_files())
545
self.assertEqual(len(base_files), len(to_files))
546
for base_file, to_file in zip(base_files, to_files):
547
self.assertEqual(base_file, to_file)
549
for path, status, kind, fileid, entry in base_files:
550
# Check that the meta information is the same
551
self.assertEqual(base_tree.get_file_size(fileid),
552
to_tree.get_file_size(fileid))
553
self.assertEqual(base_tree.get_file_sha1(fileid),
554
to_tree.get_file_sha1(fileid))
555
# Check that the contents are the same
556
# This is pretty expensive
557
# self.assertEqual(base_tree.get_file(fileid).read(),
558
# to_tree.get_file(fileid).read())
560
def test_bundle(self):
561
self.tree1 = self.make_branch_and_tree('b1')
562
self.b1 = self.tree1.branch
564
open('b1/one', 'wb').write('one\n')
565
self.tree1.add('one')
566
self.tree1.commit('add one', rev_id='a@cset-0-1')
568
bundle = self.get_valid_bundle('null:', 'a@cset-0-1')
570
# Make sure we can handle files with spaces, tabs, other
575
, 'b1/dir/filein subdir.c'
576
, 'b1/dir/WithCaps.txt'
577
, 'b1/dir/ pre space'
580
, 'b1/sub/sub/nonempty.txt'
582
open('b1/sub/sub/emptyfile.txt', 'wb').close()
583
open('b1/dir/nolastnewline.txt', 'wb').write('bloop')
584
tt = TreeTransform(self.tree1)
585
tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
587
# have to fix length of file-id so that we can predictably rewrite
588
# a (length-prefixed) record containing it later.
589
self.tree1.add('with space.txt', 'withspace-id')
592
, 'dir/filein subdir.c'
595
, 'dir/nolastnewline.txt'
598
, 'sub/sub/nonempty.txt'
599
, 'sub/sub/emptyfile.txt'
601
self.tree1.commit('add whitespace', rev_id='a@cset-0-2')
603
bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
605
# Check a rollup bundle
606
bundle = self.get_valid_bundle('null:', 'a@cset-0-2')
610
['sub/sub/nonempty.txt'
611
, 'sub/sub/emptyfile.txt'
614
tt = TreeTransform(self.tree1)
615
trans_id = tt.trans_id_tree_file_id('exe-1')
616
tt.set_executability(False, trans_id)
618
self.tree1.commit('removed', rev_id='a@cset-0-3')
620
bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
621
self.assertRaises((TestamentMismatch,
622
errors.VersionedFileInvalidChecksum), self.get_invalid_bundle,
623
'a@cset-0-2', 'a@cset-0-3')
624
# Check a rollup bundle
625
bundle = self.get_valid_bundle('null:', 'a@cset-0-3')
627
# Now move the directory
628
self.tree1.rename_one('dir', 'sub/dir')
629
self.tree1.commit('rename dir', rev_id='a@cset-0-4')
631
bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
632
# Check a rollup bundle
633
bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
636
open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
637
open('b1/sub/dir/ pre space', 'ab').write(
638
'\r\nAdding some\r\nDOS format lines\r\n')
639
open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
640
self.tree1.rename_one('sub/dir/ pre space',
642
self.tree1.commit('Modified files', rev_id='a@cset-0-5')
643
bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
645
self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
646
self.tree1.rename_one('with space.txt', 'WithCaps.txt')
647
self.tree1.rename_one('temp', 'with space.txt')
648
self.tree1.commit(u'swap filenames', rev_id='a@cset-0-6',
650
bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
651
other = self.get_checkout('a@cset-0-5')
652
tree1_inv = self.tree1.branch.repository.get_inventory_xml(
654
tree2_inv = other.branch.repository.get_inventory_xml('a@cset-0-5')
655
self.assertEqualDiff(tree1_inv, tree2_inv)
656
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
657
other.commit('rename file', rev_id='a@cset-0-6b')
658
self.tree1.merge_from_branch(other.branch)
659
self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
661
bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
663
def test_symlink_bundle(self):
664
self.requireFeature(SymlinkFeature)
665
self.tree1 = self.make_branch_and_tree('b1')
666
self.b1 = self.tree1.branch
667
tt = TreeTransform(self.tree1)
668
tt.new_symlink('link', tt.root, 'bar/foo', 'link-1')
670
self.tree1.commit('add symlink', rev_id='l@cset-0-1')
671
self.get_valid_bundle('null:', 'l@cset-0-1')
672
tt = TreeTransform(self.tree1)
673
trans_id = tt.trans_id_tree_file_id('link-1')
674
tt.adjust_path('link2', tt.root, trans_id)
675
tt.delete_contents(trans_id)
676
tt.create_symlink('mars', trans_id)
678
self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
679
self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
680
tt = TreeTransform(self.tree1)
681
trans_id = tt.trans_id_tree_file_id('link-1')
682
tt.delete_contents(trans_id)
683
tt.create_symlink('jupiter', trans_id)
685
self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
686
self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
687
tt = TreeTransform(self.tree1)
688
trans_id = tt.trans_id_tree_file_id('link-1')
689
tt.delete_contents(trans_id)
691
self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
692
self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
694
def test_binary_bundle(self):
695
self.tree1 = self.make_branch_and_tree('b1')
696
self.b1 = self.tree1.branch
697
tt = TreeTransform(self.tree1)
700
tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
701
tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
704
self.tree1.commit('add binary', rev_id='b@cset-0-1')
705
self.get_valid_bundle('null:', 'b@cset-0-1')
708
tt = TreeTransform(self.tree1)
709
trans_id = tt.trans_id_tree_file_id('binary-1')
710
tt.delete_contents(trans_id)
712
self.tree1.commit('delete binary', rev_id='b@cset-0-2')
713
self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
716
tt = TreeTransform(self.tree1)
717
trans_id = tt.trans_id_tree_file_id('binary-2')
718
tt.adjust_path('file3', tt.root, trans_id)
719
tt.delete_contents(trans_id)
720
tt.create_file('file\rcontents\x00\n\x00', trans_id)
722
self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
723
self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
726
tt = TreeTransform(self.tree1)
727
trans_id = tt.trans_id_tree_file_id('binary-2')
728
tt.delete_contents(trans_id)
729
tt.create_file('\x00file\rcontents', trans_id)
731
self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
732
self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
735
self.get_valid_bundle('null:', 'b@cset-0-4')
737
def test_last_modified(self):
738
self.tree1 = self.make_branch_and_tree('b1')
739
self.b1 = self.tree1.branch
740
tt = TreeTransform(self.tree1)
741
tt.new_file('file', tt.root, 'file', 'file')
743
self.tree1.commit('create file', rev_id='a@lmod-0-1')
745
tt = TreeTransform(self.tree1)
746
trans_id = tt.trans_id_tree_file_id('file')
747
tt.delete_contents(trans_id)
748
tt.create_file('file2', trans_id)
750
self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
752
other = self.get_checkout('a@lmod-0-1')
753
tt = TreeTransform(other)
754
trans_id = tt.trans_id_tree_file_id('file')
755
tt.delete_contents(trans_id)
756
tt.create_file('file2', trans_id)
758
other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
759
self.tree1.merge_from_branch(other.branch)
760
self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
762
self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
763
bundle = self.get_valid_bundle('a@lmod-0-2a', 'a@lmod-0-4')
765
def test_hide_history(self):
766
self.tree1 = self.make_branch_and_tree('b1')
767
self.b1 = self.tree1.branch
769
open('b1/one', 'wb').write('one\n')
770
self.tree1.add('one')
771
self.tree1.commit('add file', rev_id='a@cset-0-1')
772
open('b1/one', 'wb').write('two\n')
773
self.tree1.commit('modify', rev_id='a@cset-0-2')
774
open('b1/one', 'wb').write('three\n')
775
self.tree1.commit('modify', rev_id='a@cset-0-3')
776
bundle_file = StringIO()
777
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
778
'a@cset-0-1', bundle_file, format=self.format)
779
self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
780
self.assertContainsRe(self.get_raw(bundle_file), 'one')
781
self.assertContainsRe(self.get_raw(bundle_file), 'three')
783
def test_bundle_same_basis(self):
784
"""Ensure using the basis as the target doesn't cause an error"""
785
self.tree1 = self.make_branch_and_tree('b1')
786
self.tree1.commit('add file', rev_id='a@cset-0-1')
787
bundle_file = StringIO()
788
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
789
'a@cset-0-1', bundle_file)
792
def get_raw(bundle_file):
793
return bundle_file.getvalue()
795
def test_unicode_bundle(self):
796
# Handle international characters
799
f = open(u'b1/with Dod\xe9', 'wb')
800
except UnicodeEncodeError:
801
raise TestSkipped("Filesystem doesn't support unicode")
803
self.tree1 = self.make_branch_and_tree('b1')
804
self.b1 = self.tree1.branch
807
u'With international man of mystery\n'
808
u'William Dod\xe9\n').encode('utf-8'))
811
self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
812
self.tree1.commit(u'i18n commit from William Dod\xe9',
813
rev_id='i18n-1', committer=u'William Dod\xe9')
815
if sys.platform == 'darwin':
816
from bzrlib.workingtree import WorkingTree3
817
if type(self.tree1) is WorkingTree3:
818
self.knownFailure("Bug #141438: fails for WorkingTree3 on OSX")
820
# On Mac the '\xe9' gets changed to 'e\u0301'
821
self.assertEqual([u'.bzr', u'with Dode\u0301'],
822
sorted(os.listdir(u'b1')))
823
delta = self.tree1.changes_from(self.tree1.basis_tree())
824
self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
826
self.knownFailure("Mac OSX doesn't preserve unicode"
827
" combining characters.")
830
bundle = self.get_valid_bundle('null:', 'i18n-1')
833
f = open(u'b1/with Dod\xe9', 'wb')
834
f.write(u'Modified \xb5\n'.encode('utf8'))
836
self.tree1.commit(u'modified', rev_id='i18n-2')
838
bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
841
self.tree1.rename_one(u'with Dod\xe9', u'B\xe5gfors')
842
self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
843
committer=u'Erik B\xe5gfors')
845
bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
848
self.tree1.remove([u'B\xe5gfors'])
849
self.tree1.commit(u'removed', rev_id='i18n-4')
851
bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
854
bundle = self.get_valid_bundle('null:', 'i18n-4')
857
def test_whitespace_bundle(self):
858
if sys.platform in ('win32', 'cygwin'):
859
raise TestSkipped('Windows doesn\'t support filenames'
860
' with tabs or trailing spaces')
861
self.tree1 = self.make_branch_and_tree('b1')
862
self.b1 = self.tree1.branch
864
self.build_tree(['b1/trailing space '])
865
self.tree1.add(['trailing space '])
866
# TODO: jam 20060701 Check for handling files with '\t' characters
867
# once we actually support them
870
self.tree1.commit('funky whitespace', rev_id='white-1')
872
bundle = self.get_valid_bundle('null:', 'white-1')
875
open('b1/trailing space ', 'ab').write('add some text\n')
876
self.tree1.commit('add text', rev_id='white-2')
878
bundle = self.get_valid_bundle('white-1', 'white-2')
881
self.tree1.rename_one('trailing space ', ' start and end space ')
882
self.tree1.commit('rename', rev_id='white-3')
884
bundle = self.get_valid_bundle('white-2', 'white-3')
887
self.tree1.remove([' start and end space '])
888
self.tree1.commit('removed', rev_id='white-4')
890
bundle = self.get_valid_bundle('white-3', 'white-4')
892
# Now test a complet roll-up
893
bundle = self.get_valid_bundle('null:', 'white-4')
895
def test_alt_timezone_bundle(self):
896
self.tree1 = self.make_branch_and_memory_tree('b1')
897
self.b1 = self.tree1.branch
898
builder = treebuilder.TreeBuilder()
900
self.tree1.lock_write()
901
builder.start_tree(self.tree1)
902
builder.build(['newfile'])
903
builder.finish_tree()
905
# Asia/Colombo offset = 5 hours 30 minutes
906
self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
907
timezone=19800, timestamp=1152544886.0)
909
bundle = self.get_valid_bundle('null:', 'tz-1')
911
rev = bundle.revisions[0]
912
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
913
self.assertEqual(19800, rev.timezone)
914
self.assertEqual(1152544886.0, rev.timestamp)
917
def test_bundle_root_id(self):
918
self.tree1 = self.make_branch_and_tree('b1')
919
self.b1 = self.tree1.branch
920
self.tree1.commit('message', rev_id='revid1')
921
bundle = self.get_valid_bundle('null:', 'revid1')
922
tree = self.get_bundle_tree(bundle, 'revid1')
923
self.assertEqual('revid1', tree.inventory.root.revision)
925
def test_install_revisions(self):
926
self.tree1 = self.make_branch_and_tree('b1')
927
self.b1 = self.tree1.branch
928
self.tree1.commit('message', rev_id='rev2a')
929
bundle = self.get_valid_bundle('null:', 'rev2a')
930
branch2 = self.make_branch('b2')
931
self.assertFalse(branch2.repository.has_revision('rev2a'))
932
target_revision = bundle.install_revisions(branch2.repository)
933
self.assertTrue(branch2.repository.has_revision('rev2a'))
934
self.assertEqual('rev2a', target_revision)
936
def test_bundle_empty_property(self):
937
"""Test serializing revision properties with an empty value."""
938
tree = self.make_branch_and_memory_tree('tree')
940
self.addCleanup(tree.unlock)
941
tree.add([''], ['TREE_ROOT'])
942
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
943
self.b1 = tree.branch
944
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
945
bundle = read_bundle(bundle_sio)
946
revision_info = bundle.revisions[0]
947
self.assertEqual('rev1', revision_info.revision_id)
948
rev = revision_info.as_revision()
949
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
952
def test_bundle_sorted_properties(self):
953
"""For stability the writer should write properties in sorted order."""
954
tree = self.make_branch_and_memory_tree('tree')
956
self.addCleanup(tree.unlock)
958
tree.add([''], ['TREE_ROOT'])
959
tree.commit('One', rev_id='rev1',
960
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
961
self.b1 = tree.branch
962
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
963
bundle = read_bundle(bundle_sio)
964
revision_info = bundle.revisions[0]
965
self.assertEqual('rev1', revision_info.revision_id)
966
rev = revision_info.as_revision()
967
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
968
'd':'1'}, rev.properties)
970
def test_bundle_unicode_properties(self):
971
"""We should be able to round trip a non-ascii property."""
972
tree = self.make_branch_and_memory_tree('tree')
974
self.addCleanup(tree.unlock)
976
tree.add([''], ['TREE_ROOT'])
977
# Revisions themselves do not require anything about revision property
978
# keys, other than that they are a basestring, and do not contain
980
# However, Testaments assert than they are str(), and thus should not
982
tree.commit('One', rev_id='rev1',
983
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
984
self.b1 = tree.branch
985
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
986
bundle = read_bundle(bundle_sio)
987
revision_info = bundle.revisions[0]
988
self.assertEqual('rev1', revision_info.revision_id)
989
rev = revision_info.as_revision()
990
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
991
'alpha':u'\u03b1'}, rev.properties)
993
def test_bundle_with_ghosts(self):
994
tree = self.make_branch_and_tree('tree')
995
self.b1 = tree.branch
996
self.build_tree_contents([('tree/file', 'content1')])
999
self.build_tree_contents([('tree/file', 'content2')])
1000
tree.add_parent_tree_id('ghost')
1001
tree.commit('rev2', rev_id='rev2')
1002
bundle = self.get_valid_bundle('null:', 'rev2')
1004
def make_simple_tree(self, format=None):
1005
tree = self.make_branch_and_tree('b1', format=format)
1006
self.b1 = tree.branch
1007
self.build_tree(['b1/file'])
1011
def test_across_serializers(self):
1012
tree = self.make_simple_tree('knit')
1013
tree.commit('hello', rev_id='rev1')
1014
tree.commit('hello', rev_id='rev2')
1015
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1016
repo = self.make_repository('repo', format='dirstate-with-subtree')
1017
bundle.install_revisions(repo)
1018
inv_text = repo.get_inventory_xml('rev2')
1019
self.assertNotContainsRe(inv_text, 'format="5"')
1020
self.assertContainsRe(inv_text, 'format="7"')
1022
def make_repo_with_installed_revisions(self):
1023
tree = self.make_simple_tree('knit')
1024
tree.commit('hello', rev_id='rev1')
1025
tree.commit('hello', rev_id='rev2')
1026
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1027
repo = self.make_repository('repo', format='dirstate-with-subtree')
1028
bundle.install_revisions(repo)
1031
def test_across_models(self):
1032
repo = self.make_repo_with_installed_revisions()
1033
inv = repo.get_inventory('rev2')
1034
self.assertEqual('rev2', inv.root.revision)
1035
root_id = inv.root.file_id
1037
self.addCleanup(repo.unlock)
1038
self.assertEqual({(root_id, 'rev1'):(),
1039
(root_id, 'rev2'):((root_id, 'rev1'),)},
1040
repo.texts.get_parent_map([(root_id, 'rev1'), (root_id, 'rev2')]))
1042
def test_inv_hash_across_serializers(self):
1043
repo = self.make_repo_with_installed_revisions()
1044
recorded_inv_sha1 = repo.get_inventory_sha1('rev2')
1045
xml = repo.get_inventory_xml('rev2')
1046
self.assertEqual(sha_string(xml), recorded_inv_sha1)
1048
def test_across_models_incompatible(self):
1049
tree = self.make_simple_tree('dirstate-with-subtree')
1050
tree.commit('hello', rev_id='rev1')
1051
tree.commit('hello', rev_id='rev2')
1053
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1054
except errors.IncompatibleBundleFormat:
1055
raise TestSkipped("Format 0.8 doesn't work with knit3")
1056
repo = self.make_repository('repo', format='knit')
1057
bundle.install_revisions(repo)
1059
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1060
self.assertRaises(errors.IncompatibleRevision,
1061
bundle.install_revisions, repo)
1063
def test_get_merge_request(self):
1064
tree = self.make_simple_tree()
1065
tree.commit('hello', rev_id='rev1')
1066
tree.commit('hello', rev_id='rev2')
1067
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1068
result = bundle.get_merge_request(tree.branch.repository)
1069
self.assertEqual((None, 'rev1', 'inapplicable'), result)
1071
def test_with_subtree(self):
1072
tree = self.make_branch_and_tree('tree',
1073
format='dirstate-with-subtree')
1074
self.b1 = tree.branch
1075
subtree = self.make_branch_and_tree('tree/subtree',
1076
format='dirstate-with-subtree')
1078
tree.commit('hello', rev_id='rev1')
1080
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1081
except errors.IncompatibleBundleFormat:
1082
raise TestSkipped("Format 0.8 doesn't work with knit3")
1083
if isinstance(bundle, v09.BundleInfo09):
1084
raise TestSkipped("Format 0.9 doesn't work with subtrees")
1085
repo = self.make_repository('repo', format='knit')
1086
self.assertRaises(errors.IncompatibleRevision,
1087
bundle.install_revisions, repo)
1088
repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1089
bundle.install_revisions(repo2)
1091
def test_revision_id_with_slash(self):
1092
self.tree1 = self.make_branch_and_tree('tree')
1093
self.b1 = self.tree1.branch
1095
self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
1097
raise TestSkipped("Repository doesn't support revision ids with"
1099
bundle = self.get_valid_bundle('null:', 'rev/id')
1101
def test_skip_file(self):
1102
"""Make sure we don't accidentally write to the wrong versionedfile"""
1103
self.tree1 = self.make_branch_and_tree('tree')
1104
self.b1 = self.tree1.branch
1105
# rev1 is not present in bundle, done by fetch
1106
self.build_tree_contents([('tree/file2', 'contents1')])
1107
self.tree1.add('file2', 'file2-id')
1108
self.tree1.commit('rev1', rev_id='reva')
1109
self.build_tree_contents([('tree/file3', 'contents2')])
1110
# rev2 is present in bundle, and done by fetch
1111
# having file1 in the bunle causes file1's versionedfile to be opened.
1112
self.tree1.add('file3', 'file3-id')
1113
self.tree1.commit('rev2')
1114
# Updating file2 should not cause an attempt to add to file1's vf
1115
target = self.tree1.bzrdir.sprout('target').open_workingtree()
1116
self.build_tree_contents([('tree/file2', 'contents3')])
1117
self.tree1.commit('rev3', rev_id='rev3')
1118
bundle = self.get_valid_bundle('reva', 'rev3')
1119
if getattr(bundle, 'get_bundle_reader', None) is None:
1120
raise TestSkipped('Bundle format cannot provide reader')
1121
# be sure that file1 comes before file2
1122
for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1125
self.assertNotEqual(f, 'file2-id')
1126
bundle.install_revisions(target.branch.repository)
1129
class V08BundleTester(BundleTester, TestCaseWithTransport):
1133
def test_bundle_empty_property(self):
1134
"""Test serializing revision properties with an empty value."""
1135
tree = self.make_branch_and_memory_tree('tree')
1137
self.addCleanup(tree.unlock)
1138
tree.add([''], ['TREE_ROOT'])
1139
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1140
self.b1 = tree.branch
1141
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1142
self.assertContainsRe(bundle_sio.getvalue(),
1144
'# branch-nick: tree\n'
1148
bundle = read_bundle(bundle_sio)
1149
revision_info = bundle.revisions[0]
1150
self.assertEqual('rev1', revision_info.revision_id)
1151
rev = revision_info.as_revision()
1152
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1155
def get_bundle_tree(self, bundle, revision_id):
1156
repository = self.make_repository('repo')
1157
return bundle.revision_tree(repository, 'revid1')
1159
def test_bundle_empty_property_alt(self):
1160
"""Test serializing revision properties with an empty value.
1162
Older readers had a bug when reading an empty property.
1163
They assumed that all keys ended in ': \n'. However they would write an
1164
empty value as ':\n'. This tests make sure that all newer bzr versions
1165
can handle th second form.
1167
tree = self.make_branch_and_memory_tree('tree')
1169
self.addCleanup(tree.unlock)
1170
tree.add([''], ['TREE_ROOT'])
1171
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1172
self.b1 = tree.branch
1173
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1174
txt = bundle_sio.getvalue()
1175
loc = txt.find('# empty: ') + len('# empty:')
1176
# Create a new bundle, which strips the trailing space after empty
1177
bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
1179
self.assertContainsRe(bundle_sio.getvalue(),
1181
'# branch-nick: tree\n'
1185
bundle = read_bundle(bundle_sio)
1186
revision_info = bundle.revisions[0]
1187
self.assertEqual('rev1', revision_info.revision_id)
1188
rev = revision_info.as_revision()
1189
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1192
def test_bundle_sorted_properties(self):
1193
"""For stability the writer should write properties in sorted order."""
1194
tree = self.make_branch_and_memory_tree('tree')
1196
self.addCleanup(tree.unlock)
1198
tree.add([''], ['TREE_ROOT'])
1199
tree.commit('One', rev_id='rev1',
1200
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1201
self.b1 = tree.branch
1202
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1203
self.assertContainsRe(bundle_sio.getvalue(),
1207
'# branch-nick: tree\n'
1211
bundle = read_bundle(bundle_sio)
1212
revision_info = bundle.revisions[0]
1213
self.assertEqual('rev1', revision_info.revision_id)
1214
rev = revision_info.as_revision()
1215
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1216
'd':'1'}, rev.properties)
1218
def test_bundle_unicode_properties(self):
1219
"""We should be able to round trip a non-ascii property."""
1220
tree = self.make_branch_and_memory_tree('tree')
1222
self.addCleanup(tree.unlock)
1224
tree.add([''], ['TREE_ROOT'])
1225
# Revisions themselves do not require anything about revision property
1226
# keys, other than that they are a basestring, and do not contain
1228
# However, Testaments assert than they are str(), and thus should not
1230
tree.commit('One', rev_id='rev1',
1231
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1232
self.b1 = tree.branch
1233
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1234
self.assertContainsRe(bundle_sio.getvalue(),
1236
'# alpha: \xce\xb1\n'
1237
'# branch-nick: tree\n'
1238
'# omega: \xce\xa9\n'
1240
bundle = read_bundle(bundle_sio)
1241
revision_info = bundle.revisions[0]
1242
self.assertEqual('rev1', revision_info.revision_id)
1243
rev = revision_info.as_revision()
1244
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1245
'alpha':u'\u03b1'}, rev.properties)
1248
class V09BundleKnit2Tester(V08BundleTester):
1252
def bzrdir_format(self):
1253
format = bzrdir.BzrDirMetaFormat1()
1254
format.repository_format = knitrepo.RepositoryFormatKnit3()
1258
class V09BundleKnit1Tester(V08BundleTester):
1262
def bzrdir_format(self):
1263
format = bzrdir.BzrDirMetaFormat1()
1264
format.repository_format = knitrepo.RepositoryFormatKnit1()
1268
class V4BundleTester(BundleTester, TestCaseWithTransport):
1272
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1273
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1274
Make sure that the text generated is valid, and that it
1275
can be applied against the base, and generate the same information.
1277
:return: The in-memory bundle
1279
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1281
# This should also validate the generated bundle
1282
bundle = read_bundle(bundle_txt)
1283
repository = self.b1.repository
1284
for bundle_rev in bundle.real_revisions:
1285
# These really should have already been checked when we read the
1286
# bundle, since it computes the sha1 hash for the revision, which
1287
# only will match if everything is okay, but lets be explicit about
1289
branch_rev = repository.get_revision(bundle_rev.revision_id)
1290
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1291
'timestamp', 'timezone', 'message', 'committer',
1292
'parent_ids', 'properties'):
1293
self.assertEqual(getattr(branch_rev, a),
1294
getattr(bundle_rev, a))
1295
self.assertEqual(len(branch_rev.parent_ids),
1296
len(bundle_rev.parent_ids))
1297
self.assertEqual(set(rev_ids),
1298
set([r.revision_id for r in bundle.real_revisions]))
1299
self.valid_apply_bundle(base_rev_id, bundle,
1300
checkout_dir=checkout_dir)
1304
def get_invalid_bundle(self, base_rev_id, rev_id):
1305
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1306
Munge the text so that it's invalid.
1308
:return: The in-memory bundle
1310
from bzrlib.bundle import serializer
1311
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1312
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1313
new_text = new_text.replace('<file file_id="exe-1"',
1314
'<file executable="y" file_id="exe-1"')
1315
new_text = new_text.replace('B222', 'B237')
1316
bundle_txt = StringIO()
1317
bundle_txt.write(serializer._get_bundle_header('4'))
1318
bundle_txt.write('\n')
1319
bundle_txt.write(new_text.encode('bz2'))
1321
bundle = read_bundle(bundle_txt)
1322
self.valid_apply_bundle(base_rev_id, bundle)
1325
def create_bundle_text(self, base_rev_id, rev_id):
1326
bundle_txt = StringIO()
1327
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1328
bundle_txt, format=self.format)
1330
self.assertEqual(bundle_txt.readline(),
1331
'# Bazaar revision bundle v%s\n' % self.format)
1332
self.assertEqual(bundle_txt.readline(), '#\n')
1333
rev = self.b1.repository.get_revision(rev_id)
1335
return bundle_txt, rev_ids
1337
def get_bundle_tree(self, bundle, revision_id):
1338
repository = self.make_repository('repo')
1339
bundle.install_revisions(repository)
1340
return repository.revision_tree(revision_id)
1342
def test_creation(self):
1343
tree = self.make_branch_and_tree('tree')
1344
self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
1345
tree.add('file', 'fileid-2')
1346
tree.commit('added file', rev_id='rev1')
1347
self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
1348
tree.commit('changed file', rev_id='rev2')
1350
serializer = BundleSerializerV4('1.0')
1351
serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
1353
tree2 = self.make_branch_and_tree('target')
1354
target_repo = tree2.branch.repository
1355
install_bundle(target_repo, serializer.read(s))
1356
target_repo.lock_read()
1357
self.addCleanup(target_repo.unlock)
1358
self.assertEqual({'1':'contents1\nstatic\n',
1359
'2':'contents2\nstatic\n'},
1360
dict(target_repo.iter_files_bytes(
1361
[('fileid-2', 'rev1', '1'), ('fileid-2', 'rev2', '2')])))
1362
rtree = target_repo.revision_tree('rev2')
1363
inventory_vf = target_repo.inventories
1364
# If the inventory store has a graph, it must match the revision graph.
1366
[inventory_vf.get_parent_map([('rev2',)])[('rev2',)]],
1367
[None, (('rev1',),)])
1368
self.assertEqual('changed file',
1369
target_repo.get_revision('rev2').message)
1372
def get_raw(bundle_file):
1374
line = bundle_file.readline()
1375
line = bundle_file.readline()
1376
lines = bundle_file.readlines()
1377
return ''.join(lines).decode('bz2')
1379
def test_copy_signatures(self):
1380
tree_a = self.make_branch_and_tree('tree_a')
1382
import bzrlib.commit as commit
1383
oldstrategy = bzrlib.gpg.GPGStrategy
1384
branch = tree_a.branch
1385
repo_a = branch.repository
1386
tree_a.commit("base", allow_pointless=True, rev_id='A')
1387
self.failIf(branch.repository.has_signature_for_revision_id('A'))
1389
from bzrlib.testament import Testament
1390
# monkey patch gpg signing mechanism
1391
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1392
new_config = test_commit.MustSignConfig(branch)
1393
commit.Commit(config=new_config).commit(message="base",
1394
allow_pointless=True,
1396
working_tree=tree_a)
1398
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1399
self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1401
bzrlib.gpg.GPGStrategy = oldstrategy
1402
tree_b = self.make_branch_and_tree('tree_b')
1403
repo_b = tree_b.branch.repository
1405
serializer = BundleSerializerV4('4')
1406
serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1408
install_bundle(repo_b, serializer.read(s))
1409
self.assertTrue(repo_b.has_signature_for_revision_id('B'))
1410
self.assertEqual(repo_b.get_signature_text('B'),
1411
repo_a.get_signature_text('B'))
1413
# ensure repeat installs are harmless
1414
install_bundle(repo_b, serializer.read(s))
1417
class V4WeaveBundleTester(V4BundleTester):
1419
def bzrdir_format(self):
1423
class MungedBundleTester(object):
1425
def build_test_bundle(self):
1426
wt = self.make_branch_and_tree('b1')
1428
self.build_tree(['b1/one'])
1430
wt.commit('add one', rev_id='a@cset-0-1')
1431
self.build_tree(['b1/two'])
1433
wt.commit('add two', rev_id='a@cset-0-2',
1434
revprops={'branch-nick':'test'})
1436
bundle_txt = StringIO()
1437
rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
1438
'a@cset-0-1', bundle_txt, self.format)
1439
self.assertEqual(set(['a@cset-0-2']), set(rev_ids))
1440
bundle_txt.seek(0, 0)
1443
def check_valid(self, bundle):
1444
"""Check that after whatever munging, the final object is valid."""
1445
self.assertEqual(['a@cset-0-2'],
1446
[r.revision_id for r in bundle.real_revisions])
1448
def test_extra_whitespace(self):
1449
bundle_txt = self.build_test_bundle()
1451
# Seek to the end of the file
1452
# Adding one extra newline used to give us
1453
# TypeError: float() argument must be a string or a number
1454
bundle_txt.seek(0, 2)
1455
bundle_txt.write('\n')
1458
bundle = read_bundle(bundle_txt)
1459
self.check_valid(bundle)
1461
def test_extra_whitespace_2(self):
1462
bundle_txt = self.build_test_bundle()
1464
# Seek to the end of the file
1465
# Adding two extra newlines used to give us
1466
# MalformedPatches: The first line of all patches should be ...
1467
bundle_txt.seek(0, 2)
1468
bundle_txt.write('\n\n')
1471
bundle = read_bundle(bundle_txt)
1472
self.check_valid(bundle)
1475
class MungedBundleTesterV09(TestCaseWithTransport, MungedBundleTester):
1479
def test_missing_trailing_whitespace(self):
1480
bundle_txt = self.build_test_bundle()
1482
# Remove a trailing newline, it shouldn't kill the parser
1483
raw = bundle_txt.getvalue()
1484
# The contents of the bundle don't have to be this, but this
1485
# test is concerned with the exact case where the serializer
1486
# creates a blank line at the end, and fails if that
1488
self.assertEqual('\n\n', raw[-2:])
1489
bundle_txt = StringIO(raw[:-1])
1491
bundle = read_bundle(bundle_txt)
1492
self.check_valid(bundle)
1494
def test_opening_text(self):
1495
bundle_txt = self.build_test_bundle()
1497
bundle_txt = StringIO("Some random\nemail comments\n"
1498
+ bundle_txt.getvalue())
1500
bundle = read_bundle(bundle_txt)
1501
self.check_valid(bundle)
1503
def test_trailing_text(self):
1504
bundle_txt = self.build_test_bundle()
1506
bundle_txt = StringIO(bundle_txt.getvalue() +
1507
"Some trailing\nrandom\ntext\n")
1509
bundle = read_bundle(bundle_txt)
1510
self.check_valid(bundle)
1513
class MungedBundleTesterV4(TestCaseWithTransport, MungedBundleTester):
1518
class TestBundleWriterReader(TestCase):
1520
def test_roundtrip_record(self):
1521
fileobj = StringIO()
1522
writer = v4.BundleWriter(fileobj)
1524
writer.add_info_record(foo='bar')
1525
writer._add_record("Record body", {'parents': ['1', '3'],
1526
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1529
reader = v4.BundleReader(fileobj, stream_input=True)
1530
record_iter = reader.iter_records()
1531
record = record_iter.next()
1532
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1533
'info', None, None), record)
1534
record = record_iter.next()
1535
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1536
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1539
def test_roundtrip_record_memory_hungry(self):
1540
fileobj = StringIO()
1541
writer = v4.BundleWriter(fileobj)
1543
writer.add_info_record(foo='bar')
1544
writer._add_record("Record body", {'parents': ['1', '3'],
1545
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1548
reader = v4.BundleReader(fileobj, stream_input=False)
1549
record_iter = reader.iter_records()
1550
record = record_iter.next()
1551
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1552
'info', None, None), record)
1553
record = record_iter.next()
1554
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1555
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1558
def test_encode_name(self):
1559
self.assertEqual('revision/rev1',
1560
v4.BundleWriter.encode_name('revision', 'rev1'))
1561
self.assertEqual('file/rev//1/file-id-1',
1562
v4.BundleWriter.encode_name('file', 'rev/1', 'file-id-1'))
1563
self.assertEqual('info',
1564
v4.BundleWriter.encode_name('info', None, None))
1566
def test_decode_name(self):
1567
self.assertEqual(('revision', 'rev1', None),
1568
v4.BundleReader.decode_name('revision/rev1'))
1569
self.assertEqual(('file', 'rev/1', 'file-id-1'),
1570
v4.BundleReader.decode_name('file/rev//1/file-id-1'))
1571
self.assertEqual(('info', None, None),
1572
v4.BundleReader.decode_name('info'))
1574
def test_too_many_names(self):
1575
fileobj = StringIO()
1576
writer = v4.BundleWriter(fileobj)
1578
writer.add_info_record(foo='bar')
1579
writer._container.add_bytes_record('blah', ['two', 'names'])
1582
record_iter = v4.BundleReader(fileobj).iter_records()
1583
record = record_iter.next()
1584
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1585
'info', None, None), record)
1586
self.assertRaises(BadBundle, record_iter.next)
1589
class TestReadMergeableFromUrl(TestCaseWithTransport):
1591
def test_read_mergeable_skips_local(self):
1592
"""A local bundle named like the URL should not be read.
1594
out, wt = test_read_bundle.create_bundle_file(self)
1595
class FooService(object):
1596
"""A directory service that always returns source"""
1598
def look_up(self, name, url):
1600
directories.register('foo:', FooService, 'Testing directory service')
1601
self.addCleanup(lambda: directories.remove('foo:'))
1602
self.build_tree_contents([('./foo:bar', out.getvalue())])
1603
self.assertRaises(errors.NotABundle, read_mergeable_from_url,
added
removed
bzrlib/tests/test_bundle.py
