change tests to use simplemerge by default

tests/run-tests.py

@@ -1,432 +1,433 b''
 #!/usr/bin/env python
 #
 # run-tests.py - Run a set of tests on Mercurial
 #
 # Copyright 2006 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 import difflib
 import errno
 import optparse
 import os
 import popen2
 import re
 import shutil
 import signal
 import sys
 import tempfile
 import time
 
-required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed", "merge"]
+required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"]
 
 parser = optparse.OptionParser("%prog [options] [tests]")
 parser.add_option("-v", "--verbose", action="store_true",
     help="output verbose messages")
 parser.add_option("-t", "--timeout", type="int",
     help="kill errant tests after TIMEOUT seconds")
 parser.add_option("-c", "--cover", action="store_true",
     help="print a test coverage report")
 parser.add_option("-s", "--cover_stdlib", action="store_true",
     help="print a test coverage report inc. standard libraries")
 parser.add_option("-C", "--annotate", action="store_true",
     help="output files annotated with coverage")
 parser.add_option("-r", "--retest", action="store_true",
     help="retest failed tests")
 parser.add_option("-f", "--first", action="store_true",
     help="exit on the first test failure")
 parser.add_option("-R", "--restart", action="store_true",
     help="restart at last error")
 parser.add_option("-i", "--interactive", action="store_true",
     help="prompt to accept changed output")
 
 parser.set_defaults(timeout=180)
 (options, args) = parser.parse_args()
 verbose = options.verbose
 coverage = options.cover or options.cover_stdlib or options.annotate
 python = sys.executable
 
 def vlog(*msg):
     if verbose:
         for m in msg:
             print m,
         print
 
 def splitnewlines(text):
     '''like str.splitlines, but only split on newlines.
     keep line endings.'''
     i = 0
     lines = []
     while True:
         n = text.find('\n', i)
         if n == -1:
             last = text[i:]
             if last:
                 lines.append(last)
             return lines
         lines.append(text[i:n+1])
         i = n + 1
 
 def show_diff(expected, output):
     for line in difflib.unified_diff(expected, output,
             "Expected output", "Test output"):
         sys.stdout.write(line)
 
 def find_program(program):
     """Search PATH for a executable program"""
     for p in os.environ.get('PATH', os.defpath).split(os.pathsep):
         name = os.path.join(p, program)
         if os.access(name, os.X_OK):
             return name
     return None
 
 def check_required_tools():
     # Before we go any further, check for pre-requisite tools
     # stuff from coreutils (cat, rm, etc) are not tested
     for p in required_tools:
         if os.name == 'nt':
             p += '.exe'
         found = find_program(p)
         if found:
             vlog("# Found prerequisite", p, "at", found)
         else:
             print "WARNING: Did not find prerequisite tool: "+p
 
 def cleanup_exit():
     if verbose:
         print "# Cleaning up HGTMP", HGTMP
     shutil.rmtree(HGTMP, True)
 
 def use_correct_python():
     # some tests run python interpreter. they must use same
     # interpreter we use or bad things will happen.
     exedir, exename = os.path.split(sys.executable)
     if exename == 'python':
         path = find_program('python')
         if os.path.dirname(path) == exedir:
             return
     vlog('# Making python executable in test path use correct Python')
     my_python = os.path.join(BINDIR, 'python')
     try:
         os.symlink(sys.executable, my_python)
     except AttributeError:
         # windows fallback
         shutil.copyfile(sys.executable, my_python)
         shutil.copymode(sys.executable, my_python)
 
 def install_hg():
     global python
     vlog("# Performing temporary installation of HG")
     installerrs = os.path.join("tests", "install.err")
 
     os.chdir("..") # Get back to hg root
     cmd = ('%s setup.py clean --all'
            ' install --force --home="%s" --install-lib="%s" >%s 2>&1'
            % (sys.executable, INST, PYTHONDIR, installerrs))
     vlog("# Running", cmd)
     if os.system(cmd) == 0:
         if not verbose:
             os.remove(installerrs)
     else:
         f = open(installerrs)
         for line in f:
             print line,
         f.close()
         sys.exit(1)
     os.chdir(TESTDIR)
 
     os.environ["PATH"] = "%s%s%s" % (BINDIR, os.pathsep, os.environ["PATH"])
     os.environ["PYTHONPATH"] = PYTHONDIR
 
     use_correct_python()
 
     if coverage:
         vlog("# Installing coverage wrapper")
         os.environ['COVERAGE_FILE'] = COVERAGE_FILE
         if os.path.exists(COVERAGE_FILE):
             os.unlink(COVERAGE_FILE)
         # Create a wrapper script to invoke hg via coverage.py
         os.rename(os.path.join(BINDIR, "hg"), os.path.join(BINDIR, "_hg.py"))
         f = open(os.path.join(BINDIR, 'hg'), 'w')
         f.write('#!' + sys.executable + '\n')
         f.write('import sys, os; os.execv(sys.executable, [sys.executable, '+ \
             '"%s", "-x", "%s"] + sys.argv[1:])\n' % (
             os.path.join(TESTDIR, 'coverage.py'),
             os.path.join(BINDIR, '_hg.py')))
         f.close()
         os.chmod(os.path.join(BINDIR, 'hg'), 0700)
         python = '"%s" "%s" -x' % (sys.executable,
                                    os.path.join(TESTDIR,'coverage.py'))
 
 def output_coverage():
     vlog("# Producing coverage report")
     omit = [BINDIR, TESTDIR, PYTHONDIR]
     if not options.cover_stdlib:
         # Exclude as system paths (ignoring empty strings seen on win)
         omit += [x for x in sys.path if x != '']
     omit = ','.join(omit)
     os.chdir(PYTHONDIR)
     cmd = '"%s" "%s" -i -r "--omit=%s"' % (
         sys.executable, os.path.join(TESTDIR, 'coverage.py'), omit)
     vlog("# Running: "+cmd)
     os.system(cmd)
     if options.annotate:
         adir = os.path.join(TESTDIR, 'annotated')
         if not os.path.isdir(adir):
             os.mkdir(adir)
         cmd = '"%s" "%s" -i -a "--directory=%s" "--omit=%s"' % (
             sys.executable, os.path.join(TESTDIR, 'coverage.py'),
             adir, omit)
         vlog("# Running: "+cmd)
         os.system(cmd)
 
 class Timeout(Exception):
     pass
 
 def alarmed(signum, frame):
     raise Timeout
 
 def run(cmd):
     """Run command in a sub-process, capturing the output (stdout and stderr).
     Return the exist code, and output."""
     # TODO: Use subprocess.Popen if we're running on Python 2.4
     if os.name == 'nt':
         tochild, fromchild = os.popen4(cmd)
         tochild.close()
         output = fromchild.read()
         ret = fromchild.close()
         if ret == None:
             ret = 0
     else:
         proc = popen2.Popen4(cmd)
         try:
             output = ''
             proc.tochild.close()
             output = proc.fromchild.read()
             ret = proc.wait()
         except Timeout:
             vlog('# Process %d timed out - killing it' % proc.pid)
             os.kill(proc.pid, signal.SIGTERM)
             ret = proc.wait()
             if ret == 0:
                 ret = signal.SIGTERM << 8
     return ret, splitnewlines(output)
 
 def run_one(test):
     '''tristate output:
     None -> skipped
     True -> passed
     False -> failed'''
 
     vlog("# Test", test)
     if not verbose:
         sys.stdout.write('.')
         sys.stdout.flush()
 
     # create a fresh hgrc
     hgrc = file(HGRCPATH, 'w+')
     hgrc.close()
 
     err = os.path.join(TESTDIR, test+".err")
     ref = os.path.join(TESTDIR, test+".out")
     testpath = os.path.join(TESTDIR, test)
 
     if os.path.exists(err):
         os.remove(err)       # Remove any previous output files
 
     # Make a tmp subdirectory to work in
     tmpd = os.path.join(HGTMP, test)
     os.mkdir(tmpd)
     os.chdir(tmpd)
 
     try:
         tf = open(testpath)
         firstline = tf.readline().rstrip()
         tf.close()
     except:
         firstline = ''
     lctest = test.lower()
 
     if lctest.endswith('.py') or firstline == '#!/usr/bin/env python':
         cmd = '%s "%s"' % (python, testpath)
     elif lctest.endswith('.bat'):
         # do not run batch scripts on non-windows
         if os.name != 'nt':
             print '\nSkipping %s: batch script' % test
             return None
         # To reliably get the error code from batch files on WinXP,
         # the "cmd /c call" prefix is needed. Grrr
         cmd = 'cmd /c call "%s"' % testpath
     else:
         # do not run shell scripts on windows
         if os.name == 'nt':
             print '\nSkipping %s: shell script' % test
             return None
         # do not try to run non-executable programs
         if not os.access(testpath, os.X_OK):
             print '\nSkipping %s: not executable' % test
             return None
         cmd = '"%s"' % testpath
 
     if options.timeout > 0:
         signal.alarm(options.timeout)
 
     vlog("# Running", cmd)
     ret, out = run(cmd)
     vlog("# Ret was:", ret)
 
     if options.timeout > 0:
         signal.alarm(0)
 
     diffret = 0
     # If reference output file exists, check test output against it
     if os.path.exists(ref):
         f = open(ref, "r")
         ref_out = splitnewlines(f.read())
         f.close()
     else:
         ref_out = []
     if out != ref_out:
         diffret = 1
         print "\nERROR: %s output changed" % (test)
         show_diff(ref_out, out)
     if ret:
         print "\nERROR: %s failed with error code %d" % (test, ret)
     elif diffret:
         ret = diffret
 
     if ret != 0: # Save errors to a file for diagnosis
         f = open(err, "wb")
         for line in out:
             f.write(line)
         f.close()
 
     # Kill off any leftover daemon processes
     try:
         fp = file(DAEMON_PIDS)
         for line in fp:
             try:
                 pid = int(line)
             except ValueError:
                 continue
             try:
                 os.kill(pid, 0)
                 vlog('# Killing daemon process %d' % pid)
                 os.kill(pid, signal.SIGTERM)
                 time.sleep(0.25)
                 os.kill(pid, 0)
                 vlog('# Daemon process %d is stuck - really killing it' % pid)
                 os.kill(pid, signal.SIGKILL)
             except OSError, err:
                 if err.errno != errno.ESRCH:
                     raise
         fp.close()
         os.unlink(DAEMON_PIDS)
     except IOError:
         pass
 
     os.chdir(TESTDIR)
     shutil.rmtree(tmpd, True)
     return ret == 0
 
 
 os.umask(022)
 
 check_required_tools()
 
 # Reset some environment variables to well-known values so that
 # the tests produce repeatable output.
 os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
 os.environ['TZ'] = 'GMT'
 
