view tests/test-mdiff.py @ 40655:69d4c8c5c25e stable

subrepo: print the status line before creating the peer for better diagnostics

I ran into a problem where I tried updating to a different branch, and the
process appeared to hang.  It turned out that the subrepo revision wasn't
available locally, and I must have originally cloned it from an `hg serve -S` on
a machine that currently wasn't serving anything.  It took 2+ minutes to
timeout, and didn't mention what it was connecting to even then.

There are a couple of other issues in this scenario too.

  - The repo is dirty after the failed checkout because the top level repo is
    updated first.  We should probably make 2 passes- top down to pull
    everything needed, and then do an update once everything is in place.

  - Something must be reading .hgsubstate from wdir because if the same merge
    command is run after the timeout, a prompt is issued that the local and
    remote subrepo diverged, instead of hanging.  But it lists the local version
    and remote version as having the same hash.

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__)