ui: fix extra space in username abort

mercurial/ui.py

@@ -1,829 +1,829
 # 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 or any later version.
 
 from i18n import _
 import errno, getpass, os, socket, sys, tempfile, traceback
 import config, scmutil, util, error, formatter
 
 class ui(object):
     def __init__(self, src=None):
         self._buffers = []
         self.quiet = self.verbose = self.debugflag = self.tracebackflag = 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()
         self.callhooks = True
 
         if src:
             self.fout = src.fout
             self.ferr = src.ferr
             self.fin = src.fin
 
             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.environ = src.environ
             self.callhooks = src.callhooks
             self.fixconfig()
         else:
             self.fout = sys.stdout
             self.ferr = sys.stderr
             self.fin = sys.stdin
 
             # shared read-only environment
             self.environ = os.environ
             # we always trust global config files
             for f in scmutil.rcpath():
                 self.readconfig(f, trust=True)
 
     def copy(self):
         return self.__class__(self)
 
     def formatter(self, topic, opts):
         return formatter.formatter(self, topic, opts)
 
     def _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._trusted(fp, filename)
 
         try:
             cfg.read(filename, fp, sections=sections, remap=remap)
             fp.close()
         except error.ConfigError, inst:
             if trusted:
                 raise
             self.warn(_("ignored: %s\n") % str(inst))
 
         if self.plain():
             for k in ('debug', 'fallbackencoding', 'quiet', 'slash',
                       'logtemplate', 'style',
                       'traceback', 'verbose'):
                 if k in cfg['ui']:
                     del cfg['ui'][k]
             for k, v in cfg.items('defaults'):
                 del cfg['defaults'][k]
         # Don't remove aliases from the configuration if in the exceptionlist
         if self.plain('alias'):
             for k, v in cfg.items('alias'):
                 del cfg['alias'][k]
 
         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, section=None):
         if section in (None, 'paths'):
             # expand vars and ~
             # 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 not p:
                         continue
                     if '%%' in p:
                         self.warn(_("(deprecated '%%' in path %s=%s from %s)\n")
                                   % (n, p, self.configsource('paths', n)))
                         p = p.replace('%%', '%')
                     p = util.expandpath(p)
                     if not util.hasscheme(p) and not os.path.isabs(p):
                         p = os.path.normpath(os.path.join(root, p))
                     c.set("paths", n, p)
 
         if section in (None, 'ui'):
             # 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.debugflag or self.configbool("ui",
                 "report_untrusted", True)
             self.tracebackflag = self.configbool('ui', 'traceback', False)
 
         if section in (None, 'trusted'):
             # update trust information
             self._trustusers.update(self.configlist('trusted', 'users'))
             self._trustgroups.update(self.configlist('trusted', 'groups'))
 
     def backupconfig(self, section, item):
         return (self._ocfg.backup(section, item),
                 self._tcfg.backup(section, item),
                 self._ucfg.backup(section, item),)
     def restoreconfig(self, data):
         self._ocfg.restore(data[0])
         self._tcfg.restore(data[1])
         self._ucfg.restore(data[2])
 
     def setconfig(self, section, name, value, overlay=True):
         if overlay:
             self._ocfg.set(section, name, value)
         self._tcfg.set(section, name, value)
         self._ucfg.set(section, name, value)
         self.fixconfig(section=section)
 
     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):
         if isinstance(name, list):
             alternates = name
         else:
             alternates = [name]
 
         for n in alternates:
             value = self._data(untrusted).get(section, n, None)
             if value is not None:
                 name = n
                 break
         else:
             value = default
 
         if self.debugflag and not untrusted and self._reportuntrusted:
             for n in alternates:
                 uvalue = self._ucfg.get(section, n)
                 if uvalue is not None and uvalue != value:
                     self.debug("ignoring untrusted configuration option "
                                "%s.%s = %s\n" % (section, n, uvalue))
         return value
 
     def configpath(self, section, name, default=None, untrusted=False):
         'get a path config item, expanded relative to repo root or config file'
         v = self.config(section, name, default, untrusted)
         if v is None:
             return None
         if not os.path.isabs(v) or "://" not in v:
             src = self.configsource(section, name, untrusted)
             if ':' in src:
                 base = os.path.dirname(src.rsplit(':')[0])
                 v = os.path.join(base, os.path.expanduser(v))
         return v
 
     def configbool(self, section, name, default=False, untrusted=False):
         """parse a configuration element as a boolean
 
         >>> u = ui(); s = 'foo'
         >>> u.setconfig(s, 'true', 'yes')
         >>> u.configbool(s, 'true')
         True
         >>> u.setconfig(s, 'false', 'no')
         >>> u.configbool(s, 'false')
         False
         >>> u.configbool(s, 'unknown')
         False
         >>> u.configbool(s, 'unknown', True)
         True
         >>> u.setconfig(s, 'invalid', 'somevalue')
         >>> u.configbool(s, 'invalid')
         Traceback (most recent call last):
             ...
         ConfigError: foo.invalid is not a boolean ('somevalue')
         """
 
         v = self.config(section, name, None, untrusted)
         if v is None:
             return default
         if isinstance(v, bool):
             return v
         b = util.parsebool(v)
         if b is None:
             raise error.ConfigError(_("%s.%s is not a boolean ('%s')")
                                     % (section, name, v))
         return b
 
     def configint(self, section, name, default=None, untrusted=False):
         """parse a configuration element as an integer
 
         >>> u = ui(); s = 'foo'
         >>> u.setconfig(s, 'int1', '42')
         >>> u.configint(s, 'int1')
         42
         >>> u.setconfig(s, 'int2', '-42')
         >>> u.configint(s, 'int2')
         -42
         >>> u.configint(s, 'unknown', 7)
         7
         >>> u.setconfig(s, 'invalid', 'somevalue')
         >>> u.configint(s, 'invalid')
         Traceback (most recent call last):
             ...
         ConfigError: foo.invalid is not an integer ('somevalue')
         """
 
         v = self.config(section, name, None, untrusted)
         if v is None:
             return default
         try:
             return int(v)
         except ValueError:
             raise error.ConfigError(_("%s.%s is not an integer ('%s')")
                                     % (section, name, v))
 
     def configbytes(self, section, name, default=0, untrusted=False):
         """parse a configuration element as a quantity in bytes
 
         Units can be specified as b (bytes), k or kb (kilobytes), m or
         mb (megabytes), g or gb (gigabytes).
 
         >>> u = ui(); s = 'foo'
         >>> u.setconfig(s, 'val1', '42')
         >>> u.configbytes(s, 'val1')
         42
         >>> u.setconfig(s, 'val2', '42.5 kb')
         >>> u.configbytes(s, 'val2')
         43520
         >>> u.configbytes(s, 'unknown', '7 MB')
         7340032
         >>> u.setconfig(s, 'invalid', 'somevalue')
         >>> u.configbytes(s, 'invalid')
         Traceback (most recent call last):
             ...
         ConfigError: foo.invalid is not a byte quantity ('somevalue')
         """
 
         value = self.config(section, name)
         if value is None:
             if not isinstance(default, str):
                 return default
             value = default
         try:
             return util.sizetoint(value)
         except error.ParseError:
             raise error.ConfigError(_("%s.%s is not a byte quantity ('%s')")
                                     % (section, name, value))
 
     def configlist(self, section, name, default=None, untrusted=False):
         """parse a configuration element as a list of comma/space separated
         strings
 
         >>> u = ui(); s = 'foo'
         >>> u.setconfig(s, 'list1', 'this,is "a small" ,test')
         >>> u.configlist(s, 'list1')
         ['this', 'is', 'a small', 'test']
         """
 
         def _parse_plain(parts, s, offset):
             whitespace = False
             while offset < len(s) and (s[offset].isspace() or s[offset] == ','):
                 whitespace = True
                 offset += 1
             if offset >= len(s):
                 return None, parts, offset
             if whitespace:
                 parts.append('')
             if s[offset] == '"' and not parts[-1]:
                 return _parse_quote, parts, offset + 1
             elif s[offset] == '"' and parts[-1][-1] == '\\':
                 parts[-1] = parts[-1][:-1] + s[offset]
                 return _parse_plain, parts, offset + 1
             parts[-1] += s[offset]
             return _parse_plain, parts, offset + 1
 
         def _parse_quote(parts, s, offset):
             if offset < len(s) and s[offset] == '"': # ""
                 parts.append('')
                 offset += 1
                 while offset < len(s) and (s[offset].isspace() or
                         s[offset] == ','):
                     offset += 1
                 return _parse_plain, parts, offset
 
             while offset < len(s) and s[offset] != '"':
                 if (s[offset] == '\\' and offset + 1 < len(s)
                         and s[offset + 1] == '"'):
                     offset += 1
                     parts[-1] += '"'
                 else:
                     parts[-1] += s[offset]
                 offset += 1
 
             if offset >= len(s):
                 real_parts = _configlist(parts[-1])
                 if not real_parts:
                     parts[-1] = '"'
                 else:
                     real_parts[0] = '"' + real_parts[0]
                     parts = parts[:-1]
                     parts.extend(real_parts)
                 return None, parts, offset
 
             offset += 1
             while offset < len(s) and s[offset] in [' ', ',']:
                 offset += 1
 
             if offset < len(s):
                 if offset + 1 == len(s) and s[offset] == '"':
                     parts[-1] += '"'
                     offset += 1
                 else:
                     parts.append('')
             else:
                 return None, parts, offset
 
             return _parse_plain, parts, offset
 
         def _configlist(s):
             s = s.rstrip(' ,')
             if not s:
                 return []
             parser, parts, offset = _parse_plain, [''], 0
             while parser:
                 parser, parts, offset = parser(parts, s, offset)
             return parts
 
         result = self.config(section, name, untrusted=untrusted)
         if result is None:
             result = default or []
         if isinstance(result, basestring):
             result = _configlist(result.lstrip(' ,\n'))
             if result is None:
                 result = default or []
         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, value
 
     def plain(self, feature=None):
         '''is plain mode active?
 
         Plain mode means that all configuration variables which affect
         the behavior and output of Mercurial should be
         ignored. Additionally, the output should be stable,
         reproducible and suitable for use in scripts or applications.
 
         The only way to trigger plain mode is by setting either the
         `HGPLAIN' or `HGPLAINEXCEPT' environment variables.
 
         The return value can either be
         - False if HGPLAIN is not set, or feature is in HGPLAINEXCEPT
         - True otherwise
         '''
         if 'HGPLAIN' not in os.environ and 'HGPLAINEXCEPT' not in os.environ:
             return False
         exceptions = os.environ.get('HGPLAINEXCEPT', '').strip().split(',')
         if feature and exceptions:
             return feature not in exceptions
         return True
 
     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 not None:
                 user = os.path.expandvars(user)
         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 and not self.interactive():
             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(_('no username supplied'),
                              hint=_('use "hg config --edit" '
-                                    ' to set your username'))
+                                    'to set your 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 expandpath(self, loc, default=None):
         """Return repository location relative to cwd or from [paths]"""
         if util.hasscheme(loc) or os.path.isdir(os.path.join(loc, '.hg')):
             return loc
 
         path = self.config('paths', loc)
         if not path and default is not None:
             path = self.config('paths', default)
         return path or loc
 
     def pushbuffer(self):
         self._buffers.append([])
 
     def popbuffer(self, labeled=False):
         '''pop the last buffer and return the buffered output
 
         If labeled is True, any labels associated with buffered
         output will be handled. By default, this has no effect
         on the output returned, but extensions and GUI tools may
         handle this argument and returned styled output. If output
         is being buffered so it can be captured and parsed or
         processed, labeled should not be set to True.
         '''
         return "".join(self._buffers.pop())
 
     def write(self, *args, **opts):
         '''write args to output
 
         By default, this method simply writes to the buffer or stdout,
         but extensions or GUI tools may override this method,
         write_err(), popbuffer(), and label() to style output from
         various parts of hg.
 
         An optional keyword argument, "label", can be passed in.
         This should be a string containing label names separated by
         space. Label names take the form of "topic.type". For example,
         ui.debug() issues a label of "ui.debug".
 
         When labeling output for a specific command, a label of
         "cmdname.type" is recommended. For example, status issues
         a label of "status.modified" for modified files.
         '''
         if self._buffers:
             self._buffers[-1].extend([str(a) for a in args])
         else:
             for a in args:
                 self.fout.write(str(a))
 
     def write_err(self, *args, **opts):
         try:
             if not getattr(self.fout, 'closed', False):
                 self.fout.flush()
             for a in args:
                 self.ferr.write(str(a))
             # stderr may be buffered under win32 when redirected to files,
             # including stdout.
             if not getattr(self.ferr, 'closed', False):
                 self.ferr.flush()
         except IOError, inst:
             if inst.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
                 raise
 
     def flush(self):
         try: self.fout.flush()
         except (IOError, ValueError): pass
         try: self.ferr.flush()
         except (IOError, ValueError): pass
 
     def _isatty(self, fh):
         if self.configbool('ui', 'nontty', False):
             return False
         return util.isatty(fh)
 
     def interactive(self):
         '''is interactive input allowed?
 
         An interactive session is a session where input can be reasonably read
         from `sys.stdin'. If this function returns false, any attempt to read
         from stdin should fail with an error, unless a sensible default has been
         specified.
 
         Interactiveness is triggered by the value of the `ui.interactive'
         configuration variable or - if it is unset - when `sys.stdin' points
         to a terminal device.
 
         This function refers to input only; for output, see `ui.formatted()'.
         '''
         i = self.configbool("ui", "interactive", None)
         if i is None:
             # some environments replace stdin without implementing isatty
             # usually those are non-interactive
             return self._isatty(self.fin)
 
         return i
 
     def termwidth(self):
         '''how wide is the terminal in columns?
         '''
         if 'COLUMNS' in os.environ:
             try:
                 return int(os.environ['COLUMNS'])
             except ValueError:
                 pass
         return util.termwidth()
 
     def formatted(self):
         '''should formatted output be used?
 
         It is often desirable to format the output to suite the output medium.
         Examples of this are truncating long lines or colorizing messages.
         However, this is not often not desirable when piping output into other
         utilities, e.g. `grep'.
 
         Formatted output is triggered by the value of the `ui.formatted'
         configuration variable or - if it is unset - when `sys.stdout' points
         to a terminal device. Please note that `ui.formatted' should be
         considered an implementation detail; it is not intended for use outside
         Mercurial or its extensions.
 
         This function refers to output only; for input, see `ui.interactive()'.
         This function always returns false when in plain mode, see `ui.plain()'.
         '''
         if self.plain():
             return False
 
         i = self.configbool("ui", "formatted", None)
         if i is None:
             # some environments replace stdout without implementing isatty
             # usually those are non-interactive
             return self._isatty(self.fout)
 
         return i
 
     def _readline(self, prompt=''):
         if self._isatty(self.fin):
             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
 
         # call write() so output goes through subclassed implementation
         # e.g. color extension on Windows
         self.write(prompt)
 
         # instead of trying to emulate raw_input, swap (self.fin,
         # self.fout) with (sys.stdin, sys.stdout)
         oldin = sys.stdin
         oldout = sys.stdout
         sys.stdin = self.fin
         sys.stdout = self.fout
         line = raw_input(' ')
         sys.stdin = oldin
         sys.stdout = oldout
 
         # 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, default="y"):
         """Prompt user with msg, read response.
         If ui is not interactive, the default is returned.
         """
         if not self.interactive():
             self.write(msg, ' ', default, "\n")
             return default
         try:
             r = self._readline(self.label(msg, 'ui.prompt'))
             if not r:
                 return default
             return r
         except EOFError:
             raise util.Abort(_('response expected'))
 
     @staticmethod
     def extractchoices(prompt):
         """Extract prompt message and list of choices from specified prompt.
 
         This returns tuple "(message, choices)", and "choices" is the
         list of tuple "(response character, text without &)".
         """
         parts = prompt.split('$$')
         msg = parts[0].rstrip(' ')
         choices = [p.strip(' ') for p in parts[1:]]
         return (msg,
                 [(s[s.index('&') + 1].lower(), s.replace('&', '', 1))
                  for s in choices])
 
     def promptchoice(self, prompt, default=0):
         """Prompt user with a message, read response, and ensure it matches
         one of the provided choices. The prompt is formatted as follows:
 
            "would you like fries with that (Yn)? $$ &Yes $$ &No"
 
         The index of the choice is returned. Responses are case
         insensitive. If ui is not interactive, the default is
         returned.
         """
 
         msg, choices = self.extractchoices(prompt)
         resps = [r for r, t in choices]
         while True:
             r = self.prompt(msg, resps[default])
             if r.lower() in resps:
                 return resps.index(r.lower())
             self.write(_("unrecognized response\n"))
 
     def getpass(self, prompt=None, default=None):
         if not self.interactive():
             return default
         try:
             self.write_err(self.label(prompt or _('password: '), 'ui.prompt'))
             return getpass.getpass('')
         except EOFError:
             raise util.Abort(_('response expected'))
     def status(self, *msg, **opts):
         '''write status message to output (if ui.quiet is False)
 
         This adds an output label of "ui.status".
         '''
         if not self.quiet:
             opts['label'] = opts.get('label', '') + ' ui.status'
             self.write(*msg, **opts)
     def warn(self, *msg, **opts):
         '''write warning message to output (stderr)
 
         This adds an output label of "ui.warning".
         '''
         opts['label'] = opts.get('label', '') + ' ui.warning'
         self.write_err(*msg, **opts)
     def note(self, *msg, **opts):
         '''write note to output (if ui.verbose is True)
 
         This adds an output label of "ui.note".
         '''
         if self.verbose:
             opts['label'] = opts.get('label', '') + ' ui.note'
             self.write(*msg, **opts)
     def debug(self, *msg, **opts):
         '''write debug message to output (if ui.debugflag is True)
 
         This adds an output label of "ui.debug".
         '''
         if self.debugflag:
             opts['label'] = opts.get('label', '') + ' ui.debug'
             self.write(*msg, **opts)
     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"),
                         out=self.fout)
 
             f = open(name)
             t = f.read()
             f.close()
         finally:
             os.unlink(name)
 
         return t
 
     def traceback(self, exc=None, force=False):
         '''print exception traceback if traceback printing enabled or forced.
         only to call in exception handler. returns true if traceback
         printed.'''
         if self.tracebackflag or force:
             if exc is None:
                 exc = sys.exc_info()
             cause = getattr(exc[1], 'cause', None)
 
             if cause is not None:
                 causetb = traceback.format_tb(cause[2])
                 exctb = traceback.format_tb(exc[2])
                 exconly = traceback.format_exception_only(cause[0], cause[1])
 
                 # exclude frame where 'exc' was chained and rethrown from exctb
                 self.write_err('Traceback (most recent call last):\n',
                                ''.join(exctb[:-1]),
                                ''.join(causetb),
                                ''.join(exconly))
             else:
                 traceback.print_exception(exc[0], exc[1], exc[2],
                                           file=self.ferr)
         return self.tracebackflag or force
 
     def geteditor(self):
         '''return editor to use'''
         if sys.platform == 'plan9':
             # vi is the MIPS instruction simulator on Plan 9. We
             # instead default to E to plumb commit messages to
             # avoid confusion.
             editor = 'E'
         else:
             editor = 'vi'
         return (os.environ.get("HGEDITOR") or
                 self.config("ui", "editor") or
                 os.environ.get("VISUAL") or
                 os.environ.get("EDITOR", editor))
 
     def progress(self, topic, pos, item="", unit="", total=None):
         '''show a progress message
 
         With stock hg, this is simply a debug message that is hidden
         by default, but with extensions or GUI tools it may be
         visible. 'topic' is the current operation, 'item' is a
         non-numeric marker of the current position (i.e. the currently
         in-process file), 'pos' is the current numeric position (i.e.
         revision, bytes, etc.), unit is a corresponding unit label,
         and total is the highest expected pos.
 
         Multiple nested topics may be active at a time.
 
         All topics should be marked closed by setting pos to None at
         termination.
         '''
 
         if pos is None or not self.debugflag:
             return
 
         if unit:
             unit = ' ' + unit
         if item:
             item = ' ' + item
 
         if total:
             pct = 100.0 * pos / total
             self.debug('%s:%s %s/%s%s (%4.2f%%)\n'
                      % (topic, item, pos, total, unit, pct))
         else:
             self.debug('%s:%s %s%s\n' % (topic, item, pos, unit))
 
     def log(self, service, *msg, **opts):
         '''hook for logging facility extensions
 
         service should be a readily-identifiable subsystem, which will
         allow filtering.
         message should be a newline-terminated string to log.
         '''
         pass
 
     def label(self, msg, label):
         '''style msg based on supplied label
 
         Like ui.write(), this just returns msg unchanged, but extensions
         and GUI tools can override it to allow styling output without
         writing it.
 
         ui.write(s, 'label') is equivalent to
         ui.write(ui.label(s, 'label')).
         '''
         return msg

