ui.prompt: Show prompt and selection in non-interactive mode

ui.prompt was completely silent in non-interactive mode, unless in verbose
mode. It is fine that it chooses the default automatically, but it is confusing
that the message and prompt shown interactively can't be found in scripted
tests.

The prompt and selection is now .write'ed instead of .note'ed.

mercurial/ui.py

@@ -1,346 +1,346 b''
 # ui.py - user interface bits for mercurial
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import errno, getpass, os, socket, sys, tempfile, traceback
 import config, util, error
 
 _booleans = {'1': True, 'yes': True, 'true': True, 'on': True,
              '0': False, 'no': False, 'false': False, 'off': False}
 
 class ui(object):
     def __init__(self, src=None):
         self._buffers = []
         self.quiet = self.verbose = self.debugflag = self._traceback = False
         self._reportuntrusted = True
         self._ocfg = config.config() # overlay
         self._tcfg = config.config() # trusted
         self._ucfg = config.config() # untrusted
         self._trustusers = set()
         self._trustgroups = set()
 
         if src:
             self._tcfg = src._tcfg.copy()
             self._ucfg = src._ucfg.copy()
             self._ocfg = src._ocfg.copy()
             self._trustusers = src._trustusers.copy()
             self._trustgroups = src._trustgroups.copy()
             self.fixconfig()
         else:
             # we always trust global config files
             for f in util.rcpath():
                 self.readconfig(f, trust=True)
 
     def copy(self):
         return self.__class__(self)
 
     def _is_trusted(self, fp, f):
         st = util.fstat(fp)
         if util.isowner(st):
             return True
 
         tusers, tgroups = self._trustusers, self._trustgroups
         if '*' in tusers or '*' in tgroups:
             return True
 
         user = util.username(st.st_uid)
         group = util.groupname(st.st_gid)
         if user in tusers or group in tgroups or user == util.username():
             return True
 
         if self._reportuntrusted:
             self.warn(_('Not trusting file %s from untrusted '
                         'user %s, group %s\n') % (f, user, group))
         return False
 
     def readconfig(self, filename, root=None, trust=False,
                    sections=None, remap=None):
         try:
             fp = open(filename)
         except IOError:
             if not sections: # ignore unless we were looking for something
                 return
             raise
 
         cfg = config.config()
         trusted = sections or trust or self._is_trusted(fp, filename)
 
         try:
             cfg.read(filename, fp, sections=sections, remap=remap)
         except error.ConfigError, inst:
             if trusted:
                 raise
             self.warn(_("Ignored: %s\n") % str(inst))
 
         if trusted:
             self._tcfg.update(cfg)
             self._tcfg.update(self._ocfg)
         self._ucfg.update(cfg)
         self._ucfg.update(self._ocfg)
 
         if root is None:
             root = os.path.expanduser('~')
         self.fixconfig(root=root)
 
     def fixconfig(self, root=None):
         # translate paths relative to root (or home) into absolute paths
         root = root or os.getcwd()
         for c in self._tcfg, self._ucfg, self._ocfg:
             for n, p in c.items('paths'):
                 if p and "://" not in p and not os.path.isabs(p):
                     c.set("paths", n, os.path.normpath(os.path.join(root, p)))
 
         # update ui options
         self.debugflag = self.configbool('ui', 'debug')
         self.verbose = self.debugflag or self.configbool('ui', 'verbose')
         self.quiet = not self.debugflag and self.configbool('ui', 'quiet')
         if self.verbose and self.quiet:
             self.quiet = self.verbose = False
         self._reportuntrusted = self.configbool("ui", "report_untrusted", True)
         self._traceback = self.configbool('ui', 'traceback', False)
 
         # update trust information
         self._trustusers.update(self.configlist('trusted', 'users'))
         self._trustgroups.update(self.configlist('trusted', 'groups'))
 
     def setconfig(self, section, name, value):
         for cfg in (self._ocfg, self._tcfg, self._ucfg):
             cfg.set(section, name, value)
         self.fixconfig()
 
     def _data(self, untrusted):
         return untrusted and self._ucfg or self._tcfg
 
     def configsource(self, section, name, untrusted=False):
         return self._data(untrusted).source(section, name) or 'none'
 
     def config(self, section, name, default=None, untrusted=False):
         value = self._data(untrusted).get(section, name, default)
         if self.debugflag and not untrusted and self._reportuntrusted:
             uvalue = self._ucfg.get(section, name)
             if uvalue is not None and uvalue != value:
                 self.debug(_("ignoring untrusted configuration option "
                              "%s.%s = %s\n") % (section, name, uvalue))
         return value
 
     def configbool(self, section, name, default=False, untrusted=False):
         v = self.config(section, name, None, untrusted)
         if v is None:
             return default
         if v.lower() not in _booleans:
             raise error.ConfigError(_("%s.%s not a boolean ('%s')")
                                     % (section, name, v))
         return _booleans[v.lower()]
 
     def configlist(self, section, name, default=None, untrusted=False):
         """Return a list of comma/space separated strings"""
         result = self.config(section, name, untrusted=untrusted)
         if result is None:
             result = default or []
         if isinstance(result, basestring):
             result = result.replace(",", " ").split()
         return result
 
     def has_section(self, section, untrusted=False):
         '''tell whether section exists in config.'''
         return section in self._data(untrusted)
 
     def configitems(self, section, untrusted=False):
         items = self._data(untrusted).items(section)
         if self.debugflag and not untrusted and self._reportuntrusted:
             for k, v in self._ucfg.items(section):
                 if self._tcfg.get(section, k) != v:
                     self.debug(_("ignoring untrusted configuration option "
                                 "%s.%s = %s\n") % (section, k, v))
         return items
 
     def walkconfig(self, untrusted=False):
         cfg = self._data(untrusted)
         for section in cfg.sections():
             for name, value in self.configitems(section, untrusted):
                 yield section, name, str(value).replace('\n', '\\n')
 
     def username(self):
         """Return default username to be used in commits.
 
         Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL
         and stop searching if one of these is set.
         If not found and ui.askusername is True, ask the user, else use
         ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname".
         """
         user = os.environ.get("HGUSER")
         if user is None:
             user = self.config("ui", "username")
         if user is None:
             user = os.environ.get("EMAIL")
         if user is None and self.configbool("ui", "askusername"):
             user = self.prompt(_("enter a commit username:"), default=None)
         if user is None:
             try:
                 user = '%s@%s' % (util.getuser(), socket.getfqdn())
                 self.warn(_("No username found, using '%s' instead\n") % user)
             except KeyError:
                 pass
         if not user:
             raise util.Abort(_("Please specify a username."))
         if "\n" in user:
             raise util.Abort(_("username %s contains a newline\n") % repr(user))
         return user
 
     def shortuser(self, user):
         """Return a short representation of a user name or email address."""
         if not self.verbose: user = util.shortuser(user)
         return user
 
     def _path(self, loc):
         p = self.config('paths', loc)
         if p and '%%' in p:
             self.warn('(deprecated \'%%\' in path %s=%s from %s)\n' %
                     (loc, p, self.configsource('paths', loc)))
             p = p.replace('%%', '%')
         return p
 
     def expandpath(self, loc, default=None):
         """Return repository location relative to cwd or from [paths]"""
         if "://" in loc or os.path.isdir(os.path.join(loc, '.hg')):
             return loc
 
         path = self._path(loc)
         if not path and default is not None:
             path = self._path(default)
         return path or loc
 
     def pushbuffer(self):
         self._buffers.append([])
 
     def popbuffer(self):
         return "".join(self._buffers.pop())
 
     def write(self, *args):
         if self._buffers:
             self._buffers[-1].extend([str(a) for a in args])
         else:
             for a in args:
                 sys.stdout.write(str(a))
 
     def write_err(self, *args):
         try:
             if not sys.stdout.closed: sys.stdout.flush()
             for a in args:
                 sys.stderr.write(str(a))
             # stderr may be buffered under win32 when redirected to files,
             # including stdout.
             if not sys.stderr.closed: sys.stderr.flush()
         except IOError, inst:
             if inst.errno != errno.EPIPE:
                 raise
 
     def flush(self):
         try: sys.stdout.flush()
         except: pass
         try: sys.stderr.flush()
         except: pass
 
     def interactive(self):
         i = self.configbool("ui", "interactive", None)
         if i is None:
             return sys.stdin.isatty()
         return i
 
     def _readline(self, prompt=''):
         if sys.stdin.isatty():
             try:
                 # magically add command line editing support, where
                 # available
                 import readline
                 # force demandimport to really load the module
                 readline.read_history_file
                 # windows sometimes raises something other than ImportError
             except Exception:
                 pass
         line = raw_input(prompt)
         # When stdin is in binary mode on Windows, it can cause
         # raw_input() to emit an extra trailing carriage return
         if os.linesep == '\r\n' and line and line[-1] == '\r':
             line = line[:-1]
         return line
 
     def prompt(self, msg, choices=None, default="y"):
         """Prompt user with msg, read response, and ensure it matches
         one of the provided choices. choices is a sequence of acceptable
         responses with the format: ('&None', 'E&xec', 'Sym&link')
         No sequence implies no response checking. Responses are case
         insensitive. If ui is not interactive, the default is returned.
         """
         if not self.interactive():
