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.apply_bundle import install_bundle, merge_bundle
32
from bzrlib.bundle.bundle_data import BundleTree
33
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
34
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
35
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
36
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
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 sha_file
44
from bzrlib.tests import (
48
TestCaseWithTransport,
52
from bzrlib.transform import TreeTransform
55
class MockTree(object):
57
from bzrlib.inventory import InventoryDirectory, ROOT_ID
59
self.paths = {ROOT_ID: ""}
60
self.ids = {"": ROOT_ID}
62
self.root = InventoryDirectory(ROOT_ID, '', None)
64
inventory = property(lambda x:x)
67
return self.paths.iterkeys()
69
def __getitem__(self, file_id):
70
if file_id == self.root.file_id:
73
return self.make_entry(file_id, self.paths[file_id])
75
def parent_id(self, file_id):
76
parent_dir = os.path.dirname(self.paths[file_id])
79
return self.ids[parent_dir]
81
def iter_entries(self):
82
for path, file_id in self.ids.iteritems():
83
yield path, self[file_id]
85
def get_file_kind(self, file_id):
86
if file_id in self.contents:
92
def make_entry(self, file_id, path):
93
from bzrlib.inventory import (InventoryEntry, InventoryFile
94
, InventoryDirectory, InventoryLink)
95
name = os.path.basename(path)
96
kind = self.get_file_kind(file_id)
97
parent_id = self.parent_id(file_id)
98
text_sha_1, text_size = self.contents_stats(file_id)
99
if kind == 'directory':
100
ie = InventoryDirectory(file_id, name, parent_id)
102
ie = InventoryFile(file_id, name, parent_id)
103
elif kind == 'symlink':
104
ie = InventoryLink(file_id, name, parent_id)
106
raise BzrError('unknown kind %r' % kind)
107
ie.text_sha1 = text_sha_1
108
ie.text_size = text_size
111
def add_dir(self, file_id, path):
112
self.paths[file_id] = path
113
self.ids[path] = file_id
115
def add_file(self, file_id, path, contents):
116
self.add_dir(file_id, path)
117
self.contents[file_id] = contents
119
def path2id(self, path):
120
return self.ids.get(path)
122
def id2path(self, file_id):
123
return self.paths.get(file_id)
125
def has_id(self, file_id):
126
return self.id2path(file_id) is not None
128
def get_file(self, file_id):
130
result.write(self.contents[file_id])
134
def contents_stats(self, file_id):
135
if file_id not in self.contents:
137
text_sha1 = sha_file(self.get_file(file_id))
138
return text_sha1, len(self.contents[file_id])
141
class BTreeTester(TestCase):
142
"""A simple unittest tester for the BundleTree class."""
144
def make_tree_1(self):
146
mtree.add_dir("a", "grandparent")
147
mtree.add_dir("b", "grandparent/parent")
148
mtree.add_file("c", "grandparent/parent/file", "Hello\n")
149
mtree.add_dir("d", "grandparent/alt_parent")
150
return BundleTree(mtree, ''), mtree
152
def test_renames(self):
153
"""Ensure that file renames have the proper effect on children"""
154
btree = self.make_tree_1()[0]
155
self.assertEqual(btree.old_path("grandparent"), "grandparent")
156
self.assertEqual(btree.old_path("grandparent/parent"),
157
"grandparent/parent")
158
self.assertEqual(btree.old_path("grandparent/parent/file"),
159
"grandparent/parent/file")
161
self.assertEqual(btree.id2path("a"), "grandparent")
162
self.assertEqual(btree.id2path("b"), "grandparent/parent")
163
self.assertEqual(btree.id2path("c"), "grandparent/parent/file")
165
self.assertEqual(btree.path2id("grandparent"), "a")
166
self.assertEqual(btree.path2id("grandparent/parent"), "b")
167
self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
169
assert btree.path2id("grandparent2") is None
170
assert btree.path2id("grandparent2/parent") is None
171
assert btree.path2id("grandparent2/parent/file") is None
173
btree.note_rename("grandparent", "grandparent2")
174
assert btree.old_path("grandparent") is None
175
assert btree.old_path("grandparent/parent") is None
176
assert btree.old_path("grandparent/parent/file") is None
178
self.assertEqual(btree.id2path("a"), "grandparent2")
179
self.assertEqual(btree.id2path("b"), "grandparent2/parent")
180
self.assertEqual(btree.id2path("c"), "grandparent2/parent/file")
182
self.assertEqual(btree.path2id("grandparent2"), "a")
183
self.assertEqual(btree.path2id("grandparent2/parent"), "b")
184
self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
186
assert btree.path2id("grandparent") is None
187
assert btree.path2id("grandparent/parent") is None
188
assert btree.path2id("grandparent/parent/file") is None
190
btree.note_rename("grandparent/parent", "grandparent2/parent2")
191
self.assertEqual(btree.id2path("a"), "grandparent2")
192
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
193
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file")
195
self.assertEqual(btree.path2id("grandparent2"), "a")
196
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
197
self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
199
assert btree.path2id("grandparent2/parent") is None
200
assert btree.path2id("grandparent2/parent/file") is None
202
btree.note_rename("grandparent/parent/file",
203
"grandparent2/parent2/file2")
204
self.assertEqual(btree.id2path("a"), "grandparent2")
205
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
206
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file2")
208
self.assertEqual(btree.path2id("grandparent2"), "a")
209
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
210
self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
212
assert btree.path2id("grandparent2/parent2/file") is None
214
def test_moves(self):
215
"""Ensure that file moves have the proper effect on children"""
216
btree = self.make_tree_1()[0]
217
btree.note_rename("grandparent/parent/file",
218
"grandparent/alt_parent/file")
219
self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
220
self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
221
assert btree.path2id("grandparent/parent/file") is None
223
def unified_diff(self, old, new):
225
internal_diff("old", old, "new", new, out)
229
def make_tree_2(self):
230
btree = self.make_tree_1()[0]
231
btree.note_rename("grandparent/parent/file",
232
"grandparent/alt_parent/file")
233
assert btree.id2path("e") is None
234
assert btree.path2id("grandparent/parent/file") is None
235
btree.note_id("e", "grandparent/parent/file")
239
"""File/inventory adds"""
240
btree = self.make_tree_2()
241
add_patch = self.unified_diff([], ["Extra cheese\n"])
242
btree.note_patch("grandparent/parent/file", add_patch)
243
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
244
btree.note_target('grandparent/parent/symlink', 'venus')
245
self.adds_test(btree)
247
def adds_test(self, btree):
248
self.assertEqual(btree.id2path("e"), "grandparent/parent/file")
249
self.assertEqual(btree.path2id("grandparent/parent/file"), "e")
250
self.assertEqual(btree.get_file("e").read(), "Extra cheese\n")
251
self.assertEqual(btree.get_symlink_target('f'), 'venus')
253
def test_adds2(self):
254
"""File/inventory adds, with patch-compatibile renames"""
255
btree = self.make_tree_2()
256
btree.contents_by_id = False
257
add_patch = self.unified_diff(["Hello\n"], ["Extra cheese\n"])
258
btree.note_patch("grandparent/parent/file", add_patch)
259
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
260
btree.note_target('grandparent/parent/symlink', 'venus')
261
self.adds_test(btree)
263
def make_tree_3(self):
264
btree, mtree = self.make_tree_1()
265
mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
266
btree.note_rename("grandparent/parent/file",
267
"grandparent/alt_parent/file")
268
btree.note_rename("grandparent/parent/topping",
269
"grandparent/alt_parent/stopping")
272
def get_file_test(self, btree):
273
self.assertEqual(btree.get_file("e").read(), "Lemon\n")
274
self.assertEqual(btree.get_file("c").read(), "Hello\n")
276
def test_get_file(self):
277
"""Get file contents"""
278
btree = self.make_tree_3()
279
mod_patch = self.unified_diff(["Anchovies\n"], ["Lemon\n"])
280
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
281
self.get_file_test(btree)
283
def test_get_file2(self):
284
"""Get file contents, with patch-compatibile renames"""
285
btree = self.make_tree_3()
286
btree.contents_by_id = False
287
mod_patch = self.unified_diff([], ["Lemon\n"])
288
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
289
mod_patch = self.unified_diff([], ["Hello\n"])
290
btree.note_patch("grandparent/alt_parent/file", mod_patch)
291
self.get_file_test(btree)
293
def test_delete(self):
295
btree = self.make_tree_1()[0]
296
self.assertEqual(btree.get_file("c").read(), "Hello\n")
297
btree.note_deletion("grandparent/parent/file")
298
assert btree.id2path("c") is None
299
assert btree.path2id("grandparent/parent/file") is None
301
def sorted_ids(self, tree):
306
def test_iteration(self):
307
"""Ensure that iteration through ids works properly"""
308
btree = self.make_tree_1()[0]
309
self.assertEqual(self.sorted_ids(btree),
310
[inventory.ROOT_ID, 'a', 'b', 'c', 'd'])
311
btree.note_deletion("grandparent/parent/file")
312
btree.note_id("e", "grandparent/alt_parent/fool", kind="directory")
313
btree.note_last_changed("grandparent/alt_parent/fool",
315
self.assertEqual(self.sorted_ids(btree),
316
[inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
319
class BundleTester1(TestCaseWithTransport):
321
def test_mismatched_bundle(self):
322
format = bzrdir.BzrDirMetaFormat1()
323
format.repository_format = knitrepo.RepositoryFormatKnit3()
324
serializer = BundleSerializerV08('0.8')
325
b = self.make_branch('.', format=format)
326
self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
327
b.repository, [], {}, StringIO())
329
def test_matched_bundle(self):
330
"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
331
format = bzrdir.BzrDirMetaFormat1()
332
format.repository_format = knitrepo.RepositoryFormatKnit3()
333
serializer = BundleSerializerV09('0.9')
334
b = self.make_branch('.', format=format)
335
serializer.write(b.repository, [], {}, StringIO())
337
def test_mismatched_model(self):
338
"""Try copying a bundle from knit2 to knit1"""
339
format = bzrdir.BzrDirMetaFormat1()
340
format.repository_format = knitrepo.RepositoryFormatKnit3()
341
source = self.make_branch_and_tree('source', format=format)
342
source.commit('one', rev_id='one-id')
343
source.commit('two', rev_id='two-id')
345
write_bundle(source.branch.repository, 'two-id', 'null:', text,
349
format = bzrdir.BzrDirMetaFormat1()
350
format.repository_format = knitrepo.RepositoryFormatKnit1()
351
target = self.make_branch('target', format=format)
352
self.assertRaises(errors.IncompatibleRevision, install_bundle,
353
target.repository, read_bundle(text))
356
class BundleTester(object):
358
def bzrdir_format(self):
359
format = bzrdir.BzrDirMetaFormat1()
360
format.repository_format = knitrepo.RepositoryFormatKnit1()
363
def make_branch_and_tree(self, path, format=None):
365
format = self.bzrdir_format()
366
return TestCaseWithTransport.make_branch_and_tree(self, path, format)
368
def make_branch(self, path, format=None):
370
format = self.bzrdir_format()
371
return TestCaseWithTransport.make_branch(self, path, format)
373
def create_bundle_text(self, base_rev_id, rev_id):
374
bundle_txt = StringIO()
375
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
376
bundle_txt, format=self.format)
378
self.assertEqual(bundle_txt.readline(),
379
'# Bazaar revision bundle v%s\n' % self.format)
380
self.assertEqual(bundle_txt.readline(), '#\n')
382
rev = self.b1.repository.get_revision(rev_id)
383
self.assertEqual(bundle_txt.readline().decode('utf-8'),
386
return bundle_txt, rev_ids
388
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
389
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
390
Make sure that the text generated is valid, and that it
391
can be applied against the base, and generate the same information.
393
:return: The in-memory bundle
395
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
397
# This should also validate the generated bundle
398
bundle = read_bundle(bundle_txt)
399
repository = self.b1.repository
400
for bundle_rev in bundle.real_revisions:
401
# These really should have already been checked when we read the
402
# bundle, since it computes the sha1 hash for the revision, which
403
# only will match if everything is okay, but lets be explicit about
405
branch_rev = repository.get_revision(bundle_rev.revision_id)
406
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
407
'timestamp', 'timezone', 'message', 'committer',
408
'parent_ids', 'properties'):
409
self.assertEqual(getattr(branch_rev, a),
410
getattr(bundle_rev, a))
411
self.assertEqual(len(branch_rev.parent_ids),
412
len(bundle_rev.parent_ids))
413
self.assertEqual(rev_ids,
414
[r.revision_id for r in bundle.real_revisions])
415
self.valid_apply_bundle(base_rev_id, bundle,
416
checkout_dir=checkout_dir)
420
def get_invalid_bundle(self, base_rev_id, rev_id):
421
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
422
Munge the text so that it's invalid.
424
:return: The in-memory bundle
426
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
427
new_text = bundle_txt.getvalue().replace('executable:no',
429
bundle_txt = StringIO(new_text)
430
bundle = read_bundle(bundle_txt)
431
self.valid_apply_bundle(base_rev_id, bundle)
434
def test_non_bundle(self):
435
self.assertRaises(NotABundle, read_bundle, StringIO('#!/bin/sh\n'))
437
def test_malformed(self):
438
self.assertRaises(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'))
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 = tempfile.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
assert isinstance(s.getvalue(), str), (
465
"Bundle isn't a bytestring:\n %s..." % repr(s.getvalue())[:40])
466
install_bundle(tree.branch.repository, read_bundle(s))
467
for ancestor in ancestors:
468
old = self.b1.repository.revision_tree(ancestor)
469
new = tree.branch.repository.revision_tree(ancestor)
471
# Check that there aren't any inventory level changes
472
delta = new.changes_from(old)
473
self.assertFalse(delta.has_changed(),
474
'Revision %s not copied correctly.'
477
# Now check that the file contents are all correct
478
for inventory_id in old:
480
old_file = old.get_file(inventory_id)
485
self.assertEqual(old_file.read(),
486
new.get_file(inventory_id).read())
487
if not _mod_revision.is_null(rev_id):
488
rh = self.b1.revision_history()
489
tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
491
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
492
self.assertFalse(delta.has_changed(),
493
'Working tree has modifications: %s' % delta)
496
def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
497
"""Get the base revision, apply the changes, and make
498
sure everything matches the builtin branch.
500
to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
503
self._valid_apply_bundle(base_rev_id, info, to_tree)
507
def _valid_apply_bundle(self, base_rev_id, info, to_tree):
508
original_parents = to_tree.get_parent_ids()
509
repository = to_tree.branch.repository
510
original_parents = to_tree.get_parent_ids()
511
self.assertIs(repository.has_revision(base_rev_id), True)
512
for rev in info.real_revisions:
513
self.assert_(not repository.has_revision(rev.revision_id),
514
'Revision {%s} present before applying bundle'
516
merge_bundle(info, to_tree, True, Merge3Merger, False, False)
518
for rev in info.real_revisions:
519
self.assert_(repository.has_revision(rev.revision_id),
520
'Missing revision {%s} after applying bundle'
523
self.assert_(to_tree.branch.repository.has_revision(info.target))
524
# Do we also want to verify that all the texts have been added?
526
self.assertEqual(original_parents + [info.target],
527
to_tree.get_parent_ids())
529
rev = info.real_revisions[-1]
530
base_tree = self.b1.repository.revision_tree(rev.revision_id)
531
to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
533
# TODO: make sure the target tree is identical to base tree
534
# we might also check the working tree.
536
base_files = list(base_tree.list_files())
537
to_files = list(to_tree.list_files())
538
self.assertEqual(len(base_files), len(to_files))
539
for base_file, to_file in zip(base_files, to_files):
540
self.assertEqual(base_file, to_file)
542
for path, status, kind, fileid, entry in base_files:
543
# Check that the meta information is the same
544
self.assertEqual(base_tree.get_file_size(fileid),
545
to_tree.get_file_size(fileid))
546
self.assertEqual(base_tree.get_file_sha1(fileid),
547
to_tree.get_file_sha1(fileid))
548
# Check that the contents are the same
549
# This is pretty expensive
550
# self.assertEqual(base_tree.get_file(fileid).read(),
551
# to_tree.get_file(fileid).read())
553
def test_bundle(self):
554
self.tree1 = self.make_branch_and_tree('b1')
555
self.b1 = self.tree1.branch
557
open('b1/one', 'wb').write('one\n')
558
self.tree1.add('one')
559
self.tree1.commit('add one', rev_id='a@cset-0-1')
561
bundle = self.get_valid_bundle('null:', 'a@cset-0-1')
563
# Make sure we can handle files with spaces, tabs, other
568
, 'b1/dir/filein subdir.c'
569
, 'b1/dir/WithCaps.txt'
570
, 'b1/dir/ pre space'
573
, 'b1/sub/sub/nonempty.txt'
575
open('b1/sub/sub/emptyfile.txt', 'wb').close()
576
open('b1/dir/nolastnewline.txt', 'wb').write('bloop')
577
tt = TreeTransform(self.tree1)
578
tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
580
# have to fix length of file-id so that we can predictably rewrite
581
# a (length-prefixed) record containing it later.
582
self.tree1.add('with space.txt', 'withspace-id')
585
, 'dir/filein subdir.c'
588
, 'dir/nolastnewline.txt'
591
, 'sub/sub/nonempty.txt'
592
, 'sub/sub/emptyfile.txt'
594
self.tree1.commit('add whitespace', rev_id='a@cset-0-2')
596
bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
598
# Check a rollup bundle
599
bundle = self.get_valid_bundle('null:', 'a@cset-0-2')
603
['sub/sub/nonempty.txt'
604
, 'sub/sub/emptyfile.txt'
607
tt = TreeTransform(self.tree1)
608
trans_id = tt.trans_id_tree_file_id('exe-1')
609
tt.set_executability(False, trans_id)
611
self.tree1.commit('removed', rev_id='a@cset-0-3')
613
bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
614
self.assertRaises((TestamentMismatch,
615
errors.VersionedFileInvalidChecksum), self.get_invalid_bundle,
616
'a@cset-0-2', 'a@cset-0-3')
617
# Check a rollup bundle
618
bundle = self.get_valid_bundle('null:', 'a@cset-0-3')
620
# Now move the directory
621
self.tree1.rename_one('dir', 'sub/dir')
622
self.tree1.commit('rename dir', rev_id='a@cset-0-4')
624
bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
625
# Check a rollup bundle
626
bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
629
open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
630
open('b1/sub/dir/ pre space', 'ab').write(
631
'\r\nAdding some\r\nDOS format lines\r\n')
632
open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
633
self.tree1.rename_one('sub/dir/ pre space',
635
self.tree1.commit('Modified files', rev_id='a@cset-0-5')
636
bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
638
self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
639
self.tree1.rename_one('with space.txt', 'WithCaps.txt')
640
self.tree1.rename_one('temp', 'with space.txt')
641
self.tree1.commit(u'swap filenames', rev_id='a@cset-0-6',
643
bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
644
other = self.get_checkout('a@cset-0-5')
645
tree1_inv = self.tree1.branch.repository.get_inventory_xml(
647
tree2_inv = other.branch.repository.get_inventory_xml('a@cset-0-5')
648
self.assertEqualDiff(tree1_inv, tree2_inv)
649
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
650
other.commit('rename file', rev_id='a@cset-0-6b')
651
self.tree1.merge_from_branch(other.branch)
652
self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
654
bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
656
def test_symlink_bundle(self):
657
self.requireFeature(SymlinkFeature)
658
self.tree1 = self.make_branch_and_tree('b1')
659
self.b1 = self.tree1.branch
660
tt = TreeTransform(self.tree1)
661
tt.new_symlink('link', tt.root, 'bar/foo', 'link-1')
663
self.tree1.commit('add symlink', rev_id='l@cset-0-1')
664
self.get_valid_bundle('null:', 'l@cset-0-1')
665
tt = TreeTransform(self.tree1)
666
trans_id = tt.trans_id_tree_file_id('link-1')
667
tt.adjust_path('link2', tt.root, trans_id)
668
tt.delete_contents(trans_id)
669
tt.create_symlink('mars', trans_id)
671
self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
672
self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
673
tt = TreeTransform(self.tree1)
674
trans_id = tt.trans_id_tree_file_id('link-1')
675
tt.delete_contents(trans_id)
676
tt.create_symlink('jupiter', trans_id)
678
self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
679
self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
680
tt = TreeTransform(self.tree1)
681
trans_id = tt.trans_id_tree_file_id('link-1')
682
tt.delete_contents(trans_id)
684
self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
685
self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
687
def test_binary_bundle(self):
688
self.tree1 = self.make_branch_and_tree('b1')
689
self.b1 = self.tree1.branch
690
tt = TreeTransform(self.tree1)
693
tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
694
tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
697
self.tree1.commit('add binary', rev_id='b@cset-0-1')
698
self.get_valid_bundle('null:', 'b@cset-0-1')
701
tt = TreeTransform(self.tree1)
702
trans_id = tt.trans_id_tree_file_id('binary-1')
703
tt.delete_contents(trans_id)
705
self.tree1.commit('delete binary', rev_id='b@cset-0-2')
706
self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
709
tt = TreeTransform(self.tree1)
710
trans_id = tt.trans_id_tree_file_id('binary-2')
711
tt.adjust_path('file3', tt.root, trans_id)
712
tt.delete_contents(trans_id)
713
tt.create_file('file\rcontents\x00\n\x00', trans_id)
715
self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
716
self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
719
tt = TreeTransform(self.tree1)
720
trans_id = tt.trans_id_tree_file_id('binary-2')
721
tt.delete_contents(trans_id)
722
tt.create_file('\x00file\rcontents', trans_id)
724
self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
725
self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
728
self.get_valid_bundle('null:', 'b@cset-0-4')
730
def test_last_modified(self):
731
self.tree1 = self.make_branch_and_tree('b1')
732
self.b1 = self.tree1.branch
733
tt = TreeTransform(self.tree1)
734
tt.new_file('file', tt.root, 'file', 'file')
736
self.tree1.commit('create file', rev_id='a@lmod-0-1')
738
tt = TreeTransform(self.tree1)
739
trans_id = tt.trans_id_tree_file_id('file')
740
tt.delete_contents(trans_id)
741
tt.create_file('file2', trans_id)
743
self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
745
other = self.get_checkout('a@lmod-0-1')
746
tt = TreeTransform(other)
747
trans_id = tt.trans_id_tree_file_id('file')
748
tt.delete_contents(trans_id)
749
tt.create_file('file2', trans_id)
751
other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
752
self.tree1.merge_from_branch(other.branch)
753
self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
755
self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
756
bundle = self.get_valid_bundle('a@lmod-0-2a', 'a@lmod-0-4')
758
def test_hide_history(self):
759
self.tree1 = self.make_branch_and_tree('b1')
760
self.b1 = self.tree1.branch
762
open('b1/one', 'wb').write('one\n')
763
self.tree1.add('one')
764
self.tree1.commit('add file', rev_id='a@cset-0-1')
765
open('b1/one', 'wb').write('two\n')
766
self.tree1.commit('modify', rev_id='a@cset-0-2')
767
open('b1/one', 'wb').write('three\n')
768
self.tree1.commit('modify', rev_id='a@cset-0-3')
769
bundle_file = StringIO()
770
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
771
'a@cset-0-1', bundle_file, format=self.format)
772
self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
773
self.assertContainsRe(self.get_raw(bundle_file), 'one')
774
self.assertContainsRe(self.get_raw(bundle_file), 'three')
776
def test_bundle_same_basis(self):
777
"""Ensure using the basis as the target doesn't cause an error"""
778
self.tree1 = self.make_branch_and_tree('b1')
779
self.tree1.commit('add file', rev_id='a@cset-0-1')
780
bundle_file = StringIO()
781
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
782
'a@cset-0-1', bundle_file)
785
def get_raw(bundle_file):
786
return bundle_file.getvalue()
788
def test_unicode_bundle(self):
789
# Handle international characters
792
f = open(u'b1/with Dod\xe9', 'wb')
793
except UnicodeEncodeError:
794
raise TestSkipped("Filesystem doesn't support unicode")
796
self.tree1 = self.make_branch_and_tree('b1')
797
self.b1 = self.tree1.branch
800
u'With international man of mystery\n'
801
u'William Dod\xe9\n').encode('utf-8'))
804
self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
805
self.tree1.commit(u'i18n commit from William Dod\xe9',
806
rev_id='i18n-1', committer=u'William Dod\xe9')
808
if sys.platform == 'darwin':
809
from bzrlib.workingtree import WorkingTree3
810
if type(self.tree1) is WorkingTree3:
811
self.knownFailure("Bug #141438: fails for WorkingTree3 on OSX")
813
# On Mac the '\xe9' gets changed to 'e\u0301'
814
self.assertEqual([u'.bzr', u'with Dode\u0301'],
815
sorted(os.listdir(u'b1')))
816
delta = self.tree1.changes_from(self.tree1.basis_tree())
817
self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
819
self.knownFailure("Mac OSX doesn't preserve unicode"
820
" combining characters.")
823
bundle = self.get_valid_bundle('null:', 'i18n-1')
826
f = open(u'b1/with Dod\xe9', 'wb')
827
f.write(u'Modified \xb5\n'.encode('utf8'))
829
self.tree1.commit(u'modified', rev_id='i18n-2')
831
bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
834
self.tree1.rename_one(u'with Dod\xe9', u'B\xe5gfors')
835
self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
836
committer=u'Erik B\xe5gfors')
838
bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
841
self.tree1.remove([u'B\xe5gfors'])
842
self.tree1.commit(u'removed', rev_id='i18n-4')
844
bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
847
bundle = self.get_valid_bundle('null:', 'i18n-4')
850
def test_whitespace_bundle(self):
851
if sys.platform in ('win32', 'cygwin'):
852
raise TestSkipped('Windows doesn\'t support filenames'
853
' with tabs or trailing spaces')
854
self.tree1 = self.make_branch_and_tree('b1')
855
self.b1 = self.tree1.branch
857
self.build_tree(['b1/trailing space '])
858
self.tree1.add(['trailing space '])
859
# TODO: jam 20060701 Check for handling files with '\t' characters
860
# once we actually support them
863
self.tree1.commit('funky whitespace', rev_id='white-1')
865
bundle = self.get_valid_bundle('null:', 'white-1')
868
open('b1/trailing space ', 'ab').write('add some text\n')
869
self.tree1.commit('add text', rev_id='white-2')
871
bundle = self.get_valid_bundle('white-1', 'white-2')
874
self.tree1.rename_one('trailing space ', ' start and end space ')
875
self.tree1.commit('rename', rev_id='white-3')
877
bundle = self.get_valid_bundle('white-2', 'white-3')
880
self.tree1.remove([' start and end space '])
881
self.tree1.commit('removed', rev_id='white-4')
883
bundle = self.get_valid_bundle('white-3', 'white-4')
885
# Now test a complet roll-up
886
bundle = self.get_valid_bundle('null:', 'white-4')
888
def test_alt_timezone_bundle(self):
889
self.tree1 = self.make_branch_and_memory_tree('b1')
890
self.b1 = self.tree1.branch
891
builder = treebuilder.TreeBuilder()
893
self.tree1.lock_write()
894
builder.start_tree(self.tree1)
895
builder.build(['newfile'])
896
builder.finish_tree()
898
# Asia/Colombo offset = 5 hours 30 minutes
899
self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
900
timezone=19800, timestamp=1152544886.0)
902
bundle = self.get_valid_bundle('null:', 'tz-1')
904
rev = bundle.revisions[0]
905
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
906
self.assertEqual(19800, rev.timezone)
907
self.assertEqual(1152544886.0, rev.timestamp)
910
def test_bundle_root_id(self):
911
self.tree1 = self.make_branch_and_tree('b1')
912
self.b1 = self.tree1.branch
913
self.tree1.commit('message', rev_id='revid1')
914
bundle = self.get_valid_bundle('null:', 'revid1')
915
tree = self.get_bundle_tree(bundle, 'revid1')
916
self.assertEqual('revid1', tree.inventory.root.revision)
918
def test_install_revisions(self):
919
self.tree1 = self.make_branch_and_tree('b1')
920
self.b1 = self.tree1.branch
921
self.tree1.commit('message', rev_id='rev2a')
922
bundle = self.get_valid_bundle('null:', 'rev2a')
923
branch2 = self.make_branch('b2')
924
self.assertFalse(branch2.repository.has_revision('rev2a'))
925
target_revision = bundle.install_revisions(branch2.repository)
926
self.assertTrue(branch2.repository.has_revision('rev2a'))
927
self.assertEqual('rev2a', target_revision)
929
def test_bundle_empty_property(self):
930
"""Test serializing revision properties with an empty value."""
931
tree = self.make_branch_and_memory_tree('tree')
933
self.addCleanup(tree.unlock)
934
tree.add([''], ['TREE_ROOT'])
935
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
936
self.b1 = tree.branch
937
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
938
bundle = read_bundle(bundle_sio)
939
revision_info = bundle.revisions[0]
940
self.assertEqual('rev1', revision_info.revision_id)
941
rev = revision_info.as_revision()
942
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
945
def test_bundle_sorted_properties(self):
946
"""For stability the writer should write properties in sorted order."""
947
tree = self.make_branch_and_memory_tree('tree')
949
self.addCleanup(tree.unlock)
951
tree.add([''], ['TREE_ROOT'])
952
tree.commit('One', rev_id='rev1',
953
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
954
self.b1 = tree.branch
955
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
956
bundle = read_bundle(bundle_sio)
957
revision_info = bundle.revisions[0]
958
self.assertEqual('rev1', revision_info.revision_id)
959
rev = revision_info.as_revision()
960
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
961
'd':'1'}, rev.properties)
963
def test_bundle_unicode_properties(self):
964
"""We should be able to round trip a non-ascii property."""
965
tree = self.make_branch_and_memory_tree('tree')
967
self.addCleanup(tree.unlock)
969
tree.add([''], ['TREE_ROOT'])
970
# Revisions themselves do not require anything about revision property
971
# keys, other than that they are a basestring, and do not contain
973
# However, Testaments assert than they are str(), and thus should not
975
tree.commit('One', rev_id='rev1',
976
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
977
self.b1 = tree.branch
978
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
979
bundle = read_bundle(bundle_sio)
980
revision_info = bundle.revisions[0]
981
self.assertEqual('rev1', revision_info.revision_id)
982
rev = revision_info.as_revision()
983
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
984
'alpha':u'\u03b1'}, rev.properties)
986
def test_bundle_with_ghosts(self):
987
tree = self.make_branch_and_tree('tree')
988
self.b1 = tree.branch
989
self.build_tree_contents([('tree/file', 'content1')])
992
self.build_tree_contents([('tree/file', 'content2')])
993
tree.add_parent_tree_id('ghost')
994
tree.commit('rev2', rev_id='rev2')
995
bundle = self.get_valid_bundle('null:', 'rev2')
997
def make_simple_tree(self, format=None):
998
tree = self.make_branch_and_tree('b1', format=format)
999
self.b1 = tree.branch
1000
self.build_tree(['b1/file'])
1004
def test_across_serializers(self):
1005
tree = self.make_simple_tree('knit')
1006
tree.commit('hello', rev_id='rev1')
1007
tree.commit('hello', rev_id='rev2')
1008
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1009
repo = self.make_repository('repo', format='dirstate-with-subtree')
1010
bundle.install_revisions(repo)
1011
inv_text = repo.get_inventory_xml('rev2')
1012
self.assertNotContainsRe(inv_text, 'format="5"')
1013
self.assertContainsRe(inv_text, 'format="7"')
1015
def test_across_models(self):
1016
tree = self.make_simple_tree('knit')
1017
tree.commit('hello', rev_id='rev1')
1018
tree.commit('hello', rev_id='rev2')
1019
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1020
repo = self.make_repository('repo', format='dirstate-with-subtree')
1021
bundle.install_revisions(repo)
1022
inv = repo.get_inventory('rev2')
1023
self.assertEqual('rev2', inv.root.revision)
1024
root_vf = repo.weave_store.get_weave(inv.root.file_id,
1025
repo.get_transaction())
1026
self.assertEqual(root_vf.versions(), ['rev1', 'rev2'])
1028
def test_across_models_incompatible(self):
1029
tree = self.make_simple_tree('dirstate-with-subtree')
1030
tree.commit('hello', rev_id='rev1')
1031
tree.commit('hello', rev_id='rev2')
1033
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1034
except errors.IncompatibleBundleFormat:
1035
raise TestSkipped("Format 0.8 doesn't work with knit3")
1036
repo = self.make_repository('repo', format='knit')
1037
bundle.install_revisions(repo)
1039
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1040
self.assertRaises(errors.IncompatibleRevision,
1041
bundle.install_revisions, repo)
1043
def test_get_merge_request(self):
1044
tree = self.make_simple_tree()
1045
tree.commit('hello', rev_id='rev1')
1046
tree.commit('hello', rev_id='rev2')
1047
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1048
result = bundle.get_merge_request(tree.branch.repository)
1049
self.assertEqual((None, 'rev1', 'inapplicable'), result)
1051
def test_with_subtree(self):
1052
tree = self.make_branch_and_tree('tree',
1053
format='dirstate-with-subtree')
1054
self.b1 = tree.branch
1055
subtree = self.make_branch_and_tree('tree/subtree',
1056
format='dirstate-with-subtree')
1058
tree.commit('hello', rev_id='rev1')
1060
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1061
except errors.IncompatibleBundleFormat:
1062
raise TestSkipped("Format 0.8 doesn't work with knit3")
1063
if isinstance(bundle, v09.BundleInfo09):
1064
raise TestSkipped("Format 0.9 doesn't work with subtrees")
1065
repo = self.make_repository('repo', format='knit')
1066
self.assertRaises(errors.IncompatibleRevision,
1067
bundle.install_revisions, repo)
1068
repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1069
bundle.install_revisions(repo2)
1071
def test_revision_id_with_slash(self):
1072
self.tree1 = self.make_branch_and_tree('tree')
1073
self.b1 = self.tree1.branch
1075
self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
1077
raise TestSkipped("Repository doesn't support revision ids with"
1079
bundle = self.get_valid_bundle('null:', 'rev/id')
1081
def test_skip_file(self):
1082
"""Make sure we don't accidentally write to the wrong versionedfile"""
1083
self.tree1 = self.make_branch_and_tree('tree')
1084
self.b1 = self.tree1.branch
1085
# rev1 is not present in bundle, done by fetch
1086
self.build_tree_contents([('tree/file2', 'contents1')])
1087
self.tree1.add('file2', 'file2-id')
1088
self.tree1.commit('rev1', rev_id='reva')
1089
self.build_tree_contents([('tree/file3', 'contents2')])
1090
# rev2 is present in bundle, and done by fetch
1091
# having file1 in the bunle causes file1's versionedfile to be opened.
1092
self.tree1.add('file3', 'file3-id')
1093
self.tree1.commit('rev2')
1094
# Updating file2 should not cause an attempt to add to file1's vf
1095
target = self.tree1.bzrdir.sprout('target').open_workingtree()
1096
self.build_tree_contents([('tree/file2', 'contents3')])
1097
self.tree1.commit('rev3', rev_id='rev3')
1098
bundle = self.get_valid_bundle('reva', 'rev3')
1099
if getattr(bundle, 'get_bundle_reader', None) is None:
1100
raise TestSkipped('Bundle format cannot provide reader')
1101
# be sure that file1 comes before file2
1102
for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1105
self.assertNotEqual(f, 'file2-id')
1106
bundle.install_revisions(target.branch.repository)
1109
class V08BundleTester(BundleTester, TestCaseWithTransport):
1113
def test_bundle_empty_property(self):
1114
"""Test serializing revision properties with an empty value."""
1115
tree = self.make_branch_and_memory_tree('tree')
1117
self.addCleanup(tree.unlock)
1118
tree.add([''], ['TREE_ROOT'])
1119
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1120
self.b1 = tree.branch
1121
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1122
self.assertContainsRe(bundle_sio.getvalue(),
1124
'# branch-nick: tree\n'
1128
bundle = read_bundle(bundle_sio)
1129
revision_info = bundle.revisions[0]
1130
self.assertEqual('rev1', revision_info.revision_id)
1131
rev = revision_info.as_revision()
1132
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1135
def get_bundle_tree(self, bundle, revision_id):
1136
repository = self.make_repository('repo')
1137
return bundle.revision_tree(repository, 'revid1')
1139
def test_bundle_empty_property_alt(self):
1140
"""Test serializing revision properties with an empty value.
1142
Older readers had a bug when reading an empty property.
1143
They assumed that all keys ended in ': \n'. However they would write an
1144
empty value as ':\n'. This tests make sure that all newer bzr versions
1145
can handle th second form.
1147
tree = self.make_branch_and_memory_tree('tree')
1149
self.addCleanup(tree.unlock)
1150
tree.add([''], ['TREE_ROOT'])
1151
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1152
self.b1 = tree.branch
1153
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1154
txt = bundle_sio.getvalue()
1155
loc = txt.find('# empty: ') + len('# empty:')
1156
# Create a new bundle, which strips the trailing space after empty
1157
bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
1159
self.assertContainsRe(bundle_sio.getvalue(),
1161
'# branch-nick: tree\n'
1165
bundle = read_bundle(bundle_sio)
1166
revision_info = bundle.revisions[0]
1167
self.assertEqual('rev1', revision_info.revision_id)
1168
rev = revision_info.as_revision()
1169
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1172
def test_bundle_sorted_properties(self):
1173
"""For stability the writer should write properties in sorted order."""
1174
tree = self.make_branch_and_memory_tree('tree')
1176
self.addCleanup(tree.unlock)
1178
tree.add([''], ['TREE_ROOT'])
1179
tree.commit('One', rev_id='rev1',
1180
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1181
self.b1 = tree.branch
1182
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1183
self.assertContainsRe(bundle_sio.getvalue(),
1187
'# branch-nick: tree\n'
1191
bundle = read_bundle(bundle_sio)
1192
revision_info = bundle.revisions[0]
1193
self.assertEqual('rev1', revision_info.revision_id)
1194
rev = revision_info.as_revision()
1195
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1196
'd':'1'}, rev.properties)
1198
def test_bundle_unicode_properties(self):
1199
"""We should be able to round trip a non-ascii property."""
1200
tree = self.make_branch_and_memory_tree('tree')
1202
self.addCleanup(tree.unlock)
1204
tree.add([''], ['TREE_ROOT'])
1205
# Revisions themselves do not require anything about revision property
1206
# keys, other than that they are a basestring, and do not contain
1208
# However, Testaments assert than they are str(), and thus should not
1210
tree.commit('One', rev_id='rev1',
1211
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1212
self.b1 = tree.branch
1213
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1214
self.assertContainsRe(bundle_sio.getvalue(),
1216
'# alpha: \xce\xb1\n'
1217
'# branch-nick: tree\n'
1218
'# omega: \xce\xa9\n'
1220
bundle = read_bundle(bundle_sio)
1221
revision_info = bundle.revisions[0]
1222
self.assertEqual('rev1', revision_info.revision_id)
1223
rev = revision_info.as_revision()
1224
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1225
'alpha':u'\u03b1'}, rev.properties)
1228
class V09BundleKnit2Tester(V08BundleTester):
1232
def bzrdir_format(self):
1233
format = bzrdir.BzrDirMetaFormat1()
1234
format.repository_format = knitrepo.RepositoryFormatKnit3()
1238
class V09BundleKnit1Tester(V08BundleTester):
1242
def bzrdir_format(self):
1243
format = bzrdir.BzrDirMetaFormat1()
1244
format.repository_format = knitrepo.RepositoryFormatKnit1()
1248
class V4BundleTester(BundleTester, TestCaseWithTransport):
1252
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1253
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1254
Make sure that the text generated is valid, and that it
1255
can be applied against the base, and generate the same information.
1257
:return: The in-memory bundle
1259
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1261
# This should also validate the generated bundle
1262
bundle = read_bundle(bundle_txt)
1263
repository = self.b1.repository
1264
for bundle_rev in bundle.real_revisions:
1265
# These really should have already been checked when we read the
1266
# bundle, since it computes the sha1 hash for the revision, which
1267
# only will match if everything is okay, but lets be explicit about
1269
branch_rev = repository.get_revision(bundle_rev.revision_id)
1270
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1271
'timestamp', 'timezone', 'message', 'committer',
1272
'parent_ids', 'properties'):
1273
self.assertEqual(getattr(branch_rev, a),
1274
getattr(bundle_rev, a))
1275
self.assertEqual(len(branch_rev.parent_ids),
1276
len(bundle_rev.parent_ids))
1277
self.assertEqual(set(rev_ids),
1278
set([r.revision_id for r in bundle.real_revisions]))
1279
self.valid_apply_bundle(base_rev_id, bundle,
1280
checkout_dir=checkout_dir)
1284
def get_invalid_bundle(self, base_rev_id, rev_id):
1285
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1286
Munge the text so that it's invalid.
1288
:return: The in-memory bundle
1290
from bzrlib.bundle import serializer
1291
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1292
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1293
new_text = new_text.replace('<file file_id="exe-1"',
1294
'<file executable="y" file_id="exe-1"')
1295
new_text = new_text.replace('B222', 'B237')
1296
bundle_txt = StringIO()
1297
bundle_txt.write(serializer._get_bundle_header('4'))
1298
bundle_txt.write('\n')
1299
bundle_txt.write(new_text.encode('bz2'))
1301
bundle = read_bundle(bundle_txt)
1302
self.valid_apply_bundle(base_rev_id, bundle)
1305
def create_bundle_text(self, base_rev_id, rev_id):
1306
bundle_txt = StringIO()
1307
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1308
bundle_txt, format=self.format)
1310
self.assertEqual(bundle_txt.readline(),
1311
'# Bazaar revision bundle v%s\n' % self.format)
1312
self.assertEqual(bundle_txt.readline(), '#\n')
1313
rev = self.b1.repository.get_revision(rev_id)
1315
return bundle_txt, rev_ids
1317
def get_bundle_tree(self, bundle, revision_id):
1318
repository = self.make_repository('repo')
1319
bundle.install_revisions(repository)
1320
return repository.revision_tree(revision_id)
1322
def test_creation(self):
1323
tree = self.make_branch_and_tree('tree')
1324
self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
1325
tree.add('file', 'fileid-2')
1326
tree.commit('added file', rev_id='rev1')
1327
self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
1328
tree.commit('changed file', rev_id='rev2')
1330
serializer = BundleSerializerV4('1.0')
1331
serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
1333
tree2 = self.make_branch_and_tree('target')
1334
target_repo = tree2.branch.repository
1335
install_bundle(target_repo, serializer.read(s))
1336
vf = target_repo.weave_store.get_weave('fileid-2',
1337
target_repo.get_transaction())
1338
self.assertEqual('contents1\nstatic\n', vf.get_text('rev1'))
1339
self.assertEqual('contents2\nstatic\n', vf.get_text('rev2'))
1340
rtree = target_repo.revision_tree('rev2')
1341
inventory_vf = target_repo.get_inventory_weave()
1342
self.assertEqual(['rev1'], inventory_vf.get_parents('rev2'))
1343
self.assertEqual('changed file',
1344
target_repo.get_revision('rev2').message)
1347
def get_raw(bundle_file):
1349
line = bundle_file.readline()
1350
line = bundle_file.readline()
1351
lines = bundle_file.readlines()
1352
return ''.join(lines).decode('bz2')
1354
def test_copy_signatures(self):
1355
tree_a = self.make_branch_and_tree('tree_a')
1357
import bzrlib.commit as commit
1358
oldstrategy = bzrlib.gpg.GPGStrategy
1359
branch = tree_a.branch
1360
repo_a = branch.repository
1361
tree_a.commit("base", allow_pointless=True, rev_id='A')
1362
self.failIf(branch.repository.has_signature_for_revision_id('A'))
1364
from bzrlib.testament import Testament
1365
# monkey patch gpg signing mechanism
1366
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1367
new_config = test_commit.MustSignConfig(branch)
1368
commit.Commit(config=new_config).commit(message="base",
1369
allow_pointless=True,
1371
working_tree=tree_a)
1373
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1374
self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1376
bzrlib.gpg.GPGStrategy = oldstrategy
1377
tree_b = self.make_branch_and_tree('tree_b')
1378
repo_b = tree_b.branch.repository
1380
serializer = BundleSerializerV4('4')
1381
serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1383
install_bundle(repo_b, serializer.read(s))
1384
self.assertTrue(repo_b.has_signature_for_revision_id('B'))
1385
self.assertEqual(repo_b.get_signature_text('B'),
1386
repo_a.get_signature_text('B'))
1388
# ensure repeat installs are harmless
1389
install_bundle(repo_b, serializer.read(s))
1392
class V4WeaveBundleTester(V4BundleTester):
1394
def bzrdir_format(self):
1398
class MungedBundleTester(object):
1400
def build_test_bundle(self):
1401
wt = self.make_branch_and_tree('b1')
1403
self.build_tree(['b1/one'])
1405
wt.commit('add one', rev_id='a@cset-0-1')
1406
self.build_tree(['b1/two'])
1408
wt.commit('add two', rev_id='a@cset-0-2',
1409
revprops={'branch-nick':'test'})
1411
bundle_txt = StringIO()
1412
rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
1413
'a@cset-0-1', bundle_txt, self.format)
1414
self.assertEqual(set(['a@cset-0-2']), set(rev_ids))
1415
bundle_txt.seek(0, 0)
1418
def check_valid(self, bundle):
1419
"""Check that after whatever munging, the final object is valid."""
1420
self.assertEqual(['a@cset-0-2'],
1421
[r.revision_id for r in bundle.real_revisions])
1423
def test_extra_whitespace(self):
1424
bundle_txt = self.build_test_bundle()
1426
# Seek to the end of the file
1427
# Adding one extra newline used to give us
1428
# TypeError: float() argument must be a string or a number
1429
bundle_txt.seek(0, 2)
1430
bundle_txt.write('\n')
1433
bundle = read_bundle(bundle_txt)
1434
self.check_valid(bundle)
1436
def test_extra_whitespace_2(self):
1437
bundle_txt = self.build_test_bundle()
1439
# Seek to the end of the file
1440
# Adding two extra newlines used to give us
1441
# MalformedPatches: The first line of all patches should be ...
1442
bundle_txt.seek(0, 2)
1443
bundle_txt.write('\n\n')
1446
bundle = read_bundle(bundle_txt)
1447
self.check_valid(bundle)
1450
class MungedBundleTesterV09(TestCaseWithTransport, MungedBundleTester):
1454
def test_missing_trailing_whitespace(self):
1455
bundle_txt = self.build_test_bundle()
1457
# Remove a trailing newline, it shouldn't kill the parser
1458
raw = bundle_txt.getvalue()
1459
# The contents of the bundle don't have to be this, but this
1460
# test is concerned with the exact case where the serializer
1461
# creates a blank line at the end, and fails if that
1463
self.assertEqual('\n\n', raw[-2:])
1464
bundle_txt = StringIO(raw[:-1])
1466
bundle = read_bundle(bundle_txt)
1467
self.check_valid(bundle)
1469
def test_opening_text(self):
1470
bundle_txt = self.build_test_bundle()
1472
bundle_txt = StringIO("Some random\nemail comments\n"
1473
+ bundle_txt.getvalue())
1475
bundle = read_bundle(bundle_txt)
1476
self.check_valid(bundle)
1478
def test_trailing_text(self):
1479
bundle_txt = self.build_test_bundle()
1481
bundle_txt = StringIO(bundle_txt.getvalue() +
1482
"Some trailing\nrandom\ntext\n")
1484
bundle = read_bundle(bundle_txt)
1485
self.check_valid(bundle)
1488
class MungedBundleTesterV4(TestCaseWithTransport, MungedBundleTester):
1493
class TestBundleWriterReader(TestCase):
1495
def test_roundtrip_record(self):
1496
fileobj = StringIO()
1497
writer = v4.BundleWriter(fileobj)
1499
writer.add_info_record(foo='bar')
1500
writer._add_record("Record body", {'parents': ['1', '3'],
1501
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1504
reader = v4.BundleReader(fileobj, stream_input=True)
1505
record_iter = reader.iter_records()
1506
record = record_iter.next()
1507
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1508
'info', None, None), record)
1509
record = record_iter.next()
1510
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1511
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1514
def test_roundtrip_record_memory_hungry(self):
1515
fileobj = StringIO()
1516
writer = v4.BundleWriter(fileobj)
1518
writer.add_info_record(foo='bar')
1519
writer._add_record("Record body", {'parents': ['1', '3'],
1520
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1523
reader = v4.BundleReader(fileobj, stream_input=False)
1524
record_iter = reader.iter_records()
1525
record = record_iter.next()
1526
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1527
'info', None, None), record)
1528
record = record_iter.next()
1529
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1530
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1533
def test_encode_name(self):
1534
self.assertEqual('revision/rev1',
1535
v4.BundleWriter.encode_name('revision', 'rev1'))
1536
self.assertEqual('file/rev//1/file-id-1',
1537
v4.BundleWriter.encode_name('file', 'rev/1', 'file-id-1'))
1538
self.assertEqual('info',
1539
v4.BundleWriter.encode_name('info', None, None))
1541
def test_decode_name(self):
1542
self.assertEqual(('revision', 'rev1', None),
1543
v4.BundleReader.decode_name('revision/rev1'))
1544
self.assertEqual(('file', 'rev/1', 'file-id-1'),
1545
v4.BundleReader.decode_name('file/rev//1/file-id-1'))
1546
self.assertEqual(('info', None, None),
1547
v4.BundleReader.decode_name('info'))
1549
def test_too_many_names(self):
1550
fileobj = StringIO()
1551
writer = v4.BundleWriter(fileobj)
1553
writer.add_info_record(foo='bar')
1554
writer._container.add_bytes_record('blah', ['two', 'names'])
1557
record_iter = v4.BundleReader(fileobj).iter_records()
1558
record = record_iter.next()
1559
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1560
'info', None, None), record)
1561
self.assertRaises(BadBundle, record_iter.next)
added
removed
bzrlib/tests/test_bundle.py
