view tests/test-mdiff.py @ 45545:e5e1285b6f6f

largefiles: prevent in-memory merge instead of switching to on-disk

I enabled in-memory merge by default while testing some changes. I
spent quite some time troubleshooting why largefiles was still
creating an on-disk mergestate. Then I found out that it ignores the
callers `wc` argument to `mergemod._update()` and always uses on-disk
merge. This patch changes that so we raise an error if largefiles is
used with in-memory merge. That way we'll notice if in-memory merge is
used with largefiles instead of silently replacing ignoring the
`overlayworkingctx` instance and updating the working copy instead.

I felt a little bad that this would break things more for users with
both largefiles and in-memory rebase enabled. So I also added a
higher-level override to make sure that largefiles disables in-memory
rebase. It turns out that that fixes `run-tests.py -k largefiles
--extra-config-opt rebase.experimental.inmemory=1`.

Differential Revision: https://phab.mercurial-scm.org/D9069

from __future__ import absolute_import
from __future__ import print_function

import unittest

from mercurial import mdiff


class splitnewlinesTests(unittest.TestCase):
    def test_splitnewlines(self):
        cases = {
            b'a\nb\nc\n': [b'a\n', b'b\n', b'c\n'],
            b'a\nb\nc': [b'a\n', b'b\n', b'c'],
            b'a\nb\nc\n\n': [b'a\n', b'b\n', b'c\n', b'\n'],
            b'': [],
            b'abcabc': [b'abcabc'],
        }
        for inp, want in cases.items():
            self.assertEqual(mdiff.splitnewlines(inp), want)


if __name__ == '__main__':
    import silenttestrunner

    silenttestrunner.main(__name__)