-            self.note(msg, ' ', default, "\n")
+            self.write(msg, ' ', default, "\n")
             return default
         while True:
             try:
                 r = self._readline(msg + ' ')
                 if not r:
                     return default
                 if not choices:
                     return r
                 resps = [s[s.index('&')+1].lower() for s in choices]
                 if r.lower() in resps:
                     return r.lower()
                 else:
                     self.write(_("unrecognized response\n"))
             except EOFError:
                 raise util.Abort(_('response expected'))
 
     def getpass(self, prompt=None, default=None):
         if not self.interactive(): return default
         try:
             return getpass.getpass(prompt or _('password: '))
         except EOFError:
             raise util.Abort(_('response expected'))
     def status(self, *msg):
         if not self.quiet: self.write(*msg)
     def warn(self, *msg):
         self.write_err(*msg)
     def note(self, *msg):
         if self.verbose: self.write(*msg)
     def debug(self, *msg):
         if self.debugflag: self.write(*msg)
     def edit(self, text, user):
         (fd, name) = tempfile.mkstemp(prefix="hg-editor-", suffix=".txt",
                                       text=True)
         try:
             f = os.fdopen(fd, "w")
             f.write(text)
             f.close()
 
             editor = self.geteditor()
 
             util.system("%s \"%s\"" % (editor, name),
                         environ={'HGUSER': user},
                         onerr=util.Abort, errprefix=_("edit failed"))
 
             f = open(name)
             t = f.read()
             f.close()
         finally:
             os.unlink(name)
 
         return t
 
     def traceback(self):
         '''print exception traceback if traceback printing enabled.
         only to call in exception handler. returns true if traceback
         printed.'''
         if self._traceback:
             traceback.print_exc()
         return self._traceback
 
     def geteditor(self):
         '''return editor to use'''
         return (os.environ.get("HGEDITOR") or
                 self.config("ui", "editor") or
                 os.environ.get("VISUAL") or
                 os.environ.get("EDITOR", "vi"))

