Mercurial > hgsubversion
comparison tests/test_diff.py @ 1346:538bbb927609
Merge with stable.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Tue, 11 Aug 2015 17:07:59 -0400 |
parents | c6b01fd34694 |
children |
comparison
equal
deleted
inserted
replaced
1341:7e10891666fe | 1346:538bbb927609 |
---|---|
29 def test_diff_output(self): | 29 def test_diff_output(self): |
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 = test_util.testui() |
35 u.pushbuffer() | 35 u.pushbuffer() |
36 wrappers.diff(lambda x, y, z: None, u, self.repo, svn=True) | 36 wrappers.diff(lambda x, y, z: None, u, self.repo, svn=True) |
37 self.assertEqual(u.popbuffer(), expected_diff_output) | 37 self.assertEqual(u.popbuffer(), expected_diff_output) |