← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Martin Pool
  • Date: 2007-10-24 02:33:14 UTC
  • mto: This revision was merged to the branch mainline in revision 2933.
  • Revision ID: mbp@sourcefrog.net-20071024023314-l9mscm8wsb1bvj1f
typo

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from cStringIO import StringIO
18
18
import os
19
 
import socket
20
19
import sys
21
 
import threading
 
20
import tempfile
22
21
 
23
22
from bzrlib import (
24
23
    bzrdir,
25
 
    diff,
26
24
    errors,
27
25
    inventory,
28
 
    merge,
29
 
    osutils,
30
26
    repository,
31
27
    revision as _mod_revision,
32
 
    tests,
33
28
    treebuilder,
34
29
    )
35
 
from bzrlib.bundle import read_mergeable_from_url
 
30
from bzrlib.bzrdir import BzrDir
36
31
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
37
32
from bzrlib.bundle.bundle_data import BundleTree
38
 
from bzrlib.bzrdir import BzrDir
39
 
from bzrlib.directory_service import directories
40
33
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
41
34
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
42
35
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
43
36
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
44
37
from bzrlib.branch import Branch
 
38
from bzrlib.diff import internal_diff
 
39
from bzrlib.errors import (BzrError, TestamentMismatch, NotABundle, BadBundle, 
 
40
                           NoSuchFile,)
 
41
from bzrlib.merge import Merge3Merger
45
42
from bzrlib.repofmt import knitrepo
46
 
from bzrlib.tests import (
47
 
    test_read_bundle,
48
 
    test_commit,
49
 
    )
 
43
from bzrlib.osutils import has_symlinks, sha_file
 
44
from bzrlib.tests import (TestCaseInTempDir, TestCaseWithTransport,
 
45
                          TestCase, TestSkipped, test_commit)
50
46
from bzrlib.transform import TreeTransform
51
47
 
52
48
 
53
 
def get_text(vf, key):
54
 
    """Get the fulltext for a given revision id that is present in the vf"""
55
 
    stream = vf.get_record_stream([key], 'unordered', True)
56
 
    record = stream.next()
57
 
    return record.get_bytes_as('fulltext')
58
 
 
59
 
 
60
 
def get_inventory_text(repo, revision_id):
61
 
    """Get the fulltext for the inventory at revision id"""
62
 
    repo.lock_read()
63
 
    try:
64
 
        return get_text(repo.inventories, (revision_id,))
65
 
    finally:
66
 
        repo.unlock()
67
 
 
68
 
 
69
49
class MockTree(object):
70
50
    def __init__(self):
71
51
        from bzrlib.inventory import InventoryDirectory, ROOT_ID
117
97
        elif kind == 'symlink':
118
98
            ie = InventoryLink(file_id, name, parent_id)
119
99
        else:
120
 
            raise errors.BzrError('unknown kind %r' % kind)
 
100
            raise BzrError('unknown kind %r' % kind)
121
101
        ie.text_sha1 = text_sha_1
122
102
        ie.text_size = text_size
123
103
        return ie
125
105
    def add_dir(self, file_id, path):
126
106
        self.paths[file_id] = path
127
107
        self.ids[path] = file_id
128
 
 
 
108
    
129
109
    def add_file(self, file_id, path, contents):
130
110
        self.add_dir(file_id, path)
131
111
        self.contents[file_id] = contents
148
128
    def contents_stats(self, file_id):
149
129
        if file_id not in self.contents:
150
130
            return None, None
151
 
        text_sha1 = osutils.sha_file(self.get_file(file_id))
 
131
        text_sha1 = sha_file(self.get_file(file_id))
152
132
        return text_sha1, len(self.contents[file_id])
153
133
 
154
134
 
155
 
class BTreeTester(tests.TestCase):
 
135
class BTreeTester(TestCase):
156
136
    """A simple unittest tester for the BundleTree class."""
157
137
 
158
138
    def make_tree_1(self):
162
142
        mtree.add_file("c", "grandparent/parent/file", "Hello\n")
163
143
        mtree.add_dir("d", "grandparent/alt_parent")
164
144
        return BundleTree(mtree, ''), mtree
165
 
 
 
145
        
166
146
    def test_renames(self):
167
147
        """Ensure that file renames have the proper effect on children"""
168
148
        btree = self.make_tree_1()[0]
169
149
        self.assertEqual(btree.old_path("grandparent"), "grandparent")
