← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/bzr/gutsy

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Bazaar Package Importer
  • Author(s): Etienne Goyer
  • Date: 2007-04-27 17:53:49 UTC
  • mfrom: (1.1.23 upstream)
  • Revision ID: james.westby@ubuntu.com-20070427175349-rvowqx994rfuikuu
Tags: 0.16~rc1-0ubuntu1
New upstream development release 

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
764
764
        bundle_file = StringIO()
765
765
        rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
766
766
                               'a@cset-0-1', bundle_file, format=self.format)
767
 
        self.assertNotContainsRe(bundle_file.getvalue(), 'two')
 
767
        self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
768
768
        self.assertContainsRe(bundle_file.getvalue(), 'one')
769
769
        self.assertContainsRe(bundle_file.getvalue(), 'three')
770
770
 
784
784
            u'William Dod\xe9\n').encode('utf-8'))
785
785
        f.close()
786
786
 
787
 
        self.tree1.add([u'with Dod\xe9'])
788
 
        self.tree1.commit(u'i18n commit from William Dod\xe9', 
 
787
        self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
 
788
        self.tree1.commit(u'i18n commit from William Dod\xe9',
789
789
                          rev_id='i18n-1', committer=u'William Dod\xe9')
790
790
 
 
791
        if sys.platform == 'darwin':
 
792
            # On Mac the '\xe9' gets changed to 'e\u0301'
 
793
            self.assertEqual([u'.bzr', u'with Dode\u0301'],
 
794
                             sorted(os.listdir(u'b1')))
 
795
            delta = self.tree1.changes_from(self.tree1.basis_tree())
 
796
            self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
 
797
                             delta.removed)
 
798
            self.knownFailure("Mac OSX doesn't preserve unicode"
 
799
                              " combining characters.")
 
800
 
791
801
        # Add
792
802
        bundle = self.get_valid_bundle(None, 'i18n-1')
793
803
 
884
894
        tree = bundle.revision_tree(self.b1.repository, 'revid1')
885
895
        self.assertEqual('revid1', tree.inventory.root.revision)
886
896
 
 
897
    def test_install_revisions(self):
 
898
        self.tree1 = self.make_branch_and_tree('b1')
 
899
        self.b1 = self.tree1.branch
 
900
        self.tree1.commit('message', rev_id='rev2a')
 
901
        bundle = self.get_valid_bundle(None, 'rev2a')
 
902
        branch2 = self.make_branch('b2')
 
903
        self.assertFalse(branch2.repository.has_revision('rev2a'))
 
904
        target_revision = bundle.install_revisions(branch2.repository)
 
905
        self.assertTrue(branch2.repository.has_revision('rev2a'))
 
906
        self.assertEqual('rev2a', target_revision)
 
907
 
887
908
 
888
909
class V09BundleKnit2Tester(V08BundleTester):
889
910