/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: Jelmer Vernooij
  • Date: 2020-06-01 19:35:12 UTC
  • mfrom: (7490.29.10 work)
  • mto: This revision was merged to the branch mainline in revision 7507.
  • Revision ID: jelmer@jelmer.uk-20200601193512-yx77edrbrs12d0qy
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_diff.py
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