tests/test-committer.t

@@ -1,66 +1,66
   $ unset HGUSER
   $ EMAIL="My Name <[e-mail]>"
   $ export EMAIL
 
   $ hg init test
   $ cd test
   $ touch asdf
   $ hg add asdf
   $ hg commit -m commit-1
   $ hg tip
   changeset:   0:53f268a58230
   tag:         tip
   user:        My Name <[e-mail]>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-1
   
 
   $ unset EMAIL
   $ echo 1234 > asdf
   $ hg commit -u "[e-mail]" -m commit-1
   $ hg tip
   changeset:   1:3871b2a9e9bf
   tag:         tip
   user:        [e-mail]
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-1
   
   $ echo "[ui]" >> .hg/hgrc
   $ echo "username = foobar <[e-mail]>" >> .hg/hgrc
   $ echo 12 > asdf
   $ hg commit -m commit-1
   $ hg tip
   changeset:   2:8eeac6695c1c
   tag:         tip
   user:        foobar <[e-mail]>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-1
   
   $ echo 1 > asdf
   $ hg commit -u "[e-mail]" -m commit-1
   $ hg tip
   changeset:   3:957606a725e4
   tag:         tip
   user:        [e-mail]
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit-1
   
   $ echo 123 > asdf
   $ echo "[ui]" > .hg/hgrc
   $ echo "username = " >> .hg/hgrc
   $ hg commit -m commit-1
   abort: no username supplied
