view tests/test_diff.py @ 860:4cf20a687bff

stupid: ignore directories svn:mergeinfo in svn >= 1.7 For instance, test_fetch_renames.test_case_stupid emits this diff: Index: E =================================================================== --- E (revision 2) +++ E (revision 3) Property changes on: E ___________________________________________________________________ Added: svn:mergeinfo
author Patrick Mezard <patrick@mezard.eu>
date Thu, 19 Apr 2012 15:08:04 +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)