/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Aaron Bentley
  • Date: 2007-06-13 03:54:07 UTC
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: aaron.bentley@utoronto.ca-20070613035407-6tijerg0tti5wocg
Fix _get_bundle invocations

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
 
    revision as _mod_revision,
32
 
    tests,
33
27
    treebuilder,
34
28
    )
35
 
from bzrlib.bundle import read_mergeable_from_url
 
29
from bzrlib.builtins import _merge_helper
 
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
 
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
 
33
from bzrlib.bundle.serializer import write_bundle, read_bundle
41
34
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
42
35
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
43
 
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
 
36
from bzrlib.bundle.serializer.v10 import BundleSerializerV10
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)
50
46
from bzrlib.transform import TreeTransform
51
 
 
52
 
 
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()
 
47
from bzrlib.workingtree import WorkingTree
67
48
 
68
49
 
69
50
class MockTree(object):
117
98
        elif kind == 'symlink':
118
99
            ie = InventoryLink(file_id, name, parent_id)
119
100
        else:
120
 
            raise errors.BzrError('unknown kind %r' % kind)
 
101
            raise BzrError('unknown kind %r' % kind)
121
102
        ie.text_sha1 = text_sha_1
122
103
        ie.text_size = text_size
123
104
        return ie
125
106
    def add_dir(self, file_id, path):
126
107
        self.paths[file_id] = path
127
108
        self.ids[path] = file_id
128
 
 
 
109
    
129
110
    def add_file(self, file_id, path, contents):
130
111
        self.add_dir(file_id, path)
131
112
        self.contents[file_id] = contents
148
129
    def contents_stats(self, file_id):
149
130
        if file_id not in self.contents:
150
131
            return None, None
151
 
        text_sha1 = osutils.sha_file(self.get_file(file_id))
 
132
        text_sha1 = sha_file(self.get_file(file_id))
152
133
        return text_sha1, len(self.contents[file_id])
153
134
 
154
135
 
155
 
class BTreeTester(tests.TestCase):
 
136
class BTreeTester(TestCase):
156
137
    """A simple unittest tester for the BundleTree class."""
157
138
 
158
139
    def make_tree_1(self):
162
143
        mtree.add_file("c", "grandparent/parent/file", "Hello\n")
163
144
        mtree.add_dir("d", "grandparent/alt_parent")
164
145
        return BundleTree(mtree, ''), mtree
165
 
 
 
146
        
166
147
    def test_renames(self):
167
148
        """Ensure that file renames have the proper effect on children"""
168
149
        btree = self.make_tree_1()[0]
169
150
        self.assertEqual(btree.old_path("grandparent"), "grandparent")
170
 
        self.assertEqual(btree.old_path("grandparent/parent"),
 
151
        self.assertEqual(btree.old_path("grandparent/parent"), 
171
152
                         "grandparent/parent")
172
153
        self.assertEqual(btree.old_path("grandparent/parent/file"),
173
154
                         "grandparent/parent/file")
180
161
        self.assertEqual(btree.path2id("grandparent/parent"), "b")
181
162
        self.assertEqual(btree.path2id("grandparent/parent/file"), "c")
182
163
 
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)
 
164
        assert btree.path2id("grandparent2") is None
 
165
        assert btree.path2id("grandparent2/parent") is None
 
166
        assert btree.path2id("grandparent2/parent/file") is None
186
167
 
187
168
        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)
 
169
        assert btree.old_path("grandparent") is None
 
170
        assert btree.old_path("grandparent/parent") is None
 
171
        assert btree.old_path("grandparent/parent/file") is None
191
172
 
192
173
        self.assertEqual(btree.id2path("a"), "grandparent2")
193
174
        self.assertEqual(btree.id2path("b"), "grandparent2/parent")
197
178
        self.assertEqual(btree.path2id("grandparent2/parent"), "b")
198
179
        self.assertEqual(btree.path2id("grandparent2/parent/file"), "c")
199
180
 
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)
 
181
        assert btree.path2id("grandparent") is None
 
182
        assert btree.path2id("grandparent/parent") is None
 
183
        assert btree.path2id("grandparent/parent/file") is None
203
184
 
204
185
        btree.note_rename("grandparent/parent", "grandparent2/parent2")
205
186
        self.assertEqual(btree.id2path("a"), "grandparent2")
210
191
        self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
211
192
        self.assertEqual(btree.path2id("grandparent2/parent2/file"), "c")
212
193
 
213
 
        self.assertTrue(btree.path2id("grandparent2/parent") is None)
214
 
        self.assertTrue(btree.path2id("grandparent2/parent/file") is None)
 
194
        assert btree.path2id("grandparent2/parent") is None
 
195
        assert btree.path2id("grandparent2/parent/file") is None
215
196
 