-os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
-os.environ["HGMERGE"]  = sys.executable + ' -c "import sys; sys.exit(0)"'
-os.environ["HGUSER"]   = "test"
-os.environ["HGENCODING"] = "ascii"
-os.environ["HGENCODINGMODE"] = "strict"
-
 TESTDIR = os.environ["TESTDIR"] = os.getcwd()
 HGTMP   = os.environ["HGTMP"]   = tempfile.mkdtemp("", "hgtests.")
 DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
 HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
 
+os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
+os.environ["HGMERGE"]  = 'python "%s"' % os.path.join(TESTDIR, os.path.pardir,
+                                                      'contrib', 'simplemerge')
+os.environ["HGUSER"]   = "test"
+os.environ["HGENCODING"] = "ascii"
+os.environ["HGENCODINGMODE"] = "strict"
+
 vlog("# Using TESTDIR", TESTDIR)
 vlog("# Using HGTMP", HGTMP)
 
 INST = os.path.join(HGTMP, "install")
 BINDIR = os.path.join(INST, "bin")
 PYTHONDIR = os.path.join(INST, "lib", "python")
 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
 
 try:
     try:
         install_hg()
 
         if options.timeout > 0:
             try:
                 signal.signal(signal.SIGALRM, alarmed)
                 vlog('# Running tests with %d-second timeout' %
                      options.timeout)
             except AttributeError:
                 print 'WARNING: cannot run tests with timeouts'
                 options.timeout = 0
 
         tested = 0
         failed = 0
         skipped = 0
 
         if len(args) == 0:
             args = os.listdir(".")
             args.sort()
 
 
         tests = []
         for test in args:
             if (test.startswith("test-") and '~' not in test and
                 ('.' not in test or test.endswith('.py') or
                  test.endswith('.bat'))):
                 tests.append(test)
 
         if options.restart:
             orig = list(tests)
             while tests:
                 if os.path.exists(tests[0] + ".err"):
                     break
                 tests.pop(0)
             if not tests:
                 print "running all tests"
                 tests = orig
 
         for test in tests:
             if options.retest and not os.path.exists(test + ".err"):
                 skipped += 1
                 continue
             ret = run_one(test)
             if ret is None:
                 skipped += 1
             elif not ret:
                 if options.interactive:
                     print "Accept this change? [n] ",
                     answer = sys.stdin.readline().strip()
                     if answer.lower() in "y yes".split():
                         os.rename(test + ".err", test + ".out")
                         tested += 1
                         continue
                 failed += 1
                 if options.first:
                     break
             tested += 1
 
         print "\n# Ran %d tests, %d skipped, %d failed." % (tested, skipped,
                                                             failed)
         if coverage:
             output_coverage()
     except KeyboardInterrupt:
         failed = True
         print "\ninterrupted!"
 finally:
     cleanup_exit()
 
 if failed:
     sys.exit(1)