170
 
        self.assertEqual(btree.old_path("grandparent/parent"),
 
150
        self.assertEqual(btree.old_path("grandparent/parent"), 
171
151
                         "grandparent/parent")
172
152
        self.assertEqual(btree.old_path("grandparent/parent/file"),
173
153
                         "grandparent/parent/file")
180
160
        self.assertEqual(btree.path2id("grandparent/parent"), "b")
181
161
        self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
182
162
 
183
 
        self.assertTrue(btree.path2id("grandparent2") is None)
184
 
        self.assertTrue(btree.path2id("grandparent2/parent") is None)
185
 
        self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
 
163
        assert btree.path2id("grandparent2") is None
 
164
        assert btree.path2id("grandparent2/parent") is None
 
165
        assert btree.path2id("grandparent2/parent/file") is None
186
166
 
187
167
        btree.note_rename("grandparent", "grandparent2")
188
 
        self.assertTrue(btree.old_path("grandparent") is None)
189
 
        self.assertTrue(btree.old_path("grandparent/parent") is None)
190
 
        self.assertTrue(btree.old_path("grandparent/parent/file") is None)
 
168
        assert btree.old_path("grandparent") is None
 
169
        assert btree.old_path("grandparent/parent") is None
 
170
        assert btree.old_path("grandparent/parent/file") is None
191
171
 
192
172
        self.assertEqual(btree.id2path("a"), "grandparent2")
193
173
        self.assertEqual(btree.id2path("b"), "grandparent2/parent")
197
177
        self.assertEqual(btree.path2id("grandparent2/parent"), "b")
198
178
        self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
199
179
 
200
 
        self.assertTrue(btree.path2id("grandparent") is None)
201
 
        self.assertTrue(btree.path2id("grandparent/parent") is None)
202
 
        self.assertTrue(btree.path2id("grandparent/parent/file") is None)
 
180
        assert btree.path2id("grandparent") is None
 
181
        assert btree.path2id("grandparent/parent") is None
 
182
        assert btree.path2id("grandparent/parent/file") is None
203
183
 
204
184
        btree.note_rename("grandparent/parent", "grandparent2/parent2")
205
185
        self.assertEqual(btree.id2path("a"), "grandparent2")
210
190
        self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
211
191
        self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
212
192
 
213
 
        self.assertTrue(btree.path2id("grandparent2/parent") is None)
214
 
        self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
 
193
        assert btree.path2id("grandparent2/parent") is None
 
194
        assert btree.path2id("grandparent2/parent/file") is None
215
195
 
216
 
        btree.note_rename("grandparent/parent/file",
 
196
        btree.note_rename("grandparent/parent/file", 
217
197
                          "grandparent2/parent2/file2")
218
198
        self.assertEqual(btree.id2path("a"), "grandparent2")
219
199
        self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
223
203
        self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
224
204
        self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
225
205
 
226
 
        self.assertTrue(btree.path2id("grandparent2/parent2/file") is None)
 
206
        assert btree.path2id("grandparent2/parent2/file") is None
227
207
 
228
208
    def test_moves(self):
229
209
        """Ensure that file moves have the proper effect on children"""
230
210
        btree = self.make_tree_1()[0]
231
 
        btree.note_rename("grandparent/parent/file",
 
211
        btree.note_rename("grandparent/parent/file", 
232
212
                          "grandparent/alt_parent/file")
233
213
        self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
234
214
        self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
235
 
        self.assertTrue(btree.path2id("grandparent/parent/file") is None)
 
215
        assert btree.path2id("grandparent/parent/file") is None
236
216
 
237
217
    def unified_diff(self, old, new):
238
218
        out = StringIO()
239
 
        diff.internal_diff("old", old, "new", new, out)
 
219
        internal_diff("old", old, "new", new, out)
240
220
        out.seek(0,0)
241
221
        return out.read()
242
222
 
243
223
    def make_tree_2(self):
244
224
        btree = self.make_tree_1()[0]
245
 
        btree.note_rename("grandparent/parent/file",
 
225
        btree.note_rename("grandparent/parent/file", 
246
226
                          "grandparent/alt_parent/file")
247
 
        self.assertTrue(btree.id2path("e") is None)
248
 
        self.assertTrue(btree.path2id("grandparent/parent/file") is None)
 
227
        assert btree.id2path("e") is None
 
228
        assert btree.path2id("grandparent/parent/file") is None
249
229
        btree.note_id("e", "grandparent/parent/file")
250
230
        return btree
251
231
 
277
257
    def make_tree_3(self):
278
258
        btree, mtree = self.make_tree_1()
279
259
        mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
280
 
        btree.note_rename("grandparent/parent/file",
 
260
        btree.note_rename("grandparent/parent/file", 
281
261
                          "grandparent/alt_parent/file")
282
 
        btree.note_rename("grandparent/parent/topping",
 
262
        btree.note_rename("grandparent/parent/topping", 
283
263
                          "grandparent/alt_parent/stopping")
284
264
        return btree
285
265
 
309
289
        btree = self.make_tree_1()[0]
310
290
        self.assertEqual(btree.get_file("c").read(), "Hello\n")
311
291
        btree.note_deletion("grandparent/parent/file")
312
 
        self.assertTrue(btree.id2path("c") is None)
313
 
        self.assertTrue(btree.path2id("grandparent/parent/file") is None)
 
292
        assert btree.id2path("c") is None
 
293
        assert btree.path2id("grandparent/parent/file") is None
314
294
 
315
295
    def sorted_ids(self, tree):
316
296
        ids = list(tree)
324
304
            [inventory.ROOT_ID, 'a', 'b', 'c', 'd'])
325
305
        btree.note_deletion("grandparent/parent/file")
326
306
        btree.note_id("e", "grandparent/alt_parent/fool", kind="directory")
327
 
        btree.note_last_changed("grandparent/alt_parent/fool",
 
307
        btree.note_last_changed("grandparent/alt_parent/fool", 
328
308
                                "revisionidiguess")
329
309
        self.assertEqual(self.sorted_ids(btree),
330
310
            [inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
331
311
 
332
312
 
333
 
class BundleTester1(tests.TestCaseWithTransport):
 
313
class BundleTester1(TestCaseWithTransport):
334
314
 
335
315
    def test_mismatched_bundle(self):
336
316
        format = bzrdir.BzrDirMetaFormat1()
337
317
        format.repository_format = knitrepo.RepositoryFormatKnit3()
338
318
        serializer = BundleSerializerV08('0.8')
339
319
        b = self.make_branch('.', format=format)
340
 
        self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
 
320
        self.assertRaises(errors.IncompatibleBundleFormat, serializer.write, 
341
321
                          b.repository, [], {}, StringIO())
342
322
 
343
323
    def test_matched_bundle(self):
363
343
        format = bzrdir.BzrDirMetaFormat1()
364
344
        format.repository_format = knitrepo.RepositoryFormatKnit1()
365
345
        target = self.make_branch('target', format=format)
366
 
        self.assertRaises(errors.IncompatibleRevision, install_bundle,
 
346
        self.assertRaises(errors.IncompatibleRevision, install_bundle, 
367
347
                          target.repository, read_bundle(text))
368
348
 
369
349
 
377
357
    def make_branch_and_tree(self, path, format=None):
378
358
        if format is None:
379
359
            format = self.bzrdir_format()
380
 
        return tests.TestCaseWithTransport.make_branch_and_tree(
381
 
            self, path, format)
 
360
        return TestCaseWithTransport.make_branch_and_tree(self, path, format)
382
361
 
383
362
    def make_branch(self, path, format=None):
384
363
        if format is None:
385
364
            format = self.bzrdir_format()
386
 
        return tests.TestCaseWithTransport.make_branch(self, path, format)
 
365
        return TestCaseWithTransport.make_branch(self, path, format)
387
366
 
388
367
    def create_bundle_text(self, base_rev_id, rev_id):
389
368
        bundle_txt = StringIO()
390
 
        rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
 
369
        rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id, 
391
370
                               bundle_txt, format=self.format)
392
371
        bundle_txt.seek(0)
393
 
        self.assertEqual(bundle_txt.readline(),
 
372
        self.assertEqual(bundle_txt.readline(), 
394
373
                         '# Bazaar revision bundle v%s\n' % self.format)
395
374
        self.assertEqual(bundle_txt.readline(), '#\n')
396
375
 
404
383
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
405
384
        Make sure that the text generated is valid, and that it
406
385
        can be applied against the base, and generate the same information.
407
 
 
408
 
        :return: The in-memory bundle
 
386
        
 
387
        :return: The in-memory bundle 
409
388
        """
410
389
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
411
390
 
412
 
        # This should also validate the generated bundle
 
391
        # This should also validate the generated bundle 
413
392
        bundle = read_bundle(bundle_txt)
414
393
        repository = self.b1.repository
415
394
        for bundle_rev in bundle.real_revisions:
419
398
            # it
420
399
            branch_rev = repository.get_revision(bundle_rev.revision_id)
421
400
            for a in ('inventory_sha1', 'revision_id', 'parent_ids',
422
 
                      'timestamp', 'timezone', 'message', 'committer',
 
401
                      'timestamp', 'timezone', 'message', 'committer', 
423
402
                      'parent_ids', 'properties'):
424
 
                self.assertEqual(getattr(branch_rev, a),
 
403
                self.assertEqual(getattr(branch_rev, a), 
425
404
                                 getattr(bundle_rev, a))
426
 
            self.assertEqual(len(branch_rev.parent_ids),
 
405
            self.assertEqual(len(branch_rev.parent_ids), 
427
406
                             len(bundle_rev.parent_ids))
428
 
        self.assertEqual(rev_ids,
 
407
        self.assertEqual(rev_ids, 
429
408
                         [r.revision_id for r in bundle.real_revisions])
430
409
        self.valid_apply_bundle(base_rev_id, bundle,
431
410
                                   checkout_dir=checkout_dir)
435
414
    def get_invalid_bundle(self, base_rev_id, rev_id):
436
415
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
437
416
        Munge the text so that it's invalid.
438
 
 
 
417
        
439
418
        :return: The in-memory bundle
440
419
        """
441
420
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
442
 
        new_text = bundle_txt.getvalue().replace('executable:no',
 
421
        new_text = bundle_txt.getvalue().replace('executable:no', 
443
422
                                               'executable:yes')
444
423
        bundle_txt = StringIO(new_text)
445
424
        bundle = read_bundle(bundle_txt)
446
425
        self.valid_apply_bundle(base_rev_id, bundle)
447
 
        return bundle
 
426
        return bundle 
448
427
 
449
428
    def test_non_bundle(self):
450
 
        self.assertRaises(errors.NotABundle,
451
 
                          read_bundle, StringIO('#!/bin/sh\n'))
 
429
        self.assertRaises(NotABundle, read_bundle, StringIO('#!/bin/sh\n'))
452
430
 
453
431
    def test_malformed(self):
454
 
        self.assertRaises(errors.BadBundle, read_bundle,
 
432
        self.assertRaises(BadBundle, read_bundle, 
455
433
                          StringIO('# Bazaar revision bundle v'))
456
434
 
457
435
    def test_crlf_bundle(self):
458
436
        try:
459
437
            read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
460
 
        except errors.BadBundle:
 
438
        except BadBundle:
461
439
            # It is currently permitted for bundles with crlf line endings to
462
440
            # make read_bundle raise a BadBundle, but this should be fixed.
463
441
            # Anything else, especially NotABundle, is an error.
468
446
        """
469
447
 
470
448
        if checkout_dir is None:
471
 
            checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
 
449
            checkout_dir = tempfile.mkdtemp(prefix='test-branch-', dir='.')
472
450
        else:
473
451
            if not os.path.exists(checkout_dir):
474
452
                os.mkdir(checkout_dir)
477
455
        ancestors = write_bundle(self.b1.repository, rev_id, 'null:', s,
478
456
                                 format=self.format)
479
457
        s.seek(0)
480
 
        self.assertIsInstance(s.getvalue(), str)
 
458
        assert isinstance(s.getvalue(), str), (
 
459
            "Bundle isn't a bytestring:\n %s..." % repr(s.getvalue())[:40])
481
460
        install_bundle(tree.branch.repository, read_bundle(s))
482
461
        for ancestor in ancestors:
483
462
            old = self.b1.repository.revision_tree(ancestor)
484
463
            new = tree.branch.repository.revision_tree(ancestor)
485
 
            old.lock_read()
486
 
            new.lock_read()
487
 
            try:
488
 
                # Check that there aren't any inventory level changes
489
 
                delta = new.changes_from(old)
490
 
                self.assertFalse(delta.has_changed(),
491
 
                                 'Revision %s not copied correctly.'
492
 
                                 % (ancestor,))
493
 
 
494
 
                # Now check that the file contents are all correct
495
 
                for inventory_id in old:
496
 
                    try:
497
 
                        old_file = old.get_file(inventory_id)
498
 
                    except errors.NoSuchFile:
499
 
                        continue
500
 
                    if old_file is None:
501
 
                        continue
502
 
                    self.assertEqual(old_file.read(),
503
 
                                     new.get_file(inventory_id).read())
504
 
            finally:
505
 
                new.unlock()
506
 
                old.unlock()
 
464
 
 
465
            # Check that there aren't any inventory level changes
 
466
            delta = new.changes_from(old)
 
467
            self.assertFalse(delta.has_changed(),
 
468
                             'Revision %s not copied correctly.'
 
469
                             % (ancestor,))
 
470
 
 
471
            # Now check that the file contents are all correct
 
472
            for inventory_id in old:
 
473
                try:
 
474
                    old_file = old.get_file(inventory_id)
 
475
                except NoSuchFile:
 
476
                    continue
 
477
                if old_file is None:
 
478
                    continue
 
479
                self.assertEqual(old_file.read(),
 
480
                                 new.get_file(inventory_id).read())
507
481
        if not _mod_revision.is_null(rev_id):
508
482
            rh = self.b1.revision_history()
509
483
            tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
518
492
        sure everything matches the builtin branch.
519
493
        """
520
494
        to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
521
 
        to_tree.lock_write()
522
 
        try:
523
 
            self._valid_apply_bundle(base_rev_id, info, to_tree)
524
 
        finally:
525
 
            to_tree.unlock()
526
 
 
527
 
    def _valid_apply_bundle(self, base_rev_id, info, to_tree):
528
495
        original_parents = to_tree.get_parent_ids()
529
496
        repository = to_tree.branch.repository
530
497
        original_parents = to_tree.get_parent_ids()
531
498
        self.assertIs(repository.has_revision(base_rev_id), True)
532
499
        for rev in info.real_revisions:
533
500
            self.assert_(not repository.has_revision(rev.revision_id),
534
 
                'Revision {%s} present before applying bundle'
 
501
                'Revision {%s} present before applying bundle' 
535
502
                % rev.revision_id)
536
 
        merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
 
503
        merge_bundle(info, to_tree, True, Merge3Merger, False, False)
537
504
 
538
505
        for rev in info.real_revisions:
539
506
            self.assert_(repository.has_revision(rev.revision_id),
540
 
                'Missing revision {%s} after applying bundle'
 
507
                'Missing revision {%s} after applying bundle' 
541
508
                % rev.revision_id)
542
509
 
543
510
        self.assert_(to_tree.branch.repository.has_revision(info.target))
549
516
        rev = info.real_revisions[-1]
550
517
        base_tree = self.b1.repository.revision_tree(rev.revision_id)
551
518
        to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
552
 
 
 
519
        
553
520
        # TODO: make sure the target tree is identical to base tree
554
521
        #       we might also check the working tree.
555
522
 
574
541
        self.tree1 = self.make_branch_and_tree('b1')
575
542
        self.b1 = self.tree1.branch
576
543
 
577
 
        self.build_tree_contents([('b1/one', 'one\n')])
578
 
        self.tree1.add('one', 'one-id')
579
 
        self.tree1.set_root_id('root-id')
 
544
        open('b1/one', 'wb').write('one\n')
 
545
        self.tree1.add('one')
580
546
        self.tree1.commit('add one', rev_id='a@cset-0-1')
581
547
 
582
548
        bundle = self.get_valid_bundle('null:', 'a@cset-0-1')
593
559
                , 'b1/sub/sub/'
594
560
                , 'b1/sub/sub/nonempty.txt'
595
561
                ])
596
 
        self.build_tree_contents([('b1/sub/sub/emptyfile.txt', ''),
597
 
                                  ('b1/dir/nolastnewline.txt', 'bloop')])
 
562
        open('b1/sub/sub/emptyfile.txt', 'wb').close()
 
563
        open('b1/dir/nolastnewline.txt', 'wb').write('bloop')
598
564
        tt = TreeTransform(self.tree1)
599
565
        tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
600
566
        tt.apply()
616
582
 
617
583
        bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
618
584
 
619
 
        # Check a rollup bundle
 
585
        # Check a rollup bundle 
620
586
        bundle = self.get_valid_bundle('null:', 'a@cset-0-2')
621
587
 
622
588
        # Now delete entries
630
596
        tt.set_executability(False, trans_id)
631
597
        tt.apply()
632
598
        self.tree1.commit('removed', rev_id='a@cset-0-3')
633
 
 
 
599
        
634
600
        bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
635
 
        self.assertRaises((errors.TestamentMismatch,
636
 
            errors.VersionedFileInvalidChecksum,
637
 
            errors.BadBundle), self.get_invalid_bundle,
 
601
        self.assertRaises((TestamentMismatch,
 
602
            errors.VersionedFileInvalidChecksum), self.get_invalid_bundle,
638
603
            'a@cset-0-2', 'a@cset-0-3')
639
 
        # Check a rollup bundle
 
604
        # Check a rollup bundle 
640
605
        bundle = self.get_valid_bundle('null:', 'a@cset-0-3')
641
606
 
642
607
        # Now move the directory
644
609
        self.tree1.commit('rename dir', rev_id='a@cset-0-4')
645
610
 
646
611
        bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
647
 
        # Check a rollup bundle
 
612
        # Check a rollup bundle 
648
613
        bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
649
614
 
650
615
        # Modified files
652
617
        open('b1/sub/dir/ pre space', 'ab').write(
653
618
             '\r\nAdding some\r\nDOS format lines\r\n')
654
619
        open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
655
 
        self.tree1.rename_one('sub/dir/ pre space',
 
620
        self.tree1.rename_one('sub/dir/ pre space', 
656
621
                              'sub/ start space')
657
622
        self.tree1.commit('Modified files', rev_id='a@cset-0-5')
658
623
        bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
664
629
                          verbose=False)
665
630
        bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
666
631
        other = self.get_checkout('a@cset-0-5')
667
 
        tree1_inv = get_inventory_text(self.tree1.branch.repository,
668
 
                                       'a@cset-0-5')
669
 
        tree2_inv = get_inventory_text(other.branch.repository,
670
 
                                       'a@cset-0-5')
 
632
        tree1_inv = self.tree1.branch.repository.get_inventory_xml(
 
633
            'a@cset-0-5')
 
634
        tree2_inv = other.branch.repository.get_inventory_xml('a@cset-0-5')
671
635
        self.assertEqualDiff(tree1_inv, tree2_inv)
672
636
        other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
673
637
        other.commit('rename file', rev_id='a@cset-0-6b')
676
640
                          verbose=False)
677
641
        bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
678
642
 
679
 
    def _test_symlink_bundle(self, link_name, link_target, new_link_target):
680
 
        link_id = 'link-1'
681
 
 
682
 
        self.requireFeature(tests.SymlinkFeature)
 
643
    def test_symlink_bundle(self):
 
644
        if not has_symlinks():
 
645
            raise TestSkipped("No symlink support")
683
646
        self.tree1 = self.make_branch_and_tree('b1')
684
647
        self.b1 = self.tree1.branch
685
 
 
686
648
        tt = TreeTransform(self.tree1)
687
 
        tt.new_symlink(link_name, tt.root, link_target, link_id)
 
649
        tt.new_symlink('link', tt.root, 'bar/foo', 'link-1')
688
650
        tt.apply()
689
651
        self.tree1.commit('add symlink', rev_id='l@cset-0-1')
690
 
        bundle = self.get_valid_bundle('null:', 'l@cset-0-1')
691
 
        if getattr(bundle ,'revision_tree', None) is not None:
692
 
            # Not all bundle formats supports revision_tree
693
 
            bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-1')
694
 
            self.assertEqual(link_target, bund_tree.get_symlink_target(link_id))
695
 
 
 
652
        self.get_valid_bundle('null:', 'l@cset-0-1')
696
653
        tt = TreeTransform(self.tree1)
697
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
654
        trans_id = tt.trans_id_tree_file_id('link-1')
698
655
        tt.adjust_path('link2', tt.root, trans_id)
699
656
        tt.delete_contents(trans_id)
700
 
        tt.create_symlink(new_link_target, trans_id)
 
657
        tt.create_symlink('mars', trans_id)
701
658
        tt.apply()
702
659
        self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
703
 
        bundle = self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
704
 
        if getattr(bundle ,'revision_tree', None) is not None:
705
 
            # Not all bundle formats supports revision_tree
706
 
            bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-2')
707
 
            self.assertEqual(new_link_target,
708
 
                             bund_tree.get_symlink_target(link_id))
709
 
 
 
660
        self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
710
661
        tt = TreeTransform(self.tree1)
711
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
662
        trans_id = tt.trans_id_tree_file_id('link-1')
712
663
        tt.delete_contents(trans_id)
713
664
        tt.create_symlink('jupiter', trans_id)
714
665
        tt.apply()
715
666
        self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
716
 
        bundle = self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
717
 
 
 
667
        self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
718
668
        tt = TreeTransform(self.tree1)
719
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
669
        trans_id = tt.trans_id_tree_file_id('link-1')
720
670
        tt.delete_contents(trans_id)
721
671
        tt.apply()
722
672
        self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
723
 
        bundle = self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
724
 
 
725
 
    def test_symlink_bundle(self):
726
 
        self._test_symlink_bundle('link', 'bar/foo', 'mars')
727
 
 
728
 
    def test_unicode_symlink_bundle(self):
729
 
        self.requireFeature(tests.UnicodeFilenameFeature)
730
 
        self._test_symlink_bundle(u'\N{Euro Sign}link',
731
 
                                  u'bar/\N{Euro Sign}foo',
732
 
                                  u'mars\N{Euro Sign}')
 
673
        self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
733
674
 
734
675
    def test_binary_bundle(self):
735
676
        self.tree1 = self.make_branch_and_tree('b1')
736
677
        self.b1 = self.tree1.branch
737
678
        tt = TreeTransform(self.tree1)
738
 
 
 
679
        
739
680
        # Add
740
681
        tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
741
682
        tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
833
774
        return bundle_file.getvalue()
834
775
 
835
776
    def test_unicode_bundle(self):
836
 
        self.requireFeature(tests.UnicodeFilenameFeature)
837
777
        # Handle international characters
838
778
        os.mkdir('b1')
839
 
        f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
 
779
        try:
 
780
            f = open(u'b1/with Dod\xe9', 'wb')
 
781
        except UnicodeEncodeError:
 
782
            raise TestSkipped("Filesystem doesn't support unicode")
840
783
 
841
784
        self.tree1 = self.make_branch_and_tree('b1')
842
785
        self.b1 = self.tree1.branch
846
789
            u'William Dod\xe9\n').encode('utf-8'))
847
790
        f.close()
848
791
 
849
 
        self.tree1.add([u'with Dod\N{Euro Sign}'], ['withdod-id'])
 
792
        self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
850
793
        self.tree1.commit(u'i18n commit from William Dod\xe9',
851
794
                          rev_id='i18n-1', committer=u'William Dod\xe9')
852
795
 
 
796
        if sys.platform == 'darwin':
 
797
            from bzrlib.workingtree import WorkingTree3
 
798
            if type(self.tree1) is WorkingTree3:
 
799
                self.knownFailure("Bug #141438: fails for WorkingTree3 on OSX")
 
800
 
 
801
            # On Mac the '\xe9' gets changed to 'e\u0301'
 
802
            self.assertEqual([u'.bzr', u'with Dode\u0301'],
 
803
                             sorted(os.listdir(u'b1')))
 
804
            delta = self.tree1.changes_from(self.tree1.basis_tree())
 
805
            self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
 
806
                             delta.removed)
 
807
            self.knownFailure("Mac OSX doesn't preserve unicode"
 
808
                              " combining characters.")
 
809
 
853
810
        # Add
854
811
        bundle = self.get_valid_bundle('null:', 'i18n-1')
855
812
 
856
813
        # Modified
857
 
        f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
 
814
        f = open(u'b1/with Dod\xe9', 'wb')
858
815
        f.write(u'Modified \xb5\n'.encode('utf8'))
859
816
        f.close()
860
817
        self.tree1.commit(u'modified', rev_id='i18n-2')
861
818
 
862
819
        bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
863
 
 
 
820
        
864
821
        # Renamed
865
 
        self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
 
822
        self.tree1.rename_one(u'with Dod\xe9', u'B\xe5gfors')
866
823
        self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
867
824
                          committer=u'Erik B\xe5gfors')
868
825
 
869
826
        bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
870
827
 
871
828
        # Removed
872
 
        self.tree1.remove([u'B\N{Euro Sign}gfors'])
 
829
        self.tree1.remove([u'B\xe5gfors'])
873
830
        self.tree1.commit(u'removed', rev_id='i18n-4')
874
831
 
875
832
        bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
880
837
 
881
838
    def test_whitespace_bundle(self):
882
839
        if sys.platform in ('win32', 'cygwin'):
883
 
            raise tests.TestSkipped('Windows doesn\'t support filenames'
884
 
                                    ' with tabs or trailing spaces')
 
840
            raise TestSkipped('Windows doesn\'t support filenames'
 
841
                              ' with tabs or trailing spaces')
885
842
        self.tree1 = self.make_branch_and_tree('b1')
886
843
        self.b1 = self.tree1.branch
887
844
 
912
869
        self.tree1.commit('removed', rev_id='white-4')
913
870
 
914
871
        bundle = self.get_valid_bundle('white-3', 'white-4')
915
 
 
 
872
        
916
873
        # Now test a complet roll-up
917
874
        bundle = self.get_valid_bundle('null:', 'white-4')
918
875
 
931
888
                          timezone=19800, timestamp=1152544886.0)
932
889
 
933
890
        bundle = self.get_valid_bundle('null:', 'tz-1')
934
 
 
 
891
        
935
892
        rev = bundle.revisions[0]
936
893
        self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
937
894
        self.assertEqual(19800, rev.timezone)
1039
996
        bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1040
997
        repo = self.make_repository('repo', format='dirstate-with-subtree')
1041
998
        bundle.install_revisions(repo)
1042
 
        inv_text = repo._get_inventory_xml('rev2')
 
999
        inv_text = repo.get_inventory_xml('rev2')
1043
1000
        self.assertNotContainsRe(inv_text, 'format="5"')
1044
1001
        self.assertContainsRe(inv_text, 'format="7"')
1045
1002
 
1046
 
    def make_repo_with_installed_revisions(self):
1047
 
        tree = self.make_simple_tree('knit')
1048
 
        tree.commit('hello', rev_id='rev1')
1049
 
        tree.commit('hello', rev_id='rev2')
1050
 
        bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1051
 
        repo = self.make_repository('repo', format='dirstate-with-subtree')
1052
 
        bundle.install_revisions(repo)
1053
 
        return repo
1054
 
 
1055
1003
    def test_across_models(self):
1056
 
        repo = self.make_repo_with_installed_revisions()
 
1004
        tree = self.make_simple_tree('knit')
 
1005
        tree.commit('hello', rev_id='rev1')
 
1006
        tree.commit('hello', rev_id='rev2')
 
1007
        bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
 
1008
        repo = self.make_repository('repo', format='dirstate-with-subtree')
 
1009
        bundle.install_revisions(repo)
1057
1010
        inv = repo.get_inventory('rev2')
1058
1011
        self.assertEqual('rev2', inv.root.revision)
1059
 
        root_id = inv.root.file_id
1060
 
        repo.lock_read()
1061
 
        self.addCleanup(repo.unlock)
1062
 
        self.assertEqual({(root_id, 'rev1'):(),
1063
 
            (root_id, 'rev2'):((root_id, 'rev1'),)},
1064
 
            repo.texts.get_parent_map([(root_id, 'rev1'), (root_id, 'rev2')]))
1065
 
 
1066
 
    def test_inv_hash_across_serializers(self):
1067
 
        repo = self.make_repo_with_installed_revisions()
1068
 
        recorded_inv_sha1 = repo.get_revision('rev2').inventory_sha1
1069
 
        xml = repo._get_inventory_xml('rev2')
1070
 
        self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
 
1012
        root_vf = repo.weave_store.get_weave(inv.root.file_id,
 
1013
                                             repo.get_transaction())
 
1014
        self.assertEqual(root_vf.versions(), ['rev1', 'rev2'])
1071
1015
 
1072
1016
    def test_across_models_incompatible(self):
1073
1017
        tree = self.make_simple_tree('dirstate-with-subtree')
1076
1020
        try:
1077
1021
            bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1078
1022
        except errors.IncompatibleBundleFormat:
1079
 
            raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
 
1023
            raise TestSkipped("Format 0.8 doesn't work with knit3")
1080
1024
        repo = self.make_repository('repo', format='knit')
1081
1025
        bundle.install_revisions(repo)
1082
1026
 
1103
1047
        try:
1104
1048
            bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1105
1049
        except errors.IncompatibleBundleFormat:
1106
 
            raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
 
1050
            raise TestSkipped("Format 0.8 doesn't work with knit3")
1107
1051
        if isinstance(bundle, v09.BundleInfo09):
1108
 
            raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
 
1052
            raise TestSkipped("Format 0.9 doesn't work with subtrees")
1109
1053
        repo = self.make_repository('repo', format='knit')
1110
1054
        self.assertRaises(errors.IncompatibleRevision,
1111
1055
                          bundle.install_revisions, repo)
1118
1062
        try:
1119
1063
            self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
1120
1064
        except ValueError:
1121
 
            raise tests.TestSkipped(
1122
 
                "Repository doesn't support revision ids with slashes")
 
1065
            raise TestSkipped("Repository doesn't support revision ids with"
 
1066
                              " slashes")
1123
1067
        bundle = self.get_valid_bundle('null:', 'rev/id')
1124
1068
 
1125
1069
    def test_skip_file(self):
1141
1085
        self.tree1.commit('rev3', rev_id='rev3')
1142
1086
        bundle = self.get_valid_bundle('reva', 'rev3')
1143
1087
        if getattr(bundle, 'get_bundle_reader', None) is None:
1144
 
            raise tests.TestSkipped('Bundle format cannot provide reader')
 
1088
            raise TestSkipped('Bundle format cannot provide reader')
1145
1089
        # be sure that file1 comes before file2
1146
1090
        for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1147
1091
            if f == 'file3-id':
1150
1094
        bundle.install_revisions(target.branch.repository)
1151
1095
 
1152
1096
 
1153
 
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
 
1097
class V08BundleTester(BundleTester, TestCaseWithTransport):
1154
1098
 
1155
1099
    format = '0.8'
1156
1100
 
1289
1233
        return format
1290
1234
 
1291
1235
 
1292
 
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
 
1236
class V4BundleTester(BundleTester, TestCaseWithTransport):
1293
1237
 
1294
1238
    format = '4'
1295
1239
 
1297
1241
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
1298
1242
        Make sure that the text generated is valid, and that it
1299
1243
        can be applied against the base, and generate the same information.
1300
 
 
1301
 
        :return: The in-memory bundle
 
1244
        
 
1245
        :return: The in-memory bundle 
1302
1246
        """
1303
1247
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1304
1248
 
1305
 
        # This should also validate the generated bundle
 
1249
        # This should also validate the generated bundle 
1306
1250
        bundle = read_bundle(bundle_txt)
1307
1251
        repository = self.b1.repository
1308
1252
        for bundle_rev in bundle.real_revisions:
1312
1256
            # it
1313
1257
            branch_rev = repository.get_revision(bundle_rev.revision_id)
1314
1258
            for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1315
 
                      'timestamp', 'timezone', 'message', 'committer',
 
1259
                      'timestamp', 'timezone', 'message', 'committer', 
1316
1260
                      'parent_ids', 'properties'):
1317
 
                self.assertEqual(getattr(branch_rev, a),
 
1261
                self.assertEqual(getattr(branch_rev, a), 
1318
1262
                                 getattr(bundle_rev, a))
1319
 
            self.assertEqual(len(branch_rev.parent_ids),
 
1263
            self.assertEqual(len(branch_rev.parent_ids), 
1320
1264
                             len(bundle_rev.parent_ids))
1321
1265
        self.assertEqual(set(rev_ids),
1322
1266
                         set([r.revision_id for r in bundle.real_revisions]))
1336
1280
        new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1337
1281
        new_text = new_text.replace('<file file_id="exe-1"',
1338
1282
                                    '<file executable="y" file_id="exe-1"')
1339
 
        new_text = new_text.replace('B260', 'B275')
 
1283
        new_text = new_text.replace('B222', 'B237')
1340
1284
        bundle_txt = StringIO()
1341
1285
        bundle_txt.write(serializer._get_bundle_header('4'))
1342
1286
        bundle_txt.write('\n')
1348
1292
 
1349
1293
    def create_bundle_text(self, base_rev_id, rev_id):
1350
1294
        bundle_txt = StringIO()
1351
 
        rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
 
1295
        rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id, 
1352
1296
                               bundle_txt, format=self.format)
1353
1297
        bundle_txt.seek(0)
1354
 
        self.assertEqual(bundle_txt.readline(),
 
1298
        self.assertEqual(bundle_txt.readline(), 
1355
1299
                         '# Bazaar revision bundle v%s\n' % self.format)
1356
1300
        self.assertEqual(bundle_txt.readline(), '#\n')
1357
1301
        rev = self.b1.repository.get_revision(rev_id)
1377
1321
        tree2 = self.make_branch_and_tree('target')
1378
1322
        target_repo = tree2.branch.repository
1379
1323
        install_bundle(target_repo, serializer.read(s))
1380
 
        target_repo.lock_read()
1381
 
        self.addCleanup(target_repo.unlock)
1382
 
        # Turn the 'iterators_of_bytes' back into simple strings for comparison
1383
 
        repo_texts = dict((i, ''.join(content)) for i, content
1384
 
                          in target_repo.iter_files_bytes(
1385
 
                                [('fileid-2', 'rev1', '1'),
1386
 
                                 ('fileid-2', 'rev2', '2')]))
1387
 
        self.assertEqual({'1':'contents1\nstatic\n',
1388
 
                          '2':'contents2\nstatic\n'},
1389
 
                         repo_texts)
 
1324
        vf = target_repo.weave_store.get_weave('fileid-2',
 
1325
            target_repo.get_transaction())
 
1326
        self.assertEqual('contents1\nstatic\n', vf.get_text('rev1'))
 
1327
        self.assertEqual('contents2\nstatic\n', vf.get_text('rev2'))
1390
1328
        rtree = target_repo.revision_tree('rev2')
1391
 
        inventory_vf = target_repo.inventories
1392
 
        # If the inventory store has a graph, it must match the revision graph.
1393
 
        self.assertSubset(
1394
 
            [inventory_vf.get_parent_map([('rev2',)])[('rev2',)]],
1395
 
            [None, (('rev1',),)])
 
1329
        inventory_vf = target_repo.get_inventory_weave()
 
1330
        self.assertEqual(['rev1'], inventory_vf.get_parents('rev2'))
1396
1331
        self.assertEqual('changed file',
1397
1332
                         target_repo.get_revision('rev2').message)
1398
1333
 
1448
1383
        return 'metaweave'
1449
1384
 
1450
1385
 
1451
 
class V4_2aBundleTester(V4BundleTester):
1452
 
 
1453
 
    def bzrdir_format(self):
1454
 
        return '2a'
1455
 
 
1456
 
    def get_invalid_bundle(self, base_rev_id, rev_id):
1457
 
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
1458
 
        Munge the text so that it's invalid.
1459
 
 
1460
 
        :return: The in-memory bundle
1461
 
        """
1462
 
        from bzrlib.bundle import serializer
1463
 
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1464
 
        new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1465
 
        # We are going to be replacing some text to set the executable bit on a
1466
 
        # file. Make sure the text replacement actually works correctly.
1467
 
        self.assertContainsRe(new_text, '(?m)B244\n\ni 1\n<inventory')
1468
 
        new_text = new_text.replace('<file file_id="exe-1"',
1469
 
                                    '<file executable="y" file_id="exe-1"')
1470
 
        new_text = new_text.replace('B244', 'B259')
1471
 
        bundle_txt = StringIO()
1472
 
        bundle_txt.write(serializer._get_bundle_header('4'))
1473
 
        bundle_txt.write('\n')
1474
 
        bundle_txt.write(new_text.encode('bz2'))
1475
 
        bundle_txt.seek(0)
1476
 
        bundle = read_bundle(bundle_txt)
1477
 
        self.valid_apply_bundle(base_rev_id, bundle)
1478
 
        return bundle
1479
 
 
1480
 
    def make_merged_branch(self):
1481
 
        builder = self.make_branch_builder('source')
1482
 
        builder.start_series()
1483
 
        builder.build_snapshot('a@cset-0-1', None, [
1484
 
            ('add', ('', 'root-id', 'directory', None)),
1485
 
            ('add', ('file', 'file-id', 'file', 'original content\n')),
1486
 
            ])
1487
 
        builder.build_snapshot('a@cset-0-2a', ['a@cset-0-1'], [
1488
 
            ('modify', ('file-id', 'new-content\n')),
1489
 
            ])
1490
 
        builder.build_snapshot('a@cset-0-2b', ['a@cset-0-1'], [
1491
 
            ('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1492
 
            ])
1493
 
        builder.build_snapshot('a@cset-0-3', ['a@cset-0-2a', 'a@cset-0-2b'], [
1494
 
            ('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1495
 
            ])
1496
 
        builder.finish_series()
1497
 
        self.b1 = builder.get_branch()
1498
 
        self.b1.lock_read()
1499
 
        self.addCleanup(self.b1.unlock)
1500
 
 
1501
 
    def make_bundle_just_inventories(self, base_revision_id,
1502
 
                                     target_revision_id,
1503
 
                                     revision_ids):
1504
 
        sio = StringIO()
1505
 
        writer = v4.BundleWriteOperation(base_revision_id, target_revision_id,
1506
 
                                         self.b1.repository, sio)
1507
 
        writer.bundle.begin()
1508
 
        writer._add_inventory_mpdiffs_from_serializer(revision_ids)
1509
 
        writer.bundle.end()
1510
 
        sio.seek(0)
1511
 
        return sio
1512
 
 
1513
 
    def test_single_inventory_multiple_parents_as_xml(self):
1514
 
        self.make_merged_branch()
1515
 
        sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1516
 
                                                ['a@cset-0-3'])
1517
 
        reader = v4.BundleReader(sio, stream_input=False)
1518
 
        records = list(reader.iter_records())
1519
 
        self.assertEqual(1, len(records))
1520
 
        (bytes, metadata, repo_kind, revision_id,
1521
 
         file_id) = records[0]
1522
 
        self.assertIs(None, file_id)
1523
 
        self.assertEqual('a@cset-0-3', revision_id)
1524
 
        self.assertEqual('inventory', repo_kind)
1525
 
        self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1526
 
                          'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1527
 
                          'storage_kind': 'mpdiff',
1528
 
                         }, metadata)
1529
 
        # We should have an mpdiff that takes some lines from both parents.
1530
 
        self.assertEqualDiff(
1531
 
            'i 1\n'
1532
 
            '<inventory format="10" revision_id="a@cset-0-3">\n'
1533
 
            '\n'
1534
 
            'c 0 1 1 2\n'
1535
 
            'c 1 3 3 2\n', bytes)
1536
 
 
1537
 
    def test_single_inv_no_parents_as_xml(self):
1538
 
        self.make_merged_branch()
1539
 
        sio = self.make_bundle_just_inventories('null:', 'a@cset-0-1',
1540
 
                                                ['a@cset-0-1'])
1541
 
        reader = v4.BundleReader(sio, stream_input=False)
1542
 
        records = list(reader.iter_records())
1543
 
        self.assertEqual(1, len(records))
1544
 
        (bytes, metadata, repo_kind, revision_id,
1545
 
         file_id) = records[0]
1546
 
        self.assertIs(None, file_id)
1547
 
        self.assertEqual('a@cset-0-1', revision_id)
1548
 
        self.assertEqual('inventory', repo_kind)
1549
 
        self.assertEqual({'parents': [],
1550
 
                          'sha1': 'a13f42b142d544aac9b085c42595d304150e31a2',
1551
 
                          'storage_kind': 'mpdiff',
1552
 
                         }, metadata)
1553
 
        # We should have an mpdiff that takes some lines from both parents.
1554
 
        self.assertEqualDiff(
1555
 
            'i 4\n'
1556
 
            '<inventory format="10" revision_id="a@cset-0-1">\n'
1557
 
            '<directory file_id="root-id" name=""'
1558
 
                ' revision="a@cset-0-1" />\n'
1559
 
            '<file file_id="file-id" name="file" parent_id="root-id"'
1560
 
                ' revision="a@cset-0-1"'
1561
 
                ' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
1562
 
                ' text_size="17" />\n'
1563
 
            '</inventory>\n'
1564
 
            '\n', bytes)
1565
 
 
1566
 
    def test_multiple_inventories_as_xml(self):
1567
 
        self.make_merged_branch()
1568
 
        sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1569
 
            ['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'])
1570
 
        reader = v4.BundleReader(sio, stream_input=False)
1571
 
        records = list(reader.iter_records())
1572
 
        self.assertEqual(3, len(records))
1573
 
        revision_ids = [rev_id for b, m, k, rev_id, f in records]
1574
 
        self.assertEqual(['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'],
1575
 
                         revision_ids)
1576
 
        metadata_2a = records[0][1]
1577
 
        self.assertEqual({'parents': ['a@cset-0-1'],
1578
 
                          'sha1': '1e105886d62d510763e22885eec733b66f5f09bf',
1579
 
                          'storage_kind': 'mpdiff',
1580
 
                         }, metadata_2a)
1581
 
        metadata_2b = records[1][1]
1582
 
        self.assertEqual({'parents': ['a@cset-0-1'],
1583
 
                          'sha1': 'f03f12574bdb5ed2204c28636c98a8547544ccd8',
1584
 
                          'storage_kind': 'mpdiff',
1585
 
                         }, metadata_2b)
1586
 
        metadata_3 = records[2][1]
1587
 
        self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1588
 
                          'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1589
 
                          'storage_kind': 'mpdiff',
1590
 
                         }, metadata_3)
