/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: Vincent Ladeuil
  • Date: 2011-08-16 13:12:40 UTC
  • mfrom: (6071 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6076.
  • Revision ID: v.ladeuil+lp@free.fr-20110816131240-gcyn9cik86dxwgz3
Merge into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
28
28
    merge,
29
29
    osutils,
30
30
    revision as _mod_revision,
 
31
    symbol_versioning,
31
32
    tests,
32
33
    treebuilder,
33
34
    )
45
46
    test_commit,
46
47
    )
47
48
from bzrlib.transform import TreeTransform
 
49
from bzrlib.tests import (
 
50
    features,
 
51
    )
48
52
 
49
53
 
50
54
def get_text(vf, key):
64
68
 
65
69
 
66
70
class MockTree(object):
 
71
 
67
72
    def __init__(self):
68
73
        from bzrlib.inventory import InventoryDirectory, ROOT_ID
69
74
        object.__init__(self)
74
79
 
75
80
    inventory = property(lambda x:x)
76
81
 
77
 
    def __iter__(self):
78
 
        return self.paths.iterkeys()
 
82
    def all_file_ids(self):
 
83
        return set(self.paths.keys())
79
84
 
80
85
    def __getitem__(self, file_id):
81
86
        if file_id == self.root.file_id:
142
147
        result.seek(0,0)
143
148
        return result
144
149
 
 
150
    def get_file_revision(self, file_id):
 
151
        return self.inventory[file_id].revision
 
152
 
145
153
    def contents_stats(self, file_id):
146
154
        if file_id not in self.contents:
147
155
            return None, None
489
497
                                 % (ancestor,))
490
498
 
491
499
                # Now check that the file contents are all correct
492
 
                for inventory_id in old:
 
500
                for inventory_id in old.all_file_ids():
493
501
                    try:
494
502
                        old_file = old.get_file(inventory_id)
495
503
                    except errors.NoSuchFile:
503
511
                old.unlock()
504
512
        if not _mod_revision.is_null(rev_id):
505
513
            rh = self.b1.revision_history()
506
 
            tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
 
514
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
 
515
                tree.branch.set_revision_history, rh[:rh.index(rev_id)+1])
507
516
            tree.update()
508
517
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
509
518
            self.assertFalse(delta.has_changed(),
676
685
    def _test_symlink_bundle(self, link_name, link_target, new_link_target):
677
686
        link_id = 'link-1'
678
687
 
679
 
        self.requireFeature(tests.SymlinkFeature)
 
688
        self.requireFeature(features.SymlinkFeature)
680
689
        self.tree1 = self.make_branch_and_tree('b1')
681
690
        self.b1 = self.tree1.branch
682
691
 
723
732
        self._test_symlink_bundle('link', 'bar/foo', 'mars')
724
733
 
725
734
    def test_unicode_symlink_bundle(self):
726
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
735
        self.requireFeature(features.UnicodeFilenameFeature)
727
736
        self._test_symlink_bundle(u'\N{Euro Sign}link',
728
737
                                  u'bar/\N{Euro Sign}foo',
729
738
                                  u'mars\N{Euro Sign}')
830
839
        return bundle_file.getvalue()
831
840
 
832
841
    def test_unicode_bundle(self):
833
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
842
        self.requireFeature(features.UnicodeFilenameFeature)
834
843
        # Handle international characters
835
844
        os.mkdir('b1')
836
845
        f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
1409
1418
        branch = tree_a.branch
1410
1419
        repo_a = branch.repository
1411
1420
        tree_a.commit("base", allow_pointless=True, rev_id='A')
1412
 
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
 
1421
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
1413
1422
        try:
1414
1423
            from bzrlib.testament import Testament
1415
1424
            # monkey patch gpg signing mechanism
1439
1448
        install_bundle(repo_b, serializer.read(s))
1440
1449
 
1441
1450
 
1442
 
class V4WeaveBundleTester(V4BundleTester):
1443
 
 
1444
 
    def bzrdir_format(self):
1445
 
        return 'metaweave'
1446
 
 
1447
 
 
1448
1451
class V4_2aBundleTester(V4BundleTester):
1449
1452
 
1450
1453
    def bzrdir_format(self):