tests/test-annotate

@@ -1,76 +1,78 b''
 #!/bin/sh
 
+HGMERGE=true; export HGMERGE
+
 echo % init
 hg init
 
 echo % commit
 echo 'a' > a
 hg ci -A -m test -u nobody -d '1 0'
 
 echo % annotate -c
 hg annotate -c a
 
 echo % annotate -d
 hg annotate -d a
 
 echo % annotate -n
 hg annotate -n a
 
 echo % annotate -u
 hg annotate -u a
 
 echo % annotate -cdnu
 hg annotate -cdnu a
 
 cat <<EOF >>a
 a
 a
 EOF
 hg ci -ma1 -d '1 0'
 hg cp a b
 hg ci -mb -d '1 0'
 cat <<EOF >> b
 b
 b
 b
 EOF
 hg ci -mb2 -d '2 0'
 
 echo % annotate b
 hg annotate b
 echo % annotate -nf b
 hg annotate -nf b
 
 hg up -C 2
 cat <<EOF >> b
 b
 c
 b
 EOF
 hg ci -mb2.1 -d '2 0'
 hg merge
 hg ci -mmergeb -d '3 0'
 echo % annotate after merge
 hg annotate -nf b
 
 hg up -C 1
 hg cp a b
 cat <<EOF > b
 a
 z
 a
 EOF
 hg ci -mc -d '3 0'
 hg merge
 cat <<EOF >> b
 b
 c
 b
 EOF
 echo d >> b
 hg ci -mmerge2 -d '4 0'
 echo % annotate after rename merge
 hg annotate -nf b
 
 echo % linkrev vs rev
 hg annotate -r tip a