216
 
        btree.note_rename("grandparent/parent/file",
 
197
        btree.note_rename("grandparent/parent/file", 
217
198
                          "grandparent2/parent2/file2")
218
199
        self.assertEqual(btree.id2path("a"), "grandparent2")
219
200
        self.assertEqual(btree.id2path("b"), "grandparent2/parent2")
223
204
        self.assertEqual(btree.path2id("grandparent2/parent2"), "b")
224
205
        self.assertEqual(btree.path2id("grandparent2/parent2/file2"), "c")
225
206
 
226
 
        self.assertTrue(btree.path2id("grandparent2/parent2/file") is None)
 
207
        assert btree.path2id("grandparent2/parent2/file") is None
227
208
 
228
209
    def test_moves(self):
229
210
        """Ensure that file moves have the proper effect on children"""
230
211
        btree = self.make_tree_1()[0]
231
 
        btree.note_rename("grandparent/parent/file",
 
212
        btree.note_rename("grandparent/parent/file", 
232
213
                          "grandparent/alt_parent/file")
233
214
        self.assertEqual(btree.id2path("c"), "grandparent/alt_parent/file")
234
215
        self.assertEqual(btree.path2id("grandparent/alt_parent/file"), "c")
235
 
        self.assertTrue(btree.path2id("grandparent/parent/file") is None)
 
216
        assert btree.path2id("grandparent/parent/file") is None
236
217
 
237
218
    def unified_diff(self, old, new):
238
219
        out = StringIO()
239
 
        diff.internal_diff("old", old, "new", new, out)
 
220
        internal_diff("old", old, "new", new, out)
240
221
        out.seek(0,0)
241
222
        return out.read()
242
223
 
243
224
    def make_tree_2(self):
244
225
        btree = self.make_tree_1()[0]
245
 
        btree.note_rename("grandparent/parent/file",
 
226
        btree.note_rename("grandparent/parent/file", 
246
227
                          "grandparent/alt_parent/file")
247
 
        self.assertTrue(btree.id2path("e") is None)
248
 
        self.assertTrue(btree.path2id("grandparent/parent/file") is None)
 
228
        assert btree.id2path("e") is None
 
229
        assert btree.path2id("grandparent/parent/file") is None
249
230
        btree.note_id("e", "grandparent/parent/file")
250
231
        return btree
251
232
 
277
258
    def make_tree_3(self):
278
259
        btree, mtree = self.make_tree_1()
279
260
        mtree.add_file("e", "grandparent/parent/topping", "Anchovies\n")
280
 
        btree.note_rename("grandparent/parent/file",
 
261
        btree.note_rename("grandparent/parent/file", 
281
262
                          "grandparent/alt_parent/file")
282
 
        btree.note_rename("grandparent/parent/topping",
 
263
        btree.note_rename("grandparent/parent/topping", 
283
264
                          "grandparent/alt_parent/stopping")
284
265
        return btree
285
266
 
309
290
        btree = self.make_tree_1()[0]
310
291
        self.assertEqual(btree.get_file("c").read(), "Hello\n")
311
292
        btree.note_deletion("grandparent/parent/file")
312
 
        self.assertTrue(btree.id2path("c") is None)
313
 
        self.assertTrue(btree.path2id("grandparent/parent/file") is None)
 
293
        assert btree.id2path("c") is None
 
294
        assert btree.path2id("grandparent/parent/file") is None
314
295
 
315
296
    def sorted_ids(self, tree):
316
297
        ids = list(tree)
324
305
            [inventory.ROOT_ID, 'a', 'b', 'c', 'd'])
325
306
        btree.note_deletion("grandparent/parent/file")
326
307
        btree.note_id("e", "grandparent/alt_parent/fool", kind="directory")
327
 
        btree.note_last_changed("grandparent/alt_parent/fool",
 
308
        btree.note_last_changed("grandparent/alt_parent/fool", 
328
309
                                "revisionidiguess")
329
310
        self.assertEqual(self.sorted_ids(btree),
330
311
            [inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
331
312
 
332
313
 
333
 
class BundleTester1(tests.TestCaseWithTransport):
 
314
class BundleTester1(TestCaseWithTransport):
334
315
 
335
316
    def test_mismatched_bundle(self):
336
317
        format = bzrdir.BzrDirMetaFormat1()
337
318
        format.repository_format = knitrepo.RepositoryFormatKnit3()
338
319
        serializer = BundleSerializerV08('0.8')
339
320
        b = self.make_branch('.', format=format)
340
 
        self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
 
321
        self.assertRaises(errors.IncompatibleBundleFormat, serializer.write, 
341
322
                          b.repository, [], {}, StringIO())
342
323
 
343
324
    def test_matched_bundle(self):
356
337
        source.commit('one', rev_id='one-id')
357
338
        source.commit('two', rev_id='two-id')
358
339
        text = StringIO()
359
 
        write_bundle(source.branch.repository, 'two-id', 'null:', text,
 
340
        write_bundle(source.branch.repository, 'two-id', None, text, 
360
341
                     format='0.9')
361
342
        text.seek(0)
362
343
 
363
344
        format = bzrdir.BzrDirMetaFormat1()
364
345
        format.repository_format = knitrepo.RepositoryFormatKnit1()
365
346
        target = self.make_branch('target', format=format)
366
 
        self.assertRaises(errors.IncompatibleRevision, install_bundle,
 
347
        self.assertRaises(errors.IncompatibleRevision, install_bundle, 
367
348
                          target.repository, read_bundle(text))
368
349
 
369
350
 
370
 
class BundleTester(object):
 
351
class V08BundleTester(TestCaseWithTransport):
 
352
 
 
353
    format = '0.8'
371
354
 
372
355
    def bzrdir_format(self):
373
356
        format = bzrdir.BzrDirMetaFormat1()
377
360
    def make_branch_and_tree(self, path, format=None):
378
361
        if format is None:
379
362
            format = self.bzrdir_format()
380
 
        return tests.TestCaseWithTransport.make_branch_and_tree(
381
 
            self, path, format)
 
363
        return TestCaseWithTransport.make_branch_and_tree(self, path, format)
382
364
 
383
365
    def make_branch(self, path, format=None):
384
366
        if format is None:
385
367
            format = self.bzrdir_format()
386
 
        return tests.TestCaseWithTransport.make_branch(self, path, format)
 
368
        return TestCaseWithTransport.make_branch(self, path, format)
387
369
 
388
370
    def create_bundle_text(self, base_rev_id, rev_id):
389
371
        bundle_txt = StringIO()
390
 
        rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
 
372
        rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id, 
391
373
                               bundle_txt, format=self.format)
392
374
        bundle_txt.seek(0)
393
 
        self.assertEqual(bundle_txt.readline(),
 
375
        self.assertEqual(bundle_txt.readline(), 
394
376
                         '# Bazaar revision bundle v%s\n' % self.format)
395
377
        self.assertEqual(bundle_txt.readline(), '#\n')
396
378
 
397
379
        rev = self.b1.repository.get_revision(rev_id)
398
380
        self.assertEqual(bundle_txt.readline().decode('utf-8'),
399
381
                         u'# message:\n')
 
382
 
 
383
        open(',,bundle', 'wb').write(bundle_txt.getvalue())
400
384
        bundle_txt.seek(0)
401
385
        return bundle_txt, rev_ids
402
386
 
404
388
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
405
389
        Make sure that the text generated is valid, and that it
406
390
        can be applied against the base, and generate the same information.
407
 
 
408
 
        :return: The in-memory bundle
 
391
        
 
392
        :return: The in-memory bundle 
409
393
        """
410
394
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
411
395
 
412
 
        # This should also validate the generated bundle
 
396
        # This should also validate the generated bundle 
413
397
        bundle = read_bundle(bundle_txt)
414
398
        repository = self.b1.repository
415
399
        for bundle_rev in bundle.real_revisions:
419
403
            # it
420
404
            branch_rev = repository.get_revision(bundle_rev.revision_id)
421
405
            for a in ('inventory_sha1', 'revision_id', 'parent_ids',
422
 
                      'timestamp', 'timezone', 'message', 'committer',
 
406
                      'timestamp', 'timezone', 'message', 'committer', 
423
407
                      'parent_ids', 'properties'):
424
 
                self.assertEqual(getattr(branch_rev, a),
 
408
                self.assertEqual(getattr(branch_rev, a), 
425
409
                                 getattr(bundle_rev, a))
426
 
            self.assertEqual(len(branch_rev.parent_ids),
 
410
            self.assertEqual(len(branch_rev.parent_ids), 
427
411
                             len(bundle_rev.parent_ids))
428
 
        self.assertEqual(rev_ids,
 
412
        self.assertEqual(rev_ids, 
429
413
                         [r.revision_id for r in bundle.real_revisions])
430
414
        self.valid_apply_bundle(base_rev_id, bundle,
431
415
                                   checkout_dir=checkout_dir)
435
419
    def get_invalid_bundle(self, base_rev_id, rev_id):
436
420
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
437
421
        Munge the text so that it's invalid.
438
 
 
 
422
        
439
423
        :return: The in-memory bundle
440
424
        """
441
425
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
442
 
        new_text = bundle_txt.getvalue().replace('executable:no',
 
426
        new_text = bundle_txt.getvalue().replace('executable:no', 
443
427
                                               'executable:yes')
444
428
        bundle_txt = StringIO(new_text)
445
429
        bundle = read_bundle(bundle_txt)
446
430
        self.valid_apply_bundle(base_rev_id, bundle)
447
 
        return bundle
 
431
        return bundle 
448
432
 
449
433
    def test_non_bundle(self):
450
 
        self.assertRaises(errors.NotABundle,
451
 
                          read_bundle, StringIO('#!/bin/sh\n'))
 
434
        self.assertRaises(NotABundle, read_bundle, StringIO('#!/bin/sh\n'))
452
435
 
453
436
    def test_malformed(self):
454
 
        self.assertRaises(errors.BadBundle, read_bundle,
 
437
        self.assertRaises(BadBundle, read_bundle, 
455
438
                          StringIO('# Bazaar revision bundle v'))
456
439
 
457
440
    def test_crlf_bundle(self):
458
441
        try:
459
442
            read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
460
 
        except errors.BadBundle:
 
443
        except BadBundle:
461
444
            # It is currently permitted for bundles with crlf line endings to
462
445
            # make read_bundle raise a BadBundle, but this should be fixed.
463
446
            # Anything else, especially NotABundle, is an error.
468
451
        """
469
452
 
470
453
        if checkout_dir is None:
471
 
            checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
 
454
            checkout_dir = tempfile.mkdtemp(prefix='test-branch-', dir='.')
472
455
        else:
473
456
            if not os.path.exists(checkout_dir):
474
457
                os.mkdir(checkout_dir)
475
458
        tree = self.make_branch_and_tree(checkout_dir)
476
459
        s = StringIO()
477
 
        ancestors = write_bundle(self.b1.repository, rev_id, 'null:', s,
 
460
        ancestors = write_bundle(self.b1.repository, rev_id, None, s,
478
461
                                 format=self.format)
479
462
        s.seek(0)
480
 
        self.assertIsInstance(s.getvalue(), str)
 
463
        assert isinstance(s.getvalue(), str), (
 
464
            "Bundle isn't a bytestring:\n %s..." % repr(s.getvalue())[:40])
481
465
        install_bundle(tree.branch.repository, read_bundle(s))
482
466
        for ancestor in ancestors:
483
467
            old = self.b1.repository.revision_tree(ancestor)
484
468
            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()
507
 
        if not _mod_revision.is_null(rev_id):
 
469
 
 
470
            # Check that there aren't any inventory level changes
 
471
            delta = new.changes_from(old)
 
472
            self.assertFalse(delta.has_changed(),
 
473
                             'Revision %s not copied correctly.'
 
474
                             % (ancestor,))
 
475
 
 
476
            # Now check that the file contents are all correct
 
477
            for inventory_id in old:
 
478
                try:
 
479
                    old_file = old.get_file(inventory_id)
 
480
                except NoSuchFile:
 
481
                    continue
 
482
                if old_file is None:
 
483
                    continue
 
484
                self.assertEqual(old_file.read(),
 
485
                                 new.get_file(inventory_id).read())
 
486
        if rev_id is not None:
508
487
            rh = self.b1.revision_history()
509
488
            tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
510
489
            tree.update()
518
497
        sure everything matches the builtin branch.
519
498
        """
520
499
        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
500
        original_parents = to_tree.get_parent_ids()
529
501
        repository = to_tree.branch.repository
530
502
        original_parents = to_tree.get_parent_ids()
531
503
        self.assertIs(repository.has_revision(base_rev_id), True)
532
504
        for rev in info.real_revisions:
533
505
            self.assert_(not repository.has_revision(rev.revision_id),
534
 
                'Revision {%s} present before applying bundle'
 
506
                'Revision {%s} present before applying bundle' 
535
507
                % rev.revision_id)
536
 
        merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
 
508
        merge_bundle(info, to_tree, True, Merge3Merger, False, False)
537
509
 
538
510
        for rev in info.real_revisions:
539
511
            self.assert_(repository.has_revision(rev.revision_id),
540
 
                'Missing revision {%s} after applying bundle'
 
512
                'Missing revision {%s} after applying bundle' 
541
513
                % rev.revision_id)
542
514
 
543
515
        self.assert_(to_tree.branch.repository.has_revision(info.target))
549
521
        rev = info.real_revisions[-1]
550
522
        base_tree = self.b1.repository.revision_tree(rev.revision_id)
551
523
        to_tree = to_tree.branch.repository.revision_tree(rev.revision_id)
552
 
 
 
524
        
553
525
        # TODO: make sure the target tree is identical to base tree
554
526
        #       we might also check the working tree.
555
527
 
574
546
        self.tree1 = self.make_branch_and_tree('b1')
575
547
        self.b1 = self.tree1.branch
576
548
 
577
 
        self.build_tree_contents([('b1/one', 'one\n')])
578
 
        self.tree1.add('one', 'one-id')
579
 
        self.tree1.set_root_id('root-id')
 
549
        open('b1/one', 'wb').write('one\n')
 
550
        self.tree1.add('one')
580
551
        self.tree1.commit('add one', rev_id='a@cset-0-1')
581
552
 
582
 
        bundle = self.get_valid_bundle('null:', 'a@cset-0-1')
 
553
        bundle = self.get_valid_bundle(None, 'a@cset-0-1')
 
554
        # FIXME: The current write_bundle api no longer supports
 
555
        #        setting a custom summary message
 
556
        #        We should re-introduce the ability, and update
 
557
        #        the tests to make sure it works.
 
558
        # bundle = self.get_valid_bundle(None, 'a@cset-0-1',
 
559
        #         message='With a specialized message')
583
560
 
584
561
        # Make sure we can handle files with spaces, tabs, other
585
562
        # bogus characters
593
570
                , 'b1/sub/sub/'
594
571
                , 'b1/sub/sub/nonempty.txt'
595
572
                ])
596
 
        self.build_tree_contents([('b1/sub/sub/emptyfile.txt', ''),
597
 
                                  ('b1/dir/nolastnewline.txt', 'bloop')])
 
573
        open('b1/sub/sub/emptyfile.txt', 'wb').close()
 
574
        open('b1/dir/nolastnewline.txt', 'wb').write('bloop')
598
575
        tt = TreeTransform(self.tree1)
599
576
        tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
600
577
        tt.apply()
601
 
        # have to fix length of file-id so that we can predictably rewrite
602
 
        # a (length-prefixed) record containing it later.
603
 
        self.tree1.add('with space.txt', 'withspace-id')
604
578
        self.tree1.add([
605
 
                  'dir'
 
579
                'with space.txt'
 
580
                , 'dir'
606
581
                , 'dir/filein subdir.c'
607
582
                , 'dir/WithCaps.txt'
608
583
                , 'dir/ pre space'
616
591
 
617
592
        bundle = self.get_valid_bundle('a@cset-0-1', 'a@cset-0-2')
618
593
 
619
 
        # Check a rollup bundle
620
 
        bundle = self.get_valid_bundle('null:', 'a@cset-0-2')
 
594
        # Check a rollup bundle 
 
595
        bundle = self.get_valid_bundle(None, 'a@cset-0-2')
621
596
 
622
597
        # Now delete entries
623
598
        self.tree1.remove(
630
605
        tt.set_executability(False, trans_id)
631
606
        tt.apply()
632
607
        self.tree1.commit('removed', rev_id='a@cset-0-3')
633
 
 
 
608
        
634
609
        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,
638
 
            'a@cset-0-2', 'a@cset-0-3')
639
 
        # Check a rollup bundle
640
 
        bundle = self.get_valid_bundle('null:', 'a@cset-0-3')
 
610
        self.assertRaises(TestamentMismatch, self.get_invalid_bundle, 
 
611
                          'a@cset-0-2', 'a@cset-0-3')
 
612
        # Check a rollup bundle 
 
613
        bundle = self.get_valid_bundle(None, 'a@cset-0-3')
641
614
 
642
615
        # Now move the directory
643
616
        self.tree1.rename_one('dir', 'sub/dir')
644
617
        self.tree1.commit('rename dir', rev_id='a@cset-0-4')
645
618
 
646
619
        bundle = self.get_valid_bundle('a@cset-0-3', 'a@cset-0-4')
647
 
        # Check a rollup bundle
648
 
        bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
 
620
        # Check a rollup bundle 
 
621
        bundle = self.get_valid_bundle(None, 'a@cset-0-4')
649
622
 
650
623
        # Modified files
651
624
        open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
652
 
        open('b1/sub/dir/ pre space', 'ab').write(
653
 
             '\r\nAdding some\r\nDOS format lines\r\n')
 
625
        open('b1/sub/dir/ pre space', 'ab').write('\r\nAdding some\r\nDOS format lines\r\n')
654
626
        open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
655
 
        self.tree1.rename_one('sub/dir/ pre space',
 
627
        self.tree1.rename_one('sub/dir/ pre space', 
656
628
                              'sub/ start space')
657
629
        self.tree1.commit('Modified files', rev_id='a@cset-0-5')
658
630
        bundle = self.get_valid_bundle('a@cset-0-4', 'a@cset-0-5')
664
636
                          verbose=False)
665
637
        bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
666
638
        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')
 
639
        tree1_inv = self.tree1.branch.repository.get_inventory_xml(
 
640
            'a@cset-0-5')
 
641
        tree2_inv = other.branch.repository.get_inventory_xml('a@cset-0-5')
671
642
        self.assertEqualDiff(tree1_inv, tree2_inv)
672
643
        other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
673
644
        other.commit('rename file', rev_id='a@cset-0-6b')
674
 
        self.tree1.merge_from_branch(other.branch)
 
645
        _merge_helper([other.basedir, -1], [None, None],
 
646
                      this_dir=self.tree1.basedir)
675
647
        self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
676
648
                          verbose=False)
677
649
        bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
678
650
 
679
 
    def _test_symlink_bundle(self, link_name, link_target, new_link_target):
680
 
        link_id = 'link-1'
681
 
 
682
 
        self.requireFeature(tests.SymlinkFeature)
 
651
    def test_symlink_bundle(self):
 
652
        if not has_symlinks():
 
653
            raise TestSkipped("No symlink support")
683
654
        self.tree1 = self.make_branch_and_tree('b1')
684
655
        self.b1 = self.tree1.branch
685
 
 
686
656
        tt = TreeTransform(self.tree1)
687
 
        tt.new_symlink(link_name, tt.root, link_target, link_id)
 
657
        tt.new_symlink('link', tt.root, 'bar/foo', 'link-1')
688
658
        tt.apply()
689
659
        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
 
 
 
660
        self.get_valid_bundle(None, 'l@cset-0-1')
696
661
        tt = TreeTransform(self.tree1)
697
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
662
        trans_id = tt.trans_id_tree_file_id('link-1')
698
663
        tt.adjust_path('link2', tt.root, trans_id)
699
664
        tt.delete_contents(trans_id)
700
 
        tt.create_symlink(new_link_target, trans_id)
 
665
        tt.create_symlink('mars', trans_id)
701
666
        tt.apply()
702
667
        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
 
 
 
668
        self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
710
669
        tt = TreeTransform(self.tree1)
711
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
670
        trans_id = tt.trans_id_tree_file_id('link-1')
712
671
        tt.delete_contents(trans_id)
713
672
        tt.create_symlink('jupiter', trans_id)
714
673
        tt.apply()
715
674
        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
 
 
 
675
        self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
718
676
        tt = TreeTransform(self.tree1)
719
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
677
        trans_id = tt.trans_id_tree_file_id('link-1')
720
678
        tt.delete_contents(trans_id)
721
679
        tt.apply()
722
680
        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}')
 
681
        self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
733
682
 
734
683
    def test_binary_bundle(self):
735
684
        self.tree1 = self.make_branch_and_tree('b1')
736
685
        self.b1 = self.tree1.branch
737
686
        tt = TreeTransform(self.tree1)
738
 
 
 
687
        
739
688
        # Add
740
689
        tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
741
 
        tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
742
 
            'binary-2')
 
690
        tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff', 'binary-2')
743
691
        tt.apply()
744
692
        self.tree1.commit('add binary', rev_id='b@cset-0-1')
745
 
        self.get_valid_bundle('null:', 'b@cset-0-1')
 
693
        self.get_valid_bundle(None, 'b@cset-0-1')
746
694
 
747
695
        # Delete
748
696
        tt = TreeTransform(self.tree1)
772
720
        self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
773
721
 
774
722
        # Rollup
775
 
        self.get_valid_bundle('null:', 'b@cset-0-4')
 
723
        self.get_valid_bundle(None, 'b@cset-0-4')
776
724
 
777
725
    def test_last_modified(self):
778
726
        self.tree1 = self.make_branch_and_tree('b1')
796
744
        tt.create_file('file2', trans_id)
797
745
        tt.apply()
798
746
        other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
799
 
        self.tree1.merge_from_branch(other.branch)
 
747
        _merge_helper([other.basedir, -1], [None, None],
 
748
                      this_dir=self.tree1.basedir)
800
749
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
801
750
                          verbose=False)
802
751
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')
817
766
        rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
818
767
                               'a@cset-0-1', bundle_file, format=self.format)
819
768
        self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
820
 
        self.assertContainsRe(self.get_raw(bundle_file), 'one')
821
 
        self.assertContainsRe(self.get_raw(bundle_file), 'three')
822
 
 
823
 
    def test_bundle_same_basis(self):
824
 
        """Ensure using the basis as the target doesn't cause an error"""
825
 
        self.tree1 = self.make_branch_and_tree('b1')
826
 
        self.tree1.commit('add file', rev_id='a@cset-0-1')
827
 
        bundle_file = StringIO()
828
 
        rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
829
 
                               'a@cset-0-1', bundle_file)
830
 
 
831
 
    @staticmethod
832
 
    def get_raw(bundle_file):
833
 
        return bundle_file.getvalue()
 
769
        self.assertContainsRe(bundle_file.getvalue(), 'one')
 
770
        self.assertContainsRe(bundle_file.getvalue(), 'three')
834
771
 
835
772
    def test_unicode_bundle(self):
836
 
        self.requireFeature(tests.UnicodeFilenameFeature)
837
773
        # Handle international characters
838
774
        os.mkdir('b1')
839
 
        f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
 
775
        try:
 
776
            f = open(u'b1/with Dod\xe9', 'wb')
 
777
        except UnicodeEncodeError:
 
778
            raise TestSkipped("Filesystem doesn't support unicode")
840
779
 
841
780
        self.tree1 = self.make_branch_and_tree('b1')
842
781
        self.b1 = self.tree1.branch
846
785
            u'William Dod\xe9\n').encode('utf-8'))
847
786
        f.close()
848
787
 
849
 
        self.tree1.add([u'with Dod\N{Euro Sign}'], ['withdod-id'])
 
788
        self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
850
789
        self.tree1.commit(u'i18n commit from William Dod\xe9',
851
790
                          rev_id='i18n-1', committer=u'William Dod\xe9')
852
791
 
 
792
        if sys.platform == 'darwin':
 
793
            # On Mac the '\xe9' gets changed to 'e\u0301'
 
794
            self.assertEqual([u'.bzr', u'with Dode\u0301'],
 
795
                             sorted(os.listdir(u'b1')))
 
796
            delta = self.tree1.changes_from(self.tree1.basis_tree())
 
797
            self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
 
798
                             delta.removed)
 
799
            self.knownFailure("Mac OSX doesn't preserve unicode"
 
800
                              " combining characters.")
 
801
 
853
802
        # Add
854
 
        bundle = self.get_valid_bundle('null:', 'i18n-1')
 
803
        bundle = self.get_valid_bundle(None, 'i18n-1')
855
804
 
856
805
        # Modified
857
 
        f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
 
806
        f = open(u'b1/with Dod\xe9', 'wb')
858
807
        f.write(u'Modified \xb5\n'.encode('utf8'))
859
808
        f.close()
860
809
        self.tree1.commit(u'modified', rev_id='i18n-2')
861
810
 
862
811
        bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
863
 
 
 
812
        
864
813
        # Renamed
865
 
        self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
 
814
        self.tree1.rename_one(u'with Dod\xe9', u'B\xe5gfors')
866
815
        self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
867
816
                          committer=u'Erik B\xe5gfors')
868
817
 
869
818
        bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
870
819
 
871
820
        # Removed
872
 
        self.tree1.remove([u'B\N{Euro Sign}gfors'])
 
821
        self.tree1.remove([u'B\xe5gfors'])
873
822
        self.tree1.commit(u'removed', rev_id='i18n-4')
874
823
 
875
824
        bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
876
825
 
877
826
        # Rollup
878
 
        bundle = self.get_valid_bundle('null:', 'i18n-4')
 
827
        bundle = self.get_valid_bundle(None, 'i18n-4')
879
828
 
880
829
 
881
830
    def test_whitespace_bundle(self):
882
831
        if sys.platform in ('win32', 'cygwin'):
883
 
            raise tests.TestSkipped('Windows doesn\'t support filenames'
884
 
                                    ' with tabs or trailing spaces')
 
832
            raise TestSkipped('Windows doesn\'t support filenames'
 
833
                              ' with tabs or trailing spaces')
885
834
        self.tree1 = self.make_branch_and_tree('b1')
886
835
        self.b1 = self.tree1.branch
887
836
 
893
842
        # Added
894
843
        self.tree1.commit('funky whitespace', rev_id='white-1')
895
844
 
896
 
        bundle = self.get_valid_bundle('null:', 'white-1')
 
845
        bundle = self.get_valid_bundle(None, 'white-1')
897
846
 
898
847
        # Modified
899
848
        open('b1/trailing space ', 'ab').write('add some text\n')
912
861
        self.tree1.commit('removed', rev_id='white-4')
913
862
 
914
863
        bundle = self.get_valid_bundle('white-3', 'white-4')
915
 
 
 
864
        
916
865
        # Now test a complet roll-up
917
 
        bundle = self.get_valid_bundle('null:', 'white-4')
 
866
        bundle = self.get_valid_bundle(None, 'white-4')
918
867
 
919
868
    def test_alt_timezone_bundle(self):
920
869
        self.tree1 = self.make_branch_and_memory_tree('b1')
930
879
        self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
931
880
                          timezone=19800, timestamp=1152544886.0)
