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

  • Committer: Aaron Bentley
  • Date: 2007-11-22 04:14:11 UTC
  • mto: This revision was merged to the branch mainline in revision 3036.
  • Revision ID: aaron.bentley@utoronto.ca-20071122041411-xljgvcijantv9cdw
Associate labels with text diffing only

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
562
562
        self.new_tree = self.make_branch_and_tree('new-tree')
563
563
        self.new_tree.lock_write()
564
564
        self.addCleanup(self.new_tree.unlock)
565
 
        self.differ = TreeDiffer(self.old_tree, self.new_tree, StringIO(),
566
 
                                 internal_diff, '', '', 'utf-8')
 
565
        self.differ = TreeDiffer(self.old_tree, self.new_tree, StringIO())
567
566
 
568
567
    def test_diff_text(self):
569
568
        self.build_tree_contents([('old-tree/olddir/',),
574
573
                                  ('new-tree/newdir/newfile', 'new\n')])
575
574
        self.new_tree.add('newdir')
576
575
        self.new_tree.add('newdir/newfile', 'file-id')
577
 
        differ = TextDiffer(self.old_tree, self.new_tree,  '', '', StringIO(),
578
 
                            internal_diff)
 
576
        differ = TextDiffer(self.old_tree, self.new_tree,  '', '', 'utf-8',
 
577
                            StringIO(), internal_diff)
579
578
        differ.diff_text('file-id', None, 'old label', 'new label')
580
579
        self.assertEqual(
581
580
            '--- old label\n+++ new label\n@@ -1,1 +0,0 @@\n-old\n\n',
616
615
                                  ('new-tree/newdir/newfile', 'new\n')])
617
616
        self.new_tree.add('newdir')
618
617
        self.new_tree.add('newdir/newfile', 'file-id')
619
 
        self.differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile', '', '')
 
618
        self.differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
620
619
        self.assertContainsRe(
621
620
            self.differ.to_file.getvalue(),
622
621
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+1,1'
631
630
        os.symlink('new', 'new-tree/newdir/newfile')
632
631
        self.new_tree.add('newdir')
633
632
        self.new_tree.add('newdir/newfile', 'file-id')
634
 
        self.differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile', '', '')
 
633
        self.differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
635
634
        self.assertContainsRe(
636
635
            self.differ.to_file.getvalue(),
637
636
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+0,0'