tests/test-backout

@@ -1,99 +1,101 b''
 #!/bin/sh
 
+HGMERGE=true; export HGMERGE
+
 echo '# basic operation'
 hg init basic
 cd basic
 echo a > a
 hg commit -d '0 0' -A -m a
 echo b >> a
 hg commit -d '1 0' -m b
 
 hg backout -d '2 0' tip
 cat a
 
 echo '# file that was removed is recreated'
 cd ..
 hg init remove
 cd remove
 
 echo content > a
 hg commit -d '0 0' -A -m a
 
 hg rm a
 hg commit -d '1 0' -m b
 
 hg backout -d '2 0' --merge tip
 cat a
 
 echo '# backout of backout is as if nothing happened'
 
 hg backout -d '3 0' --merge tip
 cat a 2>/dev/null || echo cat: a: No such file or directory
 
 echo '# backout with merge'
 cd ..
 hg init merge
 cd merge
 
 echo line 1 > a
 hg commit -d '0 0' -A -m a
 
 echo line 2 >> a
 hg commit -d '1 0' -m b
 
 echo line 3 >> a
 hg commit -d '2 0' -m c
 
 hg backout --merge -d '3 0' 1
 hg commit -d '4 0' -m d
 cat a
 
 echo '# backout should not back out subsequent changesets'
 hg init onecs
 cd onecs
 echo 1 > a
 hg commit -d '0 0' -A -m a
 echo 2 >> a
 hg commit -d '1 0' -m b
 echo 1 > b
 hg commit -d '2 0' -A -m c
 hg backout -d '3 0' 1
 hg locate b
 
 cd ..
 hg init m
 cd m
 echo a > a
 hg commit -d '0 0' -A -m a
 echo b > b
 hg commit -d '1 0' -A -m b
 echo c > c
 hg commit -d '2 0' -A -m b
 hg update 1
 echo d > d
 hg commit -d '3 0' -A -m c
 hg merge 2
 hg commit -d '4 0' -A -m d
 
 echo '# backout of merge should fail'
 
 hg backout 4
 
 echo '# backout of merge with bad parent should fail'
 
 hg backout --parent 0 4
 
 echo '# backout of non-merge with parent should fail'
 
 hg backout --parent 0 3
 
 echo '# backout with valid parent should be ok'
 
 hg backout -d '5 0' --parent 2 4
 
 hg rollback
 hg update -C
 
 hg backout -d '6 0' --parent 3 4
 
 exit 0

