run-tests: define the default merge tool through configuration
Using the `HGMERGE` environment variable generates confusion as it overrides
any value set through configuration.
By setting the default value through the default HGRC, the usual overriding
rules apply and it should reduce confusion.
--- a/tests/run-tests.py Fri Oct 19 01:52:16 2018 +0200
+++ b/tests/run-tests.py Thu Nov 01 14:29:21 2018 +0100
@@ -1078,7 +1078,6 @@
b'daemon.pids'))
env["HGEDITOR"] = ('"' + sys.executable + '"'
+ ' -c "import sys; sys.exit(0)"')
- env["HGMERGE"] = "internal:merge"
env["HGUSER"] = "test"
env["HGENCODING"] = "ascii"
env["HGENCODINGMODE"] = "strict"
@@ -1116,6 +1115,7 @@
'EDITOR',
'GREP_OPTIONS',
'HG',
+ 'HGMERGE',
'HGPLAIN',
'HGPLAINEXCEPT',
'HGPROF',
@@ -1146,6 +1146,7 @@
hgrc.write(b'[ui]\n')
hgrc.write(b'slash = True\n')
hgrc.write(b'interactive = False\n')
+ hgrc.write(b'merge = internal:merge\n')
hgrc.write(b'mergemarkers = detailed\n')
hgrc.write(b'promptecho = True\n')
hgrc.write(b'[defaults]\n')
--- a/tests/test-basic.t Fri Oct 19 01:52:16 2018 +0200
+++ b/tests/test-basic.t Thu Nov 01 14:29:21 2018 +0100
@@ -9,6 +9,7 @@
lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True
ui.interactive=False
+ ui.merge=internal:merge
ui.mergemarkers=detailed
ui.promptecho=True
web.address=localhost
--- a/tests/test-commandserver.t Fri Oct 19 01:52:16 2018 +0200
+++ b/tests/test-commandserver.t Thu Nov 01 14:29:21 2018 +0100
@@ -211,6 +211,7 @@
lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True
ui.interactive=False
+ ui.merge=internal:merge
ui.mergemarkers=detailed
ui.foo=bar
ui.nontty=true
@@ -221,6 +222,7 @@
*** runcommand -R foo showconfig ui defaults
ui.slash=True
ui.interactive=False
+ ui.merge=internal:merge
ui.mergemarkers=detailed
ui.nontty=true
#endif