-  (use "hg config --edit"  to set your username)
+  (use "hg config --edit" to set your username)
   [255]
   $ rm .hg/hgrc
   $ hg commit -m commit-1 2>&1
   no username found, using '[^']*' instead (re)
 
   $ echo space > asdf
   $ hg commit -u ' ' -m commit-1
   transaction abort!
   rollback completed
   abort: empty username!
   [255]
 
   $ cd ..

tests/test-record.t

@@ -1,1302 +1,1302
 Set up a repo
 
   $ echo "[ui]" >> $HGRCPATH
   $ echo "interactive=true" >> $HGRCPATH
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "record=" >> $HGRCPATH
 
   $ hg init a
   $ cd a
 
 Select no files
 
   $ touch empty-rw
   $ hg add empty-rw
 
   $ hg record empty-rw<<EOF
   > n
   > EOF
   diff --git a/empty-rw b/empty-rw
   new file mode 100644
   examine changes to 'empty-rw'? [Ynesfdaq?] 
   no changes to record
 
   $ hg tip -p
   changeset:   -1:000000000000
   tag:         tip
   user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
   
   
 
 Select files but no hunks
 
   $ hg record empty-rw<<EOF
   > y
   > n
   > EOF
   diff --git a/empty-rw b/empty-rw
   new file mode 100644
   examine changes to 'empty-rw'? [Ynesfdaq?] 
   abort: empty commit message
   [255]
 
   $ hg tip -p
   changeset:   -1:000000000000
   tag:         tip
   user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
   
   
 
 Record empty file
 
   $ hg record -d '0 0' -m empty empty-rw<<EOF
   > y
   > y
   > EOF
   diff --git a/empty-rw b/empty-rw
   new file mode 100644
   examine changes to 'empty-rw'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   0:c0708cf4e46e
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     empty
   
   
 
 Summary shows we updated to the new cset
 
   $ hg summary
   parent: 0:c0708cf4e46e tip
    empty
   branch: default
   commit: (clean)
   update: (current)
 
 Rename empty file
 
   $ hg mv empty-rw empty-rename
   $ hg record -d '1 0' -m rename<<EOF
   > y
   > EOF
   diff --git a/empty-rw b/empty-rename
   rename from empty-rw
   rename to empty-rename
   examine changes to 'empty-rw' and 'empty-rename'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   1:d695e8dcb197
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     rename
   
   
 
 Copy empty file
 
   $ hg cp empty-rename empty-copy
   $ hg record -d '2 0' -m copy<<EOF
   > y
   > EOF
   diff --git a/empty-rename b/empty-copy
   copy from empty-rename
   copy to empty-copy
   examine changes to 'empty-rename' and 'empty-copy'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   2:1d4b90bea524
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     copy
   
   
 
 Delete empty file
 
   $ hg rm empty-copy
   $ hg record -d '3 0' -m delete<<EOF
   > y
   > EOF
   diff --git a/empty-copy b/empty-copy
   deleted file mode 100644
   examine changes to 'empty-copy'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   3:b39a238f01a1
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     delete
   
   
 
 Add binary file
 
   $ hg bundle --base -2 tip.bundle
   1 changesets found
   $ hg add tip.bundle
   $ hg record -d '4 0' -m binary<<EOF
   > y
   > EOF
   diff --git a/tip.bundle b/tip.bundle
   new file mode 100644
   this is a binary file
   examine changes to 'tip.bundle'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   4:ad816da3711e
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   summary:     binary
   
   diff -r b39a238f01a1 -r ad816da3711e tip.bundle
   Binary file tip.bundle has changed
   
 
 Change binary file
 
   $ hg bundle --base -2 tip.bundle
   1 changesets found
   $ hg record -d '5 0' -m binary-change<<EOF
   > y
   > EOF
   diff --git a/tip.bundle b/tip.bundle
   this modifies a binary file (all or nothing)
   examine changes to 'tip.bundle'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   5:dccd6f3eb485
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     binary-change
   
   diff -r ad816da3711e -r dccd6f3eb485 tip.bundle
   Binary file tip.bundle has changed
   
 
 Rename and change binary file
 
   $ hg mv tip.bundle top.bundle
   $ hg bundle --base -2 top.bundle
   1 changesets found
   $ hg record -d '6 0' -m binary-change-rename<<EOF
   > y
   > EOF
   diff --git a/tip.bundle b/top.bundle
   rename from tip.bundle
   rename to top.bundle
   this modifies a binary file (all or nothing)
   examine changes to 'tip.bundle' and 'top.bundle'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   6:7fa44105f5b3
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:06 1970 +0000
   summary:     binary-change-rename
   
   diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle
   Binary file tip.bundle has changed
   diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle
   Binary file top.bundle has changed
   
 
 Add plain file
 
   $ for i in 1 2 3 4 5 6 7 8 9 10; do
   >     echo $i >> plain
   > done
 
   $ hg add plain
   $ hg record -d '7 0' -m plain plain<<EOF
   > y
   > y
   > EOF
   diff --git a/plain b/plain
   new file mode 100644
   examine changes to 'plain'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   7:11fb457c1be4
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:07 1970 +0000
   summary:     plain
   
   diff -r 7fa44105f5b3 -r 11fb457c1be4 plain
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/plain	Thu Jan 01 00:00:07 1970 +0000
   @@ -0,0 +1,10 @@
   +1
   +2
   +3
   +4
   +5
   +6
   +7
   +8
   +9
   +10
   
 Modify end of plain file with username unset
 
   $ echo 11 >> plain
   $ unset HGUSER
   $ hg record --config ui.username= -d '8 0' -m end plain
   abort: no username supplied