tests/test-conflict

@@ -1,16 +1,15 b''
 #!/bin/sh
 
 hg init
 echo "nothing" > a
 hg add a
 hg commit -m ancestor -d "1000000 0"
 echo "something" > a
 hg commit -m branch1 -d "1000000 0"
 hg co 0
 echo "something else" > a
 hg commit -m branch2 -d "1000000 0"
-HGMERGE=merge; export HGMERGE
 hg merge 1
 hg id
 egrep -v ">>>|<<<" a
 hg status

tests/test-conflict.out

@@ -1,13 +1,13 b''
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-merge: warning: conflicts during merge
+warning: conflicts during merge.
 merging a
 merging a failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 There are unresolved merges, you can redo the full merge using:
   hg update -C 2
   hg merge 1
 e7fe8eb3e180+0d24b7662d3e+ tip
 something else
 =======
 something
 M a

tests/test-globalopts

@@ -1,72 +1,72 b''
 #!/bin/sh
 
 hg init a
 cd a
 echo a > a
 hg ci -A -d'1 0' -m a
 
 cd ..
 
 hg init b
 cd b
 echo b > b
 hg ci -A -d'1 0' -m b
 
 cd ..
 
 hg clone a c
 cd c
 hg pull -f ../b
-HGMERGE=merge hg merge
+hg merge
 
 cd ..
 
 echo %% -R/--repository
 hg -R a tip
 hg --repository b tip
 
 echo %% abbrev of long option
 hg --repo c tip
 
 echo %% --cwd
 hg --cwd a parents
 
 echo %% -y/--noninteractive - just be sure it is parsed
 hg --cwd a tip -q --noninteractive
 hg --cwd a tip -q -y
 
 echo %% -q/--quiet
 hg -R a -q tip
 hg -R b -q tip
 hg -R c --quiet parents
 
 echo %% -v/--verbose
 hg --cwd c head -v
 hg --cwd b tip --verbose
 
 echo %% --config
 hg --cwd c --config paths.quuxfoo=bar paths | grep quuxfoo > /dev/null && echo quuxfoo
 hg --cwd c --config '' tip -q
 hg --cwd c --config a.b tip -q
 hg --cwd c --config a tip -q
 hg --cwd c --config a.= tip -q
 hg --cwd c --config .b= tip -q
 
 echo %% --debug
 hg --cwd c log --debug
 
 echo %% --traceback
 hg --cwd c --config x --traceback tip 2>&1 | grep -i 'traceback'
 
 echo %% --time
 hg --cwd a --time tip 2>&1 | grep '^Time:' | sed 's/[0-9][0-9]*/x/g'
 
 echo %% --version
 hg --version -q | sed 's/version [^)]*/version xxx/'
 
 echo %% -h/--help
 hg -h
 hg --help
 
 echo %% not tested: --debugger
 

tests/test-install

@@ -1,3 +1,3 b''
 #!/bin/sh
 
-HGMERGE=merge hg debuginstall
+hg debuginstall

tests/test-merge-commit

@@ -1,77 +1,74 b''
 #!/bin/sh
 # check that renames are correctly saved by a commit after a merge
 