tests/test-merge-prompt.out

@@ -1,65 +1,69 b''
 adding file1
 adding file2
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 
 # non-interactive merge
+ local changed file1 which remote deleted
+use (c)hanged version or (d)elete? c
+remote changed file2 which local deleted
+use (c)hanged version or leave (d)eleted? c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 status:
 M file2
 C file1
 file1:
 1
 changed
 file2:
 2
 changed
 
 # interactive merge
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  local changed file1 which remote deleted
 use (c)hanged version or (d)elete? remote changed file2 which local deleted
 use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 status:
 file2: No such file or directory
 C file1
 file1:
 1
 changed
 file2 does not exist
 
 # interactive merge with bad input
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  local changed file1 which remote deleted
 use (c)hanged version or (d)elete? unrecognized response
  local changed file1 which remote deleted
 use (c)hanged version or (d)elete? unrecognized response
  local changed file1 which remote deleted
 use (c)hanged version or (d)elete? remote changed file2 which local deleted
 use (c)hanged version or leave (d)eleted? unrecognized response
 remote changed file2 which local deleted
 use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 status:
 M file2
 R file1
 file1 does not exist
 file2:
 2
 changed
 
 # interactive merge with not enough input
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  local changed file1 which remote deleted
 use (c)hanged version or (d)elete? remote changed file2 which local deleted
 use (c)hanged version or leave (d)eleted? abort: response expected
 failed
 status:
 file2: No such file or directory
 C file1
 file1:
 1
 changed
 file2 does not exist

tests/test-merge-tools.out

