view tests/test_diff.py @ 1107:0f16e11b2c2b stable

layouts: fix crash when importing hgext_hgsubversion This change was introduced in 4a92eb1484ba and fixed importing issues for mercurial < 2.8. Unfortunately, this broke imports for newer versions of mercurial that have hgsubversion installed in sys.path. We now wrap the import in a try-block to catch this ImportError.
author Sean Farley <sean.michael.farley@gmail.com>
date Thu, 06 Feb 2014 14:30:05 -0600
parents d741f536f23a
children c6b01fd34694
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)