1591
 
        bytes_2a = records[0][0]
1592
 
        self.assertEqualDiff(
1593
 
            'i 1\n'
1594
 
            '<inventory format="10" revision_id="a@cset-0-2a">\n'
1595
 
            '\n'
1596
 
            'c 0 1 1 1\n'
1597
 
            'i 1\n'
1598
 
            '<file file_id="file-id" name="file" parent_id="root-id"'
1599
 
                ' revision="a@cset-0-2a"'
1600
 
                ' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
1601
 
                ' text_size="12" />\n'
1602
 
            '\n'
1603
 
            'c 0 3 3 1\n', bytes_2a)
1604
 
        bytes_2b = records[1][0]
1605
 
        self.assertEqualDiff(
1606
 
            'i 1\n'
1607
 
            '<inventory format="10" revision_id="a@cset-0-2b">\n'
1608
 
            '\n'
1609
 
            'c 0 1 1 2\n'
1610
 
            'i 1\n'
1611
 
            '<file file_id="file2-id" name="other-file" parent_id="root-id"'
1612
 
                ' revision="a@cset-0-2b"'
1613
 
                ' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
1614
 
                ' text_size="14" />\n'
1615
 
            '\n'
1616
 
            'c 0 3 4 1\n', bytes_2b)
1617
 
        bytes_3 = records[2][0]
