/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

Distinguish between label and path when generating diffs.

Merged from https://code.launchpad.net/~jelmer/brz/diff-fix/+merge/384877

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_diff.py
608
608
            [('tree/' + alpha, b'\0'),
609
609
             ('tree/' + omega,
610
610
              (b'The %s and the %s\n' % (alpha_utf8, omega_utf8)))])
611
 
        tree.add([alpha], [b'file-id'])
612
 
        tree.add([omega], [b'file-id-2'])
 
611
        tree.add([alpha])
 
612
        tree.add([omega])
613
613
        diff_content = StubO()
614
614
        diff.show_diff_trees(tree.basis_tree(), tree, diff_content)
615
615
        diff_content.check_types(self, bytes)
805
805
        self.differ.diff('olddir/oldfile', 'newdir/newfile')
806
806
        self.assertContainsRe(
807
807
            self.differ.to_file.getvalue(),
808
 
            br'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+0,0'
809
 
            br' \@\@\n-old\n\n')
 
808
            br'--- olddir/oldfile.*\n'
 
809
            br'\+\+\+ newdir/newfile.*\n'
 
810
            br'\@\@ -1,1 \+0,0 \@\@\n'
 
811
            br'-old\n'
 
812
            br'\n')
810
813
        self.assertContainsRe(self.differ.to_file.getvalue(),
811
814
                              b"=== target is 'new'\n")
812
815