-HGMERGE=merge
-export HGMERGE
-
 # test with the merge on 3 having the rename on the local parent
 hg init a
 cd a
 
 echo line1 > foo
 hg add foo
 hg ci -m '0: add foo' -d '0 0'
 
 echo line2 >> foo
 hg ci -m '1: change foo' -d '0 0'
 
 hg up -C 0
 hg mv foo bar
 rm bar
 echo line0 > bar
 echo line1 >> bar
 hg ci -m '2: mv foo bar; change bar' -d '0 0'
 
 hg merge 1
 echo '% contents of bar should be line0 line1 line2'
 cat bar
 hg ci -m '3: merge with local rename' -d '0 0'
 hg debugindex .hg/store/data/bar.i
 hg debugrename bar
 hg debugindex .hg/store/data/foo.i
 
 # revert the content change from rev 2
 hg up -C 2
 rm bar
 echo line1 > bar
 hg ci -m '4: revert content change from rev 2' -d '0 0'
 
 hg log --template '#rev#:#node|short# #parents#\n'
 echo '% this should use bar@rev2 as the ancestor'
 hg --debug merge 3
 echo '% contents of bar should be line1 line2'
 cat bar
 hg ci -m '5: merge' -d '0 0'
 hg debugindex .hg/store/data/bar.i
 
 
 # same thing, but with the merge on 3 having the rename on the remote parent
 echo
 echo
 cd ..
 hg clone -U -r 1 -r 2 a b
 cd b
 
 hg up -C 1
 hg merge 2
 echo '% contents of bar should be line0 line1 line2'
 cat bar
 hg ci -m '3: merge with remote rename' -d '0 0'
 hg debugindex .hg/store/data/bar.i
 hg debugrename bar
 hg debugindex .hg/store/data/foo.i
 
 # revert the content change from rev 2
 hg up -C 2
 rm bar
 echo line1 > bar
 hg ci -m '4: revert content change from rev 2' -d '0 0'
 
 hg log --template '#rev#:#node|short# #parents#\n'
 echo '% this should use bar@rev2 as the ancestor'
 hg --debug merge 3
 echo '% contents of bar should be line1 line2'
 cat bar
 hg ci -m '5: merge' -d '0 0'
 hg debugindex .hg/store/data/bar.i
 

tests/test-merge-local

@@ -1,50 +1,50 b''
 #!/bin/sh
 
 hg init
 
 echo "# revision 0"
 echo "unchanged" > unchanged
 echo "remove me" > remove
 echo "copy me" > copy
 echo "move me" > move
 for i in 1 2 3 4 5 6 7 8 9; do
     echo "merge ok $i" >> zzz1_merge_ok
 done
 echo "merge bad" > zzz2_merge_bad
 hg ci -Am "revision 0" -d "1000000 0"
 
 echo "# revision 1"
 hg rm remove
 hg mv move moved
 hg cp copy copied
 echo "added" > added
 hg add added
 echo "new first line" > zzz1_merge_ok
 hg cat zzz1_merge_ok >> zzz1_merge_ok
 echo "new last line" >> zzz2_merge_bad
 hg ci -m "revision 1" -d "1000000 0"
 
 echo "# local changes to revision 0"
 hg co 0
 echo "new last line" >> zzz1_merge_ok
 echo "another last line" >> zzz2_merge_bad
 hg diff --nodates | grep "^[+-][^<>]"
 hg st
 
 echo "# local merge with bad merge tool"
 HGMERGE=false hg co
 hg co 0
 hg diff --nodates | grep "^[+-][^<>]"
 hg st
 
 echo "# local merge with conflicts"
-HGMERGE=merge hg co
+hg co
 hg co 0
 hg diff --nodates | grep "^[+-][^<>]"
 hg st
 
 echo "# local merge without conflicts"
 hg revert zzz2_merge_bad
-HGMERGE=merge hg co
+hg co
 hg diff --nodates | grep "^[+-][^<>]"
 hg st

tests/test-merge-local.out

@@ -1,67 +1,67 b''
 # revision 0
 adding copy
 adding move
 adding remove
 adding unchanged
 adding zzz1_merge_ok
 adding zzz2_merge_bad
 # revision 1
 # local changes to revision 0
 4 files updated, 0 files merged, 3 files removed, 0 files unresolved
 --- a/zzz1_merge_ok
 +++ b/zzz1_merge_ok
 +new last line
 --- a/zzz2_merge_bad
 +++ b/zzz2_merge_bad
 +another last line
 M zzz1_merge_ok
 M zzz2_merge_bad
 # local merge with bad merge tool
 merging zzz1_merge_ok
 merging zzz1_merge_ok failed!
 merging zzz2_merge_bad
 merging zzz2_merge_bad failed!
 3 files updated, 0 files merged, 1 files removed, 2 files unresolved
 There are unresolved merges with locally modified files.
 You can redo the full merge using:
   hg update 0
   hg update 1
 2 files updated, 0 files merged, 3 files removed, 0 files unresolved
 --- a/zzz1_merge_ok
 +++ b/zzz1_merge_ok
 +new last line
 --- a/zzz2_merge_bad
 +++ b/zzz2_merge_bad
 +another last line
 M zzz1_merge_ok
 M zzz2_merge_bad
 # local merge with conflicts