1618
 
        self.assertEqualDiff(
1619
 
            'i 1\n'
1620
 
            '<inventory format="10" revision_id="a@cset-0-3">\n'
1621
 
            '\n'
1622
 
            'c 0 1 1 2\n'
1623
 
            'c 1 3 3 2\n', bytes_3)
1624
 
 
1625
 
    def test_creating_bundle_preserves_chk_pages(self):
1626
 
        self.make_merged_branch()
1627
 
        target = self.b1.bzrdir.sprout('target',
1628
 
                                       revision_id='a@cset-0-2a').open_branch()
1629
 
        bundle_txt, rev_ids = self.create_bundle_text('a@cset-0-2a',
1630
 
                                                      'a@cset-0-3')
1631
 
        self.assertEqual(['a@cset-0-2b', 'a@cset-0-3'], rev_ids)
1632
 
        bundle = read_bundle(bundle_txt)
1633
 
        target.lock_write()
1634
 
        self.addCleanup(target.unlock)
1635
 
        install_bundle(target.repository, bundle)
1636
 
        inv1 = self.b1.repository.inventories.get_record_stream([
1637
 
            ('a@cset-0-3',)], 'unordered',
1638
 
            True).next().get_bytes_as('fulltext')
1639
 
        inv2 = target.repository.inventories.get_record_stream([
1640
 
            ('a@cset-0-3',)], 'unordered',
1641
 
            True).next().get_bytes_as('fulltext')
