1
# Copyright (C) 2005-2011 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from cStringIO import StringIO
30
revision as _mod_revision,
34
from bzrlib.bundle import read_mergeable_from_url
35
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
36
from bzrlib.bundle.bundle_data import BundleTree
37
from bzrlib.directory_service import directories
38
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
39
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
40
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
41
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
42
from bzrlib.repofmt import knitrepo
43
from bzrlib.tests import (
47
from bzrlib.transform import TreeTransform
50
def get_text(vf, key):
51
"""Get the fulltext for a given revision id that is present in the vf"""
52
stream = vf.get_record_stream([key], 'unordered', True)
53
record = stream.next()
54
return record.get_bytes_as('fulltext')
57
def get_inventory_text(repo, revision_id):
58
"""Get the fulltext for the inventory at revision id"""
61
return get_text(repo.inventories, (revision_id,))
66
class MockTree(object):
68
from bzrlib.inventory import InventoryDirectory, ROOT_ID
70
self.paths = {ROOT_ID: ""}
71
self.ids = {"": ROOT_ID}
73
self.root = InventoryDirectory(ROOT_ID, '', None)
75
inventory = property(lambda x:x)
78
return self.paths.iterkeys()
80
def __getitem__(self, file_id):
81
if file_id == self.root.file_id:
84
return self.make_entry(file_id, self.paths[file_id])
86
def parent_id(self, file_id):
87
parent_dir = os.path.dirname(self.paths[file_id])
90
return self.ids[parent_dir]
92
def iter_entries(self):
93
for path, file_id in self.ids.iteritems():
94
yield path, self[file_id]
96
def get_file_kind(self, file_id):
97
if file_id in self.contents:
103
def make_entry(self, file_id, path):
104
from bzrlib.inventory import (InventoryEntry, InventoryFile
105
, InventoryDirectory, InventoryLink)
106
name = os.path.basename(path)
107
kind = self.get_file_kind(file_id)
108
parent_id = self.parent_id(file_id)
109
text_sha_1, text_size = self.contents_stats(file_id)
110
if kind == 'directory':
111
ie = InventoryDirectory(file_id, name, parent_id)
113
ie = InventoryFile(file_id, name, parent_id)
114
ie.text_sha1 = text_sha_1
115
ie.text_size = text_size
116
elif kind == 'symlink':
117
ie = InventoryLink(file_id, name, parent_id)
119
raise errors.BzrError('unknown kind %r' % kind)
122
def add_dir(self, file_id, path):
123
self.paths[file_id] = path
124
self.ids[path] = file_id
126
def add_file(self, file_id, path, contents):
127
self.add_dir(file_id, path)
128
self.contents[file_id] = contents
130
def path2id(self, path):
131
return self.ids.get(path)
133
def id2path(self, file_id):
134
return self.paths.get(file_id)
136
def has_id(self, file_id):
137
return self.id2path(file_id) is not None
139
def get_file(self, file_id):
141
result.write(self.contents[file_id])
145
def contents_stats(self, file_id):
146
if file_id not in self.contents:
148
text_sha1 = osutils.sha_file(self.get_file(file_id))
149
return text_sha1, len(self.contents[file_id])
152
class BTreeTester(tests.TestCase):
153
"""A simple unittest tester for the BundleTree class."""
155
def make_tree_1(self):
157
mtree.add_dir("a", "grandparent")
158
mtree.add_dir("b", "grandparent/parent")
159
mtree.add_file("c", "grandparent/parent/file", "Hello\n")
160
mtree.add_dir("d", "grandparent/alt_parent")
161
return BundleTree(mtree, ''), mtree
163
def test_renames(self):
164
"""Ensure that file renames have the proper effect on children"""
165
btree = self.make_tree_1()[0]
166
self.assertEqual(btree.old_path("grandparent"), "grandparent")
167
self.assertEqual(btree.old_path("grandparent/parent"),
168
"grandparent/parent")
169
self.assertEqual(btree.old_path("grandparent/parent/file"),
170
"grandparent/parent/file")
172
self.assertEqual(btree.id2path("a"), "grandparent")
173
self.assertEqual(btree.id2path("b"), "grandparent/parent")
174
self.assertEqual(btree.id2path("c"), "grandparent/parent/file")
176
self.assertEqual(btree.path2id("grandparent"), "a")
177
self.assertEqual(btree.path2id("grandparent/parent"), "b")
178
self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
180
self.assertTrue(btree.path2id("grandparent2") is None)
181
self.assertTrue(btree.path2id("grandparent2/parent") is None)
182
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
184
btree.note_rename("grandparent", "grandparent2")
185
self.assertTrue(btree.old_path("grandparent") is None)
186
self.assertTrue(btree.old_path("grandparent/parent") is None)
187
self.assertTrue(btree.old_path("grandparent/parent/file") is None)
189
self.assertEqual(btree.id2path("a"), "grandparent2")
190
self.assertEqual(btree.id2path("b"), "grandparent2/parent")
191
self.assertEqual(btree.id2path("c"), "grandparent2/parent/file")
193
self.assertEqual(btree.path2id("grandparent2"), "a")
194
self.assertEqual(btree.path2id("grandparent2/parent"), "b")
195
self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
197
self.assertTrue(btree.path2id("grandparent") is None)
198
self.assertTrue(btree.path2id("grandparent/parent") is None)
199
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
201
btree.note_rename("grandparent/parent", "grandparent2/parent2")
202
self.assertEqual(btree.id2path("a"), "grandparent2")
203
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
204
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file")
206
self.assertEqual(btree.path2id("grandparent2"), "a")
207
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
208
self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
210
self.assertTrue(btree.path2id("grandparent2/parent") is None)
211
self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
213
btree.note_rename("grandparent/parent/file",
214
"grandparent2/parent2/file2")
215
self.assertEqual(btree.id2path("a"), "grandparent2")
216
self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
217
self.assertEqual(btree.id2path("c"), "grandparent2/parent2/file2")
219
self.assertEqual(btree.path2id("grandparent2"), "a")
220
self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
221
self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
223
self.assertTrue(btree.path2id("grandparent2/parent2/file") is None)
225
def test_moves(self):
226
"""Ensure that file moves have the proper effect on children"""
227
btree = self.make_tree_1()[0]
228
btree.note_rename("grandparent/parent/file",
229
"grandparent/alt_parent/file")
230
self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
231
self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
232
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
234
def unified_diff(self, old, new):
236
diff.internal_diff("old", old, "new", new, out)
240
def make_tree_2(self):
241
btree = self.make_tree_1()[0]
242
btree.note_rename("grandparent/parent/file",
243
"grandparent/alt_parent/file")
244
self.assertTrue(btree.id2path("e") is None)
245
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
246
btree.note_id("e", "grandparent/parent/file")
250
"""File/inventory adds"""
251
btree = self.make_tree_2()
252
add_patch = self.unified_diff([], ["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 adds_test(self, btree):
259
self.assertEqual(btree.id2path("e"), "grandparent/parent/file")
260
self.assertEqual(btree.path2id("grandparent/parent/file"), "e")
261
self.assertEqual(btree.get_file("e").read(), "Extra cheese\n")
262
self.assertEqual(btree.get_symlink_target('f'), 'venus')
264
def test_adds2(self):
265
"""File/inventory adds, with patch-compatibile renames"""
266
btree = self.make_tree_2()
267
btree.contents_by_id = False
268
add_patch = self.unified_diff(["Hello\n"], ["Extra cheese\n"])
269
btree.note_patch("grandparent/parent/file", add_patch)
270
btree.note_id('f', 'grandparent/parent/symlink', kind='symlink')
271
btree.note_target('grandparent/parent/symlink', 'venus')
272
self.adds_test(btree)
274
def make_tree_3(self):
275
btree, mtree = self.make_tree_1()
276
mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
277
btree.note_rename("grandparent/parent/file",
278
"grandparent/alt_parent/file")
279
btree.note_rename("grandparent/parent/topping",
280
"grandparent/alt_parent/stopping")
283
def get_file_test(self, btree):
284
self.assertEqual(btree.get_file("e").read(), "Lemon\n")
285
self.assertEqual(btree.get_file("c").read(), "Hello\n")
287
def test_get_file(self):
288
"""Get file contents"""
289
btree = self.make_tree_3()
290
mod_patch = self.unified_diff(["Anchovies\n"], ["Lemon\n"])
291
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
292
self.get_file_test(btree)
294
def test_get_file2(self):
295
"""Get file contents, with patch-compatibile renames"""
296
btree = self.make_tree_3()
297
btree.contents_by_id = False
298
mod_patch = self.unified_diff([], ["Lemon\n"])
299
btree.note_patch("grandparent/alt_parent/stopping", mod_patch)
300
mod_patch = self.unified_diff([], ["Hello\n"])
301
btree.note_patch("grandparent/alt_parent/file", mod_patch)
302
self.get_file_test(btree)
304
def test_delete(self):
306
btree = self.make_tree_1()[0]
307
self.assertEqual(btree.get_file("c").read(), "Hello\n")
308
btree.note_deletion("grandparent/parent/file")
309
self.assertTrue(btree.id2path("c") is None)
310
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
312
def sorted_ids(self, tree):
317
def test_iteration(self):
318
"""Ensure that iteration through ids works properly"""
319
btree = self.make_tree_1()[0]
320
self.assertEqual(self.sorted_ids(btree),
321
[inventory.ROOT_ID, 'a', 'b', 'c', 'd'])
322
btree.note_deletion("grandparent/parent/file")
323
btree.note_id("e", "grandparent/alt_parent/fool", kind="directory")
324
btree.note_last_changed("grandparent/alt_parent/fool",
326
self.assertEqual(self.sorted_ids(btree),
327
[inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
330
class BundleTester1(tests.TestCaseWithTransport):
332
def test_mismatched_bundle(self):
333
format = bzrdir.BzrDirMetaFormat1()
334
format.repository_format = knitrepo.RepositoryFormatKnit3()
335
serializer = BundleSerializerV08('0.8')
336
b = self.make_branch('.', format=format)
337
self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
338
b.repository, [], {}, StringIO())
340
def test_matched_bundle(self):
341
"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
342
format = bzrdir.BzrDirMetaFormat1()
343
format.repository_format = knitrepo.RepositoryFormatKnit3()
344
serializer = BundleSerializerV09('0.9')
345
b = self.make_branch('.', format=format)
346
serializer.write(b.repository, [], {}, StringIO())
348
def test_mismatched_model(self):
349
"""Try copying a bundle from knit2 to knit1"""
350
format = bzrdir.BzrDirMetaFormat1()
351
format.repository_format = knitrepo.RepositoryFormatKnit3()
352
source = self.make_branch_and_tree('source', format=format)
353
source.commit('one', rev_id='one-id')
354
source.commit('two', rev_id='two-id')
356
write_bundle(source.branch.repository, 'two-id', 'null:', text,
360
format = bzrdir.BzrDirMetaFormat1()
361
format.repository_format = knitrepo.RepositoryFormatKnit1()
362
target = self.make_branch('target', format=format)
363
self.assertRaises(errors.IncompatibleRevision, install_bundle,
364
target.repository, read_bundle(text))
367
class BundleTester(object):
369
def bzrdir_format(self):
370
format = bzrdir.BzrDirMetaFormat1()
371
format.repository_format = knitrepo.RepositoryFormatKnit1()
374
def make_branch_and_tree(self, path, format=None):
376
format = self.bzrdir_format()
377
return tests.TestCaseWithTransport.make_branch_and_tree(
380
def make_branch(self, path, format=None):
382
format = self.bzrdir_format()
383
return tests.TestCaseWithTransport.make_branch(self, path, format)
385
def create_bundle_text(self, base_rev_id, rev_id):
386
bundle_txt = StringIO()
387
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
388
bundle_txt, format=self.format)
390
self.assertEqual(bundle_txt.readline(),
391
'# Bazaar revision bundle v%s\n' % self.format)
392
self.assertEqual(bundle_txt.readline(), '#\n')
394
rev = self.b1.repository.get_revision(rev_id)
395
self.assertEqual(bundle_txt.readline().decode('utf-8'),
398
return bundle_txt, rev_ids
400
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
401
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
402
Make sure that the text generated is valid, and that it
403
can be applied against the base, and generate the same information.
405
:return: The in-memory bundle
407
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
409
# This should also validate the generated bundle
410
bundle = read_bundle(bundle_txt)
411
repository = self.b1.repository
412
for bundle_rev in bundle.real_revisions:
413
# These really should have already been checked when we read the
414
# bundle, since it computes the sha1 hash for the revision, which
415
# only will match if everything is okay, but lets be explicit about
417
branch_rev = repository.get_revision(bundle_rev.revision_id)
418
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
419
'timestamp', 'timezone', 'message', 'committer',
420
'parent_ids', 'properties'):
421
self.assertEqual(getattr(branch_rev, a),
422
getattr(bundle_rev, a))
423
self.assertEqual(len(branch_rev.parent_ids),
424
len(bundle_rev.parent_ids))
425
self.assertEqual(rev_ids,
426
[r.revision_id for r in bundle.real_revisions])
427
self.valid_apply_bundle(base_rev_id, bundle,
428
checkout_dir=checkout_dir)
432
def get_invalid_bundle(self, base_rev_id, rev_id):
433
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
434
Munge the text so that it's invalid.
436
:return: The in-memory bundle
438
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
439
new_text = bundle_txt.getvalue().replace('executable:no',
441
bundle_txt = StringIO(new_text)
442
bundle = read_bundle(bundle_txt)
443
self.valid_apply_bundle(base_rev_id, bundle)
446
def test_non_bundle(self):
447
self.assertRaises(errors.NotABundle,
448
read_bundle, StringIO('#!/bin/sh\n'))
450
def test_malformed(self):
451
self.assertRaises(errors.BadBundle, read_bundle,
452
StringIO('# Bazaar revision bundle v'))
454
def test_crlf_bundle(self):
456
read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
457
except errors.BadBundle:
458
# It is currently permitted for bundles with crlf line endings to
459
# make read_bundle raise a BadBundle, but this should be fixed.
460
# Anything else, especially NotABundle, is an error.
463
def get_checkout(self, rev_id, checkout_dir=None):
464
"""Get a new tree, with the specified revision in it.
467
if checkout_dir is None:
468
checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
470
if not os.path.exists(checkout_dir):
471
os.mkdir(checkout_dir)
472
tree = self.make_branch_and_tree(checkout_dir)
474
ancestors = write_bundle(self.b1.repository, rev_id, 'null:', s,
477
self.assertIsInstance(s.getvalue(), str)
478
install_bundle(tree.branch.repository, read_bundle(s))
479
for ancestor in ancestors:
480
old = self.b1.repository.revision_tree(ancestor)
481
new = tree.branch.repository.revision_tree(ancestor)
485
# Check that there aren't any inventory level changes
486
delta = new.changes_from(old)
487
self.assertFalse(delta.has_changed(),
488
'Revision %s not copied correctly.'
491
# Now check that the file contents are all correct
492
for inventory_id in old:
494
old_file = old.get_file(inventory_id)
495
except errors.NoSuchFile:
499
self.assertEqual(old_file.read(),
500
new.get_file(inventory_id).read())
504
if not _mod_revision.is_null(rev_id):
505
rh = self.b1.revision_history()
506
tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
508
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
509
self.assertFalse(delta.has_changed(),
510
'Working tree has modifications: %s' % delta)
513
def valid_apply_bundle(self, base_rev_id, info, checkout_dir=None):
514
"""Get the base revision, apply the changes, and make
515
sure everything matches the builtin branch.
517
to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
520
self._valid_apply_bundle(base_rev_id, info, to_tree)
524
def _valid_apply_bundle(self, base_rev_id, info, to_tree):
525
original_parents = to_tree.get_parent_ids()
526
repository = to_tree.branch.repository
527
original_parents = to_tree.get_parent_ids()
528
self.assertIs(repository.has_revision(base_rev_id), True)
529
for rev in info.real_revisions:
530
self.assert_(not repository.has_revision(rev.revision_id),
531
'Revision {%s} present before applying bundle'
533
merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
535
for rev in info.real_revisions:
536
self.assert_(repository.has_revision(rev.revision_id),
537
'Missing revision {%s} after applying bundle'
540
self.assert_(to_tree.branch.repository.has_revision(info.target))
541
# Do we also want to verify that all the texts have been added?
543
self.assertEqual(original_parents + [info.target],
544
to_tree.get_parent_ids())
546
rev = info.real_revisions[-1]
547
base_tree = self.b1.repository.revision_tree(rev.revision_id)
548
to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
550
# TODO: make sure the target tree is identical to base tree
551
# we might also check the working tree.
553
base_files = list(base_tree.list_files())
554
to_files = list(to_tree.list_files())
555
self.assertEqual(len(base_files), len(to_files))
556
for base_file, to_file in zip(base_files, to_files):
557
self.assertEqual(base_file, to_file)
559
for path, status, kind, fileid, entry in base_files:
560
# Check that the meta information is the same
561
self.assertEqual(base_tree.get_file_size(fileid),
562
to_tree.get_file_size(fileid))
563
self.assertEqual(base_tree.get_file_sha1(fileid),
564
to_tree.get_file_sha1(fileid))
565
# Check that the contents are the same
566
# This is pretty expensive
567
# self.assertEqual(base_tree.get_file(fileid).read(),
568
# to_tree.get_file(fileid).read())
570
def test_bundle(self):
571
self.tree1 = self.make_branch_and_tree('b1')
572
self.b1 = self.tree1.branch
574
self.build_tree_contents([('b1/one', 'one\n')])
575
self.tree1.add('one', 'one-id')
576
self.tree1.set_root_id('root-id')
577
self.tree1.commit('add one', rev_id='a@cset-0-1')
579
bundle = self.get_valid_bundle('null:', 'a@cset-0-1')
581
# Make sure we can handle files with spaces, tabs, other
586
, 'b1/dir/filein subdir.c'
587
, 'b1/dir/WithCaps.txt'
588
, 'b1/dir/ pre space'
591
, 'b1/sub/sub/nonempty.txt'
593
self.build_tree_contents([('b1/sub/sub/emptyfile.txt', ''),
594
('b1/dir/nolastnewline.txt', 'bloop')])
595
tt = TreeTransform(self.tree1)
596
tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
598
# have to fix length of file-id so that we can predictably rewrite
599
# a (length-prefixed) record containing it later.
600
self.tree1.add('with space.txt', 'withspace-id')
603
, 'dir/filein subdir.c'
606
, 'dir/nolastnewline.txt'
609
, 'sub/sub/nonempty.txt'
610
, 'sub/sub/emptyfile.txt'
612
self.tree1.commit('add whitespace', rev_id='a@cset-0-2')
614
bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
616
# Check a rollup bundle
617
bundle = self.get_valid_bundle('null:', 'a@cset-0-2')
621
['sub/sub/nonempty.txt'
622
, 'sub/sub/emptyfile.txt'
625
tt = TreeTransform(self.tree1)
626
trans_id = tt.trans_id_tree_file_id('exe-1')
627
tt.set_executability(False, trans_id)
629
self.tree1.commit('removed', rev_id='a@cset-0-3')
631
bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
632
self.assertRaises((errors.TestamentMismatch,
633
errors.VersionedFileInvalidChecksum,
634
errors.BadBundle), self.get_invalid_bundle,
635
'a@cset-0-2', 'a@cset-0-3')
636
# Check a rollup bundle
637
bundle = self.get_valid_bundle('null:', 'a@cset-0-3')
639
# Now move the directory
640
self.tree1.rename_one('dir', 'sub/dir')
641
self.tree1.commit('rename dir', rev_id='a@cset-0-4')
643
bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
644
# Check a rollup bundle
645
bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
648
open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
649
open('b1/sub/dir/ pre space', 'ab').write(
650
'\r\nAdding some\r\nDOS format lines\r\n')
651
open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
652
self.tree1.rename_one('sub/dir/ pre space',
654
self.tree1.commit('Modified files', rev_id='a@cset-0-5')
655
bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
657
self.tree1.rename_one('sub/dir/WithCaps.txt', 'temp')
658
self.tree1.rename_one('with space.txt', 'WithCaps.txt')
659
self.tree1.rename_one('temp', 'with space.txt')
660
self.tree1.commit(u'swap filenames', rev_id='a@cset-0-6',
662
bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
663
other = self.get_checkout('a@cset-0-5')
664
tree1_inv = get_inventory_text(self.tree1.branch.repository,
666
tree2_inv = get_inventory_text(other.branch.repository,
668
self.assertEqualDiff(tree1_inv, tree2_inv)
669
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
670
other.commit('rename file', rev_id='a@cset-0-6b')
671
self.tree1.merge_from_branch(other.branch)
672
self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
674
bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
676
def _test_symlink_bundle(self, link_name, link_target, new_link_target):
679
self.requireFeature(tests.SymlinkFeature)
680
self.tree1 = self.make_branch_and_tree('b1')
681
self.b1 = self.tree1.branch
683
tt = TreeTransform(self.tree1)
684
tt.new_symlink(link_name, tt.root, link_target, link_id)
686
self.tree1.commit('add symlink', rev_id='l@cset-0-1')
687
bundle = self.get_valid_bundle('null:', 'l@cset-0-1')
688
if getattr(bundle ,'revision_tree', None) is not None:
689
# Not all bundle formats supports revision_tree
690
bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-1')
691
self.assertEqual(link_target, bund_tree.get_symlink_target(link_id))
693
tt = TreeTransform(self.tree1)
694
trans_id = tt.trans_id_tree_file_id(link_id)
695
tt.adjust_path('link2', tt.root, trans_id)
696
tt.delete_contents(trans_id)
697
tt.create_symlink(new_link_target, trans_id)
699
self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
700
bundle = self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
701
if getattr(bundle ,'revision_tree', None) is not None:
702
# Not all bundle formats supports revision_tree
703
bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-2')
704
self.assertEqual(new_link_target,
705
bund_tree.get_symlink_target(link_id))
707
tt = TreeTransform(self.tree1)
708
trans_id = tt.trans_id_tree_file_id(link_id)
709
tt.delete_contents(trans_id)
710
tt.create_symlink('jupiter', trans_id)
712
self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
713
bundle = self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
715
tt = TreeTransform(self.tree1)
716
trans_id = tt.trans_id_tree_file_id(link_id)
717
tt.delete_contents(trans_id)
719
self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
720
bundle = self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
722
def test_symlink_bundle(self):
723
self._test_symlink_bundle('link', 'bar/foo', 'mars')
725
def test_unicode_symlink_bundle(self):
726
self.requireFeature(tests.UnicodeFilenameFeature)
727
self._test_symlink_bundle(u'\N{Euro Sign}link',
728
u'bar/\N{Euro Sign}foo',
729
u'mars\N{Euro Sign}')
731
def test_binary_bundle(self):
732
self.tree1 = self.make_branch_and_tree('b1')
733
self.b1 = self.tree1.branch
734
tt = TreeTransform(self.tree1)
737
tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
738
tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
741
self.tree1.commit('add binary', rev_id='b@cset-0-1')
742
self.get_valid_bundle('null:', 'b@cset-0-1')
745
tt = TreeTransform(self.tree1)
746
trans_id = tt.trans_id_tree_file_id('binary-1')
747
tt.delete_contents(trans_id)
749
self.tree1.commit('delete binary', rev_id='b@cset-0-2')
750
self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
753
tt = TreeTransform(self.tree1)
754
trans_id = tt.trans_id_tree_file_id('binary-2')
755
tt.adjust_path('file3', tt.root, trans_id)
756
tt.delete_contents(trans_id)
757
tt.create_file('file\rcontents\x00\n\x00', trans_id)
759
self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
760
self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
763
tt = TreeTransform(self.tree1)
764
trans_id = tt.trans_id_tree_file_id('binary-2')
765
tt.delete_contents(trans_id)
766
tt.create_file('\x00file\rcontents', trans_id)
768
self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
769
self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
772
self.get_valid_bundle('null:', 'b@cset-0-4')
774
def test_last_modified(self):
775
self.tree1 = self.make_branch_and_tree('b1')
776
self.b1 = self.tree1.branch
777
tt = TreeTransform(self.tree1)
778
tt.new_file('file', tt.root, 'file', 'file')
780
self.tree1.commit('create file', rev_id='a@lmod-0-1')
782
tt = TreeTransform(self.tree1)
783
trans_id = tt.trans_id_tree_file_id('file')
784
tt.delete_contents(trans_id)
785
tt.create_file('file2', trans_id)
787
self.tree1.commit('modify text', rev_id='a@lmod-0-2a')
789
other = self.get_checkout('a@lmod-0-1')
790
tt = TreeTransform(other)
791
trans_id = tt.trans_id_tree_file_id('file')
792
tt.delete_contents(trans_id)
793
tt.create_file('file2', trans_id)
795
other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
796
self.tree1.merge_from_branch(other.branch)
797
self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
799
self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
800
bundle = self.get_valid_bundle('a@lmod-0-2a', 'a@lmod-0-4')
802
def test_hide_history(self):
803
self.tree1 = self.make_branch_and_tree('b1')
804
self.b1 = self.tree1.branch
806
open('b1/one', 'wb').write('one\n')
807
self.tree1.add('one')
808
self.tree1.commit('add file', rev_id='a@cset-0-1')
809
open('b1/one', 'wb').write('two\n')
810
self.tree1.commit('modify', rev_id='a@cset-0-2')
811
open('b1/one', 'wb').write('three\n')
812
self.tree1.commit('modify', rev_id='a@cset-0-3')
813
bundle_file = StringIO()
814
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
815
'a@cset-0-1', bundle_file, format=self.format)
816
self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
817
self.assertContainsRe(self.get_raw(bundle_file), 'one')
818
self.assertContainsRe(self.get_raw(bundle_file), 'three')
820
def test_bundle_same_basis(self):
821
"""Ensure using the basis as the target doesn't cause an error"""
822
self.tree1 = self.make_branch_and_tree('b1')
823
self.tree1.commit('add file', rev_id='a@cset-0-1')
824
bundle_file = StringIO()
825
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
826
'a@cset-0-1', bundle_file)
829
def get_raw(bundle_file):
830
return bundle_file.getvalue()
832
def test_unicode_bundle(self):
833
self.requireFeature(tests.UnicodeFilenameFeature)
834
# Handle international characters
836
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
838
self.tree1 = self.make_branch_and_tree('b1')
839
self.b1 = self.tree1.branch
842
u'With international man of mystery\n'
843
u'William Dod\xe9\n').encode('utf-8'))
846
self.tree1.add([u'with Dod\N{Euro Sign}'], ['withdod-id'])
847
self.tree1.commit(u'i18n commit from William Dod\xe9',
848
rev_id='i18n-1', committer=u'William Dod\xe9')
851
bundle = self.get_valid_bundle('null:', 'i18n-1')
854
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
855
f.write(u'Modified \xb5\n'.encode('utf8'))
857
self.tree1.commit(u'modified', rev_id='i18n-2')
859
bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
862
self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
863
self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
864
committer=u'Erik B\xe5gfors')
866
bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
869
self.tree1.remove([u'B\N{Euro Sign}gfors'])
870
self.tree1.commit(u'removed', rev_id='i18n-4')
872
bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
875
bundle = self.get_valid_bundle('null:', 'i18n-4')
878
def test_whitespace_bundle(self):
879
if sys.platform in ('win32', 'cygwin'):
880
raise tests.TestSkipped('Windows doesn\'t support filenames'
881
' with tabs or trailing spaces')
882
self.tree1 = self.make_branch_and_tree('b1')
883
self.b1 = self.tree1.branch
885
self.build_tree(['b1/trailing space '])
886
self.tree1.add(['trailing space '])
887
# TODO: jam 20060701 Check for handling files with '\t' characters
888
# once we actually support them
891
self.tree1.commit('funky whitespace', rev_id='white-1')
893
bundle = self.get_valid_bundle('null:', 'white-1')
896
open('b1/trailing space ', 'ab').write('add some text\n')
897
self.tree1.commit('add text', rev_id='white-2')
899
bundle = self.get_valid_bundle('white-1', 'white-2')
902
self.tree1.rename_one('trailing space ', ' start and end space ')
903
self.tree1.commit('rename', rev_id='white-3')
905
bundle = self.get_valid_bundle('white-2', 'white-3')
908
self.tree1.remove([' start and end space '])
909
self.tree1.commit('removed', rev_id='white-4')
911
bundle = self.get_valid_bundle('white-3', 'white-4')
913
# Now test a complet roll-up
914
bundle = self.get_valid_bundle('null:', 'white-4')
916
def test_alt_timezone_bundle(self):
917
self.tree1 = self.make_branch_and_memory_tree('b1')
918
self.b1 = self.tree1.branch
919
builder = treebuilder.TreeBuilder()
921
self.tree1.lock_write()
922
builder.start_tree(self.tree1)
923
builder.build(['newfile'])
924
builder.finish_tree()
926
# Asia/Colombo offset = 5 hours 30 minutes
927
self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
928
timezone=19800, timestamp=1152544886.0)
930
bundle = self.get_valid_bundle('null:', 'tz-1')
932
rev = bundle.revisions[0]
933
self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
934
self.assertEqual(19800, rev.timezone)
935
self.assertEqual(1152544886.0, rev.timestamp)
938
def test_bundle_root_id(self):
939
self.tree1 = self.make_branch_and_tree('b1')
940
self.b1 = self.tree1.branch
941
self.tree1.commit('message', rev_id='revid1')
942
bundle = self.get_valid_bundle('null:', 'revid1')
943
tree = self.get_bundle_tree(bundle, 'revid1')
944
self.assertEqual('revid1', tree.inventory.root.revision)
946
def test_install_revisions(self):
947
self.tree1 = self.make_branch_and_tree('b1')
948
self.b1 = self.tree1.branch
949
self.tree1.commit('message', rev_id='rev2a')
950
bundle = self.get_valid_bundle('null:', 'rev2a')
951
branch2 = self.make_branch('b2')
952
self.assertFalse(branch2.repository.has_revision('rev2a'))
953
target_revision = bundle.install_revisions(branch2.repository)
954
self.assertTrue(branch2.repository.has_revision('rev2a'))
955
self.assertEqual('rev2a', target_revision)
957
def test_bundle_empty_property(self):
958
"""Test serializing revision properties with an empty value."""
959
tree = self.make_branch_and_memory_tree('tree')
961
self.addCleanup(tree.unlock)
962
tree.add([''], ['TREE_ROOT'])
963
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
964
self.b1 = tree.branch
965
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
966
bundle = read_bundle(bundle_sio)
967
revision_info = bundle.revisions[0]
968
self.assertEqual('rev1', revision_info.revision_id)
969
rev = revision_info.as_revision()
970
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
973
def test_bundle_sorted_properties(self):
974
"""For stability the writer should write properties in sorted order."""
975
tree = self.make_branch_and_memory_tree('tree')
977
self.addCleanup(tree.unlock)
979
tree.add([''], ['TREE_ROOT'])
980
tree.commit('One', rev_id='rev1',
981
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
982
self.b1 = tree.branch
983
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
984
bundle = read_bundle(bundle_sio)
985
revision_info = bundle.revisions[0]
986
self.assertEqual('rev1', revision_info.revision_id)
987
rev = revision_info.as_revision()
988
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
989
'd':'1'}, rev.properties)
991
def test_bundle_unicode_properties(self):
992
"""We should be able to round trip a non-ascii property."""
993
tree = self.make_branch_and_memory_tree('tree')
995
self.addCleanup(tree.unlock)
997
tree.add([''], ['TREE_ROOT'])
998
# Revisions themselves do not require anything about revision property
999
# keys, other than that they are a basestring, and do not contain
1001
# However, Testaments assert than they are str(), and thus should not
1003
tree.commit('One', rev_id='rev1',
1004
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1005
self.b1 = tree.branch
1006
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1007
bundle = read_bundle(bundle_sio)
1008
revision_info = bundle.revisions[0]
1009
self.assertEqual('rev1', revision_info.revision_id)
1010
rev = revision_info.as_revision()
1011
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1012
'alpha':u'\u03b1'}, rev.properties)
1014
def test_bundle_with_ghosts(self):
1015
tree = self.make_branch_and_tree('tree')
1016
self.b1 = tree.branch
1017
self.build_tree_contents([('tree/file', 'content1')])
1020
self.build_tree_contents([('tree/file', 'content2')])
1021
tree.add_parent_tree_id('ghost')
1022
tree.commit('rev2', rev_id='rev2')
1023
bundle = self.get_valid_bundle('null:', 'rev2')
1025
def make_simple_tree(self, format=None):
1026
tree = self.make_branch_and_tree('b1', format=format)
1027
self.b1 = tree.branch
1028
self.build_tree(['b1/file'])
1032
def test_across_serializers(self):
1033
tree = self.make_simple_tree('knit')
1034
tree.commit('hello', rev_id='rev1')
1035
tree.commit('hello', rev_id='rev2')
1036
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1037
repo = self.make_repository('repo', format='dirstate-with-subtree')
1038
bundle.install_revisions(repo)
1039
inv_text = repo._get_inventory_xml('rev2')
1040
self.assertNotContainsRe(inv_text, 'format="5"')
1041
self.assertContainsRe(inv_text, 'format="7"')
1043
def make_repo_with_installed_revisions(self):
1044
tree = self.make_simple_tree('knit')
1045
tree.commit('hello', rev_id='rev1')
1046
tree.commit('hello', rev_id='rev2')
1047
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1048
repo = self.make_repository('repo', format='dirstate-with-subtree')
1049
bundle.install_revisions(repo)
1052
def test_across_models(self):
1053
repo = self.make_repo_with_installed_revisions()
1054
inv = repo.get_inventory('rev2')
1055
self.assertEqual('rev2', inv.root.revision)
1056
root_id = inv.root.file_id
1058
self.addCleanup(repo.unlock)
1059
self.assertEqual({(root_id, 'rev1'):(),
1060
(root_id, 'rev2'):((root_id, 'rev1'),)},
1061
repo.texts.get_parent_map([(root_id, 'rev1'), (root_id, 'rev2')]))
1063
def test_inv_hash_across_serializers(self):
1064
repo = self.make_repo_with_installed_revisions()
1065
recorded_inv_sha1 = repo.get_revision('rev2').inventory_sha1
1066
xml = repo._get_inventory_xml('rev2')
1067
self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
1069
def test_across_models_incompatible(self):
1070
tree = self.make_simple_tree('dirstate-with-subtree')
1071
tree.commit('hello', rev_id='rev1')
1072
tree.commit('hello', rev_id='rev2')
1074
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1075
except errors.IncompatibleBundleFormat:
1076
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1077
repo = self.make_repository('repo', format='knit')
1078
bundle.install_revisions(repo)
1080
bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1081
self.assertRaises(errors.IncompatibleRevision,
1082
bundle.install_revisions, repo)
1084
def test_get_merge_request(self):
1085
tree = self.make_simple_tree()
1086
tree.commit('hello', rev_id='rev1')
1087
tree.commit('hello', rev_id='rev2')
1088
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1089
result = bundle.get_merge_request(tree.branch.repository)
1090
self.assertEqual((None, 'rev1', 'inapplicable'), result)
1092
def test_with_subtree(self):
1093
tree = self.make_branch_and_tree('tree',
1094
format='dirstate-with-subtree')
1095
self.b1 = tree.branch
1096
subtree = self.make_branch_and_tree('tree/subtree',
1097
format='dirstate-with-subtree')
1099
tree.commit('hello', rev_id='rev1')
1101
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1102
except errors.IncompatibleBundleFormat:
1103
raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1104
if isinstance(bundle, v09.BundleInfo09):
1105
raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
1106
repo = self.make_repository('repo', format='knit')
1107
self.assertRaises(errors.IncompatibleRevision,
1108
bundle.install_revisions, repo)
1109
repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1110
bundle.install_revisions(repo2)
1112
def test_revision_id_with_slash(self):
1113
self.tree1 = self.make_branch_and_tree('tree')
1114
self.b1 = self.tree1.branch
1116
self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
1118
raise tests.TestSkipped(
1119
"Repository doesn't support revision ids with slashes")
1120
bundle = self.get_valid_bundle('null:', 'rev/id')
1122
def test_skip_file(self):
1123
"""Make sure we don't accidentally write to the wrong versionedfile"""
1124
self.tree1 = self.make_branch_and_tree('tree')
1125
self.b1 = self.tree1.branch
1126
# rev1 is not present in bundle, done by fetch
1127
self.build_tree_contents([('tree/file2', 'contents1')])
1128
self.tree1.add('file2', 'file2-id')
1129
self.tree1.commit('rev1', rev_id='reva')
1130
self.build_tree_contents([('tree/file3', 'contents2')])
1131
# rev2 is present in bundle, and done by fetch
1132
# having file1 in the bunle causes file1's versionedfile to be opened.
1133
self.tree1.add('file3', 'file3-id')
1134
self.tree1.commit('rev2')
1135
# Updating file2 should not cause an attempt to add to file1's vf
1136
target = self.tree1.bzrdir.sprout('target').open_workingtree()
1137
self.build_tree_contents([('tree/file2', 'contents3')])
1138
self.tree1.commit('rev3', rev_id='rev3')
1139
bundle = self.get_valid_bundle('reva', 'rev3')
1140
if getattr(bundle, 'get_bundle_reader', None) is None:
1141
raise tests.TestSkipped('Bundle format cannot provide reader')
1142
# be sure that file1 comes before file2
1143
for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1146
self.assertNotEqual(f, 'file2-id')
1147
bundle.install_revisions(target.branch.repository)
1150
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
1154
def test_bundle_empty_property(self):
1155
"""Test serializing revision properties with an empty value."""
1156
tree = self.make_branch_and_memory_tree('tree')
1158
self.addCleanup(tree.unlock)
1159
tree.add([''], ['TREE_ROOT'])
1160
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1161
self.b1 = tree.branch
1162
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1163
self.assertContainsRe(bundle_sio.getvalue(),
1165
'# branch-nick: tree\n'
1169
bundle = read_bundle(bundle_sio)
1170
revision_info = bundle.revisions[0]
1171
self.assertEqual('rev1', revision_info.revision_id)
1172
rev = revision_info.as_revision()
1173
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1176
def get_bundle_tree(self, bundle, revision_id):
1177
repository = self.make_repository('repo')
1178
return bundle.revision_tree(repository, 'revid1')
1180
def test_bundle_empty_property_alt(self):
1181
"""Test serializing revision properties with an empty value.
1183
Older readers had a bug when reading an empty property.
1184
They assumed that all keys ended in ': \n'. However they would write an
1185
empty value as ':\n'. This tests make sure that all newer bzr versions
1186
can handle th second form.
1188
tree = self.make_branch_and_memory_tree('tree')
1190
self.addCleanup(tree.unlock)
1191
tree.add([''], ['TREE_ROOT'])
1192
tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1193
self.b1 = tree.branch
1194
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1195
txt = bundle_sio.getvalue()
1196
loc = txt.find('# empty: ') + len('# empty:')
1197
# Create a new bundle, which strips the trailing space after empty
1198
bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
1200
self.assertContainsRe(bundle_sio.getvalue(),
1202
'# branch-nick: tree\n'
1206
bundle = read_bundle(bundle_sio)
1207
revision_info = bundle.revisions[0]
1208
self.assertEqual('rev1', revision_info.revision_id)
1209
rev = revision_info.as_revision()
1210
self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1213
def test_bundle_sorted_properties(self):
1214
"""For stability the writer should write properties in sorted order."""
1215
tree = self.make_branch_and_memory_tree('tree')
1217
self.addCleanup(tree.unlock)
1219
tree.add([''], ['TREE_ROOT'])
1220
tree.commit('One', rev_id='rev1',
1221
revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1222
self.b1 = tree.branch
1223
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1224
self.assertContainsRe(bundle_sio.getvalue(),
1228
'# branch-nick: tree\n'
1232
bundle = read_bundle(bundle_sio)
1233
revision_info = bundle.revisions[0]
1234
self.assertEqual('rev1', revision_info.revision_id)
1235
rev = revision_info.as_revision()
1236
self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
1237
'd':'1'}, rev.properties)
1239
def test_bundle_unicode_properties(self):
1240
"""We should be able to round trip a non-ascii property."""
1241
tree = self.make_branch_and_memory_tree('tree')
1243
self.addCleanup(tree.unlock)
1245
tree.add([''], ['TREE_ROOT'])
1246
# Revisions themselves do not require anything about revision property
1247
# keys, other than that they are a basestring, and do not contain
1249
# However, Testaments assert than they are str(), and thus should not
1251
tree.commit('One', rev_id='rev1',
1252
revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1253
self.b1 = tree.branch
1254
bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1255
self.assertContainsRe(bundle_sio.getvalue(),
1257
'# alpha: \xce\xb1\n'
1258
'# branch-nick: tree\n'
1259
'# omega: \xce\xa9\n'
1261
bundle = read_bundle(bundle_sio)
1262
revision_info = bundle.revisions[0]
1263
self.assertEqual('rev1', revision_info.revision_id)
1264
rev = revision_info.as_revision()
1265
self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1266
'alpha':u'\u03b1'}, rev.properties)
1269
class V09BundleKnit2Tester(V08BundleTester):
1273
def bzrdir_format(self):
1274
format = bzrdir.BzrDirMetaFormat1()
1275
format.repository_format = knitrepo.RepositoryFormatKnit3()
1279
class V09BundleKnit1Tester(V08BundleTester):
1283
def bzrdir_format(self):
1284
format = bzrdir.BzrDirMetaFormat1()
1285
format.repository_format = knitrepo.RepositoryFormatKnit1()
1289
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
1293
def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1294
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1295
Make sure that the text generated is valid, and that it
1296
can be applied against the base, and generate the same information.
1298
:return: The in-memory bundle
1300
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1302
# This should also validate the generated bundle
1303
bundle = read_bundle(bundle_txt)
1304
repository = self.b1.repository
1305
for bundle_rev in bundle.real_revisions:
1306
# These really should have already been checked when we read the
1307
# bundle, since it computes the sha1 hash for the revision, which
1308
# only will match if everything is okay, but lets be explicit about
1310
branch_rev = repository.get_revision(bundle_rev.revision_id)
1311
for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1312
'timestamp', 'timezone', 'message', 'committer',
1313
'parent_ids', 'properties'):
1314
self.assertEqual(getattr(branch_rev, a),
1315
getattr(bundle_rev, a))
1316
self.assertEqual(len(branch_rev.parent_ids),
1317
len(bundle_rev.parent_ids))
1318
self.assertEqual(set(rev_ids),
1319
set([r.revision_id for r in bundle.real_revisions]))
1320
self.valid_apply_bundle(base_rev_id, bundle,
1321
checkout_dir=checkout_dir)
1325
def get_invalid_bundle(self, base_rev_id, rev_id):
1326
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1327
Munge the text so that it's invalid.
1329
:return: The in-memory bundle
1331
from bzrlib.bundle import serializer
1332
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1333
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1334
new_text = new_text.replace('<file file_id="exe-1"',
1335
'<file executable="y" file_id="exe-1"')
1336
new_text = new_text.replace('B260', 'B275')
1337
bundle_txt = StringIO()
1338
bundle_txt.write(serializer._get_bundle_header('4'))
1339
bundle_txt.write('\n')
1340
bundle_txt.write(new_text.encode('bz2'))
1342
bundle = read_bundle(bundle_txt)
1343
self.valid_apply_bundle(base_rev_id, bundle)
1346
def create_bundle_text(self, base_rev_id, rev_id):
1347
bundle_txt = StringIO()
1348
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1349
bundle_txt, format=self.format)
1351
self.assertEqual(bundle_txt.readline(),
1352
'# Bazaar revision bundle v%s\n' % self.format)
1353
self.assertEqual(bundle_txt.readline(), '#\n')
1354
rev = self.b1.repository.get_revision(rev_id)
1356
return bundle_txt, rev_ids
1358
def get_bundle_tree(self, bundle, revision_id):
1359
repository = self.make_repository('repo')
1360
bundle.install_revisions(repository)
1361
return repository.revision_tree(revision_id)
1363
def test_creation(self):
1364
tree = self.make_branch_and_tree('tree')
1365
self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
1366
tree.add('file', 'fileid-2')
1367
tree.commit('added file', rev_id='rev1')
1368
self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
1369
tree.commit('changed file', rev_id='rev2')
1371
serializer = BundleSerializerV4('1.0')
1372
serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
1374
tree2 = self.make_branch_and_tree('target')
1375
target_repo = tree2.branch.repository
1376
install_bundle(target_repo, serializer.read(s))
1377
target_repo.lock_read()
1378
self.addCleanup(target_repo.unlock)
1379
# Turn the 'iterators_of_bytes' back into simple strings for comparison
1380
repo_texts = dict((i, ''.join(content)) for i, content
1381
in target_repo.iter_files_bytes(
1382
[('fileid-2', 'rev1', '1'),
1383
('fileid-2', 'rev2', '2')]))
1384
self.assertEqual({'1':'contents1\nstatic\n',
1385
'2':'contents2\nstatic\n'},
1387
rtree = target_repo.revision_tree('rev2')
1388
inventory_vf = target_repo.inventories
1389
# If the inventory store has a graph, it must match the revision graph.
1391
[inventory_vf.get_parent_map([('rev2',)])[('rev2',)]],
1392
[None, (('rev1',),)])
1393
self.assertEqual('changed file',
1394
target_repo.get_revision('rev2').message)
1397
def get_raw(bundle_file):
1399
line = bundle_file.readline()
1400
line = bundle_file.readline()
1401
lines = bundle_file.readlines()
1402
return ''.join(lines).decode('bz2')
1404
def test_copy_signatures(self):
1405
tree_a = self.make_branch_and_tree('tree_a')
1407
import bzrlib.commit as commit
1408
oldstrategy = bzrlib.gpg.GPGStrategy
1409
branch = tree_a.branch
1410
repo_a = branch.repository
1411
tree_a.commit("base", allow_pointless=True, rev_id='A')
1412
self.failIf(branch.repository.has_signature_for_revision_id('A'))
1414
from bzrlib.testament import Testament
1415
# monkey patch gpg signing mechanism
1416
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1417
new_config = test_commit.MustSignConfig(branch)
1418
commit.Commit(config=new_config).commit(message="base",
1419
allow_pointless=True,
1421
working_tree=tree_a)
1423
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1424
self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1426
bzrlib.gpg.GPGStrategy = oldstrategy
1427
tree_b = self.make_branch_and_tree('tree_b')
1428
repo_b = tree_b.branch.repository
1430
serializer = BundleSerializerV4('4')
1431
serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1433
install_bundle(repo_b, serializer.read(s))
1434
self.assertTrue(repo_b.has_signature_for_revision_id('B'))
1435
self.assertEqual(repo_b.get_signature_text('B'),
1436
repo_a.get_signature_text('B'))
1438
# ensure repeat installs are harmless
1439
install_bundle(repo_b, serializer.read(s))
1442
class V4WeaveBundleTester(V4BundleTester):
1444
def bzrdir_format(self):
1448
class V4_2aBundleTester(V4BundleTester):
1450
def bzrdir_format(self):
1453
def get_invalid_bundle(self, base_rev_id, rev_id):
1454
"""Create a bundle from base_rev_id -> rev_id in built-in branch.
1455
Munge the text so that it's invalid.
1457
:return: The in-memory bundle
1459
from bzrlib.bundle import serializer
1460
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1461
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1462
# We are going to be replacing some text to set the executable bit on a
1463
# file. Make sure the text replacement actually works correctly.
1464
self.assertContainsRe(new_text, '(?m)B244\n\ni 1\n<inventory')
1465
new_text = new_text.replace('<file file_id="exe-1"',
1466
'<file executable="y" file_id="exe-1"')
1467
new_text = new_text.replace('B244', 'B259')
1468
bundle_txt = StringIO()
1469
bundle_txt.write(serializer._get_bundle_header('4'))
1470
bundle_txt.write('\n')
1471
bundle_txt.write(new_text.encode('bz2'))
1473
bundle = read_bundle(bundle_txt)
1474
self.valid_apply_bundle(base_rev_id, bundle)
1477
def make_merged_branch(self):
1478
builder = self.make_branch_builder('source')
1479
builder.start_series()
1480
builder.build_snapshot('a@cset-0-1', None, [
1481
('add', ('', 'root-id', 'directory', None)),
1482
('add', ('file', 'file-id', 'file', 'original content\n')),
1484
builder.build_snapshot('a@cset-0-2a', ['a@cset-0-1'], [
1485
('modify', ('file-id', 'new-content\n')),
1487
builder.build_snapshot('a@cset-0-2b', ['a@cset-0-1'], [
1488
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1490
builder.build_snapshot('a@cset-0-3', ['a@cset-0-2a', 'a@cset-0-2b'], [
1491
('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1493
builder.finish_series()
1494
self.b1 = builder.get_branch()
1496
self.addCleanup(self.b1.unlock)
1498
def make_bundle_just_inventories(self, base_revision_id,
1502
writer = v4.BundleWriteOperation(base_revision_id, target_revision_id,
1503
self.b1.repository, sio)
1504
writer.bundle.begin()
1505
writer._add_inventory_mpdiffs_from_serializer(revision_ids)
1510
def test_single_inventory_multiple_parents_as_xml(self):
1511
self.make_merged_branch()
1512
sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1514
reader = v4.BundleReader(sio, stream_input=False)
1515
records = list(reader.iter_records())
1516
self.assertEqual(1, len(records))
1517
(bytes, metadata, repo_kind, revision_id,
1518
file_id) = records[0]
1519
self.assertIs(None, file_id)
1520
self.assertEqual('a@cset-0-3', revision_id)
1521
self.assertEqual('inventory', repo_kind)
1522
self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1523
'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1524
'storage_kind': 'mpdiff',
1526
# We should have an mpdiff that takes some lines from both parents.
1527
self.assertEqualDiff(
1529
'<inventory format="10" revision_id="a@cset-0-3">\n'
1532
'c 1 3 3 2\n', bytes)
1534
def test_single_inv_no_parents_as_xml(self):
1535
self.make_merged_branch()
1536
sio = self.make_bundle_just_inventories('null:', 'a@cset-0-1',
1538
reader = v4.BundleReader(sio, stream_input=False)
1539
records = list(reader.iter_records())
1540
self.assertEqual(1, len(records))
1541
(bytes, metadata, repo_kind, revision_id,
1542
file_id) = records[0]
1543
self.assertIs(None, file_id)
1544
self.assertEqual('a@cset-0-1', revision_id)
1545
self.assertEqual('inventory', repo_kind)
1546
self.assertEqual({'parents': [],
1547
'sha1': 'a13f42b142d544aac9b085c42595d304150e31a2',
1548
'storage_kind': 'mpdiff',
1550
# We should have an mpdiff that takes some lines from both parents.
1551
self.assertEqualDiff(
1553
'<inventory format="10" revision_id="a@cset-0-1">\n'
1554
'<directory file_id="root-id" name=""'
1555
' revision="a@cset-0-1" />\n'
1556
'<file file_id="file-id" name="file" parent_id="root-id"'
1557
' revision="a@cset-0-1"'
1558
' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
1559
' text_size="17" />\n'
1563
def test_multiple_inventories_as_xml(self):
1564
self.make_merged_branch()
1565
sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1566
['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'])
1567
reader = v4.BundleReader(sio, stream_input=False)
1568
records = list(reader.iter_records())
1569
self.assertEqual(3, len(records))
1570
revision_ids = [rev_id for b, m, k, rev_id, f in records]
1571
self.assertEqual(['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'],
1573
metadata_2a = records[0][1]
1574
self.assertEqual({'parents': ['a@cset-0-1'],
1575
'sha1': '1e105886d62d510763e22885eec733b66f5f09bf',
1576
'storage_kind': 'mpdiff',
1578
metadata_2b = records[1][1]
1579
self.assertEqual({'parents': ['a@cset-0-1'],
1580
'sha1': 'f03f12574bdb5ed2204c28636c98a8547544ccd8',
1581
'storage_kind': 'mpdiff',
1583
metadata_3 = records[2][1]
1584
self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1585
'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1586
'storage_kind': 'mpdiff',
1588
bytes_2a = records[0][0]
1589
self.assertEqualDiff(
1591
'<inventory format="10" revision_id="a@cset-0-2a">\n'
1595
'<file file_id="file-id" name="file" parent_id="root-id"'
1596
' revision="a@cset-0-2a"'
1597
' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
1598
' text_size="12" />\n'
1600
'c 0 3 3 1\n', bytes_2a)
1601
bytes_2b = records[1][0]
1602
self.assertEqualDiff(
1604
'<inventory format="10" revision_id="a@cset-0-2b">\n'
1608
'<file file_id="file2-id" name="other-file" parent_id="root-id"'
1609
' revision="a@cset-0-2b"'
1610
' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
1611
' text_size="14" />\n'
1613
'c 0 3 4 1\n', bytes_2b)
1614
bytes_3 = records[2][0]
1615
self.assertEqualDiff(
1617
'<inventory format="10" revision_id="a@cset-0-3">\n'
1620
'c 1 3 3 2\n', bytes_3)
1622
def test_creating_bundle_preserves_chk_pages(self):
1623
self.make_merged_branch()
1624
target = self.b1.bzrdir.sprout('target',
1625
revision_id='a@cset-0-2a').open_branch()
1626
bundle_txt, rev_ids = self.create_bundle_text('a@cset-0-2a',
1628
self.assertEqual(['a@cset-0-2b', 'a@cset-0-3'], rev_ids)
1629
bundle = read_bundle(bundle_txt)
1631
self.addCleanup(target.unlock)
1632
install_bundle(target.repository, bundle)
1633
inv1 = self.b1.repository.inventories.get_record_stream([
1634
('a@cset-0-3',)], 'unordered',
1635
True).next().get_bytes_as('fulltext')
1636
inv2 = target.repository.inventories.get_record_stream([
1637
('a@cset-0-3',)], 'unordered',
1638
True).next().get_bytes_as('fulltext')
1639
self.assertEqualDiff(inv1, inv2)
1642
class MungedBundleTester(object):
1644
def build_test_bundle(self):
1645
wt = self.make_branch_and_tree('b1')
1647
self.build_tree(['b1/one'])
1649
wt.commit('add one', rev_id='a@cset-0-1')
1650
self.build_tree(['b1/two'])
1652
wt.commit('add two', rev_id='a@cset-0-2',
1653
revprops={'branch-nick':'test'})
1655
bundle_txt = StringIO()
1656
rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
1657
'a@cset-0-1', bundle_txt, self.format)
1658
self.assertEqual(set(['a@cset-0-2']), set(rev_ids))
1659
bundle_txt.seek(0, 0)
1662
def check_valid(self, bundle):
1663
"""Check that after whatever munging, the final object is valid."""
1664
self.assertEqual(['a@cset-0-2'],
1665
[r.revision_id for r in bundle.real_revisions])
1667
def test_extra_whitespace(self):
1668
bundle_txt = self.build_test_bundle()
1670
# Seek to the end of the file
1671
# Adding one extra newline used to give us
1672
# TypeError: float() argument must be a string or a number
1673
bundle_txt.seek(0, 2)
1674
bundle_txt.write('\n')
1677
bundle = read_bundle(bundle_txt)
1678
self.check_valid(bundle)
1680
def test_extra_whitespace_2(self):
1681
bundle_txt = self.build_test_bundle()
1683
# Seek to the end of the file
1684
# Adding two extra newlines used to give us
1685
# MalformedPatches: The first line of all patches should be ...
1686
bundle_txt.seek(0, 2)
1687
bundle_txt.write('\n\n')
1690
bundle = read_bundle(bundle_txt)
1691
self.check_valid(bundle)
1694
class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
1698
def test_missing_trailing_whitespace(self):
1699
bundle_txt = self.build_test_bundle()
1701
# Remove a trailing newline, it shouldn't kill the parser
1702
raw = bundle_txt.getvalue()
1703
# The contents of the bundle don't have to be this, but this
1704
# test is concerned with the exact case where the serializer
1705
# creates a blank line at the end, and fails if that
1707
self.assertEqual('\n\n', raw[-2:])
1708
bundle_txt = StringIO(raw[:-1])
1710
bundle = read_bundle(bundle_txt)
1711
self.check_valid(bundle)
1713
def test_opening_text(self):
1714
bundle_txt = self.build_test_bundle()
1716
bundle_txt = StringIO("Some random\nemail comments\n"
1717
+ bundle_txt.getvalue())
1719
bundle = read_bundle(bundle_txt)
1720
self.check_valid(bundle)
1722
def test_trailing_text(self):
1723
bundle_txt = self.build_test_bundle()
1725
bundle_txt = StringIO(bundle_txt.getvalue() +
1726
"Some trailing\nrandom\ntext\n")
1728
bundle = read_bundle(bundle_txt)
1729
self.check_valid(bundle)
1732
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
1737
class TestBundleWriterReader(tests.TestCase):
1739
def test_roundtrip_record(self):
1740
fileobj = StringIO()
1741
writer = v4.BundleWriter(fileobj)
1743
writer.add_info_record(foo='bar')
1744
writer._add_record("Record body", {'parents': ['1', '3'],
1745
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1748
reader = v4.BundleReader(fileobj, stream_input=True)
1749
record_iter = reader.iter_records()
1750
record = record_iter.next()
1751
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1752
'info', None, None), record)
1753
record = record_iter.next()
1754
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1755
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1758
def test_roundtrip_record_memory_hungry(self):
1759
fileobj = StringIO()
1760
writer = v4.BundleWriter(fileobj)
1762
writer.add_info_record(foo='bar')
1763
writer._add_record("Record body", {'parents': ['1', '3'],
1764
'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1767
reader = v4.BundleReader(fileobj, stream_input=False)
1768
record_iter = reader.iter_records()
1769
record = record_iter.next()
1770
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1771
'info', None, None), record)
1772
record = record_iter.next()
1773
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1774
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1777
def test_encode_name(self):
1778
self.assertEqual('revision/rev1',
1779
v4.BundleWriter.encode_name('revision', 'rev1'))
1780
self.assertEqual('file/rev//1/file-id-1',
1781
v4.BundleWriter.encode_name('file', 'rev/1', 'file-id-1'))
1782
self.assertEqual('info',
1783
v4.BundleWriter.encode_name('info', None, None))
1785
def test_decode_name(self):
1786
self.assertEqual(('revision', 'rev1', None),
1787
v4.BundleReader.decode_name('revision/rev1'))
1788
self.assertEqual(('file', 'rev/1', 'file-id-1'),
1789
v4.BundleReader.decode_name('file/rev//1/file-id-1'))
1790
self.assertEqual(('info', None, None),
1791
v4.BundleReader.decode_name('info'))
1793
def test_too_many_names(self):
1794
fileobj = StringIO()
1795
writer = v4.BundleWriter(fileobj)
1797
writer.add_info_record(foo='bar')
1798
writer._container.add_bytes_record('blah', ['two', 'names'])
1801
record_iter = v4.BundleReader(fileobj).iter_records()
1802
record = record_iter.next()
1803
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1804
'info', None, None), record)
1805
self.assertRaises(errors.BadBundle, record_iter.next)
1808
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
1810
def test_read_mergeable_skips_local(self):
1811
"""A local bundle named like the URL should not be read.
1813
out, wt = test_read_bundle.create_bundle_file(self)
1814
class FooService(object):
1815
"""A directory service that always returns source"""
1817
def look_up(self, name, url):
1819
directories.register('foo:', FooService, 'Testing directory service')
1820
self.addCleanup(directories.remove, 'foo:')
1821
self.build_tree_contents([('./foo:bar', out.getvalue())])
1822
self.assertRaises(errors.NotABundle, read_mergeable_from_url,
1825
def test_infinite_redirects_are_not_a_bundle(self):
1826
"""If a URL causes TooManyRedirections then NotABundle is raised.
1828
from bzrlib.tests.blackbox.test_push import RedirectingMemoryServer
1829
server = RedirectingMemoryServer()
1830
self.start_server(server)
1831
url = server.get_url() + 'infinite-loop'
1832
self.assertRaises(errors.NotABundle, read_mergeable_from_url, url)
1834
def test_smart_server_connection_reset(self):
1835
"""If a smart server connection fails during the attempt to read a
1836
bundle, then the ConnectionReset error should be propagated.
1838
# Instantiate a server that will provoke a ConnectionReset
1839
sock_server = _DisconnectingTCPServer()
1840
self.start_server(sock_server)
1841
# We don't really care what the url is since the server will close the
1842
# connection without interpreting it
1843
url = sock_server.get_url()
1844
self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1847
class _DisconnectingTCPServer(object):
1848
"""A TCP server that immediately closes any connection made to it."""
1850
def start_server(self):
1851
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1852
self.sock.bind(('127.0.0.1', 0))
1854
self.port = self.sock.getsockname()[1]
1855
self.thread = threading.Thread(
1856
name='%s (port %d)' % (self.__class__.__name__, self.port),
1857
target=self.accept_and_close)
1860
def accept_and_close(self):
1861
conn, addr = self.sock.accept()
1862
conn.shutdown(socket.SHUT_RDWR)
1866
return 'bzr://127.0.0.1:%d/' % (self.port,)
1868
def stop_server(self):
1870
# make sure the thread dies by connecting to the listening socket,
1871
# just in case the test failed to do so.
1872
conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1873
conn.connect(self.sock.getsockname())
1875
except socket.error:
added
removed
bzrlib/tests/test_bundle.py
