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.builtins import _merge_helper
31
from bzrlib.bzrdir import BzrDir
32
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
33
from bzrlib.bundle.bundle_data import BundleTree
34
from bzrlib.bundle.serializer import write_bundle, read_bundle
35
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
36
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
37
from bzrlib.branch import Branch
38
from bzrlib.diff import internal_diff
39
from bzrlib.errors import (BzrError, TestamentMismatch, NotABundle, BadBundle,
41
from bzrlib.merge import Merge3Merger
42
from bzrlib.repofmt import knitrepo
43
from bzrlib.osutils import has_symlinks, sha_file
44
from bzrlib.tests import (TestCaseInTempDir, TestCaseWithTransport,
45
TestCase, TestSkipped)
46
from bzrlib.transform import TreeTransform
47
from bzrlib.workingtree import WorkingTree
50
class MockTree(object):
52
from bzrlib.inventory import InventoryDirectory, ROOT_ID
54
self.paths = {ROOT_ID: ""}
55
self.ids = {"": ROOT_ID}
57
self.root = InventoryDirectory(ROOT_ID, '', None)
59
inventory = property(lambda x:x)
62
return self.paths.iterkeys()
64
def __getitem__(self, file_id):
65
if file_id == self.root.file_id:
68
return self.make_entry(file_id, self.paths[file_id])
70
def parent_id(self, file_id):
71
parent_dir = os.path.dirname(self.paths[file_id])
74
return self.ids[parent_dir]
76
def iter_entries(self):
77
for path, file_id in self.ids.iteritems():
78
yield path, self[file_id]
80
def get_file_kind(self, file_id):
81
if file_id in self.contents:
87
def make_entry(self, file_id, path):
88
from bzrlib.inventory import (InventoryEntry, InventoryFile
89
, InventoryDirectory, InventoryLink)
90
name = os.path.basename(path)
91
kind = self.get_file_kind(file_id)
92
parent_id = self.parent_id(file_id)
93
text_sha_1, text_size = self.contents_stats(file_id)
94
if kind == 'directory':
95
ie = InventoryDirectory(file_id, name, parent_id)
97
ie = InventoryFile(file_id, name, parent_id)
98
elif kind == 'symlink':
99
ie = InventoryLink(file_id, name, parent_id)
101
raise BzrError('unknown kind %r' % kind)
102
ie.text_sha1 = text_sha_1
103
ie.text_size = text_size
106
def add_dir(self, file_id, path):
107
self.paths[file_id] = path
108
self.ids[path] = file_id
110
def add_file(self, file_id, path, contents):
111
self.add_dir(file_id, path)
112
self.contents[file_id] = contents
114
def path2id(self, path):
115
return self.ids.get(path)
117
def id2path(self, file_id):
118
return self.paths.get(file_id)
120
def has_id(self, file_id):
121
return self.id2path(file_id) is not None
123
def get_file(self, file_id):
125
result.write(self.contents[file_id])
129
def contents_stats(self, file_id):
130
if file_id not in self.contents:
132
text_sha1 = sha_file(self.get_file(file_id))
133
return text_sha1, len(self.contents[file_id])
136
class BTreeTester(TestCase):
137
"""A simple unittest tester for the BundleTree class."""
139
def make_tree_1(self):
141
mtree.add_dir("a", "grandparent")
142
mtree.add_dir("b", "grandparent/parent")
143
mtree.add_file("c", "grandparent/parent/file", "Hello\n")
144
mtree.add_dir("d", "grandparent/alt_parent")
145
return BundleTree(mtree, ''), mtree
147
def test_renames(self):
148
"""Ensure that file renames have the proper effect on children"""
149
btree = self.make_tree_1()[0]
150
self.assertEqual(btree.old_path("grandparent"), "grandparent")
151
self.assertEqual(btree.old_path("grandparent/parent"),
152
"grandparent/parent")
153
self.assertEqual(btree.old_path("grandparent/parent/file"),
154
"grandparent/parent/file")
156
self.assertEqual(btree.id2path("a"), "grandparent")
157
self.assertEqual(btree.id2path("b"), "grandparent/parent")
158
self.assertEqual(btree.id2path("c"), "grandparent/parent/file")
160
self.assertEqual(btree.path2id("grandparent"), "a")
161
self.assertEqual(btree.path2id("grandparent/parent"), "b")
162
self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
164
assert btree.path2id("grandparent2") is None
165
assert btree.path2id("grandparent2/parent") is None
166
assert btree.path2id("grandparent2/parent/file") is None
168
btree.note_rename("grandparent", "grandparent2")
169
assert btree.old_path("grandparent") is None
170
assert btree.old_path("grandparent/parent") is None
171
assert btree.old_path("grandparent/parent/file") is None
173
self.assertEqual(btree.id2path("a"), "grandparent2")
174
self.assertEqual(btree.id2path("b"), "grandparent2/parent")
175
self.assertEqual(btree.id2path("c"), "grandparent2/parent/file")
177
self.assertEqual(btree.path2id("grandparent2"), "a")
178
self.assertEqual(btree.path2id("grandparent2/parent"), "b")
179
self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
181
assert btree.path2id("grandparent") is None
182
assert btree.path2id("grandparent/parent") is None
183
assert btree.path2id("grandparent/parent/file") is None
185
btree.note_rename("grandparent/parent", "grandparent2/parent2")
186
self.assertEqual(btree.id2path("a"), "grandparent2")
187
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
188
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file")
190
self.assertEqual(btree.path2id("grandparent2"), "a")
191
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
192
self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
194
assert btree.path2id("grandparent2/parent") is None
195
assert btree.path2id("grandparent2/parent/file") is None
197
btree.note_rename("grandparent/parent/file",
198
"grandparent2/parent2/file2")
199
self.assertEqual(btree.id2path("a"), "grandparent2")
200
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
201
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file2")
203
self.assertEqual(btree.path2id("grandparent2"), "a")
204
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
205
self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
207
assert btree.path2id("grandparent2/parent2/file") is None
209
def test_moves(self):
210
"""Ensure that file moves have the proper effect on children"""
211
btree = self.make_tree_1()[0]
212
btree.note_rename("grandparent/parent/file",
213
"grandparent/alt_parent/file")
214
self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
215
self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
216
assert btree.path2id("grandparent/parent/file") is None
218
def unified_diff(self, old, new):
220
internal_diff("old", old, "new", new, out)
224
def make_tree_2(self):
225
btree = self.make_tree_1()[0]
226
btree.note_rename("grandparent/parent/file",
227
"grandparent/alt_parent/file")
228
assert btree.id2path("e") is None
229
assert btree.path2id("grandparent/parent/file") is None
230
btree.note_id("e", "grandparent/parent/file")
234
"""File/inventory adds"""
235
btree = self.make_tree_2()
236
add_patch = self.unified_diff([], ["Extra cheese\n"])
237
btree.note_patch("grandparent/parent/file", add_patch)
238
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
239
btree.note_target('grandparent/parent/symlink', 'venus')
240
self.adds_test(btree)
242
def adds_test(self, btree):
243
self.assertEqual(btree.id2path("e"), "grandparent/parent/file")
244
self.assertEqual(btree.path2id("grandparent/parent/file"), "e")
245
self.assertEqual(btree.get_file("e").read(), "Extra cheese\n")
246
self.assertEqual(btree.get_symlink_target('f'), 'venus')
248
def test_adds2(self):
249
"""File/inventory adds, with patch-compatibile renames"""
250
btree = self.make_tree_2()
251
btree.contents_by_id = False
252
add_patch = self.unified_diff(["Hello\n"], ["Extra cheese\n"])
253
btree.note_patch("grandparent/parent/file", add_patch)
254
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
255
btree.note_target('grandparent/parent/symlink', 'venus')
256
self.adds_test(btree)
258
def make_tree_3(self):
259
btree, mtree = self.make_tree_1()
260
mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
261
btree.note_rename("grandparent/parent/file",
262
"grandparent/alt_parent/file")
263
btree.note_rename("grandparent/parent/topping",
264
"grandparent/alt_parent/stopping")
267
def get_file_test(self, btree):
268
self.assertEqual(btree.get_file("e").read(), "Lemon\n")
269
self.assertEqual(btree.get_file("c").read(), "Hello\n")
271
def test_get_file(self):
272
"""Get file contents"""
273
btree = self.make_tree_3()
274
mod_patch = self.unified_diff(["Anchovies\n"], ["Lemon\n"])
275
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
276
self.get_file_test(btree)
278
def test_get_file2(self):
279
"""Get file contents, with patch-compatibile renames"""
280
btree = self.make_tree_3()
281
btree.contents_by_id = False
282
mod_patch = self.unified_diff([], ["Lemon\n"])
283
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
284
mod_patch = self.unified_diff([], ["Hello\n"])
285
btree.note_patch("grandparent/alt_parent/file", mod_patch)
286
self.get_file_test(btree)
288
def test_delete(self):
290
btree = self.make_tree_1()[0]
291
self.assertEqual(btree.get_file("c").read(), "Hello\n")
292
btree.note_deletion("grandparent/parent/file")
293
assert btree.id2path("c") is None
294
assert btree.path2id("grandparent/parent/file") is None
296
def sorted_ids(self, tree):
301
def test_iteration(self):
302
"""Ensure that iteration through ids works properly"""
303
btree = self.make_tree_1()[0]
304
self.assertEqual(self.sorted_ids(btree),
305
[inventory.ROOT_ID, 'a', 'b', 'c', 'd'])
306
btree.note_deletion("grandparent/parent/file")
307
btree.note_id("e", "grandparent/alt_parent/fool", kind="directory")
308
btree.note_last_changed("grandparent/alt_parent/fool",
310
self.assertEqual(self.sorted_ids(btree),
311
[inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
314
class BundleTester1(TestCaseWithTransport):
316
def test_mismatched_bundle(self):
317
format = bzrdir.BzrDirMetaFormat1()
318
format.repository_format = knitrepo.RepositoryFormatKnit3()
319
serializer = BundleSerializerV08('0.8')
320
b = self.make_branch('.', format=format)
321
self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
322
b.repository, [], {}, StringIO())
324
def test_matched_bundle(self):
325
"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
326
format = bzrdir.BzrDirMetaFormat1()
327
format.repository_format = knitrepo.RepositoryFormatKnit3()
328
serializer = BundleSerializerV09('0.9')
329
b = self.make_branch('.', format=format)
330
serializer.write(b.repository, [], {}, StringIO())
332
def test_mismatched_model(self):
333
"""Try copying a bundle from knit2 to knit1"""
334
format = bzrdir.BzrDirMetaFormat1()
335
format.repository_format = knitrepo.RepositoryFormatKnit3()
336
source = self.make_branch_and_tree('source', format=format)
337
source.commit('one', rev_id='one-id')
338
source.commit('two', rev_id='two-id')
340
write_bundle(source.branch.repository, 'two-id', 'null:', text,
344
format = bzrdir.BzrDirMetaFormat1()
345
format.repository_format = knitrepo.RepositoryFormatKnit1()
346
target = self.make_branch('target', format=format)
347
self.assertRaises(errors.IncompatibleRevision, install_bundle,
348
target.repository, read_bundle(text))
351
class V08BundleTester(TestCaseWithTransport):
355
def bzrdir_format(self):
356
format = bzrdir.BzrDirMetaFormat1()
357
format.repository_format = knitrepo.RepositoryFormatKnit1()
360
def make_branch_and_tree(self, path, format=None):
362
format = self.bzrdir_format()
363
return TestCaseWithTransport.make_branch_and_tree(self, path, format)
365
def make_branch(self, path, format=None):
367
format = self.bzrdir_format()
368
return TestCaseWithTransport.make_branch(self, path, format)
370
def create_bundle_text(self, base_rev_id, rev_id):
371
bundle_txt = StringIO()
372
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
373
bundle_txt, format=self.format)
375
self.assertEqual(bundle_txt.readline(),
376
'# Bazaar revision bundle v%s\n' % self.format)
377
self.assertEqual(bundle_txt.readline(), '#\n')
379
rev = self.b1.repository.get_revision(rev_id)
380
self.assertEqual(bundle_txt.readline().decode('utf-8'),
383
open(',,bundle', 'wb').write(bundle_txt.getvalue())
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(NotABundle, read_bundle, StringIO('#!/bin/sh\n'))
436
def test_malformed(self):
437
self.assertRaises(BadBundle, read_bundle,
438
StringIO('# Bazaar revision bundle v'))
440
def test_crlf_bundle(self):
442
read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
444
# It is currently permitted for bundles with crlf line endings to
445
# make read_bundle raise a BadBundle, but this should be fixed.
446
# Anything else, especially NotABundle, is an error.
449
def get_checkout(self, rev_id, checkout_dir=None):
450
"""Get a new tree, with the specified revision in it.
453
if checkout_dir is None:
454
checkout_dir = tempfile.mkdtemp(prefix='test-branch-', dir='.')
456
if not os.path.exists(checkout_dir):
457
os.mkdir(checkout_dir)
458
tree = self.make_branch_and_tree(checkout_dir)
460
ancestors = write_bundle(self.b1.repository, rev_id, 'null:', s,
463
assert isinstance(s.getvalue(), str), (
464
"Bundle isn't a bytestring:\n %s..." % repr(s.getvalue())[:40])
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)
470
# Check that there aren't any inventory level changes
471
delta = new.changes_from(old)
472
self.assertFalse(delta.has_changed(),
473
'Revision %s not copied correctly.'
476
# Now check that the file contents are all correct
477
for inventory_id in old:
479
old_file = old.get_file(inventory_id)
484
self.assertEqual(old_file.read(),
485
new.get_file(inventory_id).read())
486
if not _mod_revision.is_null(rev_id):
487
rh = self.b1.revision_history()
488
tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
490
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
491
self.assertFalse(delta.has_changed(),
492
'Working tree has modifications: %s' % delta)
495
def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
496
"""Get the base revision, apply the changes, and make
497
sure everything matches the builtin branch.
499
to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
500
original_parents = to_tree.get_parent_ids()
501
repository = to_tree.branch.repository
502
original_parents = to_tree.get_parent_ids()
503
self.assertIs(repository.has_revision(base_rev_id), True)
504
for rev in info.real_revisions:
505
self.assert_(not repository.has_revision(rev.revision_id),
506
'Revision {%s} present before applying bundle'
508
merge_bundle(info, to_tree, True, Merge3Merger, False, False)
510
for rev in info.real_revisions:
511
self.assert_(repository.has_revision(rev.revision_id),
512
'Missing revision {%s} after applying bundle'
515
self.assert_(to_tree.branch.repository.has_revision(info.target))
516
# Do we also want to verify that all the texts have been added?
518
self.assertEqual(original_parents + [info.target],
519
to_tree.get_parent_ids())
521
rev = info.real_revisions[-1]
522
base_tree = self.b1.repository.revision_tree(rev.revision_id)
523
to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
525
# TODO: make sure the target tree is identical to base tree
526
# we might also check the working tree.
528
base_files = list(base_tree.list_files())
529
to_files = list(to_tree.list_files())
530
self.assertEqual(len(base_files), len(to_files))
531
for base_file, to_file in zip(base_files, to_files):
532
self.assertEqual(base_file, to_file)
534
for path, status, kind, fileid, entry in base_files:
535
# Check that the meta information is the same
536
self.assertEqual(base_tree.get_file_size(fileid),
537
to_tree.get_file_size(fileid))
538
self.assertEqual(base_tree.get_file_sha1(fileid),
539
to_tree.get_file_sha1(fileid))
540
# Check that the contents are the same
541
# This is pretty expensive
542
# self.assertEqual(base_tree.get_file(fileid).read(),
543
# to_tree.get_file(fileid).read())
545
def test_bundle(self):
546
self.tree1 = self.make_branch_and_tree('b1')
547
self.b1 = self.tree1.branch
549
open('b1/one', 'wb').write('one\n')
550
self.tree1.add('one')
551
self.tree1.commit('add one', rev_id='a@cset-0-1')
553
bundle = self.get_valid_bundle('null:', 'a@cset-0-1')
554
# FIXME: The current write_bundle api no longer supports
555
# setting a custom summary message
556
# We should re-introduce the ability, and update
557
# the tests to make sure it works.
558
# bundle = self.get_valid_bundle(None, 'a@cset-0-1',
559
# message='With a specialized message')
561
# Make sure we can handle files with spaces, tabs, other
566
, 'b1/dir/filein subdir.c'
567
, 'b1/dir/WithCaps.txt'
568
, 'b1/dir/ pre space'
571
, 'b1/sub/sub/nonempty.txt'
573
open('b1/sub/sub/emptyfile.txt', 'wb').close()
574
open('b1/dir/nolastnewline.txt', 'wb').write('bloop')
575
tt = TreeTransform(self.tree1)
576
tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
581
, 'dir/filein subdir.c'
584
, 'dir/nolastnewline.txt'
587
, 'sub/sub/nonempty.txt'
588
, 'sub/sub/emptyfile.txt'
590
self.tree1.commit('add whitespace', rev_id='a@cset-0-2')
592
bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
594
# Check a rollup bundle
595
bundle = self.get_valid_bundle('null:', 'a@cset-0-2')
599
['sub/sub/nonempty.txt'
600
, 'sub/sub/emptyfile.txt'
603
tt = TreeTransform(self.tree1)
604
trans_id = tt.trans_id_tree_file_id('exe-1')
605
tt.set_executability(False, trans_id)
607
self.tree1.commit('removed', rev_id='a@cset-0-3')
609
bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
610
self.assertRaises(TestamentMismatch, self.get_invalid_bundle,
611
'a@cset-0-2', 'a@cset-0-3')
612
# Check a rollup bundle
613
bundle = self.get_valid_bundle('null:', 'a@cset-0-3')
615
# Now move the directory
616
self.tree1.rename_one('dir', 'sub/dir')
617
self.tree1.commit('rename dir', rev_id='a@cset-0-4')
619
bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
620
# Check a rollup bundle
621
bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
624
open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
625
open('b1/sub/dir/ pre space', 'ab').write('\r\nAdding some\r\nDOS format lines\r\n')
626
open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
627
self.tree1.rename_one('sub/dir/ pre space',
629
self.tree1.commit('Modified files', rev_id='a@cset-0-5')
630
bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
632
self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
633
self.tree1.rename_one('with space.txt', 'WithCaps.txt')
634
self.tree1.rename_one('temp', 'with space.txt')
635
self.tree1.commit(u'swap filenames', rev_id='a@cset-0-6',
637
bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
638
other = self.get_checkout('a@cset-0-5')
639
tree1_inv = self.tree1.branch.repository.get_inventory_xml(
641
tree2_inv = other.branch.repository.get_inventory_xml('a@cset-0-5')
642
self.assertEqualDiff(tree1_inv, tree2_inv)
643
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
644
other.commit('rename file', rev_id='a@cset-0-6b')
645
_merge_helper([other.basedir, -1], [None, None],
646
this_dir=self.tree1.basedir)
647
self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
649
bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
651
def test_symlink_bundle(self):
652
if not has_symlinks():
653
raise TestSkipped("No symlink support")
654
self.tree1 = self.make_branch_and_tree('b1')
655
self.b1 = self.tree1.branch
656
tt = TreeTransform(self.tree1)
657
tt.new_symlink('link', tt.root, 'bar/foo', 'link-1')
659
self.tree1.commit('add symlink', rev_id='l@cset-0-1')
660
self.get_valid_bundle('null:', 'l@cset-0-1')
661
tt = TreeTransform(self.tree1)
662
trans_id = tt.trans_id_tree_file_id('link-1')
663
tt.adjust_path('link2', tt.root, trans_id)
664
tt.delete_contents(trans_id)
665
tt.create_symlink('mars', trans_id)
667
self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
668
self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
669
tt = TreeTransform(self.tree1)
670
trans_id = tt.trans_id_tree_file_id('link-1')
671
tt.delete_contents(trans_id)
672
tt.create_symlink('jupiter', trans_id)
674
self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
675
self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
676
tt = TreeTransform(self.tree1)
677
trans_id = tt.trans_id_tree_file_id('link-1')
678
tt.delete_contents(trans_id)
680
self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
681
self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
683
def test_binary_bundle(self):
684
self.tree1 = self.make_branch_and_tree('b1')
685
self.b1 = self.tree1.branch
686
tt = TreeTransform(self.tree1)
689
tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
690
tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff', 'binary-2')
692
self.tree1.commit('add binary', rev_id='b@cset-0-1')
693
self.get_valid_bundle('null:', 'b@cset-0-1')
696
tt = TreeTransform(self.tree1)
697
trans_id = tt.trans_id_tree_file_id('binary-1')
698
tt.delete_contents(trans_id)
700
self.tree1.commit('delete binary', rev_id='b@cset-0-2')
701
self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
704
tt = TreeTransform(self.tree1)
705
trans_id = tt.trans_id_tree_file_id('binary-2')
706
tt.adjust_path('file3', tt.root, trans_id)
707
tt.delete_contents(trans_id)
708
tt.create_file('file\rcontents\x00\n\x00', trans_id)
710
self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
711
self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
714
tt = TreeTransform(self.tree1)
715
trans_id = tt.trans_id_tree_file_id('binary-2')
716
tt.delete_contents(trans_id)
717
tt.create_file('\x00file\rcontents', trans_id)
719
self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
720
self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
723
self.get_valid_bundle('null:', 'b@cset-0-4')
725
def test_last_modified(self):
726
self.tree1 = self.make_branch_and_tree('b1')
727
self.b1 = self.tree1.branch
728
tt = TreeTransform(self.tree1)
729
tt.new_file('file', tt.root, 'file', 'file')
731
self.tree1.commit('create file', rev_id='a@lmod-0-1')
733
tt = TreeTransform(self.tree1)
734
trans_id = tt.trans_id_tree_file_id('file')
735
tt.delete_contents(trans_id)
736
tt.create_file('file2', trans_id)
738
self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
740
other = self.get_checkout('a@lmod-0-1')
741
tt = TreeTransform(other)
742
trans_id = tt.trans_id_tree_file_id('file')
743
tt.delete_contents(trans_id)
744
tt.create_file('file2', trans_id)
746
other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
747
_merge_helper([other.basedir, -1], [None, None],
748
this_dir=self.tree1.basedir)
749
self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
751
self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
752
bundle = self.get_valid_bundle('a@lmod-0-2a', 'a@lmod-0-4')
754
def test_hide_history(self):
755
self.tree1 = self.make_branch_and_tree('b1')
756
self.b1 = self.tree1.branch
758
open('b1/one', 'wb').write('one\n')
759
self.tree1.add('one')
760
self.tree1.commit('add file', rev_id='a@cset-0-1')
761
open('b1/one', 'wb').write('two\n')
762
self.tree1.commit('modify', rev_id='a@cset-0-2')
763
open('b1/one', 'wb').write('three\n')
764
self.tree1.commit('modify', rev_id='a@cset-0-3')
765
bundle_file = StringIO()
766
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
767
'a@cset-0-1', bundle_file, format=self.format)
768
self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
769
self.assertContainsRe(bundle_file.getvalue(), 'one')
770
self.assertContainsRe(bundle_file.getvalue(), 'three')
772
def test_unicode_bundle(self):
773
# Handle international characters
776
f = open(u'b1/with Dod\xe9', 'wb')
777
except UnicodeEncodeError:
778
raise TestSkipped("Filesystem doesn't support unicode")
780
self.tree1 = self.make_branch_and_tree('b1')
781
self.b1 = self.tree1.branch
784
u'With international man of mystery\n'
785
u'William Dod\xe9\n').encode('utf-8'))
788
self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
789
self.tree1.commit(u'i18n commit from William Dod\xe9',
790
rev_id='i18n-1', committer=u'William Dod\xe9')
792
if sys.platform == 'darwin':
793
# On Mac the '\xe9' gets changed to 'e\u0301'
794
self.assertEqual([u'.bzr', u'with Dode\u0301'],
795
sorted(os.listdir(u'b1')))
796
delta = self.tree1.changes_from(self.tree1.basis_tree())
797
self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
799
self.knownFailure("Mac OSX doesn't preserve unicode"
800
" combining characters.")
803
bundle = self.get_valid_bundle('null:', 'i18n-1')
806
f = open(u'b1/with Dod\xe9', 'wb')
807
f.write(u'Modified \xb5\n'.encode('utf8'))
809
self.tree1.commit(u'modified', rev_id='i18n-2')
811
bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
814
self.tree1.rename_one(u'with Dod\xe9', u'B\xe5gfors')
815
self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
816
committer=u'Erik B\xe5gfors')
818
bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
821
self.tree1.remove([u'B\xe5gfors'])
822
self.tree1.commit(u'removed', rev_id='i18n-4')
824
bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
827
bundle = self.get_valid_bundle('null:', 'i18n-4')
830
def test_whitespace_bundle(self):
831
if sys.platform in ('win32', 'cygwin'):
832
raise TestSkipped('Windows doesn\'t support filenames'
833
' with tabs or trailing spaces')
834
self.tree1 = self.make_branch_and_tree('b1')
835
self.b1 = self.tree1.branch
837
self.build_tree(['b1/trailing space '])
838
self.tree1.add(['trailing space '])
839
# TODO: jam 20060701 Check for handling files with '\t' characters
840
# once we actually support them
843
self.tree1.commit('funky whitespace', rev_id='white-1')
845
bundle = self.get_valid_bundle('null:', 'white-1')
848
open('b1/trailing space ', 'ab').write('add some text\n')
849
self.tree1.commit('add text', rev_id='white-2')
851
bundle = self.get_valid_bundle('white-1', 'white-2')
854
self.tree1.rename_one('trailing space ', ' start and end space ')
855
self.tree1.commit('rename', rev_id='white-3')
857
bundle = self.get_valid_bundle('white-2', 'white-3')
860
self.tree1.remove([' start and end space '])
861
self.tree1.commit('removed', rev_id='white-4')
863
bundle = self.get_valid_bundle('white-3', 'white-4')
865
# Now test a complet roll-up
866
bundle = self.get_valid_bundle('null:', 'white-4')
868
def test_alt_timezone_bundle(self):
869
self.tree1 = self.make_branch_and_memory_tree('b1')
870
self.b1 = self.tree1.branch
871
builder = treebuilder.TreeBuilder()
873
self.tree1.lock_write()
874
builder.start_tree(self.tree1)
875
builder.build(['newfile'])
876
builder.finish_tree()
878
# Asia/Colombo offset = 5 hours 30 minutes
879
self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
880
timezone=19800, timestamp=1152544886.0)
882
bundle = self.get_valid_bundle('null:', 'tz-1')
884
rev = bundle.revisions[0]
885
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
886
self.assertEqual(19800, rev.timezone)
887
self.assertEqual(1152544886.0, rev.timestamp)
890
def test_bundle_root_id(self):
891
self.tree1 = self.make_branch_and_tree('b1')
892
self.b1 = self.tree1.branch
893
self.tree1.commit('message', rev_id='revid1')
894
bundle = self.get_valid_bundle('null:', 'revid1')
895
tree = bundle.revision_tree(self.b1.repository, 'revid1')
896
self.assertEqual('revid1', tree.inventory.root.revision)
898
def test_install_revisions(self):
899
self.tree1 = self.make_branch_and_tree('b1')
900
self.b1 = self.tree1.branch
901
self.tree1.commit('message', rev_id='rev2a')
902
bundle = self.get_valid_bundle('null:', 'rev2a')
903
branch2 = self.make_branch('b2')
904
self.assertFalse(branch2.repository.has_revision('rev2a'))
905
target_revision = bundle.install_revisions(branch2.repository)
906
self.assertTrue(branch2.repository.has_revision('rev2a'))
907
self.assertEqual('rev2a', target_revision)
909
def test_bundle_empty_property(self):
910
"""Test serializing revision properties with an empty value."""
911
tree = self.make_branch_and_memory_tree('tree')
913
self.addCleanup(tree.unlock)
914
tree.add([''], ['TREE_ROOT'])
915
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
916
self.b1 = tree.branch
917
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
918
self.assertContainsRe(bundle_sio.getvalue(),
920
'# branch-nick: tree\n'
924
bundle = read_bundle(bundle_sio)
925
revision_info = bundle.revisions[0]
926
self.assertEqual('rev1', revision_info.revision_id)
927
rev = revision_info.as_revision()
928
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
931
def test_bundle_empty_property_alt(self):
932
"""Test serializing revision properties with an empty value.
934
Older readers had a bug when reading an empty property.
935
They assumed that all keys ended in ': \n'. However they would write an
936
empty value as ':\n'. This tests make sure that all newer bzr versions
937
can handle th second form.
939
tree = self.make_branch_and_memory_tree('tree')
941
self.addCleanup(tree.unlock)
942
tree.add([''], ['TREE_ROOT'])
943
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
944
self.b1 = tree.branch
945
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
946
txt = bundle_sio.getvalue()
947
loc = txt.find('# empty: ') + len('# empty:')
948
# Create a new bundle, which strips the trailing space after empty
949
bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
951
self.assertContainsRe(bundle_sio.getvalue(),
953
'# branch-nick: tree\n'
957
bundle = read_bundle(bundle_sio)
958
revision_info = bundle.revisions[0]
959
self.assertEqual('rev1', revision_info.revision_id)
960
rev = revision_info.as_revision()
961
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
964
def test_bundle_sorted_properties(self):
965
"""For stability the writer should write properties in sorted order."""
966
tree = self.make_branch_and_memory_tree('tree')
968
self.addCleanup(tree.unlock)
970
tree.add([''], ['TREE_ROOT'])
971
tree.commit('One', rev_id='rev1',
972
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
973
self.b1 = tree.branch
974
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
975
self.assertContainsRe(bundle_sio.getvalue(),
979
'# branch-nick: tree\n'
983
bundle = read_bundle(bundle_sio)
984
revision_info = bundle.revisions[0]
985
self.assertEqual('rev1', revision_info.revision_id)
986
rev = revision_info.as_revision()
987
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
988
'd':'1'}, rev.properties)
990
def test_bundle_unicode_properties(self):
991
"""We should be able to round trip a non-ascii property."""
992
tree = self.make_branch_and_memory_tree('tree')
994
self.addCleanup(tree.unlock)
996
tree.add([''], ['TREE_ROOT'])
997
# Revisions themselves do not require anything about revision property
998
# keys, other than that they are a basestring, and do not contain
1000
# However, Testaments assert than they are str(), and thus should not
1002
tree.commit('One', rev_id='rev1',
1003
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1004
self.b1 = tree.branch
1005
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1006
self.assertContainsRe(bundle_sio.getvalue(),
1008
'# alpha: \xce\xb1\n'
1009
'# branch-nick: tree\n'
1010
'# omega: \xce\xa9\n'
1012
bundle = read_bundle(bundle_sio)
1013
revision_info = bundle.revisions[0]
1014
self.assertEqual('rev1', revision_info.revision_id)
1015
rev = revision_info.as_revision()
1016
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1017
'alpha':u'\u03b1'}, rev.properties)
1020
class V09BundleKnit2Tester(V08BundleTester):
1024
def bzrdir_format(self):
1025
format = bzrdir.BzrDirMetaFormat1()
1026
format.repository_format = knitrepo.RepositoryFormatKnit3()
1030
class V09BundleKnit1Tester(V08BundleTester):
1034
def bzrdir_format(self):
1035
format = bzrdir.BzrDirMetaFormat1()
1036
format.repository_format = knitrepo.RepositoryFormatKnit1()
1040
class MungedBundleTester(TestCaseWithTransport):
1042
def build_test_bundle(self):
1043
wt = self.make_branch_and_tree('b1')
1045
self.build_tree(['b1/one'])
1047
wt.commit('add one', rev_id='a@cset-0-1')
1048
self.build_tree(['b1/two'])
1050
wt.commit('add two', rev_id='a@cset-0-2',
1051
revprops={'branch-nick':'test'})
1053
bundle_txt = StringIO()
1054
rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
1055
'a@cset-0-1', bundle_txt)
1056
self.assertEqual(['a@cset-0-2'], rev_ids)
1057
bundle_txt.seek(0, 0)
1060
def check_valid(self, bundle):
1061
"""Check that after whatever munging, the final object is valid."""
1062
self.assertEqual(['a@cset-0-2'],
1063
[r.revision_id for r in bundle.real_revisions])
1065
def test_extra_whitespace(self):
1066
bundle_txt = self.build_test_bundle()
1068
# Seek to the end of the file
1069
# Adding one extra newline used to give us
1070
# TypeError: float() argument must be a string or a number
1071
bundle_txt.seek(0, 2)
1072
bundle_txt.write('\n')
1075
bundle = read_bundle(bundle_txt)
1076
self.check_valid(bundle)
1078
def test_extra_whitespace_2(self):
1079
bundle_txt = self.build_test_bundle()
1081
# Seek to the end of the file
1082
# Adding two extra newlines used to give us
1083
# MalformedPatches: The first line of all patches should be ...
1084
bundle_txt.seek(0, 2)
1085
bundle_txt.write('\n\n')
1088
bundle = read_bundle(bundle_txt)
1089
self.check_valid(bundle)
1091
def test_missing_trailing_whitespace(self):
1092
bundle_txt = self.build_test_bundle()
1094
# Remove a trailing newline, it shouldn't kill the parser
1095
raw = bundle_txt.getvalue()
1096
# The contents of the bundle don't have to be this, but this
1097
# test is concerned with the exact case where the serializer
1098
# creates a blank line at the end, and fails if that
1100
self.assertEqual('\n\n', raw[-2:])
1101
bundle_txt = StringIO(raw[:-1])
1103
bundle = read_bundle(bundle_txt)
1104
self.check_valid(bundle)
1106
def test_opening_text(self):
1107
bundle_txt = self.build_test_bundle()
1109
bundle_txt = StringIO("Some random\nemail comments\n"
1110
+ bundle_txt.getvalue())
1112
bundle = read_bundle(bundle_txt)
1113
self.check_valid(bundle)
1115
def test_trailing_text(self):
1116
bundle_txt = self.build_test_bundle()
1118
bundle_txt = StringIO(bundle_txt.getvalue() +
1119
"Some trailing\nrandom\ntext\n")
1121
bundle = read_bundle(bundle_txt)
1122
self.check_valid(bundle)
added
removed
bzrlib/tests/test_bundle.py
