Mercurial > hgsubversion

comparison tests/test_diff.py @ 304:ce676eff002b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
First merge, totally untested.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Fri, 01 May 2009 10:28:59 +0200
parents ffccf0080e54
children 75f082b5897e
comparison
equal deleted inserted replaced
303:f423a8780832 304:ce676eff002b
1 import unittest 1 import unittest
2 2
3 from mercurial import ui 3 from mercurial import ui
4 4
5 import diff_cmd 5 import wrappers
6 6
7 import test_util 7 import test_util
8 8
9 expected_diff_output = '''Index: alpha 9 expected_diff_output = '''Index: alpha
10 =================================================================== 10 ===================================================================
30 self._load_fixture_and_fetch('two_revs.svndump') 30 self._load_fixture_and_fetch('two_revs.svndump')
31 self.commitchanges([('foo', 'foo', 'This is missing a newline.'), 31 self.commitchanges([('foo', 'foo', 'This is missing a newline.'),
32 ('alpha', 'alpha', 'alpha\n\nadded line\n'), 32 ('alpha', 'alpha', 'alpha\n\nadded line\n'),
33 ]) 33 ])
34 u = ui.ui() 34 u = ui.ui()
35 diff_cmd.diff_command(u, self.repo, self.wc_path) 35 wrappers.diff(lambda x,y,z: None,
36 u, self.repo, svn=True)
36 self.assertEqual(u.stream.getvalue(), expected_diff_output) 37 self.assertEqual(u.stream.getvalue(), expected_diff_output)
37 38
38 39
39 def suite(): 40 def suite():
40 all = [unittest.TestLoader().loadTestsFromTestCase(DiffTests), 41 all = [unittest.TestLoader().loadTestsFromTestCase(DiffTests),