1642
 
        self.assertEqualDiff(inv1, inv2)
1643
 
 
1644
 
 
1645
1386
class MungedBundleTester(object):
1646
1387
 
1647
1388
    def build_test_bundle(self):
1694
1435
        self.check_valid(bundle)
1695
1436
 
1696
1437
 
1697
 
class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
 
1438
class MungedBundleTesterV09(TestCaseWithTransport, MungedBundleTester):
1698
1439
 
1699
1440
    format = '0.9'
1700
1441
 
1732
1473
        self.check_valid(bundle)
1733
1474
 
1734
1475
 
1735
 
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
 
1476
class MungedBundleTesterV4(TestCaseWithTransport, MungedBundleTester):
1736
1477
 
1737
1478
    format = '4'
1738
1479
 
1739
1480
 
1740
 
class TestBundleWriterReader(tests.TestCase):
 
1481
class TestBundleWriterReader(TestCase):
1741
1482
 
1742
1483
    def test_roundtrip_record(self):
1743
1484
        fileobj = StringIO()
1805
1546
        record = record_iter.next()
1806
1547
        self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1807
1548
            'info', None, None), record)
1808
 
        self.assertRaises(errors.BadBundle, record_iter.next)
1809
 
 
1810
 
 
1811
 
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
1812
 
 
1813
 
    def test_read_mergeable_skips_local(self):
