/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 15:15:02 UTC
  • mto: This revision was merged to the branch mainline in revision 3036.
  • Revision ID: abentley@panoramicfeedback.com-20071122151502-m9kwy2ums0gddyev
Refactor differ to support registering differ factories

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
573
573
                                  ('new-tree/newdir/newfile', 'new\n')])
574
574
        self.new_tree.add('newdir')
575
575
        self.new_tree.add('newdir/newfile', 'file-id')
576
 
        differ = TextDiffer(self.old_tree, self.new_tree,  '', '', 'utf-8',
577
 
                            StringIO(), internal_diff)
 
576
        differ = TextDiffer(self.old_tree, self.new_tree, StringIO())
578
577
        differ.diff_text('file-id', None, 'old label', 'new label')
579
578
        self.assertEqual(
580
579
            '--- old label\n+++ new label\n@@ -1,1 +0,0 @@\n-old\n\n',