-merge: warning: conflicts during merge
+warning: conflicts during merge.
 merging zzz1_merge_ok
 merging zzz2_merge_bad
 merging zzz2_merge_bad failed!
 3 files updated, 1 files merged, 1 files removed, 1 files unresolved
 There are unresolved merges with locally modified files.
 You can finish the partial merge using:
   hg update 0
   hg update 1
 2 files updated, 0 files merged, 3 files removed, 0 files unresolved
 --- a/zzz1_merge_ok
 +++ b/zzz1_merge_ok
 +new first line
 +new last line
 --- a/zzz2_merge_bad
 +++ b/zzz2_merge_bad
 +another last line
 +=======
 +new last line
 M zzz1_merge_ok
 M zzz2_merge_bad
 # local merge without conflicts
 merging zzz1_merge_ok
 4 files updated, 1 files merged, 1 files removed, 0 files unresolved
 --- a/zzz1_merge_ok
 +++ b/zzz1_merge_ok
 +new last line
 M zzz1_merge_ok
 ? zzz2_merge_bad.orig

tests/test-merge-revert

@@ -1,44 +1,44 b''
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo "added file1" > file1
 echo "added file2" > file2
 hg add file1 file2
 hg commit -m "added file1 and file2" -d "1000000 0" -u user
 echo "changed file1" >> file1
 hg commit -m "changed file1" -d "1000000 0" -u user
 hg -q log
 hg id
 hg update -C 0
 hg id
 echo "changed file1" >> file1
 hg id
 hg revert --all
 hg diff
 hg status
 hg id
 hg update
 hg diff
 hg status
 hg id
 hg update -C 0
 echo "changed file1" >> file1
-HGMERGE=merge hg update
+hg update
 hg diff
 hg status
 hg id
 hg revert --all
 hg diff
 hg status
 hg id
 hg revert -r tip --all
 hg diff
 hg status
 hg id
 hg update -C
 hg diff
 hg status
 hg id
 

tests/test-merge-revert2

@@ -1,45 +1,45 b''
 #!/bin/sh
 
 mkdir t
 cd t
 hg init
 echo "added file1" > file1
 echo "another line of text" >> file1
 echo "added file2" > file2
 hg add file1 file2
 hg commit -m "added file1 and file2" -d "1000000 0" -u user
 echo "changed file1" >> file1
 hg commit -m "changed file1" -d "1000000 0" -u user
 hg -q log
 hg id
 hg update -C 0
 hg id
 echo "changed file1" >> file1
 hg id
 hg revert --no-backup --all
 hg diff
 hg status
 hg id
 hg update
 hg diff
 hg status
 hg id
 hg update -C 0
 echo "changed file1 different" >> file1
-HGMERGE=merge hg update
+hg update
 hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
 hg status
 hg id
 hg revert --no-backup --all
 hg diff
 hg status
 hg id
 hg revert -r tip --no-backup --all
 hg diff
 hg status
 hg id
 hg update -C
 hg diff
 hg status
 hg id
 

tests/test-merge-revert2.out

@@ -1,37 +1,37 b''
 1:f248da0d4c3e
 0:9eca13a34789
 f248da0d4c3e tip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 9eca13a34789
 9eca13a34789+
 reverting file1
 9eca13a34789
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 f248da0d4c3e tip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-merge: warning: conflicts during merge
+warning: conflicts during merge.
 merging file1
 merging file1 failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 There are unresolved merges with locally modified files.
 You can redo the full merge using:
   hg update 0
   hg update 1
 diff -r f248da0d4c3e file1
 --- a/file1
 +++ b/file1
 @@ -1,3 +1,7 @@ added file1
  added file1
  another line of text
 +<<<<<<<
 +changed file1 different
 +=======
  changed file1
 +>>>>>>>
 M file1
 f248da0d4c3e+ tip
 reverting file1
 f248da0d4c3e tip
 f248da0d4c3e tip
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 f248da0d4c3e tip

tests/test-merge7