1814
 
        """A local bundle named like the URL should not be read.
1815
 
        """
1816
 
        out, wt = test_read_bundle.create_bundle_file(self)
1817
 
        class FooService(object):
1818
 
            """A directory service that always returns source"""
1819
 
 
1820
 
            def look_up(self, name, url):
1821
 
                return 'source'
1822
 
        directories.register('foo:', FooService, 'Testing directory service')
1823
 
        self.addCleanup(directories.remove, 'foo:')
1824
 
        self.build_tree_contents([('./foo:bar', out.getvalue())])
1825
 
        self.assertRaises(errors.NotABundle, read_mergeable_from_url,
1826
 
                          'foo:bar')
1827
 
 
1828
 
    def test_infinite_redirects_are_not_a_bundle(self):
1829
 
        """If a URL causes TooManyRedirections then NotABundle is raised.
1830
 
        """
1831
 
        from bzrlib.tests.blackbox.test_push import RedirectingMemoryServer
1832
 
        server = RedirectingMemoryServer()
1833
 
        self.start_server(server)
1834
 
        url = server.get_url() + 'infinite-loop'
1835
 
        self.assertRaises(errors.NotABundle, read_mergeable_from_url, url)
1836
 
 
1837
 
    def test_smart_server_connection_reset(self):
