##// END OF EJS Templates
resolve: add option to warn/abort on -m with unresolved conflict markers...
resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

File last commit:

r37732:5dd71e9a default
r38817:bb54db4a @96 default
Show More
test-hg-parseurl.py
34 lines | 1.4 KiB | text/x-python | PythonLexer
from __future__ import absolute_import, print_function
import unittest
from mercurial import (
hg,
)
class ParseRequestTests(unittest.TestCase):
def testparse(self):
self.assertEqual(hg.parseurl(b'http://example.com/no/anchor'),
(b'http://example.com/no/anchor', (None, [])))
self.assertEqual(hg.parseurl(b'http://example.com/an/anchor#foo'),
(b'http://example.com/an/anchor', (b'foo', [])))
self.assertEqual(
hg.parseurl(b'http://example.com/no/anchor/branches', [b'foo']),
(b'http://example.com/no/anchor/branches', (None, [b'foo'])))
self.assertEqual(
hg.parseurl(b'http://example.com/an/anchor/branches#bar', [b'foo']),
(b'http://example.com/an/anchor/branches', (b'bar', [b'foo'])))
self.assertEqual(hg.parseurl(
b'http://example.com/an/anchor/branches-None#foo', None),
(b'http://example.com/an/anchor/branches-None', (b'foo', [])))
self.assertEqual(hg.parseurl(b'http://example.com/'),
(b'http://example.com/', (None, [])))
self.assertEqual(hg.parseurl(b'http://example.com'),
(b'http://example.com/', (None, [])))
self.assertEqual(hg.parseurl(b'http://example.com#foo'),
(b'http://example.com/', (b'foo', [])))
if __name__ == '__main__':
import silenttestrunner
silenttestrunner.main(__name__)