932
881
 
933
 
        bundle = self.get_valid_bundle('null:', 'tz-1')
934
 
 
 
882
        bundle = self.get_valid_bundle(None, 'tz-1')
 
883
        
935
884
        rev = bundle.revisions[0]
936
885
        self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
937
886
        self.assertEqual(19800, rev.timezone)
942
891
        self.tree1 = self.make_branch_and_tree('b1')
943
892
        self.b1 = self.tree1.branch
944
893
        self.tree1.commit('message', rev_id='revid1')
945
 
        bundle = self.get_valid_bundle('null:', 'revid1')
946
 
        tree = self.get_bundle_tree(bundle, 'revid1')
 
894
        bundle = self.get_valid_bundle(None, 'revid1')
 
895
        tree = bundle.revision_tree(self.b1.repository, 'revid1')
947
896
        self.assertEqual('revid1', tree.inventory.root.revision)
948
897
 
949
898
    def test_install_revisions(self):
950
899
        self.tree1 = self.make_branch_and_tree('b1')
951
900
        self.b1 = self.tree1.branch
952
901
        self.tree1.commit('message', rev_id='rev2a')
953
 
        bundle = self.get_valid_bundle('null:', 'rev2a')
 
902
        bundle = self.get_valid_bundle(None, 'rev2a')
