/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 breezy/tests/test_diff.py

  • Committer: Gustav Hartvigsson
  • Date: 2021-01-11 20:19:38 UTC
  • mfrom: (7526.3.2 work)
  • Revision ID: gustav.hartvigsson@gmail.com-20210111201938-omr9wjz3qdgyxe8k
Merged lp:brz

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_diff.py
559
559
    def test_internal_diff_exec_property(self):
560
560
        tree = self.make_branch_and_tree('tree')
561
561
 
562
 
        tt = tree.get_transform()
 
562
        tt = tree.transform()
563
563
        tt.new_file('a', tt.root, [b'contents\n'], b'a-id', True)
564
564
        tt.new_file('b', tt.root, [b'contents\n'], b'b-id', False)
565
565
        tt.new_file('c', tt.root, [b'contents\n'], b'c-id', True)
569
569
        tt.apply()
570
570
        tree.commit('one', rev_id=b'rev-1')
571
571
 
572
 
        tt = tree.get_transform()
 
572
        tt = tree.transform()
573
573
        tt.set_executability(False, tt.trans_id_file_id(b'a-id'))
574
574
        tt.set_executability(True, tt.trans_id_file_id(b'b-id'))
575
575
        tt.set_executability(False, tt.trans_id_file_id(b'c-id'))
605
605
            [('tree/' + alpha, b'\0'),
606
606
             ('tree/' + omega,
607
607
              (b'The %s and the %s\n' % (alpha_utf8, omega_utf8)))])
608
 
        tree.add([alpha], [b'file-id'])
609
 
        tree.add([omega], [b'file-id-2'])
 
608
        tree.add([alpha])
 
609
        tree.add([omega])
610
610
        diff_content = StubO()
611
611
        diff.show_diff_trees(tree.basis_tree(), tree, diff_content)
612
612
        diff_content.check_types(self, bytes)
802
802
        self.differ.diff('olddir/oldfile', 'newdir/newfile')
803
803
        self.assertContainsRe(
804
804
            self.differ.to_file.getvalue(),
805
 
            br'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+0,0'
806
 
            br' \@\@\n-old\n\n')
 
805
            br'--- olddir/oldfile.*\n'
 
806
            br'\+\+\+ newdir/newfile.*\n'
 
807
            br'\@\@ -1,1 \+0,0 \@\@\n'
 
808
            br'-old\n'
 
809
            br'\n')
807
810
        self.assertContainsRe(self.differ.to_file.getvalue(),
808
811
                              b"=== target is 'new'\n")
809
812