@@ -1,66 +1,66 b''
 #!/bin/sh
 
 # initial
 hg init test-a
 cd test-a
 cat >test.txt <<"EOF"
 1
 2
 3
 EOF
 hg add test.txt
 hg commit -m "Initial" -d "1000000 0"
 
 # clone
 cd ..
 hg clone test-a test-b
 
 # change test-a
 cd test-a
 cat >test.txt <<"EOF"
 one
 two
 three
 EOF
 hg commit -m "Numbers as words" -d "1000000 0"
 
 # change test-b
 cd ../test-b
 cat >test.txt <<"EOF"
 1
 2.5
 3
 EOF
 hg commit -m "2 -> 2.5" -d "1000000 0"
 
 # now pull and merge from test-a
 hg pull ../test-a
-HGMERGE=merge hg merge
+hg merge
 # resolve conflict
 cat >test.txt <<"EOF"
 one
 two-point-five
 three
 EOF
 rm -f *.orig
 hg commit -m "Merge 1" -d "1000000 0"
 
 # change test-a again
 cd ../test-a
 cat >test.txt <<"EOF"
 one
 two-point-one
 three
 EOF
 hg commit -m "two -> two-point-one" -d "1000000 0"
 
 # pull and merge from test-a again
 cd ../test-b
 hg pull ../test-a
-HGMERGE=merge hg merge --debug
+hg merge --debug
 
 cat test.txt | sed "s% .*%%"
 
 hg debugindex .hg/store/data/test.txt.i
 
 hg log

tests/test-merge7.out

@@ -1,77 +1,77 b''
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../test-a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
-merge: warning: conflicts during merge
+warning: conflicts during merge.
 merging test.txt
 merging test.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 There are unresolved merges, you can redo the full merge using:
   hg update -C 1
   hg merge 2
 pulling from ../test-a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
-merge: warning: conflicts during merge
+warning: conflicts during merge.
 resolving manifests
  overwrite None partial False
  ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360
  test.txt: versions differ -> m
 merging test.txt
 my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
 merging test.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 There are unresolved merges, you can redo the full merge using:
   hg update -C 3
   hg merge 4
 one
 <<<<<<<
 two-point-five
 =======
 two-point-one
 >>>>>>>
 three
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       7      0       0 01365c4cca56 000000000000 000000000000
      1         7       9      1       1 7b013192566a 01365c4cca56 000000000000
      2        16      15      2       2 8fe46a3eb557 01365c4cca56 000000000000
      3        31      27      2       3 fc3148072371 7b013192566a 8fe46a3eb557
      4        58      25      4       4 d40249267ae3 8fe46a3eb557 000000000000
 changeset:   4:a070d41e8360
 tag:         tip
 parent:      2:faaea63e63a9
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     two -> two-point-one
 
 changeset:   3:451c744aabcc
 parent:      1:e409be6afcc0
 parent:      2:faaea63e63a9
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Merge 1
 
 changeset:   2:faaea63e63a9
 parent:      0:095c92b91f1a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Numbers as words
 
 changeset:   1:e409be6afcc0
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2 -> 2.5
 
 changeset:   0:095c92b91f1a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Initial
 

tests/test-up-local-change

@@ -1,66 +1,68 b''
 #!/bin/sh
 
+HGMERGE=true; export HGMERGE
+
 set -e
 mkdir r1
 cd r1
 hg init
 echo a > a
 hg addremove
 hg commit -m "1" -d "1000000 0"
 
 hg clone . ../r2
 cd ../r2
 hg up
 echo abc > a
 hg diff --nodates
 
 cd ../r1
 echo b > b
 echo a2 > a
 hg addremove
 hg commit -m "2" -d "1000000 0"
 
 cd ../r2
 hg -q pull ../r1
 hg status
 hg parents
 hg --debug up
 hg parents
 hg --debug up 0
 hg parents
 hg --debug merge || echo failed
 hg parents
 hg --debug up
 hg parents
 hg -v history
 hg diff --nodates
 
 # create a second head
 cd ../r1
 hg up 0
 echo b2 > b
 echo a3 > a
 hg addremove
 hg commit -m "3" -d "1000000 0"
 
 cd ../r2
 hg -q pull ../r1
 hg status
 hg parents
 hg --debug up || echo failed
 hg --debug merge || echo failed
 hg --debug merge -f
 hg parents
 hg diff --nodates
 
 # test a local add
 cd ..
 hg init a
 hg init b
 echo a > a/a
 echo a > b/a
 hg --cwd a commit -A -m a
 cd b
 hg add a 
 hg pull -u ../a
 hg st