954
903
        branch2 = self.make_branch('b2')
955
904
        self.assertFalse(branch2.repository.has_revision('rev2a'))
956
905
        target_revision = bundle.install_revisions(branch2.repository)
965
914
        tree.add([''], ['TREE_ROOT'])
966
915
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
967
916
        self.b1 = tree.branch
968
 
        bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
969
 
        bundle = read_bundle(bundle_sio)
970
 
        revision_info = bundle.revisions[0]
971
 
        self.assertEqual('rev1', revision_info.revision_id)
972
 
        rev = revision_info.as_revision()
973
 
        self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
974
 
                         rev.properties)
975
 
 
976
 
    def test_bundle_sorted_properties(self):
977
 
        """For stability the writer should write properties in sorted order."""
978
 
        tree = self.make_branch_and_memory_tree('tree')
979
 
        tree.lock_write()
980
 
        self.addCleanup(tree.unlock)
981
 
 
982
 
        tree.add([''], ['TREE_ROOT'])
983
 
        tree.commit('One', rev_id='rev1',
984
 
                    revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
985
 
        self.b1 = tree.branch
986
 
        bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
987
 
        bundle = read_bundle(bundle_sio)
988
 
        revision_info = bundle.revisions[0]
989
 
        self.assertEqual('rev1', revision_info.revision_id)
990
 
        rev = revision_info.as_revision()
991
 
        self.assertEqual({'branch-nick':'tree', 'a':'4', 'b':'3', 'c':'2',
992
 
                          'd':'1'}, rev.properties)
993
 
 
994
 
    def test_bundle_unicode_properties(self):
995
 
        """We should be able to round trip a non-ascii property."""
996
 
        tree = self.make_branch_and_memory_tree('tree')
997
 
        tree.lock_write()
998
 
        self.addCleanup(tree.unlock)
999
 
 
1000
 
        tree.add([''], ['TREE_ROOT'])
1001
 
        # Revisions themselves do not require anything about revision property
1002
 
        # keys, other than that they are a basestring, and do not contain
1003
 
        # whitespace.
1004
 
        # However, Testaments assert than they are str(), and thus should not
1005
 
        # be Unicode.
1006
 
        tree.commit('One', rev_id='rev1',
1007
 
                    revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1008
 
        self.b1 = tree.branch
1009
 
        bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1010
 
        bundle = read_bundle(bundle_sio)
1011
 
        revision_info = bundle.revisions[0]
1012
 
        self.assertEqual('rev1', revision_info.revision_id)
1013
 
        rev = revision_info.as_revision()
1014
 
        self.assertEqual({'branch-nick':'tree', 'omega':u'\u03a9',
1015
 
                          'alpha':u'\u03b1'}, rev.properties)
1016
 
 
1017
 
    def test_bundle_with_ghosts(self):
1018
 
        tree = self.make_branch_and_tree('tree')
1019
 
        self.b1 = tree.branch
1020
 
        self.build_tree_contents([('tree/file', 'content1')])
1021
 
        tree.add(['file'])
1022
 
        tree.commit('rev1')
1023
 
        self.build_tree_contents([('tree/file', 'content2')])
1024
 
        tree.add_parent_tree_id('ghost')
1025
 
        tree.commit('rev2', rev_id='rev2')
1026
 
        bundle = self.get_valid_bundle('null:', 'rev2')
1027
 
 
1028
 
    def make_simple_tree(self, format=None):
1029
 
        tree = self.make_branch_and_tree('b1', format=format)
1030
 
        self.b1 = tree.branch
1031
 
        self.build_tree(['b1/file'])
1032
 
        tree.add('file')
1033
 
        return tree
1034
 
 
1035
 
    def test_across_serializers(self):
1036
 
        tree = self.make_simple_tree('knit')
1037
 
        tree.commit('hello', rev_id='rev1')
1038
 
        tree.commit('hello', rev_id='rev2')
1039
 
        bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1040
 
        repo = self.make_repository('repo', format='dirstate-with-subtree')
1041
 
        bundle.install_revisions(repo)
1042
 
        inv_text = repo._get_inventory_xml('rev2')
1043
 
        self.assertNotContainsRe(inv_text, 'format="5"')
1044
 
        self.assertContainsRe(inv_text, 'format="7"')
1045
 
 
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
 
    def test_across_models(self):
1056
 
        repo = self.make_repo_with_installed_revisions()
1057
 
        inv = repo.get_inventory('rev2')
1058
 
        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)
1071
 
 
1072
 
    def test_across_models_incompatible(self):
1073
 
        tree = self.make_simple_tree('dirstate-with-subtree')
1074
 
        tree.commit('hello', rev_id='rev1')
1075
 
        tree.commit('hello', rev_id='rev2')
1076
 
        try:
1077
 
            bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1078
 
        except errors.IncompatibleBundleFormat:
1079
 
            raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1080
 
        repo = self.make_repository('repo', format='knit')
1081
 
        bundle.install_revisions(repo)
1082
 
 
1083
 
        bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1084
 
        self.assertRaises(errors.IncompatibleRevision,
1085
 
                          bundle.install_revisions, repo)
1086
 
 
1087
 
    def test_get_merge_request(self):
1088
 
        tree = self.make_simple_tree()
1089
 
        tree.commit('hello', rev_id='rev1')
1090
 
        tree.commit('hello', rev_id='rev2')
1091
 
        bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1092
 
        result = bundle.get_merge_request(tree.branch.repository)
1093
 
        self.assertEqual((None, 'rev1', 'inapplicable'), result)
1094
 
 
1095
 
    def test_with_subtree(self):
1096
 
        tree = self.make_branch_and_tree('tree',
1097
 
                                         format='dirstate-with-subtree')
1098
 
        self.b1 = tree.branch
1099
 
        subtree = self.make_branch_and_tree('tree/subtree',
1100
 
                                            format='dirstate-with-subtree')
1101
 
        tree.add('subtree')
1102
 
        tree.commit('hello', rev_id='rev1')
1103
 
        try:
1104
 
            bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1105
 
        except errors.IncompatibleBundleFormat:
1106
 
            raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
1107
 
        if isinstance(bundle, v09.BundleInfo09):
1108
 
            raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
1109
 
        repo = self.make_repository('repo', format='knit')
1110
 
        self.assertRaises(errors.IncompatibleRevision,
1111
 
                          bundle.install_revisions, repo)
1112
 
        repo2 = self.make_repository('repo2', format='dirstate-with-subtree')
1113
 
        bundle.install_revisions(repo2)
1114
 
 
1115
 
    def test_revision_id_with_slash(self):
1116
 
        self.tree1 = self.make_branch_and_tree('tree')
1117
 
        self.b1 = self.tree1.branch
1118
 
        try:
1119
 
            self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
1120
 
        except ValueError:
1121
 
            raise tests.TestSkipped(
1122
 
                "Repository doesn't support revision ids with slashes")
1123
 
        bundle = self.get_valid_bundle('null:', 'rev/id')
1124
 
 
1125
 
    def test_skip_file(self):
1126
 
        """Make sure we don't accidentally write to the wrong versionedfile"""
1127
 
        self.tree1 = self.make_branch_and_tree('tree')
1128
 
        self.b1 = self.tree1.branch
1129
 
        # rev1 is not present in bundle, done by fetch
1130
 
        self.build_tree_contents([('tree/file2', 'contents1')])
1131
 
        self.tree1.add('file2', 'file2-id')
1132
 
        self.tree1.commit('rev1', rev_id='reva')
1133
 
        self.build_tree_contents([('tree/file3', 'contents2')])
1134
 
        # rev2 is present in bundle, and done by fetch
1135
 
        # having file1 in the bunle causes file1's versionedfile to be opened.
1136
 
        self.tree1.add('file3', 'file3-id')
1137
 
        self.tree1.commit('rev2')
1138
 
        # Updating file2 should not cause an attempt to add to file1's vf
1139
 
        target = self.tree1.bzrdir.sprout('target').open_workingtree()
1140
 
        self.build_tree_contents([('tree/file2', 'contents3')])
1141
 
        self.tree1.commit('rev3', rev_id='rev3')
1142
 
        bundle = self.get_valid_bundle('reva', 'rev3')
1143
 
        if getattr(bundle, 'get_bundle_reader', None) is None:
1144
 
            raise tests.TestSkipped('Bundle format cannot provide reader')
1145
 
        # be sure that file1 comes before file2
1146
 
        for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1147
 
            if f == 'file3-id':
1148
 
                break
1149
 
            self.assertNotEqual(f, 'file2-id')
1150
 
        bundle.install_revisions(target.branch.repository)
1151
 
 
1152
 
 
1153
 
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
1154
 
 
1155
 
    format = '0.8'
1156
 
 
1157
 
    def test_bundle_empty_property(self):
1158
 
        """Test serializing revision properties with an empty value."""
1159
 
        tree = self.make_branch_and_memory_tree('tree')
1160
 
        tree.lock_write()
1161
 
        self.addCleanup(tree.unlock)
1162
 
        tree.add([''], ['TREE_ROOT'])
1163
 
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1164
 
        self.b1 = tree.branch
1165
 
        bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
 
917
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
1166
918
        self.assertContainsRe(bundle_sio.getvalue(),
1167
919
                              '# properties:\n'
1168
920
                              '#   branch-nick: tree\n'
1176
928
        self.assertEqual({'branch-nick':'tree', 'empty':'', 'one':'two'},
1177
929
                         rev.properties)
1178
930
 
1179
 
    def get_bundle_tree(self, bundle, revision_id):
1180
 
        repository = self.make_repository('repo')
1181
 
        return bundle.revision_tree(repository, 'revid1')
1182
 
 
1183
931
    def test_bundle_empty_property_alt(self):
1184
932
        """Test serializing revision properties with an empty value.
1185
933
 
1194
942
        tree.add([''], ['TREE_ROOT'])
1195
943
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id='rev1')
1196
944
        self.b1 = tree.branch
1197
 
        bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
 
945
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
1198
946
        txt = bundle_sio.getvalue()
1199
947
        loc = txt.find('#   empty: ') + len('#   empty:')
1200
948
        # Create a new bundle, which strips the trailing space after empty
1223
971
        tree.commit('One', rev_id='rev1',
1224
972
                    revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1225
973
        self.b1 = tree.branch
1226
 
        bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
 
974
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
1227
975
        self.assertContainsRe(bundle_sio.getvalue(),
1228
976
                              '# properties:\n'
1229
977
                              '#   a: 4\n'
1254
1002
        tree.commit('One', rev_id='rev1',
1255
1003
                    revprops={'omega':u'\u03a9', 'alpha':u'\u03b1'})
1256
1004
        self.b1 = tree.branch
1257
 
        bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
 
1005
        bundle_sio, revision_ids = self.create_bundle_text(None, 'rev1')
1258
1006
        self.assertContainsRe(bundle_sio.getvalue(),
1259
1007
                              '# properties:\n'
1260
1008
                              '#   alpha: \xce\xb1\n'
1289
1037
        return format
1290
1038
 
1291
1039
 
1292
 
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
 
1040
class V10BundleTester(V08BundleTester):
1293
1041
 
1294
 
    format = '4'
 
1042
    format = '1.0'
1295
1043
 
1296
1044
    def get_valid_bundle(self, base_rev_id, rev_id, checkout_dir=None):
1297
1045
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
1298
1046
        Make sure that the text generated is valid, and that it
1299
1047
        can be applied against the base, and generate the same information.
1300
 
 
1301
 
        :return: The in-memory bundle
 
1048
        
 
1049
        :return: The in-memory bundle 
1302
1050
        """
1303
1051
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1304
1052
 
1305
 
        # This should also validate the generated bundle
 
1053
        # This should also validate the generated bundle 
1306
1054
        bundle = read_bundle(bundle_txt)
1307
1055
        repository = self.b1.repository
 
1056
        return bundle
1308
1057
        for bundle_rev in bundle.real_revisions:
1309
1058
            # These really should have already been checked when we read the
1310
1059
            # bundle, since it computes the sha1 hash for the revision, which
1312
1061
            # it
1313
1062
            branch_rev = repository.get_revision(bundle_rev.revision_id)
1314
1063
            for a in ('inventory_sha1', 'revision_id', 'parent_ids',
1315
 
                      'timestamp', 'timezone', 'message', 'committer',
 
1064
                      'timestamp', 'timezone', 'message', 'committer', 
1316
1065
                      'parent_ids', 'properties'):
1317
 
                self.assertEqual(getattr(branch_rev, a),
 
1066
                self.assertEqual(getattr(branch_rev, a), 
1318
1067
                                 getattr(bundle_rev, a))
1319
 
            self.assertEqual(len(branch_rev.parent_ids),
 
1068
            self.assertEqual(len(branch_rev.parent_ids), 
1320
1069
                             len(bundle_rev.parent_ids))
1321
 
        self.assertEqual(set(rev_ids),
1322
 
                         set([r.revision_id for r in bundle.real_revisions]))
 
1070
        self.assertEqual(rev_ids, 
 
1071
                         [r.revision_id for r in bundle.real_revisions])
1323
1072
        self.valid_apply_bundle(base_rev_id, bundle,
1324
1073
                                   checkout_dir=checkout_dir)
1325
1074
 
1326
1075
        return bundle
1327
1076
 
1328
 
    def get_invalid_bundle(self, base_rev_id, rev_id):
1329
 
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
1330
 
        Munge the text so that it's invalid.
1331
 
 
1332
 
        :return: The in-memory bundle
1333
 
        """
1334
 
        from bzrlib.bundle import serializer
1335
 
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1336
 
        new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1337
 
        new_text = new_text.replace('<file file_id="exe-1"',
1338
 
                                    '<file executable="y" file_id="exe-1"')
1339
 
        new_text = new_text.replace('B260', 'B275')
1340
 
        bundle_txt = StringIO()
1341
 
        bundle_txt.write(serializer._get_bundle_header('4'))
1342
 
        bundle_txt.write('\n')
1343
 
        bundle_txt.write(new_text.encode('bz2'))
1344
 
        bundle_txt.seek(0)
1345
 
        bundle = read_bundle(bundle_txt)
1346
 
        self.valid_apply_bundle(base_rev_id, bundle)
1347
 
        return bundle
1348
 
 
1349
1077
    def create_bundle_text(self, base_rev_id, rev_id):
1350
1078
        bundle_txt = StringIO()
1351
 
        rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
 
1079
        rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id, 
1352
1080
                               bundle_txt, format=self.format)
1353
1081
        bundle_txt.seek(0)
1354
 
        self.assertEqual(bundle_txt.readline(),
 
1082
        self.assertEqual(bundle_txt.readline(), 
1355
1083
                         '# Bazaar revision bundle v%s\n' % self.format)
1356
1084
        self.assertEqual(bundle_txt.readline(), '#\n')
 
1085
 
1357
1086
        rev = self.b1.repository.get_revision(rev_id)
 
1087
        self.assertEqual(bundle_txt.readline().decode('utf-8'),
 
1088
                         u'bzr pack format 1\n')
 
1089
 
 
1090
        open(',,bundle', 'wb').write(bundle_txt.getvalue())
1358
1091
        bundle_txt.seek(0)
1359
1092
        return bundle_txt, rev_ids
1360
1093
 
1361
 
    def get_bundle_tree(self, bundle, revision_id):
1362
 
        repository = self.make_repository('repo')
1363
 
        bundle.install_revisions(repository)
1364
 
        return repository.revision_tree(revision_id)
1365
 
 
1366
1094
    def test_creation(self):
1367
1095
        tree = self.make_branch_and_tree('tree')
1368
1096
        self.build_tree_contents([('tree/file', 'contents1\nstatic\n')])
1371
1099
        self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
1372
1100
        tree.commit('changed file', rev_id='rev2')
1373
1101
        s = StringIO()
1374
 
        serializer = BundleSerializerV4('1.0')
 
1102
        serializer = BundleSerializerV10('1.0')
1375
1103
        serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
1376
1104
        s.seek(0)
1377
1105
        tree2 = self.make_branch_and_tree('target')
1378
1106
        target_repo = tree2.branch.repository
1379
1107
        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)
 
1108
        vf = target_repo.weave_store.get_weave('fileid-2',
 
1109
            target_repo.get_transaction())
 
1110
        self.assertEqual('contents1\nstatic\n', vf.get_text('rev1'))
 
1111
        self.assertEqual('contents2\nstatic\n', vf.get_text('rev2'))
1390
1112
        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',),)])
 
1113
        inventory_vf = target_repo.get_inventory_weave()
 
1114
        self.assertEqual(['rev1'], inventory_vf.get_parents('rev2'))
1396
1115
        self.assertEqual('changed file',
1397
1116
                         target_repo.get_revision('rev2').message)
1398
1117
 
1399
 
    @staticmethod
1400
 
    def get_raw(bundle_file):
1401
 
        bundle_file.seek(0)
1402
 
        line = bundle_file.readline()
1403
 
        line = bundle_file.readline()
1404
 
        lines = bundle_file.readlines()
1405
 
        return ''.join(lines).decode('bz2')
1406
 
 
1407
 
    def test_copy_signatures(self):
1408
 
        tree_a = self.make_branch_and_tree('tree_a')
1409
 
        import bzrlib.gpg
1410
 
        import bzrlib.commit as commit
1411
 
        oldstrategy = bzrlib.gpg.GPGStrategy
1412
 
        branch = tree_a.branch
1413
 
        repo_a = branch.repository
1414
 
        tree_a.commit("base", allow_pointless=True, rev_id='A')
1415
 
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
1416
 
        try:
1417
 
            from bzrlib.testament import Testament
1418
 
            # monkey patch gpg signing mechanism
1419
 
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1420
 
            new_config = test_commit.MustSignConfig(branch)
1421
 
            commit.Commit(config=new_config).commit(message="base",
1422
 
                                                    allow_pointless=True,
1423
 
                                                    rev_id='B',
1424
 
                                                    working_tree=tree_a)
1425
 
            def sign(text):
1426
 
                return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1427
 
            self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1428
 
        finally:
1429
 
            bzrlib.gpg.GPGStrategy = oldstrategy
1430
 
        tree_b = self.make_branch_and_tree('tree_b')
1431
 
        repo_b = tree_b.branch.repository
1432
 
        s = StringIO()
1433
 
        serializer = BundleSerializerV4('4')
1434
 
        serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1435
 
        s.seek(0)
1436
 
        install_bundle(repo_b, serializer.read(s))
1437
 
        self.assertTrue(repo_b.has_signature_for_revision_id('B'))
1438
 
        self.assertEqual(repo_b.get_signature_text('B'),
1439
 
                         repo_a.get_signature_text('B'))
1440
 
        s.seek(0)
1441
 
        # ensure repeat installs are harmless
1442
 
        install_bundle(repo_b, serializer.read(s))
1443
 
 
1444
 
 
1445
 
class V4WeaveBundleTester(V4BundleTester):
1446
 
 
1447
 
    def bzrdir_format(self):
1448
 
        return 'metaweave'
1449
 
 
1450
 
 
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
 
class MungedBundleTester(object):
 
1118
    def test_name_encode(self):
 
1119
        self.assertEqual('revision:rev1',
 
1120
            BundleSerializerV10.encode_name('revision', 'rev1'))
 
1121
        self.assertEqual('file:rev1/file-id-1',
 
1122
            BundleSerializerV10.encode_name('file', 'rev1', 'file-id-1'))
 
1123
 
 
1124
    def test_name_decode(self):
 
1125
        self.assertEqual(('revision', 'rev1', None),
 
1126
            BundleSerializerV10.decode_name('revision:rev1'))
 
1127
        self.assertEqual(('file', 'rev1', 'file-id-1'),
 
1128
            BundleSerializerV10.decode_name('file:rev1/file-id-1'))
 
1129
 
 
1130
 
 
1131
class MungedBundleTester(TestCaseWithTransport):
1646
1132
 
1647
1133
    def build_test_bundle(self):
1648
1134
        wt = self.make_branch_and_tree('b1')
1657
1143
 
1658
1144
        bundle_txt = StringIO()
1659
1145
        rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
1660
 
                               'a@cset-0-1', bundle_txt, self.format)
1661
 
        self.assertEqual(set(['a@cset-0-2']), set(rev_ids))
 
1146
                               'a@cset-0-1', bundle_txt)
 
1147
        self.assertEqual(['a@cset-0-2'], rev_ids)
1662
1148
        bundle_txt.seek(0, 0)
1663
1149
        return bundle_txt
1664
1150
 
1693
1179
        bundle = read_bundle(bundle_txt)
1694
1180
        self.check_valid(bundle)
1695
1181
 
1696
 
 
1697
 
class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
1698
 
 
1699
 
    format = '0.9'
1700
 
 
1701
1182
    def test_missing_trailing_whitespace(self):
1702
1183
        bundle_txt = self.build_test_bundle()
1703
1184
 
1731
1212
        bundle = read_bundle(bundle_txt)
1732
1213
        self.check_valid(bundle)
1733
1214
 
1734
 
 
1735
 
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
1736
 
 
1737
 
    format = '4'
1738
 
 
1739
 
 
1740
 
class TestBundleWriterReader(tests.TestCase):
1741
 
 
1742
 
    def test_roundtrip_record(self):
1743
 
        fileobj = StringIO()
1744
 
        writer = v4.BundleWriter(fileobj)
1745
 
        writer.begin()
1746
 
        writer.add_info_record(foo='bar')
1747
 
        writer._add_record("Record body", {'parents': ['1', '3'],
1748
 
            'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1749
 
        writer.end()
1750
 
        fileobj.seek(0)
1751
 
        reader = v4.BundleReader(fileobj, stream_input=True)
1752
 
        record_iter = reader.iter_records()
1753
 
        record = record_iter.next()
1754
 
        self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1755
 
            'info', None, None), record)
1756
 
        record = record_iter.next()
1757
 
        self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1758
 
                          'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1759
 
                          record)
1760
 
 
1761
 
    def test_roundtrip_record_memory_hungry(self):
1762
 
        fileobj = StringIO()
1763
 
        writer = v4.BundleWriter(fileobj)
1764
 
        writer.begin()
1765
 
        writer.add_info_record(foo='bar')
1766
 
        writer._add_record("Record body", {'parents': ['1', '3'],
1767
 
            'storage_kind':'fulltext'}, 'file', 'revid', 'fileid')
1768
 
        writer.end()
1769
 
        fileobj.seek(0)
1770
 
        reader = v4.BundleReader(fileobj, stream_input=False)
1771
 
        record_iter = reader.iter_records()
1772
 
        record = record_iter.next()
1773
 
        self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1774
 
            'info', None, None), record)
1775
 
        record = record_iter.next()
1776
 
        self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1777
 
                          'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1778
 
                          record)
1779
 
 
1780
 
    def test_encode_name(self):
1781
 
        self.assertEqual('revision/rev1',
1782
 
            v4.BundleWriter.encode_name('revision', 'rev1'))
1783
 
        self.assertEqual('file/rev//1/file-id-1',
1784
 
            v4.BundleWriter.encode_name('file', 'rev/1', 'file-id-1'))
1785
 
        self.assertEqual('info',
1786
 
            v4.BundleWriter.encode_name('info', None, None))
1787
 
 
1788
 
    def test_decode_name(self):
1789
 
        self.assertEqual(('revision', 'rev1', None),
1790
 
            v4.BundleReader.decode_name('revision/rev1'))
1791
 
        self.assertEqual(('file', 'rev/1', 'file-id-1'),
1792
 
            v4.BundleReader.decode_name('file/rev//1/file-id-1'))
1793
 
        self.assertEqual(('info', None, None),
1794
 
                         v4.BundleReader.decode_name('info'))
1795
 
 
1796
 
    def test_too_many_names(self):
1797
 
        fileobj = StringIO()
1798
 
        writer = v4.BundleWriter(fileobj)
1799
 
        writer.begin()
1800
 
        writer.add_info_record(foo='bar')
1801
 
        writer._container.add_bytes_record('blah', ['two', 'names'])
1802
 
        writer.end()
1803
 
        fileobj.seek(0)
1804
 
        record_iter = v4.BundleReader(fileobj).iter_records()
1805
 
        record = record_iter.next()
1806
 
        self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1807
 
            '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()