@@ -1,524 +1,528 b''
 # revision 0
 adding f
 # revision 1
 # revision 2
 created new head
 # revision 3 - simple to merge
 created new head
 
 
 Tool selection
 
 # default is internal merge:
 [merge-tools]
 # hg update -C 1
 # hg merge -r 2
 merging f
 warning: conflicts during merge.
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 <<<<<<< local
 revision 1
 =======
 revision 2
 >>>>>>> other
 space
 # hg stat
 M f
 ? f.orig
 
 # simplest hgrc using false for merge:
 [merge-tools]
 false.whatever=
 # hg update -C 1
 # hg merge -r 2
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # true with higher .priority gets precedence:
 [merge-tools]
 false.whatever=
 true.priority=1
 # hg update -C 1
 # hg merge -r 2
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 # unless lowered on command line:
 [merge-tools]
 false.whatever=
 true.priority=1
 # hg update -C 1
 # hg merge -r 2 --config merge-tools.true.priority=-7
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # or false set higher on command line:
 [merge-tools]
 false.whatever=
 true.priority=1
 # hg update -C 1
 # hg merge -r 2 --config merge-tools.false.priority=117
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # or true.executable not found in PATH:
 [merge-tools]
 false.whatever=
 true.priority=1
 # hg update -C 1
 # hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # or true.executable with bogus path:
 [merge-tools]
 false.whatever=
 true.priority=1
 # hg update -C 1
 # hg merge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # but true.executable set to cat found in PATH works:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2
 revision 1
 space
 revision 0
 space
 revision 2
 space
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 # and true.executable set to cat with path works:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config merge-tools.true.executable=cat
 revision 1
 space
 revision 0
 space
 revision 2
 space
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 
 Tool selection and merge-patterns
 
 # merge-patterns specifies new tool false:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config merge-patterns.f=false
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # merge-patterns specifies executable not found in PATH and gets warning:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
 couldn't find merge tool true specified for f
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # merge-patterns specifies executable with bogus path and gets warning:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool
 couldn't find merge tool true specified for f
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 
 ui.merge overrules priority
 
 # ui.merge specifies false:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config ui.merge=false
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 # ui.merge specifies internal:fail:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config ui.merge=internal:fail
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 # ui.merge specifies internal:local:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config ui.merge=internal:local
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 # ui.merge specifies internal:other:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config ui.merge=internal:other
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 2
 space
 # hg stat
 M f
 
 # ui.merge specifies internal:prompt:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config ui.merge=internal:prompt
+ no tool found to merge f
+keep (l)ocal or take (o)ther? l
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 # ui.merge specifies internal:dump:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config ui.merge=internal:dump
 merging f
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.base
 ? f.local
 ? f.orig
 ? f.other
 
 f.base:
 revision 0
 space
 f.local:
 revision 1
 space
 f.other:
 revision 2
 space
 
 # ui.merge specifies internal:other but is overruled by pattern for false:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false
 merging f
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig
 
 
 Premerge
 
 # Default is silent simplemerge:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 3
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 revision 3
 # hg stat
 M f
 
 # .premerge=True is same:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 3 --config merge-tools.true.premerge=True
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 revision 3
 # hg stat
 M f
 
 # .premerge=False executes merge-tool:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -r 3 --config merge-tools.true.premerge=False
 revision 1
 space
 revision 0
 space
 revision 0
 space
 revision 3
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 
 Tool execution
 
 # set tools.args explicit to include $base $local $other $output:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 ==> ... <==
 revision 0
 space
 
 ==> ... <==
 revision 1
 space
 
 ==> ... <==
 revision 2
 space
 
 ==> ... <==
 revision 1
 space
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 revision 1
 space
 # hg stat
 M f
 
 # Merge with "echo mergeresult > $local":
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 mergeresult
 # hg stat
 M f
 
 # - and $local is the file f:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 mergeresult
 # hg stat
 M f
 
 # Merge with "echo mergeresult > $output" - the variable is a bit magic:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 # cat f
 mergeresult
 # hg stat
 M f
 
 
 Merge post-processing
 
 # cat is a bad merge-tool and doesn't change:
 [merge-tools]
 false.whatever=
 true.priority=1
 true.executable=cat
 # hg update -C 1
 # hg merge -y -r 2 --config merge-tools.true.checkchanged=1
 revision 1
 space
 revision 0
 space
 revision 2
 space
 merging f
+ output file f appears unchanged
+was merge successful (yn)? n
 merging f failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 # cat f
 revision 1
 space
 # hg stat
 M f
 ? f.orig