/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-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

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,
32
31
    tests,
33
32
    treebuilder,
34
33
    )
46
45
    test_commit,
47
46
    )
48
47
from bzrlib.transform import TreeTransform
 
48
from bzrlib.tests import (
 
49
    features,
 
50
    )
49
51
 
50
52
 
51
53
def get_text(vf, key):
507
509
                new.unlock()
508
510
                old.unlock()
509
511
        if not _mod_revision.is_null(rev_id):
510
 
            rh = self.b1.revision_history()
511
 
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
512
 
                tree.branch.set_revision_history, rh[:rh.index(rev_id)+1])
 
512
            tree.branch.generate_revision_history(rev_id)
513
513
            tree.update()
514
514
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
515
515
            self.assertFalse(delta.has_changed(),
682
682
    def _test_symlink_bundle(self, link_name, link_target, new_link_target):
683
683
        link_id = 'link-1'
684
684
 
685
 
        self.requireFeature(tests.SymlinkFeature)
 
685
        self.requireFeature(features.SymlinkFeature)
686
686
        self.tree1 = self.make_branch_and_tree('b1')
687
687
        self.b1 = self.tree1.branch
688
688
 
729
729
        self._test_symlink_bundle('link', 'bar/foo', 'mars')
730
730
 
731
731
    def test_unicode_symlink_bundle(self):
732
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
732
        self.requireFeature(features.UnicodeFilenameFeature)
733
733
        self._test_symlink_bundle(u'\N{Euro Sign}link',
734
734
                                  u'bar/\N{Euro Sign}foo',
735
735
                                  u'mars\N{Euro Sign}')
836
836
        return bundle_file.getvalue()
837
837
 
838
838
    def test_unicode_bundle(self):
839
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
839
        self.requireFeature(features.UnicodeFilenameFeature)
840
840
        # Handle international characters
841
841
        os.mkdir('b1')
842
842
        f = open(u'b1/with Dod\N{Euro Sign}', 'wb')