← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-30 14:18:22 UTC
  • mfrom: (6456 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120130141822-u4fqwswoyew4a14a
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
87
87
        return set(self.paths.keys())
88
88
 
89
89
    def is_executable(self, file_id):
 
90
        # Not all the files are executable.
90
91
        return False
91
92
 
92
93
    def __getitem__(self, file_id):
659
660
        bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
660
661
 
661
662
        # Modified files
662
 
        open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
663
 
        open('b1/sub/dir/ pre space', 'ab').write(
 
663
        with open('b1/sub/dir/WithCaps.txt', 'ab') as f: f.write('\nAdding some text\n')
 
664
        with open('b1/sub/dir/ pre space', 'ab') as f: f.write(
664
665
             '\r\nAdding some\r\nDOS format lines\r\n')
665
 
        open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
 
666
        with open('b1/sub/dir/nolastnewline.txt', 'ab') as f: f.write('\n')
666
667
        self.tree1.rename_one('sub/dir/ pre space',
667
668
                              'sub/ start space')
668
669
        self.tree1.commit('Modified files', rev_id='a@cset-0-5')
817
818
        self.tree1 = self.make_branch_and_tree('b1')
818
819
        self.b1 = self.tree1.branch
819
820
 
820
 
        open('b1/one', 'wb').write('one\n')
 
821
        with open('b1/one', 'wb') as f: f.write('one\n')
821
822
        self.tree1.add('one')
822
823
        self.tree1.commit('add file', rev_id='a@cset-0-1')
823
 
        open('b1/one', 'wb').write('two\n')
 
824
        with open('b1/one', 'wb') as f: f.write('two\n')
824
825
        self.tree1.commit('modify', rev_id='a@cset-0-2')
825
 
        open('b1/one', 'wb').write('three\n')
 
826
        with open('b1/one', 'wb') as f: f.write('three\n')
826
827
        self.tree1.commit('modify', rev_id='a@cset-0-3')
827
828
        bundle_file = StringIO()
828
829
        rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
907
908
        bundle = self.get_valid_bundle('null:', 'white-1')
908
909
 
909
910
        # Modified
910
 
        open('b1/trailing space ', 'ab').write('add some text\n')
 
911
        with open('b1/trailing space ', 'ab') as f: f.write('add some text\n')
911
912
        self.tree1.commit('add text', rev_id='white-2')
912
913
 
913
914
        bundle = self.get_valid_bundle('white-1', 'white-2')