-  (use "hg config --edit"  to set your username)
+  (use "hg config --edit" to set your username)
   [255]
 
 
 Modify end of plain file, also test that diffopts are accounted for
 
   $ HGUSER="test"
   $ export HGUSER
   $ hg record --config diff.showfunc=true -d '8 0' -m end plain <<EOF
   > y
   > y
   > EOF
   diff --git a/plain b/plain
   1 hunks, 1 lines changed
   examine changes to 'plain'? [Ynesfdaq?] 
   @@ -8,3 +8,4 @@ 7
    8
    9
    10
   +11
   record this change to 'plain'? [Ynesfdaq?] 
 
 Modify end of plain file, no EOL
 
   $ hg tip --template '{node}' >> plain
   $ hg record -d '9 0' -m noeol plain <<EOF
   > y
   > y
   > EOF
   diff --git a/plain b/plain
   1 hunks, 1 lines changed
   examine changes to 'plain'? [Ynesfdaq?] 
   @@ -9,3 +9,4 @@
    9
    10
    11
   +7264f99c5f5ff3261504828afa4fb4d406c3af54
   \ No newline at end of file
   record this change to 'plain'? [Ynesfdaq?] 
 
 Modify end of plain file, add EOL
 
   $ echo >> plain
   $ echo 1 > plain2
   $ hg add plain2
   $ hg record -d '10 0' -m eol plain plain2 <<EOF
   > y
   > y
   > y
   > EOF
   diff --git a/plain b/plain
   1 hunks, 1 lines changed
   examine changes to 'plain'? [Ynesfdaq?] 
   @@ -9,4 +9,4 @@
    9
    10
    11
   -7264f99c5f5ff3261504828afa4fb4d406c3af54
   \ No newline at end of file
   +7264f99c5f5ff3261504828afa4fb4d406c3af54
   record change 1/2 to 'plain'? [Ynesfdaq?] 
   diff --git a/plain2 b/plain2
   new file mode 100644
   examine changes to 'plain2'? [Ynesfdaq?] 
 
 Modify beginning, trim end, record both, add another file to test
 changes numbering
 
   $ rm plain
   $ for i in 2 2 3 4 5 6 7 8 9 10; do
   >   echo $i >> plain
   > done
   $ echo 2 >> plain2
 
   $ hg record -d '10 0' -m begin-and-end plain plain2 <<EOF
   > y
   > y
   > y
   > y
   > y
   > EOF
   diff --git a/plain b/plain
   2 hunks, 3 lines changed
   examine changes to 'plain'? [Ynesfdaq?] 
   @@ -1,4 +1,4 @@
   -1
   +2
    2
    3
    4
   record change 1/3 to 'plain'? [Ynesfdaq?] 
   @@ -8,5 +8,3 @@
    8
    9
    10
   -11
   -7264f99c5f5ff3261504828afa4fb4d406c3af54
   record change 2/3 to 'plain'? [Ynesfdaq?] 
   diff --git a/plain2 b/plain2
   1 hunks, 1 lines changed
   examine changes to 'plain2'? [Ynesfdaq?] 
   @@ -1,1 +1,2 @@
    1
   +2
   record change 3/3 to 'plain2'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   11:21df83db12b8
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:10 1970 +0000
   summary:     begin-and-end
   
   diff -r ddb8b281c3ff -r 21df83db12b8 plain
   --- a/plain	Thu Jan 01 00:00:10 1970 +0000
   +++ b/plain	Thu Jan 01 00:00:10 1970 +0000
   @@ -1,4 +1,4 @@
   -1
   +2
    2
    3
    4
   @@ -8,5 +8,3 @@
    8
    9
    10
   -11
   -7264f99c5f5ff3261504828afa4fb4d406c3af54
   diff -r ddb8b281c3ff -r 21df83db12b8 plain2
   --- a/plain2	Thu Jan 01 00:00:10 1970 +0000
   +++ b/plain2	Thu Jan 01 00:00:10 1970 +0000
   @@ -1,1 +1,2 @@
    1
   +2
   
 
 Trim beginning, modify end
 
   $ rm plain
   > for i in 4 5 6 7 8 9 10.new; do
   >   echo $i >> plain
   > done
 
 Record end
 
   $ hg record -d '11 0' -m end-only plain <<EOF
   > y
   > n
   > y
   > EOF
   diff --git a/plain b/plain
   2 hunks, 4 lines changed
   examine changes to 'plain'? [Ynesfdaq?] 
   @@ -1,9 +1,6 @@
   -2
   -2
   -3
    4
    5
    6
    7
    8
    9
   record change 1/2 to 'plain'? [Ynesfdaq?] 
   @@ -4,7 +1,7 @@
    4
    5
    6
    7
    8
    9
   -10
   +10.new
   record change 2/2 to 'plain'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   12:99337501826f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:11 1970 +0000
   summary:     end-only
   
   diff -r 21df83db12b8 -r 99337501826f plain
   --- a/plain	Thu Jan 01 00:00:10 1970 +0000
   +++ b/plain	Thu Jan 01 00:00:11 1970 +0000
   @@ -7,4 +7,4 @@
    7
    8
    9
   -10
   +10.new
   
 
 Record beginning
 
   $ hg record -d '12 0' -m begin-only plain <<EOF
   > y
   > y
   > EOF
   diff --git a/plain b/plain
   1 hunks, 3 lines changed
   examine changes to 'plain'? [Ynesfdaq?] 
   @@ -1,6 +1,3 @@
   -2
   -2
   -3
    4
    5
    6
   record this change to 'plain'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   13:bbd45465d540
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:12 1970 +0000
   summary:     begin-only
   
   diff -r 99337501826f -r bbd45465d540 plain
   --- a/plain	Thu Jan 01 00:00:11 1970 +0000
   +++ b/plain	Thu Jan 01 00:00:12 1970 +0000
   @@ -1,6 +1,3 @@
   -2
   -2
   -3
    4
    5
    6
   
 
 Add to beginning, trim from end
 
   $ rm plain
   $ for i in 1 2 3 4 5 6 7 8 9; do
   >  echo $i >> plain
   > done
 
 Record end
 
   $ hg record --traceback -d '13 0' -m end-again plain<<EOF
   > y
   > n
   > y
   > EOF
   diff --git a/plain b/plain
   2 hunks, 4 lines changed
   examine changes to 'plain'? [Ynesfdaq?] 
   @@ -1,6 +1,9 @@
   +1
   +2
   +3
    4
    5
    6
    7
    8
    9
   record change 1/2 to 'plain'? [Ynesfdaq?] 
   @@ -1,7 +4,6 @@
    4
    5
    6
    7
    8
    9
   -10.new
   record change 2/2 to 'plain'? [Ynesfdaq?] 
 
 Add to beginning, middle, end
 
   $ rm plain
   $ for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do
   >   echo $i >> plain
   > done
 
 Record beginning, middle
 
   $ hg record -d '14 0' -m middle-only plain <<EOF
   > y
   > y
   > y
   > n
   > EOF
   diff --git a/plain b/plain
   3 hunks, 7 lines changed
   examine changes to 'plain'? [Ynesfdaq?] 
   @@ -1,2 +1,5 @@
   +1
   +2
   +3
    4
    5
   record change 1/3 to 'plain'? [Ynesfdaq?] 
   @@ -1,6 +4,8 @@
    4
    5
   +5.new
   +5.reallynew
    6
    7
    8
    9
   record change 2/3 to 'plain'? [Ynesfdaq?] 
   @@ -3,4 +8,6 @@
    6
    7
    8
    9
   +10
   +11
   record change 3/3 to 'plain'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   15:f34a7937ec33
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:14 1970 +0000
   summary:     middle-only
   
   diff -r 82c065d0b850 -r f34a7937ec33 plain
   --- a/plain	Thu Jan 01 00:00:13 1970 +0000
   +++ b/plain	Thu Jan 01 00:00:14 1970 +0000
   @@ -1,5 +1,10 @@
   +1
   +2
   +3
    4
    5
   +5.new
   +5.reallynew
    6
    7
    8
   
 
 Record end
 
   $ hg record -d '15 0' -m end-only plain <<EOF
   > y
   > y
   > EOF
   diff --git a/plain b/plain
   1 hunks, 2 lines changed
   examine changes to 'plain'? [Ynesfdaq?] 
   @@ -9,3 +9,5 @@
    7
    8
    9
   +10
   +11
   record this change to 'plain'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   16:f9900b71a04c
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:15 1970 +0000
   summary:     end-only
   
   diff -r f34a7937ec33 -r f9900b71a04c plain
   --- a/plain	Thu Jan 01 00:00:14 1970 +0000
   +++ b/plain	Thu Jan 01 00:00:15 1970 +0000
   @@ -9,3 +9,5 @@
    7
    8
    9
   +10
   +11
   
 
   $ mkdir subdir
   $ cd subdir
   $ echo a > a
   $ hg ci -d '16 0' -Amsubdir
   adding subdir/a
 
   $ echo a >> a
   $ hg record -d '16 0' -m subdir-change a <<EOF
   > y
   > y
   > EOF
   diff --git a/subdir/a b/subdir/a
   1 hunks, 1 lines changed
   examine changes to 'subdir/a'? [Ynesfdaq?] 
   @@ -1,1 +1,2 @@
    a
   +a
   record this change to 'subdir/a'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   18:61be427a9deb
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:16 1970 +0000
   summary:     subdir-change
   
   diff -r a7ffae4d61cb -r 61be427a9deb subdir/a
   --- a/subdir/a	Thu Jan 01 00:00:16 1970 +0000
   +++ b/subdir/a	Thu Jan 01 00:00:16 1970 +0000
   @@ -1,1 +1,2 @@
    a
   +a
   
 
   $ echo a > f1
   $ echo b > f2
   $ hg add f1 f2
 
   $ hg ci -mz -d '17 0'
 
   $ echo a >> f1
   $ echo b >> f2
 
 Help, quit
 
   $ hg record <<EOF
   > ?
   > q
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   y - yes, record this change
   n - no, skip this change
   e - edit this change manually
   s - skip remaining changes to this file
   f - record remaining changes to this file
   d - done, skip remaining changes and files
   a - record all changes to all remaining files
   q - quit, recording no changes
   ? - ? (display help)
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   abort: user quit
   [255]
 
 Skip
 
   $ hg record <<EOF
   > s
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   diff --git a/subdir/f2 b/subdir/f2
   1 hunks, 1 lines changed
   examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected
   [255]
 
 No
 
   $ hg record <<EOF
   > n
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   diff --git a/subdir/f2 b/subdir/f2
   1 hunks, 1 lines changed
   examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected
   [255]
 
 f, quit
 
   $ hg record <<EOF
   > f
   > q
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   diff --git a/subdir/f2 b/subdir/f2
   1 hunks, 1 lines changed
   examine changes to 'subdir/f2'? [Ynesfdaq?] 
   abort: user quit
   [255]
 
 s, all
 
   $ hg record -d '18 0' -mx <<EOF
   > s
   > a
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   diff --git a/subdir/f2 b/subdir/f2
   1 hunks, 1 lines changed
   examine changes to 'subdir/f2'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   20:b3df3dda369a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:18 1970 +0000
   summary:     x
   
   diff -r 6e02d6c9906d -r b3df3dda369a subdir/f2
   --- a/subdir/f2	Thu Jan 01 00:00:17 1970 +0000
   +++ b/subdir/f2	Thu Jan 01 00:00:18 1970 +0000
   @@ -1,1 +1,2 @@
    b
   +b
   
 
 f
 
   $ hg record -d '19 0' -my <<EOF
   > f
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   21:38ec577f126b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:19 1970 +0000
   summary:     y
   
   diff -r b3df3dda369a -r 38ec577f126b subdir/f1
   --- a/subdir/f1	Thu Jan 01 00:00:18 1970 +0000
   +++ b/subdir/f1	Thu Jan 01 00:00:19 1970 +0000
   @@ -1,1 +1,2 @@
    a
   +a
   
 
 #if execbit
 
 Preserve chmod +x
 
   $ chmod +x f1
   $ echo a >> f1
   $ hg record -d '20 0' -mz <<EOF
   > y
   > y
   > y
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   old mode 100644
   new mode 100755
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   @@ -1,2 +1,3 @@
    a
    a
   +a
   record this change to 'subdir/f1'? [Ynesfdaq?] 
 
   $ hg tip --config diff.git=True -p
   changeset:   22:3261adceb075
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:20 1970 +0000
   summary:     z
   
   diff --git a/subdir/f1 b/subdir/f1
   old mode 100644
   new mode 100755
   --- a/subdir/f1
   +++ b/subdir/f1
   @@ -1,2 +1,3 @@
    a
    a
   +a
   
 
 Preserve execute permission on original
 
   $ echo b >> f1
   $ hg record -d '21 0' -maa <<EOF
   > y
   > y
   > y
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   @@ -1,3 +1,4 @@
    a
    a
    a
   +b
   record this change to 'subdir/f1'? [Ynesfdaq?] 
 
   $ hg tip --config diff.git=True -p
   changeset:   23:b429867550db
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:21 1970 +0000
   summary:     aa
   
   diff --git a/subdir/f1 b/subdir/f1
   --- a/subdir/f1
   +++ b/subdir/f1
   @@ -1,3 +1,4 @@
    a
    a
    a
   +b
   
 
 Preserve chmod -x
 
   $ chmod -x f1
   $ echo c >> f1
   $ hg record -d '22 0' -mab <<EOF
   > y
   > y
   > y
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   old mode 100755
   new mode 100644
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   @@ -2,3 +2,4 @@
    a
    a
    b
   +c
   record this change to 'subdir/f1'? [Ynesfdaq?] 
 
   $ hg tip --config diff.git=True -p
   changeset:   24:0b082130c20a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:22 1970 +0000
   summary:     ab
   
   diff --git a/subdir/f1 b/subdir/f1
   old mode 100755
   new mode 100644
   --- a/subdir/f1
   +++ b/subdir/f1
   @@ -2,3 +2,4 @@
    a
    a
    b
   +c
   
 
 #else
 
 Slightly bogus tests to get almost same repo structure as when x bit is used
 - but with different hashes.
 
 Mock "Preserve chmod +x"
 
   $ echo a >> f1
   $ hg record -d '20 0' -mz <<EOF
   > y
   > y
   > y
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   @@ -1,2 +1,3 @@
    a
    a
   +a
   record this change to 'subdir/f1'? [Ynesfdaq?] 
 
   $ hg tip --config diff.git=True -p
   changeset:   22:0d463bd428f5
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:20 1970 +0000
   summary:     z
   
   diff --git a/subdir/f1 b/subdir/f1
   --- a/subdir/f1
   +++ b/subdir/f1
   @@ -1,2 +1,3 @@
    a
    a
   +a
   
 
 Mock "Preserve execute permission on original"
 
   $ echo b >> f1
   $ hg record -d '21 0' -maa <<EOF
   > y
   > y
   > y
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   @@ -1,3 +1,4 @@
    a
    a
    a
   +b
   record this change to 'subdir/f1'? [Ynesfdaq?] 
 
   $ hg tip --config diff.git=True -p
   changeset:   23:0eab41a3e524
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:21 1970 +0000
   summary:     aa
   
   diff --git a/subdir/f1 b/subdir/f1
   --- a/subdir/f1
   +++ b/subdir/f1
   @@ -1,3 +1,4 @@
    a
    a
    a
   +b
   
 
 Mock "Preserve chmod -x"
 
   $ chmod -x f1
   $ echo c >> f1
   $ hg record -d '22 0' -mab <<EOF
   > y
   > y
   > y
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   @@ -2,3 +2,4 @@
    a
    a
    b
   +c
   record this change to 'subdir/f1'? [Ynesfdaq?] 
 
   $ hg tip --config diff.git=True -p
   changeset:   24:f4f718f27b7c
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:22 1970 +0000
   summary:     ab
   
   diff --git a/subdir/f1 b/subdir/f1
   --- a/subdir/f1
   +++ b/subdir/f1
   @@ -2,3 +2,4 @@
    a
    a
    b
   +c
   
 
 #endif
 
   $ cd ..
 
 
 Abort early when a merge is in progress
 
   $ hg up 4
   1 files updated, 0 files merged, 6 files removed, 0 files unresolved
 
   $ touch iwillmergethat
   $ hg add iwillmergethat
 
   $ hg branch thatbranch
   marked working directory as branch thatbranch
   (branches are permanent and global, did you want a bookmark?)
 
   $ hg ci -m'new head'
 
   $ hg up default
   6 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ hg merge thatbranch
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg record -m'will abort'
   abort: cannot partially commit a merge (use "hg commit" instead)
   [255]
 
   $ hg up -C
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Editing patch (and ignoring trailing text)
 
   $ cat > editor.sh << '__EOF__'
   > sed -e 7d -e '5s/^-/ /' -e '/^# ---/i\
   > trailing\nditto' "$1" > tmp
   > mv tmp "$1"
   > __EOF__
   $ cat > editedfile << '__EOF__'
   > This is the first line
   > This is the second line
   > This is the third line
   > __EOF__
   $ hg add editedfile
   $ hg commit -medit-patch-1
   $ cat > editedfile << '__EOF__'
   > This line has changed
   > This change will be committed
   > This is the third line
   > __EOF__
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record -d '23 0' -medit-patch-2 <<EOF
   > y
   > e
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 2 lines changed
   examine changes to 'editedfile'? [Ynesfdaq?] 
   @@ -1,3 +1,3 @@
   -This is the first line
   -This is the second line
   +This line has changed
   +This change will be committed
    This is the third line
   record this change to 'editedfile'? [Ynesfdaq?] 
   $ cat editedfile
   This line has changed
   This change will be committed
   This is the third line
   $ hg cat -r tip editedfile
   This is the first line
   This change will be committed
   This is the third line
   $ hg revert editedfile
 
 Trying to edit patch for whole file
 
   $ echo "This is the fourth line" >> editedfile
   $ hg record <<EOF
   > e
   > q
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 1 lines changed
   examine changes to 'editedfile'? [Ynesfdaq?] 
   cannot edit patch for whole file
   examine changes to 'editedfile'? [Ynesfdaq?] 
   abort: user quit
   [255]
   $ hg revert editedfile
 
 Removing changes from patch
 
   $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp
   $ mv tmp editedfile
   $ echo "This line has been added" >> editedfile
   $ cat > editor.sh << '__EOF__'
   > sed -e 's/^[-+]/ /' "$1" > tmp
   > mv tmp "$1"
   > __EOF__
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF
   > y
   > e
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 3 lines changed
   examine changes to 'editedfile'? [Ynesfdaq?] 
   @@ -1,3 +1,3 @@
   -This is the first line
   -This change will be committed
   -This is the third line
   +This change will not be committed
   +This is the second line
   +This line has been added
   record this change to 'editedfile'? [Ynesfdaq?] 
   no changes to record
   $ cat editedfile
   This change will not be committed
   This is the second line
   This line has been added
   $ hg cat -r tip editedfile
   This is the first line
   This change will be committed
   This is the third line
   $ hg revert editedfile
 
 Invalid patch
 
   $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp
   $ mv tmp editedfile
   $ echo "This line has been added" >> editedfile
   $ cat > editor.sh << '__EOF__'
   > sed s/This/That/ "$1" > tmp
   > mv tmp "$1"
   > __EOF__
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF
   > y
   > e
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 3 lines changed
   examine changes to 'editedfile'? [Ynesfdaq?] 
   @@ -1,3 +1,3 @@
   -This is the first line
   -This change will be committed
   -This is the third line
   +This change will not be committed
   +This is the second line
   +This line has been added
   record this change to 'editedfile'? [Ynesfdaq?] 
   patching file editedfile
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej
   abort: patch failed to apply
   [255]
   $ cat editedfile
   This change will not be committed
   This is the second line
   This line has been added
   $ hg cat -r tip editedfile
   This is the first line
   This change will be committed
   This is the third line
   $ cat editedfile.rej
   --- editedfile
   +++ editedfile
   @@ -1,3 +1,3 @@
   -That is the first line
   -That change will be committed
   -That is the third line
   +That change will not be committed
   +That is the second line
   +That line has been added
 
 Malformed patch - error handling
 
   $ cat > editor.sh << '__EOF__'
   > sed -e '/^@/p' "$1" > tmp
   > mv tmp "$1"
   > __EOF__
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF
   > y
   > e
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 3 lines changed
   examine changes to 'editedfile'? [Ynesfdaq?] 
   @@ -1,3 +1,3 @@
   -This is the first line
   -This change will be committed
   -This is the third line
   +This change will not be committed
   +This is the second line
   +This line has been added
   record this change to 'editedfile'? [Ynesfdaq?] 
   abort: error parsing patch: unhandled transition: range -> range
   [255]
 
 random text in random positions is still an error
 
   $ cat > editor.sh << '__EOF__'
   > sed -e '/^@/i\
   > other' "$1" > tmp
   > mv tmp "$1"
   > __EOF__
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF
   > y
   > e
   > EOF
   diff --git a/editedfile b/editedfile
   1 hunks, 3 lines changed
   examine changes to 'editedfile'? [Ynesfdaq?] 
   @@ -1,3 +1,3 @@
   -This is the first line
   -This change will be committed
   -This is the third line
   +This change will not be committed
   +This is the second line
   +This line has been added
   record this change to 'editedfile'? [Ynesfdaq?] 
   abort: error parsing patch: unhandled transition: file -> other
   [255]
 
   $ hg up -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 With win32text
 
   $ echo '[extensions]' >> .hg/hgrc
   $ echo 'win32text = ' >> .hg/hgrc
   $ echo '[decode]' >> .hg/hgrc
   $ echo '** = cleverdecode:' >> .hg/hgrc
   $ echo '[encode]' >> .hg/hgrc
   $ echo '** = cleverencode:' >> .hg/hgrc
   $ echo '[patch]' >> .hg/hgrc
   $ echo 'eol = crlf' >> .hg/hgrc
 
 Ignore win32text deprecation warning for now:
 
   $ echo '[win32text]' >> .hg/hgrc
   $ echo 'warn = no' >> .hg/hgrc
 
   $ echo d >> subdir/f1
   $ hg record -d '24 0' -mw1 <<EOF
   > y
   > y
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   @@ -3,3 +3,4 @@
    a
    b
    c
   +d
   record this change to 'subdir/f1'? [Ynesfdaq?] 
 
   $ hg tip -p
   changeset:   28:* (glob)
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:24 1970 +0000
   summary:     w1
   
   diff -r ???????????? -r ???????????? subdir/f1 (glob)
   --- a/subdir/f1	Thu Jan 01 00:00:23 1970 +0000
   +++ b/subdir/f1	Thu Jan 01 00:00:24 1970 +0000
   @@ -3,3 +3,4 @@
    a
    b
    c
   +d
   
 Test --user when ui.username not set
   $ unset HGUSER
   $ echo e >> subdir/f1
   $ hg record  --config ui.username= -d '8 0' --user xyz -m "user flag" <<EOF
   > y
   > y
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'? [Ynesfdaq?] 
   @@ -4,3 +4,4 @@
    b
    c
    d
   +e
   record this change to 'subdir/f1'? [Ynesfdaq?] 
   $ hg log --template '{author}\n' -l 1
   xyz
   $ HGUSER="test"
   $ export HGUSER
 
   $ cd ..