1838
 
        """If a smart server connection fails during the attempt to read a
1839
 
        bundle, then the ConnectionReset error should be propagated.
1840
 
        """
1841
 
        # Instantiate a server that will provoke a ConnectionReset
1842
 
        sock_server = _DisconnectingTCPServer()
1843
 
        self.start_server(sock_server)
1844
 
        # We don't really care what the url is since the server will close the
1845
 
        # connection without interpreting it
1846
 
        url = sock_server.get_url()
1847
 
        self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1848
 
 
1849
 
 
1850
 
class _DisconnectingTCPServer(object):
1851
 
    """A TCP server that immediately closes any connection made to it."""
1852
 
 
1853
 
    def start_server(self):
1854
 
        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1855
 
        self.sock.bind(('127.0.0.1', 0))
1856
 
        self.sock.listen(1)
1857
 
        self.port = self.sock.getsockname()[1]
1858
 
        self.thread = threading.Thread(
1859
 
            name='%s (port %d)' % (self.__class__.__name__, self.port),
1860
 
            target=self.accept_and_close)
1861
 
        self.thread.start()
1862
 
 
1863
 
    def accept_and_close(self):
1864
 
        conn, addr = self.sock.accept()
1865
 
        conn.shutdown(socket.SHUT_RDWR)
1866
 
        conn.close()
1867
 
 
1868
 
    def get_url(self):
1869
 
        return 'bzr://127.0.0.1:%d/' % (self.port,)
1870
 
 
1871
 
    def stop_server(self):
1872
 
        try:
1873
 
            # make sure the thread dies by connecting to the listening socket,
1874
 
            # just in case the test failed to do so.
1875
 
            conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1876
 
            conn.connect(self.sock.getsockname())
1877
 
            conn.close()
1878
 
        except socket.error:
1879
 
            pass
1880
 
        self.sock.close()
1881
 
        self.thread.join()
 
1549
        self.assertRaises(BadBundle, record_iter.next)