view tests/test_diff.py @ 1515:106716ed2ed0

subrepo: add missing arg to dirty() Upstream Mercurial has added a new 'missing' argument to the dirty function. We need to add it as well. The default argument should mean this is backwards compatible with older Mercurials. I don't understand the subrepo or hgsubverison code 100%, so this patch is my best attempt at a fix.
author Durham Goode <durham@fb.com>
date Tue, 11 Jul 2017 16:37:57 -0700
parents c6b01fd34694
children
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 = test_util.testui()
        u.pushbuffer()
        wrappers.diff(lambda x, y, z: None, u, self.repo, svn=True)
        self.assertEqual(u.popbuffer(), expected_diff_output)