Mercurial > hgsubversion
view tests/test_diff.py @ 946:289f2c7752a8
push: reset encoding before the final update
Before a9f315eae67c, all the rebase sequence including the update
was executed with the encoding reset to the native one. After the
change, the final update was left out and ran with UTF-8, which
fails for some badly shaped repository. Reset the correct encoding
context.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Fri, 12 Oct 2012 21:30:24 +0200 |
parents | 312b37bc5e20 |
children | d741f536f23a |
line wrap: on
line source
import test_util import unittest from mercurial import ui from hgsubversion import wrappers expected_diff_output = '''Index: alpha =================================================================== --- alpha\t(revision 3) +++ alpha\t(working copy) @@ -1,1 +1,3 @@ -file: alpha +alpha + +added line Index: foo =================================================================== new file mode 100644 --- foo\t(revision 0) +++ foo\t(working copy) @@ -0,0 +1,1 @@ +This is missing a newline. \ No newline at end of file ''' class DiffTests(test_util.TestBase): def test_diff_output(self): self._load_fixture_and_fetch('two_revs.svndump') self.commitchanges([('foo', 'foo', 'This is missing a newline.'), ('alpha', 'alpha', 'alpha\n\nadded line\n'), ]) u = ui.ui() u.pushbuffer() wrappers.diff(lambda x, y, z: None, u, self.repo, svn=True) self.assertEqual(u.popbuffer(), expected_diff_output) def suite(): all_tests = [unittest.TestLoader().loadTestsFromTestCase(DiffTests), ] return unittest.TestSuite(all_tests)