ui: add option to timestamp status and diagnostic messages

Differential Revision: https://phab.mercurial-scm.org/D8640

mercurial/configitems.py

@@ -1,1572 +1,1575 b''
 # configitems.py - centralized declaration of configuration option
 #
 #  Copyright 2017 Pierre-Yves David <[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 __future__ import absolute_import
 
 import functools
 import re
 
 from . import (
     encoding,
     error,
 )
 
 
 def loadconfigtable(ui, extname, configtable):
     """update config item known to the ui with the extension ones"""
     for section, items in sorted(configtable.items()):
         knownitems = ui._knownconfig.setdefault(section, itemregister())
         knownkeys = set(knownitems)
         newkeys = set(items)
         for key in sorted(knownkeys & newkeys):
             msg = b"extension '%s' overwrite config item '%s.%s'"
             msg %= (extname, section, key)
             ui.develwarn(msg, config=b'warn-config')
 
         knownitems.update(items)
 
 
 class configitem(object):
     """represent a known config item
 
     :section: the official config section where to find this item,
        :name: the official name within the section,
     :default: default value for this item,
     :alias: optional list of tuples as alternatives,
     :generic: this is a generic definition, match name using regular expression.
     """
 
     def __init__(
         self,
         section,
         name,
         default=None,
         alias=(),
         generic=False,
         priority=0,
         experimental=False,
     ):
         self.section = section
         self.name = name
         self.default = default
         self.alias = list(alias)
         self.generic = generic
         self.priority = priority
         self.experimental = experimental
         self._re = None
         if generic:
             self._re = re.compile(self.name)
 
 
 class itemregister(dict):
     """A specialized dictionary that can handle wild-card selection"""
 
     def __init__(self):
         super(itemregister, self).__init__()
         self._generics = set()
 
     def update(self, other):
         super(itemregister, self).update(other)
         self._generics.update(other._generics)
 
     def __setitem__(self, key, item):
         super(itemregister, self).__setitem__(key, item)
         if item.generic:
             self._generics.add(item)
 
     def get(self, key):
         baseitem = super(itemregister, self).get(key)
         if baseitem is not None and not baseitem.generic:
             return baseitem
 
         # search for a matching generic item
         generics = sorted(self._generics, key=(lambda x: (x.priority, x.name)))
         for item in generics:
             # we use 'match' instead of 'search' to make the matching simpler
             # for people unfamiliar with regular expression. Having the match
             # rooted to the start of the string will produce less surprising
             # result for user writing simple regex for sub-attribute.
             #
             # For example using "color\..*" match produces an unsurprising
             # result, while using search could suddenly match apparently
             # unrelated configuration that happens to contains "color."
             # anywhere. This is a tradeoff where we favor requiring ".*" on
             # some match to avoid the need to prefix most pattern with "^".
             # The "^" seems more error prone.
             if item._re.match(key):
                 return item
 
         return None
 
 
 coreitems = {}
 
 
 def _register(configtable, *args, **kwargs):
     item = configitem(*args, **kwargs)
     section = configtable.setdefault(item.section, itemregister())
     if item.name in section:
         msg = b"duplicated config item registration for '%s.%s'"
         raise error.ProgrammingError(msg % (item.section, item.name))
     section[item.name] = item
 
 
 # special value for case where the default is derived from other values
 dynamicdefault = object()
 
 # Registering actual config items
 
 
 def getitemregister(configtable):
     f = functools.partial(_register, configtable)
     # export pseudo enum as configitem.*
     f.dynamicdefault = dynamicdefault
     return f
 
 
 coreconfigitem = getitemregister(coreitems)
 
 
 def _registerdiffopts(section, configprefix=b''):
     coreconfigitem(
         section, configprefix + b'nodates', default=False,
     )
     coreconfigitem(
         section, configprefix + b'showfunc', default=False,
     )
     coreconfigitem(
         section, configprefix + b'unified', default=None,
     )
     coreconfigitem(
         section, configprefix + b'git', default=False,
     )
     coreconfigitem(
         section, configprefix + b'ignorews', default=False,
     )
     coreconfigitem(
         section, configprefix + b'ignorewsamount', default=False,
     )
     coreconfigitem(
         section, configprefix + b'ignoreblanklines', default=False,
     )
     coreconfigitem(
         section, configprefix + b'ignorewseol', default=False,
     )
     coreconfigitem(
         section, configprefix + b'nobinary', default=False,
     )
     coreconfigitem(
         section, configprefix + b'noprefix', default=False,
     )
     coreconfigitem(
         section, configprefix + b'word-diff', default=False,
     )
 
 
 coreconfigitem(
     b'alias', b'.*', default=dynamicdefault, generic=True,
 )
 coreconfigitem(
     b'auth', b'cookiefile', default=None,
 )
 _registerdiffopts(section=b'annotate')
 # bookmarks.pushing: internal hack for discovery
 coreconfigitem(
     b'bookmarks', b'pushing', default=list,
 )
 # bundle.mainreporoot: internal hack for bundlerepo
 coreconfigitem(
     b'bundle', b'mainreporoot', default=b'',
 )
 coreconfigitem(
     b'censor', b'policy', default=b'abort', experimental=True,
 )
 coreconfigitem(
     b'chgserver', b'idletimeout', default=3600,
 )
 coreconfigitem(
     b'chgserver', b'skiphash', default=False,
 )
 coreconfigitem(
     b'cmdserver', b'log', default=None,
 )
 coreconfigitem(
     b'cmdserver', b'max-log-files', default=7,
 )
 coreconfigitem(
     b'cmdserver', b'max-log-size', default=b'1 MB',
 )
 coreconfigitem(
     b'cmdserver', b'max-repo-cache', default=0, experimental=True,
 )
 coreconfigitem(
     b'cmdserver', b'message-encodings', default=list, experimental=True,
 )
 coreconfigitem(
     b'cmdserver',
     b'track-log',
     default=lambda: [b'chgserver', b'cmdserver', b'repocache'],
 )
 coreconfigitem(
     b'color', b'.*', default=None, generic=True,
 )
 coreconfigitem(
     b'color', b'mode', default=b'auto',
 )
 coreconfigitem(
     b'color', b'pagermode', default=dynamicdefault,
 )
 _registerdiffopts(section=b'commands', configprefix=b'commit.interactive.')
 coreconfigitem(
     b'commands', b'commit.post-status', default=False,
 )
 coreconfigitem(
     b'commands', b'grep.all-files', default=False, experimental=True,
 )
 coreconfigitem(
     b'commands', b'merge.require-rev', default=False,
 )
 coreconfigitem(
     b'commands', b'push.require-revs', default=False,
 )
 coreconfigitem(
     b'commands', b'resolve.confirm', default=False,
 )
 coreconfigitem(
     b'commands', b'resolve.explicit-re-merge', default=False,
 )
 coreconfigitem(
     b'commands', b'resolve.mark-check', default=b'none',
 )
 _registerdiffopts(section=b'commands', configprefix=b'revert.interactive.')
 coreconfigitem(
     b'commands', b'show.aliasprefix', default=list,
 )
 coreconfigitem(
     b'commands', b'status.relative', default=False,
 )
 coreconfigitem(
     b'commands', b'status.skipstates', default=[], experimental=True,
 )
 coreconfigitem(
     b'commands', b'status.terse', default=b'',
 )
 coreconfigitem(
     b'commands', b'status.verbose', default=False,
 )
 coreconfigitem(
     b'commands', b'update.check', default=None,
 )
 coreconfigitem(
     b'commands', b'update.requiredest', default=False,
 )
 coreconfigitem(
     b'committemplate', b'.*', default=None, generic=True,
 )
 coreconfigitem(
     b'convert', b'bzr.saverev', default=True,
 )
 coreconfigitem(
     b'convert', b'cvsps.cache', default=True,
 )
 coreconfigitem(
     b'convert', b'cvsps.fuzz', default=60,
 )
 coreconfigitem(
     b'convert', b'cvsps.logencoding', default=None,
 )
 coreconfigitem(
     b'convert', b'cvsps.mergefrom', default=None,
 )
 coreconfigitem(
     b'convert', b'cvsps.mergeto', default=None,
 )
 coreconfigitem(
     b'convert', b'git.committeractions', default=lambda: [b'messagedifferent'],
 )
 coreconfigitem(
     b'convert', b'git.extrakeys', default=list,
 )
 coreconfigitem(
     b'convert', b'git.findcopiesharder', default=False,
 )
 coreconfigitem(
     b'convert', b'git.remoteprefix', default=b'remote',
 )
 coreconfigitem(
     b'convert', b'git.renamelimit', default=400,
 )
 coreconfigitem(
     b'convert', b'git.saverev', default=True,
 )
 coreconfigitem(
     b'convert', b'git.similarity', default=50,
 )
 coreconfigitem(
     b'convert', b'git.skipsubmodules', default=False,
 )
 coreconfigitem(
     b'convert', b'hg.clonebranches', default=False,
 )
 coreconfigitem(
     b'convert', b'hg.ignoreerrors', default=False,
 )
 coreconfigitem(
     b'convert', b'hg.preserve-hash', default=False,
 )
 coreconfigitem(
     b'convert', b'hg.revs', default=None,
 )
 coreconfigitem(
     b'convert', b'hg.saverev', default=False,
 )
 coreconfigitem(
     b'convert', b'hg.sourcename', default=None,
 )
 coreconfigitem(
     b'convert', b'hg.startrev', default=None,
 )
 coreconfigitem(
     b'convert', b'hg.tagsbranch', default=b'default',
 )
 coreconfigitem(
     b'convert', b'hg.usebranchnames', default=True,
 )
 coreconfigitem(
     b'convert', b'ignoreancestorcheck', default=False, experimental=True,
 )
 coreconfigitem(
     b'convert', b'localtimezone', default=False,
 )
 coreconfigitem(
     b'convert', b'p4.encoding', default=dynamicdefault,
 )
 coreconfigitem(
     b'convert', b'p4.startrev', default=0,
 )
 coreconfigitem(
     b'convert', b'skiptags', default=False,
 )
 coreconfigitem(
     b'convert', b'svn.debugsvnlog', default=True,
 )
 coreconfigitem(
     b'convert', b'svn.trunk', default=None,
 )
 coreconfigitem(
     b'convert', b'svn.tags', default=None,
 )
 coreconfigitem(
     b'convert', b'svn.branches', default=None,
 )
 coreconfigitem(
     b'convert', b'svn.startrev', default=0,
 )
 coreconfigitem(
     b'debug', b'dirstate.delaywrite', default=0,
 )
 coreconfigitem(
     b'defaults', b'.*', default=None, generic=True,
 )
 coreconfigitem(
     b'devel', b'all-warnings', default=False,
 )
 coreconfigitem(
     b'devel', b'bundle2.debug', default=False,
 )
 coreconfigitem(
     b'devel', b'bundle.delta', default=b'',
 )
 coreconfigitem(
     b'devel', b'cache-vfs', default=None,
 )
 coreconfigitem(
     b'devel', b'check-locks', default=False,
 )
 coreconfigitem(
     b'devel', b'check-relroot', default=False,
 )
 coreconfigitem(
     b'devel', b'default-date', default=None,
 )
 coreconfigitem(
     b'devel', b'deprec-warn', default=False,
 )
 coreconfigitem(
     b'devel', b'disableloaddefaultcerts', default=False,
 )
 coreconfigitem(
     b'devel', b'warn-empty-changegroup', default=False,
 )
 coreconfigitem(
     b'devel', b'legacy.exchange', default=list,
 )
 coreconfigitem(
     b'devel', b'persistent-nodemap', default=False,
 )
 coreconfigitem(
     b'devel', b'servercafile', default=b'',
 )
 coreconfigitem(
     b'devel', b'serverexactprotocol', default=b'',
 )
 coreconfigitem(
     b'devel', b'serverrequirecert', default=False,
 )
 coreconfigitem(
     b'devel', b'strip-obsmarkers', default=True,
 )
 coreconfigitem(
     b'devel', b'warn-config', default=None,
 )
 coreconfigitem(
     b'devel', b'warn-config-default', default=None,
 )
 coreconfigitem(
     b'devel', b'user.obsmarker', default=None,
 )
 coreconfigitem(
     b'devel', b'warn-config-unknown', default=None,
 )
 coreconfigitem(
     b'devel', b'debug.copies', default=False,
 )
 coreconfigitem(
     b'devel', b'debug.extensions', default=False,
 )
 coreconfigitem(
     b'devel', b'debug.repo-filters', default=False,
 )
 coreconfigitem(
     b'devel', b'debug.peer-request', default=False,
 )
 coreconfigitem(
     b'devel', b'discovery.randomize', default=True,
 )
 _registerdiffopts(section=b'diff')
 coreconfigitem(
     b'email', b'bcc', default=None,
 )
 coreconfigitem(
     b'email', b'cc', default=None,
 )
 coreconfigitem(
     b'email', b'charsets', default=list,
 )
 coreconfigitem(
     b'email', b'from', default=None,
 )
 coreconfigitem(
     b'email', b'method', default=b'smtp',
 )
 coreconfigitem(
     b'email', b'reply-to', default=None,
 )
 coreconfigitem(
     b'email', b'to', default=None,
 )
 coreconfigitem(
     b'experimental', b'archivemetatemplate', default=dynamicdefault,
 )
 coreconfigitem(
     b'experimental', b'auto-publish', default=b'publish',
 )
 coreconfigitem(
     b'experimental', b'bundle-phases', default=False,
 )
 coreconfigitem(
     b'experimental', b'bundle2-advertise', default=True,
 )
 coreconfigitem(
     b'experimental', b'bundle2-output-capture', default=False,
 )
 coreconfigitem(
     b'experimental', b'bundle2.pushback', default=False,
 )
 coreconfigitem(
     b'experimental', b'bundle2lazylocking', default=False,
 )
 coreconfigitem(
     b'experimental', b'bundlecomplevel', default=None,
 )
 coreconfigitem(
     b'experimental', b'bundlecomplevel.bzip2', default=None,
 )
 coreconfigitem(
     b'experimental', b'bundlecomplevel.gzip', default=None,
 )
 coreconfigitem(
     b'experimental', b'bundlecomplevel.none', default=None,
 )
 coreconfigitem(
     b'experimental', b'bundlecomplevel.zstd', default=None,
 )
 coreconfigitem(
     b'experimental', b'changegroup3', default=False,
 )
 coreconfigitem(
     b'experimental', b'cleanup-as-archived', default=False,
 )
 coreconfigitem(
     b'experimental', b'clientcompressionengines', default=list,
 )
 coreconfigitem(
     b'experimental', b'copytrace', default=b'on',
 )
 coreconfigitem(
     b'experimental', b'copytrace.movecandidateslimit', default=100,
 )
 coreconfigitem(
     b'experimental', b'copytrace.sourcecommitlimit', default=100,
 )
 coreconfigitem(
     b'experimental', b'copies.read-from', default=b"filelog-only",
 )
 coreconfigitem(
     b'experimental', b'copies.write-to', default=b'filelog-only',
 )
 coreconfigitem(
     b'experimental', b'crecordtest', default=None,
 )
 coreconfigitem(
     b'experimental', b'directaccess', default=False,
 )
 coreconfigitem(
     b'experimental', b'directaccess.revnums', default=False,
 )
 coreconfigitem(
     b'experimental', b'editortmpinhg', default=False,
 )
 coreconfigitem(
     b'experimental', b'evolution', default=list,
 )
 coreconfigitem(
     b'experimental',
     b'evolution.allowdivergence',
     default=False,
     alias=[(b'experimental', b'allowdivergence')],
 )
 coreconfigitem(
     b'experimental', b'evolution.allowunstable', default=None,
 )
 coreconfigitem(
     b'experimental', b'evolution.createmarkers', default=None,
 )
 coreconfigitem(
     b'experimental',
     b'evolution.effect-flags',
     default=True,
     alias=[(b'experimental', b'effect-flags')],
 )
 coreconfigitem(
     b'experimental', b'evolution.exchange', default=None,
 )
 coreconfigitem(
     b'experimental', b'evolution.bundle-obsmarker', default=False,
 )
 coreconfigitem(
     b'experimental', b'log.topo', default=False,
 )
 coreconfigitem(
     b'experimental', b'evolution.report-instabilities', default=True,
 )
 coreconfigitem(
     b'experimental', b'evolution.track-operation', default=True,
 )
 # repo-level config to exclude a revset visibility
 #
 # The target use case is to use `share` to expose different subset of the same
 # repository, especially server side. See also `server.view`.
 coreconfigitem(
     b'experimental', b'extra-filter-revs', default=None,
 )
 coreconfigitem(
     b'experimental', b'maxdeltachainspan', default=-1,
 )
 coreconfigitem(
     b'experimental', b'mergetempdirprefix', default=None,
 )
 coreconfigitem(
     b'experimental', b'mmapindexthreshold', default=None,
 )
 coreconfigitem(
     b'experimental', b'narrow', default=False,
 )
 coreconfigitem(
     b'experimental', b'nonnormalparanoidcheck', default=False,
 )
 coreconfigitem(
     b'experimental', b'exportableenviron', default=list,
 )
 coreconfigitem(
     b'experimental', b'extendedheader.index', default=None,
 )
 coreconfigitem(
     b'experimental', b'extendedheader.similarity', default=False,
 )
 coreconfigitem(
     b'experimental', b'graphshorten', default=False,
 )
 coreconfigitem(
     b'experimental', b'graphstyle.parent', default=dynamicdefault,
 )
 coreconfigitem(
     b'experimental', b'graphstyle.missing', default=dynamicdefault,
 )
 coreconfigitem(
     b'experimental', b'graphstyle.grandparent', default=dynamicdefault,
 )
 coreconfigitem(
     b'experimental', b'hook-track-tags', default=False,
 )
 coreconfigitem(
     b'experimental', b'httppeer.advertise-v2', default=False,
 )
 coreconfigitem(
     b'experimental', b'httppeer.v2-encoder-order', default=None,
 )
 coreconfigitem(
     b'experimental', b'httppostargs', default=False,
 )
 coreconfigitem(
     b'experimental', b'mergedriver', default=None,
 )
 coreconfigitem(b'experimental', b'nointerrupt', default=False)
 coreconfigitem(b'experimental', b'nointerrupt-interactiveonly', default=True)
 
 coreconfigitem(
     b'experimental', b'obsmarkers-exchange-debug', default=False,
 )
 coreconfigitem(
     b'experimental', b'remotenames', default=False,
 )
 coreconfigitem(
     b'experimental', b'removeemptydirs', default=True,
 )
 coreconfigitem(
     b'experimental', b'revert.interactive.select-to-keep', default=False,
 )
 coreconfigitem(
     b'experimental', b'revisions.prefixhexnode', default=False,
 )
 coreconfigitem(
     b'experimental', b'revlogv2', default=None,
 )
 coreconfigitem(
     b'experimental', b'revisions.disambiguatewithin', default=None,
 )
 coreconfigitem(
     b'experimental', b'rust.index', default=False,
 )
 coreconfigitem(
     b'experimental', b'server.filesdata.recommended-batch-size', default=50000,
 )
 coreconfigitem(
     b'experimental',
     b'server.manifestdata.recommended-batch-size',
     default=100000,
 )
 coreconfigitem(
     b'experimental', b'server.stream-narrow-clones', default=False,
 )
 coreconfigitem(
     b'experimental', b'single-head-per-branch', default=False,
 )
 coreconfigitem(
     b'experimental',
     b'single-head-per-branch:account-closed-heads',
     default=False,
 )
 coreconfigitem(
     b'experimental', b'sshserver.support-v2', default=False,
 )
 coreconfigitem(
     b'experimental', b'sparse-read', default=False,
 )
 coreconfigitem(
     b'experimental', b'sparse-read.density-threshold', default=0.50,
 )
 coreconfigitem(
     b'experimental', b'sparse-read.min-gap-size', default=b'65K',
 )
 coreconfigitem(
     b'experimental', b'treemanifest', default=False,
 )
 coreconfigitem(
     b'experimental', b'update.atomic-file', default=False,
 )
 coreconfigitem(
     b'experimental', b'sshpeer.advertise-v2', default=False,
 )
 coreconfigitem(
     b'experimental', b'web.apiserver', default=False,
 )
 coreconfigitem(
     b'experimental', b'web.api.http-v2', default=False,
 )
 coreconfigitem(
     b'experimental', b'web.api.debugreflect', default=False,
 )
 coreconfigitem(
     b'experimental', b'worker.wdir-get-thread-safe', default=False,
 )
 coreconfigitem(
     b'experimental', b'worker.repository-upgrade', default=False,
 )
 coreconfigitem(
     b'experimental', b'xdiff', default=False,
 )
 coreconfigitem(
     b'extensions', b'.*', default=None, generic=True,
 )
 coreconfigitem(
     b'extdata', b'.*', default=None, generic=True,
 )
 coreconfigitem(
     b'format', b'bookmarks-in-store', default=False,
 )
 coreconfigitem(
     b'format', b'chunkcachesize', default=None, experimental=True,
 )
 coreconfigitem(
     b'format', b'dotencode', default=True,
 )
 coreconfigitem(
     b'format', b'generaldelta', default=False, experimental=True,
 )
 coreconfigitem(
     b'format', b'manifestcachesize', default=None, experimental=True,
 )
 coreconfigitem(
     b'format', b'maxchainlen', default=dynamicdefault, experimental=True,
 )
 coreconfigitem(
     b'format', b'obsstore-version', default=None,
 )
 coreconfigitem(
     b'format', b'sparse-revlog', default=True,
 )
 coreconfigitem(
     b'format',
     b'revlog-compression',
     default=lambda: [b'zlib'],
     alias=[(b'experimental', b'format.compression')],
 )
 coreconfigitem(
     b'format', b'usefncache', default=True,
 )
 coreconfigitem(
     b'format', b'usegeneraldelta', default=True,
 )
 coreconfigitem(
     b'format', b'usestore', default=True,
 )
 # Right now, the only efficient implement of the nodemap logic is in Rust, so
 # the persistent nodemap feature needs to stay experimental as long as the Rust
 # extensions are an experimental feature.
 coreconfigitem(
     b'format', b'use-persistent-nodemap', default=False, experimental=True
 )
 coreconfigitem(
     b'format',
     b'exp-use-copies-side-data-changeset',
     default=False,
     experimental=True,
 )
 coreconfigitem(
     b'format', b'exp-use-side-data', default=False, experimental=True,
 )
 coreconfigitem(
     b'format', b'internal-phase', default=False, experimental=True,
 )
 coreconfigitem(
     b'fsmonitor', b'warn_when_unused', default=True,
 )
 coreconfigitem(
     b'fsmonitor', b'warn_update_file_count', default=50000,
 )
 coreconfigitem(
     b'help', br'hidden-command\..*', default=False, generic=True,
 )
 coreconfigitem(
     b'help', br'hidden-topic\..*', default=False, generic=True,
 )
 coreconfigitem(
     b'hooks', b'.*', default=dynamicdefault, generic=True,
 )
 coreconfigitem(
     b'hgweb-paths', b'.*', default=list, generic=True,
 )
 coreconfigitem(
     b'hostfingerprints', b'.*', default=list, generic=True,
 )
 coreconfigitem(
     b'hostsecurity', b'ciphers', default=None,
 )
 coreconfigitem(
     b'hostsecurity', b'minimumprotocol', default=dynamicdefault,
 )
 coreconfigitem(
     b'hostsecurity',
     b'.*:minimumprotocol$',
     default=dynamicdefault,
     generic=True,
 )
 coreconfigitem(
     b'hostsecurity', b'.*:ciphers$', default=dynamicdefault, generic=True,
 )
 coreconfigitem(
     b'hostsecurity', b'.*:fingerprints$', default=list, generic=True,
 )
 coreconfigitem(
     b'hostsecurity', b'.*:verifycertsfile$', default=None, generic=True,
 )
 
 coreconfigitem(
     b'http_proxy', b'always', default=False,
 )
 coreconfigitem(
     b'http_proxy', b'host', default=None,
 )
 coreconfigitem(
     b'http_proxy', b'no', default=list,
 )
 coreconfigitem(
     b'http_proxy', b'passwd', default=None,
 )
 coreconfigitem(
     b'http_proxy', b'user', default=None,
 )
 
 coreconfigitem(
     b'http', b'timeout', default=None,
 )
 
 coreconfigitem(
     b'logtoprocess', b'commandexception', default=None,
 )
 coreconfigitem(
     b'logtoprocess', b'commandfinish', default=None,
 )
 coreconfigitem(
     b'logtoprocess', b'command', default=None,
 )
 coreconfigitem(
     b'logtoprocess', b'develwarn', default=None,
 )
 coreconfigitem(
     b'logtoprocess', b'uiblocked', default=None,
 )
 coreconfigitem(
     b'merge', b'checkunknown', default=b'abort',
 )
 coreconfigitem(
     b'merge', b'checkignored', default=b'abort',
 )
 coreconfigitem(
     b'experimental', b'merge.checkpathconflicts', default=False,
 )
 coreconfigitem(
     b'merge', b'followcopies', default=True,
 )
 coreconfigitem(
     b'merge', b'on-failure', default=b'continue',
 )
 coreconfigitem(
     b'merge', b'preferancestor', default=lambda: [b'*'], experimental=True,
 )
 coreconfigitem(
     b'merge', b'strict-capability-check', default=False,
 )
 coreconfigitem(
     b'merge-tools', b'.*', default=None, generic=True,
 )
 coreconfigitem(
     b'merge-tools',
     br'.*\.args$',
     default=b"$local $base $other",
     generic=True,
     priority=-1,
 )
 coreconfigitem(
     b'merge-tools', br'.*\.binary$', default=False, generic=True, priority=-1,
 )
 coreconfigitem(
     b'merge-tools', br'.*\.check$', default=list, generic=True, priority=-1,
 )
 coreconfigitem(
     b'merge-tools',
     br'.*\.checkchanged$',
     default=False,
     generic=True,
     priority=-1,
 )
 coreconfigitem(
     b'merge-tools',
     br'.*\.executable$',
     default=dynamicdefault,
     generic=True,
     priority=-1,
 )
 coreconfigitem(
     b'merge-tools', br'.*\.fixeol$', default=False, generic=True, priority=-1,
 )
 coreconfigitem(
     b'merge-tools', br'.*\.gui$', default=False, generic=True, priority=-1,
 )
 coreconfigitem(
     b'merge-tools',
     br'.*\.mergemarkers$',
     default=b'basic',
     generic=True,
     priority=-1,
 )
 coreconfigitem(
     b'merge-tools',
     br'.*\.mergemarkertemplate$',
     default=dynamicdefault,  # take from ui.mergemarkertemplate
     generic=True,
     priority=-1,
 )
 coreconfigitem(
     b'merge-tools', br'.*\.priority$', default=0, generic=True, priority=-1,
 )
 coreconfigitem(
     b'merge-tools',
     br'.*\.premerge$',
     default=dynamicdefault,
     generic=True,
     priority=-1,
 )
 coreconfigitem(
     b'merge-tools', br'.*\.symlink$', default=False, generic=True, priority=-1,
 )
 coreconfigitem(
     b'pager', b'attend-.*', default=dynamicdefault, generic=True,
 )
 coreconfigitem(
     b'pager', b'ignore', default=list,
 )
 coreconfigitem(
     b'pager', b'pager', default=dynamicdefault,
 )
 coreconfigitem(
     b'patch', b'eol', default=b'strict',
 )
 coreconfigitem(
     b'patch', b'fuzz', default=2,
 )
 coreconfigitem(
     b'paths', b'default', default=None,
 )
 coreconfigitem(
     b'paths', b'default-push', default=None,
 )
 coreconfigitem(
     b'paths', b'.*', default=None, generic=True,
 )
 coreconfigitem(
     b'phases', b'checksubrepos', default=b'follow',
 )
 coreconfigitem(
     b'phases', b'new-commit', default=b'draft',
 )
 coreconfigitem(
     b'phases', b'publish', default=True,
 )
 coreconfigitem(
     b'profiling', b'enabled', default=False,
 )
 coreconfigitem(
     b'profiling', b'format', default=b'text',
 )
 coreconfigitem(
     b'profiling', b'freq', default=1000,
 )
 coreconfigitem(
     b'profiling', b'limit', default=30,
 )
 coreconfigitem(
     b'profiling', b'nested', default=0,
 )
 coreconfigitem(
     b'profiling', b'output', default=None,
 )
 coreconfigitem(
     b'profiling', b'showmax', default=0.999,
 )
 coreconfigitem(
     b'profiling', b'showmin', default=dynamicdefault,
 )
 coreconfigitem(
     b'profiling', b'showtime', default=True,
 )
 coreconfigitem(
     b'profiling', b'sort', default=b'inlinetime',
 )
 coreconfigitem(
     b'profiling', b'statformat', default=b'hotpath',
 )
 coreconfigitem(
     b'profiling', b'time-track', default=dynamicdefault,
 )
 coreconfigitem(
     b'profiling', b'type', default=b'stat',
 )
 coreconfigitem(
     b'progress', b'assume-tty', default=False,
 )
 coreconfigitem(
     b'progress', b'changedelay', default=1,
 )
 coreconfigitem(
     b'progress', b'clear-complete', default=True,
 )
 coreconfigitem(
     b'progress', b'debug', default=False,
 )
 coreconfigitem(
     b'progress', b'delay', default=3,
 )
 coreconfigitem(
     b'progress', b'disable', default=False,
 )
 coreconfigitem(
     b'progress', b'estimateinterval', default=60.0,
 )
 coreconfigitem(
     b'progress',
     b'format',
     default=lambda: [b'topic', b'bar', b'number', b'estimate'],
 )
 coreconfigitem(
     b'progress', b'refresh', default=0.1,
 )
 coreconfigitem(
     b'progress', b'width', default=dynamicdefault,
 )
 coreconfigitem(
     b'pull', b'confirm', default=False,
 )
 coreconfigitem(
     b'push', b'pushvars.server', default=False,
 )
 coreconfigitem(
     b'rewrite',
     b'backup-bundle',
     default=True,
     alias=[(b'ui', b'history-editing-backup')],
 )
 coreconfigitem(
     b'rewrite', b'update-timestamp', default=False,
 )
 coreconfigitem(
     b'storage', b'new-repo-backend', default=b'revlogv1', experimental=True,
 )
 coreconfigitem(
     b'storage',
     b'revlog.optimize-delta-parent-choice',
     default=True,
     alias=[(b'format', b'aggressivemergedeltas')],
 )
 # experimental as long as rust is experimental (or a C version is implemented)
 coreconfigitem(
     b'storage', b'revlog.nodemap.mmap', default=True, experimental=True
 )
 # experimental as long as format.use-persistent-nodemap is.
 coreconfigitem(
     b'storage', b'revlog.nodemap.mode', default=b'compat', experimental=True
 )
 coreconfigitem(
     b'storage', b'revlog.reuse-external-delta', default=True,
 )
 coreconfigitem(
     b'storage', b'revlog.reuse-external-delta-parent', default=None,
 )
 coreconfigitem(
     b'storage', b'revlog.zlib.level', default=None,
 )
 coreconfigitem(
     b'storage', b'revlog.zstd.level', default=None,
 )
 coreconfigitem(
     b'server', b'bookmarks-pushkey-compat', default=True,
 )
 coreconfigitem(
     b'server', b'bundle1', default=True,
 )
 coreconfigitem(
     b'server', b'bundle1gd', default=None,
 )
 coreconfigitem(
     b'server', b'bundle1.pull', default=None,
 )
 coreconfigitem(
     b'server', b'bundle1gd.pull', default=None,
 )
 coreconfigitem(
     b'server', b'bundle1.push', default=None,
 )
 coreconfigitem(
     b'server', b'bundle1gd.push', default=None,
 )
 coreconfigitem(
     b'server',
     b'bundle2.stream',
     default=True,
     alias=[(b'experimental', b'bundle2.stream')],
 )
 coreconfigitem(
     b'server', b'compressionengines', default=list,
 )
 coreconfigitem(
     b'server', b'concurrent-push-mode', default=b'check-related',
 )
 coreconfigitem(
     b'server', b'disablefullbundle', default=False,
 )
 coreconfigitem(
     b'server', b'maxhttpheaderlen', default=1024,
 )
 coreconfigitem(
     b'server', b'pullbundle', default=False,
 )
 coreconfigitem(
     b'server', b'preferuncompressed', default=False,
 )
 coreconfigitem(
     b'server', b'streamunbundle', default=False,
 )
 coreconfigitem(
     b'server', b'uncompressed', default=True,
 )
 coreconfigitem(
     b'server', b'uncompressedallowsecret', default=False,
 )
 coreconfigitem(
     b'server', b'view', default=b'served',
 )
 coreconfigitem(
     b'server', b'validate', default=False,
 )
 coreconfigitem(
     b'server', b'zliblevel', default=-1,
 )
 coreconfigitem(
     b'server', b'zstdlevel', default=3,
 )
 coreconfigitem(
     b'share', b'pool', default=None,
 )
 coreconfigitem(
     b'share', b'poolnaming', default=b'identity',
 )
 coreconfigitem(
     b'shelve', b'maxbackups', default=10,
 )
 coreconfigitem(
     b'smtp', b'host', default=None,
 )
 coreconfigitem(
     b'smtp', b'local_hostname', default=None,
 )
 coreconfigitem(
     b'smtp', b'password', default=None,
 )
 coreconfigitem(
     b'smtp', b'port', default=dynamicdefault,
 )
 coreconfigitem(
     b'smtp', b'tls', default=b'none',
 )
 coreconfigitem(
     b'smtp', b'username', default=None,
 )
 coreconfigitem(
     b'sparse', b'missingwarning', default=True, experimental=True,
 )
 coreconfigitem(
     b'subrepos',
     b'allowed',
     default=dynamicdefault,  # to make backporting simpler
 )
 coreconfigitem(
     b'subrepos', b'hg:allowed', default=dynamicdefault,
 )
 coreconfigitem(
     b'subrepos', b'git:allowed', default=dynamicdefault,
 )
 coreconfigitem(
     b'subrepos', b'svn:allowed', default=dynamicdefault,
 )
 coreconfigitem(
     b'templates', b'.*', default=None, generic=True,
 )
 coreconfigitem(
     b'templateconfig', b'.*', default=dynamicdefault, generic=True,
 )
 coreconfigitem(
     b'trusted', b'groups', default=list,
 )
 coreconfigitem(
     b'trusted', b'users', default=list,
 )
 coreconfigitem(
     b'ui', b'_usedassubrepo', default=False,
 )
 coreconfigitem(
     b'ui', b'allowemptycommit', default=False,
 )
 coreconfigitem(
     b'ui', b'archivemeta', default=True,
 )
 coreconfigitem(
     b'ui', b'askusername', default=False,
 )
 coreconfigitem(
     b'ui', b'clonebundlefallback', default=False,
 )
 coreconfigitem(
     b'ui', b'clonebundleprefers', default=list,
 )
 coreconfigitem(
     b'ui', b'clonebundles', default=True,
 )
 coreconfigitem(
     b'ui', b'color', default=b'auto',
 )
 coreconfigitem(
     b'ui', b'commitsubrepos', default=False,
 )
 coreconfigitem(
     b'ui', b'debug', default=False,
 )
 coreconfigitem(
     b'ui', b'debugger', default=None,
 )
 coreconfigitem(
     b'ui', b'editor', default=dynamicdefault,
 )
 coreconfigitem(
     b'ui', b'fallbackencoding', default=None,
 )
 coreconfigitem(
     b'ui', b'forcecwd', default=None,
 )
 coreconfigitem(
     b'ui', b'forcemerge', default=None,
 )
 coreconfigitem(
     b'ui', b'formatdebug', default=False,
 )
 coreconfigitem(
     b'ui', b'formatjson', default=False,
 )
 coreconfigitem(
     b'ui', b'formatted', default=None,
 )
 coreconfigitem(
     b'ui', b'graphnodetemplate', default=None,
 )
 coreconfigitem(
     b'ui', b'interactive', default=None,
 )
 coreconfigitem(
     b'ui', b'interface', default=None,
 )
 coreconfigitem(
     b'ui', b'interface.chunkselector', default=None,
 )
 coreconfigitem(
     b'ui', b'large-file-limit', default=10000000,
 )
 coreconfigitem(
     b'ui', b'logblockedtimes', default=False,
 )
 coreconfigitem(
     b'ui', b'logtemplate', default=None,
 )
 coreconfigitem(
     b'ui', b'merge', default=None,
 )
 coreconfigitem(
     b'ui', b'mergemarkers', default=b'basic',
 )
 coreconfigitem(
     b'ui',
     b'mergemarkertemplate',
     default=(
         b'{node|short} '
         b'{ifeq(tags, "tip", "", '
         b'ifeq(tags, "", "", "{tags} "))}'
         b'{if(bookmarks, "{bookmarks} ")}'
         b'{ifeq(branch, "default", "", "{branch} ")}'
         b'- {author|user}: {desc|firstline}'
     ),
 )
 coreconfigitem(
     b'ui', b'message-output', default=b'stdio',
 )
 coreconfigitem(
     b'ui', b'nontty', default=False,
 )
 coreconfigitem(
     b'ui', b'origbackuppath', default=None,
 )
 coreconfigitem(
     b'ui', b'paginate', default=True,
 )
 coreconfigitem(
     b'ui', b'patch', default=None,
 )
 coreconfigitem(
     b'ui', b'pre-merge-tool-output-template', default=None,
 )
 coreconfigitem(
     b'ui', b'portablefilenames', default=b'warn',
 )
 coreconfigitem(
     b'ui', b'promptecho', default=False,
 )
 coreconfigitem(
     b'ui', b'quiet', default=False,
 )
 coreconfigitem(
     b'ui', b'quietbookmarkmove', default=False,
 )
 coreconfigitem(
     b'ui', b'relative-paths', default=b'legacy',
 )
 coreconfigitem(
     b'ui', b'remotecmd', default=b'hg',
 )
 coreconfigitem(
     b'ui', b'report_untrusted', default=True,
 )
 coreconfigitem(
     b'ui', b'rollback', default=True,
 )
 coreconfigitem(
     b'ui', b'signal-safe-lock', default=True,
 )
 coreconfigitem(
     b'ui', b'slash', default=False,
 )
 coreconfigitem(
     b'ui', b'ssh', default=b'ssh',
 )
 coreconfigitem(
     b'ui', b'ssherrorhint', default=None,
 )
 coreconfigitem(
     b'ui', b'statuscopies', default=False,
 )
 coreconfigitem(
     b'ui', b'strict', default=False,
 )
 coreconfigitem(
     b'ui', b'style', default=b'',
 )
 coreconfigitem(
     b'ui', b'supportcontact', default=None,
 )
 coreconfigitem(
     b'ui', b'textwidth', default=78,
 )
 coreconfigitem(
     b'ui', b'timeout', default=b'600',
 )
 coreconfigitem(
     b'ui', b'timeout.warn', default=0,
 )
 coreconfigitem(
+    b'ui', b'timestamp-output', default=False,
+)
+coreconfigitem(
     b'ui', b'traceback', default=False,
 )
 coreconfigitem(
     b'ui', b'tweakdefaults', default=False,
 )
 coreconfigitem(b'ui', b'username', alias=[(b'ui', b'user')])
 coreconfigitem(
     b'ui', b'verbose', default=False,
 )
 coreconfigitem(
     b'verify', b'skipflags', default=None,
 )
 coreconfigitem(
     b'web', b'allowbz2', default=False,
 )
 coreconfigitem(
     b'web', b'allowgz', default=False,
 )
 coreconfigitem(
     b'web', b'allow-pull', alias=[(b'web', b'allowpull')], default=True,
 )
 coreconfigitem(
     b'web', b'allow-push', alias=[(b'web', b'allow_push')], default=list,
 )
 coreconfigitem(
     b'web', b'allowzip', default=False,
 )
 coreconfigitem(
     b'web', b'archivesubrepos', default=False,
 )
 coreconfigitem(
     b'web', b'cache', default=True,
 )
 coreconfigitem(
     b'web', b'comparisoncontext', default=5,
 )
 coreconfigitem(
     b'web', b'contact', default=None,
 )
 coreconfigitem(
     b'web', b'deny_push', default=list,
 )
 coreconfigitem(
     b'web', b'guessmime', default=False,
 )
 coreconfigitem(
     b'web', b'hidden', default=False,
 )
 coreconfigitem(
     b'web', b'labels', default=list,
 )
 coreconfigitem(
     b'web', b'logoimg', default=b'hglogo.png',
 )
 coreconfigitem(
     b'web', b'logourl', default=b'https://mercurial-scm.org/',
 )
 coreconfigitem(
     b'web', b'accesslog', default=b'-',
 )
 coreconfigitem(
     b'web', b'address', default=b'',
 )
 coreconfigitem(
     b'web', b'allow-archive', alias=[(b'web', b'allow_archive')], default=list,
 )
 coreconfigitem(
     b'web', b'allow_read', default=list,
 )
 coreconfigitem(
     b'web', b'baseurl', default=None,
 )
 coreconfigitem(
     b'web', b'cacerts', default=None,
 )
 coreconfigitem(
     b'web', b'certificate', default=None,
 )
 coreconfigitem(
     b'web', b'collapse', default=False,
 )
 coreconfigitem(
     b'web', b'csp', default=None,
 )
 coreconfigitem(
     b'web', b'deny_read', default=list,
 )
 coreconfigitem(
     b'web', b'descend', default=True,
 )
 coreconfigitem(
     b'web', b'description', default=b"",
 )
 coreconfigitem(
     b'web', b'encoding', default=lambda: encoding.encoding,
 )
 coreconfigitem(
     b'web', b'errorlog', default=b'-',
 )
 coreconfigitem(
     b'web', b'ipv6', default=False,
 )
 coreconfigitem(
     b'web', b'maxchanges', default=10,
 )
 coreconfigitem(
     b'web', b'maxfiles', default=10,
 )
 coreconfigitem(
     b'web', b'maxshortchanges', default=60,
 )
 coreconfigitem(
     b'web', b'motd', default=b'',
 )
 coreconfigitem(
     b'web', b'name', default=dynamicdefault,
 )
 coreconfigitem(
     b'web', b'port', default=8000,
 )
 coreconfigitem(
     b'web', b'prefix', default=b'',
 )
 coreconfigitem(
     b'web', b'push_ssl', default=True,
 )
 coreconfigitem(
     b'web', b'refreshinterval', default=20,
 )
 coreconfigitem(
     b'web', b'server-header', default=None,
 )
 coreconfigitem(
     b'web', b'static', default=None,
 )
 coreconfigitem(
     b'web', b'staticurl', default=None,
 )
 coreconfigitem(
     b'web', b'stripes', default=1,
 )
 coreconfigitem(
     b'web', b'style', default=b'paper',
 )
 coreconfigitem(
     b'web', b'templates', default=None,
 )
 coreconfigitem(
     b'web', b'view', default=b'served', experimental=True,
 )
 coreconfigitem(
     b'worker', b'backgroundclose', default=dynamicdefault,
 )
 # Windows defaults to a limit of 512 open files. A buffer of 128
 # should give us enough headway.
 coreconfigitem(
     b'worker', b'backgroundclosemaxqueue', default=384,
 )
 coreconfigitem(
     b'worker', b'backgroundcloseminfilecount', default=2048,
 )
 coreconfigitem(
     b'worker', b'backgroundclosethreadcount', default=4,
 )
 coreconfigitem(
     b'worker', b'enabled', default=True,
 )
 coreconfigitem(
     b'worker', b'numcpus', default=None,
 )
 
 # Rebase related configuration moved to core because other extension are doing
 # strange things. For example, shelve import the extensions to reuse some bit
 # without formally loading it.
 coreconfigitem(
     b'commands', b'rebase.requiredest', default=False,
 )
 coreconfigitem(
     b'experimental', b'rebaseskipobsolete', default=True,
 )
 coreconfigitem(
     b'rebase', b'singletransaction', default=False,
 )
 coreconfigitem(
     b'rebase', b'experimental.inmemory', default=False,
 )

mercurial/ui.py

@@ -1,2335 +1,2351 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 or any later version.
 
 from __future__ import absolute_import
 
 import collections
 import contextlib
+import datetime
 import errno
 import getpass
 import inspect
 import os
 import re
 import signal
 import socket
 import subprocess
 import sys
 import traceback
 
 from .i18n import _
 from .node import hex
 from .pycompat import (
     getattr,
     open,
     setattr,
 )
 
 from . import (
     color,
     config,
     configitems,
     encoding,
     error,
     formatter,
     loggingutil,
     progress,
     pycompat,
     rcutil,
     scmutil,
     util,
 )
 from .utils import (
     dateutil,
     procutil,
     resourceutil,
     stringutil,
 )
 
 urlreq = util.urlreq
 
 # for use with str.translate(None, _keepalnum), to keep just alphanumerics
 _keepalnum = b''.join(
     c for c in map(pycompat.bytechr, range(256)) if not c.isalnum()
 )
 
 # The config knobs that will be altered (if unset) by ui.tweakdefaults.
 tweakrc = b"""
 [ui]
 # The rollback command is dangerous. As a rule, don't use it.
 rollback = False
 # Make `hg status` report copy information
 statuscopies = yes
 # Prefer curses UIs when available. Revert to plain-text with `text`.
 interface = curses
 # Make compatible commands emit cwd-relative paths by default.
 relative-paths = yes
 
 [commands]
 # Grep working directory by default.
 grep.all-files = True
 # Refuse to perform an `hg update` that would cause a file content merge
 update.check = noconflict
 # Show conflicts information in `hg status`
 status.verbose = True
 # Make `hg resolve` with no action (like `-m`) fail instead of re-merging.
 resolve.explicit-re-merge = True
 
 [diff]
 git = 1
 showfunc = 1
 word-diff = 1
 """
 
 samplehgrcs = {
     b'user': b"""# example user config (see 'hg help config' for more info)
 [ui]
 # name and email, e.g.
 # username = Jane Doe <[e-mail]>
 username =
 
 # We recommend enabling tweakdefaults to get slight improvements to
 # the UI over time. Make sure to set HGPLAIN in the environment when
 # writing scripts!
 # tweakdefaults = True
 
 # uncomment to disable color in command output
 # (see 'hg help color' for details)
 # color = never
 
 # uncomment to disable command output pagination
 # (see 'hg help pager' for details)
 # paginate = never
 
 [extensions]
 # uncomment the lines below to enable some popular extensions
 # (see 'hg help extensions' for more info)
 #
 # histedit =
 # rebase =
 # uncommit =
 """,
     b'cloned': b"""# example repository config (see 'hg help config' for more info)
 [paths]
 default = %s
 
 # path aliases to other clones of this repo in URLs or filesystem paths
 # (see 'hg help config.paths' for more info)
 #
 # default:pushurl = ssh://[e-mail]/hg/jdoes-fork
 # my-fork         = ssh://[e-mail]/hg/jdoes-fork
 # my-clone        = /home/jdoe/jdoes-clone
 
 [ui]
 # name and email (local to this repository, optional), e.g.
 # username = Jane Doe <[e-mail]>
 """,
     b'local': b"""# example repository config (see 'hg help config' for more info)
 [paths]
 # path aliases to other clones of this repo in URLs or filesystem paths
 # (see 'hg help config.paths' for more info)
 #
 # default         = http://example.com/hg/example-repo
 # default:pushurl = ssh://[e-mail]/hg/jdoes-fork
 # my-fork         = ssh://[e-mail]/hg/jdoes-fork
 # my-clone        = /home/jdoe/jdoes-clone
 
 [ui]
 # name and email (local to this repository, optional), e.g.
 # username = Jane Doe <[e-mail]>
 """,
     b'global': b"""# example system-wide hg config (see 'hg help config' for more info)
 
 [ui]
 # uncomment to disable color in command output
 # (see 'hg help color' for details)
 # color = never
 
 # uncomment to disable command output pagination
 # (see 'hg help pager' for details)
 # paginate = never
 
 [extensions]
 # uncomment the lines below to enable some popular extensions
 # (see 'hg help extensions' for more info)
 #
 # blackbox =
 # churn =
 """,
 }
 
 
 def _maybestrurl(maybebytes):
     return pycompat.rapply(pycompat.strurl, maybebytes)
 
 
 def _maybebytesurl(maybestr):
     return pycompat.rapply(pycompat.bytesurl, maybestr)
 
 
 class httppasswordmgrdbproxy(object):
     """Delays loading urllib2 until it's needed."""
 
     def __init__(self):
         self._mgr = None
 
     def _get_mgr(self):
         if self._mgr is None:
             self._mgr = urlreq.httppasswordmgrwithdefaultrealm()
         return self._mgr
 
     def add_password(self, realm, uris, user, passwd):
         return self._get_mgr().add_password(
             _maybestrurl(realm),
             _maybestrurl(uris),
             _maybestrurl(user),
             _maybestrurl(passwd),
         )
 
     def find_user_password(self, realm, uri):
         mgr = self._get_mgr()
         return _maybebytesurl(
             mgr.find_user_password(_maybestrurl(realm), _maybestrurl(uri))
         )
 
 
 def _catchterm(*args):
     raise error.SignalInterrupt
 
 
 # unique object used to detect no default value has been provided when
 # retrieving configuration value.
 _unset = object()
 
 # _reqexithandlers: callbacks run at the end of a request
 _reqexithandlers = []
 
 
 class ui(object):
     def __init__(self, src=None):
         """Create a fresh new ui object if no src given
 
         Use uimod.ui.load() to create a ui which knows global and user configs.
         In most cases, you should use ui.copy() to create a copy of an existing
         ui object.
         """
         # _buffers: used for temporary capture of output
         self._buffers = []
         # 3-tuple describing how each buffer in the stack behaves.
         # Values are (capture stderr, capture subprocesses, apply labels).
         self._bufferstates = []
         # When a buffer is active, defines whether we are expanding labels.
         # This exists to prevent an extra list lookup.
         self._bufferapplylabels = None
         self.quiet = self.verbose = self.debugflag = self.tracebackflag = False
         self._reportuntrusted = True
         self._knownconfig = configitems.coreitems
         self._ocfg = config.config()  # overlay
         self._tcfg = config.config()  # trusted
         self._ucfg = config.config()  # untrusted
         self._trustusers = set()
         self._trustgroups = set()
         self.callhooks = True
         # Insecure server connections requested.
         self.insecureconnections = False
         # Blocked time
         self.logblockedtimes = False
         # color mode: see mercurial/color.py for possible value
         self._colormode = None
         self._terminfoparams = {}
         self._styles = {}
         self._uninterruptible = False
+        self.showtimestamp = False
 
         if src:
             self._fout = src._fout
             self._ferr = src._ferr
             self._fin = src._fin
             self._fmsg = src._fmsg
             self._fmsgout = src._fmsgout
             self._fmsgerr = src._fmsgerr
             self._finoutredirected = src._finoutredirected
             self._loggers = src._loggers.copy()
             self.pageractive = src.pageractive
             self._disablepager = src._disablepager
             self._tweaked = src._tweaked
 
             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.insecureconnections = src.insecureconnections
             self._colormode = src._colormode
             self._terminfoparams = src._terminfoparams.copy()
             self._styles = src._styles.copy()
 
             self.fixconfig()
 
             self.httppasswordmgrdb = src.httppasswordmgrdb
             self._blockedtimes = src._blockedtimes
         else:
             self._fout = procutil.stdout
             self._ferr = procutil.stderr
             self._fin = procutil.stdin
             self._fmsg = None
             self._fmsgout = self.fout  # configurable
             self._fmsgerr = self.ferr  # configurable
             self._finoutredirected = False
             self._loggers = {}
             self.pageractive = False
             self._disablepager = False
             self._tweaked = False
 
             # shared read-only environment
             self.environ = encoding.environ
 
             self.httppasswordmgrdb = httppasswordmgrdbproxy()
             self._blockedtimes = collections.defaultdict(int)
 
         allowed = self.configlist(b'experimental', b'exportableenviron')
         if b'*' in allowed:
             self._exportableenviron = self.environ
         else:
             self._exportableenviron = {}
             for k in allowed:
                 if k in self.environ:
                     self._exportableenviron[k] = self.environ[k]
 
     @classmethod
     def load(cls):
         """Create a ui and load global and user configs"""
         u = cls()
         # we always trust global config files and environment variables
         for t, f in rcutil.rccomponents():
             if t == b'path':
                 u.readconfig(f, trust=True)
             elif t == b'resource':
                 u.read_resource_config(f, trust=True)
             elif t == b'items':
                 sections = set()
                 for section, name, value, source in f:
                     # do not set u._ocfg
                     # XXX clean this up once immutable config object is a thing
                     u._tcfg.set(section, name, value, source)
                     u._ucfg.set(section, name, value, source)
                     sections.add(section)
                 for section in sections:
                     u.fixconfig(section=section)
             else:
                 raise error.ProgrammingError(b'unknown rctype: %s' % t)
         u._maybetweakdefaults()
         return u
 
     def _maybetweakdefaults(self):
         if not self.configbool(b'ui', b'tweakdefaults'):
             return
         if self._tweaked or self.plain(b'tweakdefaults'):
             return
 
         # Note: it is SUPER IMPORTANT that you set self._tweaked to
         # True *before* any calls to setconfig(), otherwise you'll get
         # infinite recursion between setconfig and this method.
         #
         # TODO: We should extract an inner method in setconfig() to
         # avoid this weirdness.
         self._tweaked = True
         tmpcfg = config.config()
         tmpcfg.parse(b'<tweakdefaults>', tweakrc)
         for section in tmpcfg:
             for name, value in tmpcfg.items(section):
                 if not self.hasconfig(section, name):
                     self.setconfig(section, name, value, b"<tweakdefaults>")
 
     def copy(self):
         return self.__class__(self)
 
     def resetstate(self):
         """Clear internal state that shouldn't persist across commands"""
         if self._progbar:
             self._progbar.resetstate()  # reset last-print time of progress bar
         self.httppasswordmgrdb = httppasswordmgrdbproxy()
 
     @contextlib.contextmanager
     def timeblockedsection(self, key):
         # this is open-coded below - search for timeblockedsection to find them
         starttime = util.timer()
         try:
             yield
         finally:
             self._blockedtimes[key + b'_blocked'] += (
                 util.timer() - starttime
             ) * 1000
 
     @contextlib.contextmanager
     def uninterruptible(self):
         """Mark an operation as unsafe.
 
         Most operations on a repository are safe to interrupt, but a
         few are risky (for example repair.strip). This context manager
         lets you advise Mercurial that something risky is happening so
         that control-C etc can be blocked if desired.
         """
         enabled = self.configbool(b'experimental', b'nointerrupt')
         if enabled and self.configbool(
             b'experimental', b'nointerrupt-interactiveonly'
         ):
             enabled = self.interactive()
         if self._uninterruptible or not enabled:
             # if nointerrupt support is turned off, the process isn't
             # interactive, or we're already in an uninterruptible
             # block, do nothing.
             yield
             return
 
         def warn():
             self.warn(_(b"shutting down cleanly\n"))
             self.warn(
                 _(b"press ^C again to terminate immediately (dangerous)\n")
             )
             return True
 
         with procutil.uninterruptible(warn):
             try:
                 self._uninterruptible = True
                 yield
             finally:
                 self._uninterruptible = False
 
     def formatter(self, topic, opts):
         return formatter.formatter(self, 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 b'*' in tusers or b'*' 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(
                 _(
                     b'not trusting file %s from untrusted '
                     b'user %s, group %s\n'
                 )
                 % (f, user, group)
             )
         return False
 
     def read_resource_config(
         self, name, root=None, trust=False, sections=None, remap=None
     ):
         try:
             fp = resourceutil.open_resource(name[0], name[1])
         except IOError:
             if not sections:  # ignore unless we were looking for something
                 return
             raise
 
         self._readconfig(
             b'resource:%s.%s' % name, fp, root, trust, sections, remap
         )
 
     def readconfig(
         self, filename, root=None, trust=False, sections=None, remap=None
     ):
         try:
             fp = open(filename, 'rb')
         except IOError:
             if not sections:  # ignore unless we were looking for something
                 return
             raise
 
         self._readconfig(filename, fp, root, trust, sections, remap)
 
     def _readconfig(
         self, filename, fp, root=None, trust=False, sections=None, remap=None
     ):
         with fp:
             cfg = config.config()
             trusted = sections or trust or self._trusted(fp, filename)
 
             try:
                 cfg.read(filename, fp, sections=sections, remap=remap)
             except error.ParseError as inst:
                 if trusted:
                     raise
                 self.warn(_(b'ignored: %s\n') % stringutil.forcebytestr(inst))
 
         self._applyconfig(cfg, trusted, root)
 
     def applyconfig(self, configitems, source=b"", root=None):
         """Add configitems from a non-file source.  Unlike with ``setconfig()``,
         they can be overridden by subsequent config file reads.  The items are
         in the same format as ``configoverride()``, namely a dict of the
         following structures: {(section, name) : value}
 
         Typically this is used by extensions that inject themselves into the
         config file load procedure by monkeypatching ``localrepo.loadhgrc()``.
         """
         cfg = config.config()
 
         for (section, name), value in configitems.items():
             cfg.set(section, name, value, source)
 
         self._applyconfig(cfg, True, root)
 
     def _applyconfig(self, cfg, trusted, root):
         if self.plain():
             for k in (
                 b'debug',
                 b'fallbackencoding',
                 b'quiet',
                 b'slash',
                 b'logtemplate',
                 b'message-output',
                 b'statuscopies',
                 b'style',
                 b'traceback',
                 b'verbose',
             ):
                 if k in cfg[b'ui']:
                     del cfg[b'ui'][k]
             for k, v in cfg.items(b'defaults'):
                 del cfg[b'defaults'][k]
             for k, v in cfg.items(b'commands'):
                 del cfg[b'commands'][k]
         # Don't remove aliases from the configuration if in the exceptionlist
         if self.plain(b'alias'):
             for k, v in cfg.items(b'alias'):
                 del cfg[b'alias'][k]
         if self.plain(b'revsetalias'):
             for k, v in cfg.items(b'revsetalias'):
                 del cfg[b'revsetalias'][k]
         if self.plain(b'templatealias'):
             for k, v in cfg.items(b'templatealias'):
                 del cfg[b'templatealias'][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(b'~')
         self.fixconfig(root=root)
 
     def fixconfig(self, root=None, section=None):
         if section in (None, b'paths'):
             # expand vars and ~
             # translate paths relative to root (or home) into absolute paths
             root = root or encoding.getcwd()
             for c in self._tcfg, self._ucfg, self._ocfg:
                 for n, p in c.items(b'paths'):
                     # Ignore sub-options.
                     if b':' in n:
                         continue
                     if not p:
                         continue
                     if b'%%' in p:
                         s = self.configsource(b'paths', n) or b'none'
                         self.warn(
                             _(b"(deprecated '%%' in path %s=%s from %s)\n")
                             % (n, p, s)
                         )
                         p = p.replace(b'%%', b'%')
                     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(b"paths", n, p)
 
         if section in (None, b'ui'):
             # update ui options
             self._fmsgout, self._fmsgerr = _selectmsgdests(self)
             self.debugflag = self.configbool(b'ui', b'debug')
             self.verbose = self.debugflag or self.configbool(b'ui', b'verbose')
             self.quiet = not self.debugflag and self.configbool(b'ui', b'quiet')
             if self.verbose and self.quiet:
                 self.quiet = self.verbose = False
             self._reportuntrusted = self.debugflag or self.configbool(
                 b"ui", b"report_untrusted"
             )
+            self.showtimestamp = self.configbool(b'ui', b'timestamp-output')
             self.tracebackflag = self.configbool(b'ui', b'traceback')
             self.logblockedtimes = self.configbool(b'ui', b'logblockedtimes')
 
         if section in (None, b'trusted'):
             # update trust information
             self._trustusers.update(self.configlist(b'trusted', b'users'))
             self._trustgroups.update(self.configlist(b'trusted', b'groups'))
 
         if section in (None, b'devel', b'ui') and self.debugflag:
             tracked = set()
             if self.configbool(b'devel', b'debug.extensions'):
                 tracked.add(b'extension')
             if tracked:
                 logger = loggingutil.fileobjectlogger(self._ferr, tracked)
                 self.setlogger(b'debug', logger)
 
     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, source=b''):
         for cfg in (self._ocfg, self._tcfg, self._ucfg):
             cfg.set(section, name, value, source)
         self.fixconfig(section=section)
         self._maybetweakdefaults()
 
     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)
 
     def config(self, section, name, default=_unset, untrusted=False):
         """return the plain string version of a config"""
         value = self._config(
             section, name, default=default, untrusted=untrusted
         )
         if value is _unset:
             return None
         return value
 
     def _config(self, section, name, default=_unset, untrusted=False):
         value = itemdefault = default
         item = self._knownconfig.get(section, {}).get(name)
         alternates = [(section, name)]
 
         if item is not None:
             alternates.extend(item.alias)
             if callable(item.default):
                 itemdefault = item.default()
             else:
                 itemdefault = item.default
         else:
             msg = b"accessing unregistered config item: '%s.%s'"
             msg %= (section, name)
             self.develwarn(msg, 2, b'warn-config-unknown')
 
         if default is _unset:
             if item is None:
                 value = default
             elif item.default is configitems.dynamicdefault:
                 value = None
                 msg = b"config item requires an explicit default value: '%s.%s'"
                 msg %= (section, name)
                 self.develwarn(msg, 2, b'warn-config-default')
             else:
                 value = itemdefault
         elif (
             item is not None
             and item.default is not configitems.dynamicdefault
             and default != itemdefault
         ):
             msg = (
                 b"specifying a mismatched default value for a registered "
                 b"config item: '%s.%s' '%s'"
             )
             msg %= (section, name, pycompat.bytestr(default))
             self.develwarn(msg, 2, b'warn-config-default')
 
         for s, n in alternates:
             candidate = self._data(untrusted).get(s, n, None)
             if candidate is not None:
                 value = candidate
                 break
 
         if self.debugflag and not untrusted and self._reportuntrusted:
             for s, n in alternates:
                 uvalue = self._ucfg.get(s, n)
                 if uvalue is not None and uvalue != value:
                     self.debug(
                         b"ignoring untrusted configuration option "
                         b"%s.%s = %s\n" % (s, n, uvalue)
                     )
         return value
 
     def configsuboptions(self, section, name, default=_unset, untrusted=False):
         """Get a config option and all sub-options.
 
         Some config options have sub-options that are declared with the
         format "key:opt = value". This method is used to return the main
         option and all its declared sub-options.
 
         Returns a 2-tuple of ``(option, sub-options)``, where `sub-options``
         is a dict of defined sub-options where keys and values are strings.
         """
         main = self.config(section, name, default, untrusted=untrusted)
         data = self._data(untrusted)
         sub = {}
         prefix = b'%s:' % name
         for k, v in data.items(section):
             if k.startswith(prefix):
                 sub[k[len(prefix) :]] = v
 
         if self.debugflag and not untrusted and self._reportuntrusted:
             for k, v in sub.items():
                 uvalue = self._ucfg.get(section, b'%s:%s' % (name, k))
                 if uvalue is not None and uvalue != v:
                     self.debug(
                         b'ignoring untrusted configuration option '
                         b'%s:%s.%s = %s\n' % (section, name, k, uvalue)
                     )
 
         return main, sub
 
     def configpath(self, section, name, default=_unset, 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 b"://" not in v:
             src = self.configsource(section, name, untrusted)
             if b':' in src:
                 base = os.path.dirname(src.rsplit(b':')[0])
                 v = os.path.join(base, os.path.expanduser(v))
         return v
 
     def configbool(self, section, name, default=_unset, untrusted=False):
         """parse a configuration element as a boolean
 
         >>> u = ui(); s = b'foo'
         >>> u.setconfig(s, b'true', b'yes')
         >>> u.configbool(s, b'true')
         True
         >>> u.setconfig(s, b'false', b'no')
         >>> u.configbool(s, b'false')
         False
         >>> u.configbool(s, b'unknown')
         False
         >>> u.configbool(s, b'unknown', True)
         True
         >>> u.setconfig(s, b'invalid', b'somevalue')
         >>> u.configbool(s, b'invalid')
         Traceback (most recent call last):
             ...
         ConfigError: foo.invalid is not a boolean ('somevalue')
         """
 
         v = self._config(section, name, default, untrusted=untrusted)
         if v is None:
             return v
         if v is _unset:
             if default is _unset:
                 return False
             return default
         if isinstance(v, bool):
             return v
         b = stringutil.parsebool(v)
         if b is None:
             raise error.ConfigError(
                 _(b"%s.%s is not a boolean ('%s')") % (section, name, v)
             )
         return b
 
     def configwith(
         self, convert, section, name, default=_unset, desc=None, untrusted=False
     ):
         """parse a configuration element with a conversion function
 
         >>> u = ui(); s = b'foo'
         >>> u.setconfig(s, b'float1', b'42')
         >>> u.configwith(float, s, b'float1')
         42.0
         >>> u.setconfig(s, b'float2', b'-4.25')
         >>> u.configwith(float, s, b'float2')
         -4.25
         >>> u.configwith(float, s, b'unknown', 7)
         7.0
         >>> u.setconfig(s, b'invalid', b'somevalue')
         >>> u.configwith(float, s, b'invalid')
         Traceback (most recent call last):
             ...
         ConfigError: foo.invalid is not a valid float ('somevalue')
         >>> u.configwith(float, s, b'invalid', desc=b'womble')
         Traceback (most recent call last):
             ...
         ConfigError: foo.invalid is not a valid womble ('somevalue')
         """
 
         v = self.config(section, name, default, untrusted)
         if v is None:
             return v  # do not attempt to convert None
         try:
             return convert(v)
         except (ValueError, error.ParseError):
             if desc is None:
                 desc = pycompat.sysbytes(convert.__name__)
             raise error.ConfigError(
                 _(b"%s.%s is not a valid %s ('%s')") % (section, name, desc, v)
             )
 
     def configint(self, section, name, default=_unset, untrusted=False):
         """parse a configuration element as an integer
 
         >>> u = ui(); s = b'foo'
         >>> u.setconfig(s, b'int1', b'42')
         >>> u.configint(s, b'int1')
         42
         >>> u.setconfig(s, b'int2', b'-42')
         >>> u.configint(s, b'int2')
         -42
         >>> u.configint(s, b'unknown', 7)
         7
         >>> u.setconfig(s, b'invalid', b'somevalue')
         >>> u.configint(s, b'invalid')
         Traceback (most recent call last):
             ...
         ConfigError: foo.invalid is not a valid integer ('somevalue')
         """
 
         return self.configwith(
             int, section, name, default, b'integer', untrusted
         )
 
     def configbytes(self, section, name, default=_unset, 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 = b'foo'
         >>> u.setconfig(s, b'val1', b'42')
         >>> u.configbytes(s, b'val1')
         42
         >>> u.setconfig(s, b'val2', b'42.5 kb')
         >>> u.configbytes(s, b'val2')
         43520
         >>> u.configbytes(s, b'unknown', b'7 MB')
         7340032
         >>> u.setconfig(s, b'invalid', b'somevalue')
         >>> u.configbytes(s, b'invalid')
         Traceback (most recent call last):
             ...
         ConfigError: foo.invalid is not a byte quantity ('somevalue')
         """
 
         value = self._config(section, name, default, untrusted)
         if value is _unset:
             if default is _unset:
                 default = 0
             value = default
         if not isinstance(value, bytes):
             return value
         try:
             return util.sizetoint(value)
         except error.ParseError:
             raise error.ConfigError(
                 _(b"%s.%s is not a byte quantity ('%s')")
                 % (section, name, value)
             )
 
     def configlist(self, section, name, default=_unset, untrusted=False):
         """parse a configuration element as a list of comma/space separated
         strings
 
         >>> u = ui(); s = b'foo'
         >>> u.setconfig(s, b'list1', b'this,is "a small" ,test')
         >>> u.configlist(s, b'list1')
         ['this', 'is', 'a small', 'test']
         >>> u.setconfig(s, b'list2', b'this, is "a small" , test ')
         >>> u.configlist(s, b'list2')
         ['this', 'is', 'a small', 'test']
         """
         # default is not always a list
         v = self.configwith(
             config.parselist, section, name, default, b'list', untrusted
         )
         if isinstance(v, bytes):
             return config.parselist(v)
         elif v is None:
             return []
         return v
 
     def configdate(self, section, name, default=_unset, untrusted=False):
         """parse a configuration element as a tuple of ints
 
         >>> u = ui(); s = b'foo'
         >>> u.setconfig(s, b'date', b'0 0')
         >>> u.configdate(s, b'date')
         (0, 0)
         """
         if self.config(section, name, default, untrusted):
             return self.configwith(
                 dateutil.parsedate, section, name, default, b'date', untrusted
             )
         if default is _unset:
             return None
         return default
 
     def configdefault(self, section, name):
         """returns the default value of the config item"""
         item = self._knownconfig.get(section, {}).get(name)
         itemdefault = None
         if item is not None:
             if callable(item.default):
                 itemdefault = item.default()
             else:
                 itemdefault = item.default
         return itemdefault
 
     def hasconfig(self, section, name, untrusted=False):
         return self._data(untrusted).hasitem(section, name)
 
     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, ignoresub=False):
         items = self._data(untrusted).items(section)
         if ignoresub:
             items = [i for i in items if b':' not in i[0]]
         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(
                         b"ignoring untrusted configuration option "
                         b"%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
         - False if feature is disabled by default and not included in HGPLAIN
         - True otherwise
         '''
         if (
             b'HGPLAIN' not in encoding.environ
             and b'HGPLAINEXCEPT' not in encoding.environ
         ):
             return False
         exceptions = (
             encoding.environ.get(b'HGPLAINEXCEPT', b'').strip().split(b',')
         )
         # TODO: add support for HGPLAIN=+feature,-feature syntax
         if b'+strictflags' not in encoding.environ.get(b'HGPLAIN', b'').split(
             b','
         ):
             exceptions.append(b'strictflags')
         if feature and exceptions:
             return feature not in exceptions
         return True
 
     def username(self, acceptempty=False):
         """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 acceptempty is True, returns None.
         If not found and ui.askusername is True, ask the user, else use
         ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname".
         If no username could be found, raise an Abort error.
         """
         user = encoding.environ.get(b"HGUSER")
         if user is None:
             user = self.config(b"ui", b"username")
             if user is not None:
                 user = os.path.expandvars(user)
         if user is None:
             user = encoding.environ.get(b"EMAIL")
         if user is None and acceptempty:
             return user
         if user is None and self.configbool(b"ui", b"askusername"):
             user = self.prompt(_(b"enter a commit username:"), default=None)
         if user is None and not self.interactive():
             try:
                 user = b'%s@%s' % (
                     procutil.getuser(),
                     encoding.strtolocal(socket.getfqdn()),
                 )
                 self.warn(_(b"no username found, using '%s' instead\n") % user)
             except KeyError:
                 pass
         if not user:
             raise error.Abort(
                 _(b'no username supplied'),
                 hint=_(b"use 'hg config --edit' " b'to set your username'),
             )
         if b"\n" in user:
             raise error.Abort(
                 _(b"username %r contains a newline\n") % pycompat.bytestr(user)
             )
         return user
 
     def shortuser(self, user):
         """Return a short representation of a user name or email address."""
         if not self.verbose:
             user = stringutil.shortuser(user)
         return user
 
     def expandpath(self, loc, default=None):
         """Return repository location relative to cwd or from [paths]"""
         try:
             p = self.paths.getpath(loc)
             if p:
                 return p.rawloc
         except error.RepoError:
             pass
 
         if default:
             try:
                 p = self.paths.getpath(default)
                 if p:
                     return p.rawloc
             except error.RepoError:
                 pass
 
         return loc
 
     @util.propertycache
     def paths(self):
         return paths(self)
 
     @property
     def fout(self):
         return self._fout
 
     @fout.setter
     def fout(self, f):
         self._fout = f
         self._fmsgout, self._fmsgerr = _selectmsgdests(self)
 
     @property
     def ferr(self):
         return self._ferr
 
     @ferr.setter
     def ferr(self, f):
         self._ferr = f
         self._fmsgout, self._fmsgerr = _selectmsgdests(self)
 
     @property
     def fin(self):
         return self._fin
 
     @fin.setter
     def fin(self, f):
         self._fin = f
 
     @property
     def fmsg(self):
         """Stream dedicated for status/error messages; may be None if
         fout/ferr are used"""
         return self._fmsg
 
     @fmsg.setter
     def fmsg(self, f):
         self._fmsg = f
         self._fmsgout, self._fmsgerr = _selectmsgdests(self)
 
     def pushbuffer(self, error=False, subproc=False, labeled=False):
         """install a buffer to capture standard output of the ui object
 
         If error is True, the error output will be captured too.
 
         If subproc is True, output from subprocesses (typically hooks) will be
         captured too.
 
         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.
         """
         self._buffers.append([])
         self._bufferstates.append((error, subproc, labeled))
         self._bufferapplylabels = labeled
 
     def popbuffer(self):
         '''pop the last buffer and return the buffered output'''
         self._bufferstates.pop()
         if self._bufferstates:
             self._bufferapplylabels = self._bufferstates[-1][2]
         else:
             self._bufferapplylabels = None
 
         return b"".join(self._buffers.pop())
 
     def _isbuffered(self, dest):
         if dest is self._fout:
             return bool(self._buffers)
         if dest is self._ferr:
             return bool(self._bufferstates and self._bufferstates[-1][0])
         return False
 
     def canwritewithoutlabels(self):
         '''check if write skips the label'''
         if self._buffers and not self._bufferapplylabels:
             return True
         return self._colormode is None
 
     def canbatchlabeledwrites(self):
         '''check if write calls with labels are batchable'''
         # Windows color printing is special, see ``write``.
         return self._colormode != b'win32'
 
     def write(self, *args, **opts):
         '''write args to output
 
         By default, this method simply writes to the buffer or stdout.
         Color mode can be set on the UI class to have the output decorated
         with color modifier before being written to stdout.
 
         The color used is controlled by an optional keyword argument, "label".
         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".
 
         Progress reports via stderr are normally cleared before writing as
         stdout and stderr go to the same terminal. This can be skipped with
         the optional keyword argument "keepprogressbar". The progress bar
         will continue to occupy a partial line on stderr in that case.
         This functionality is intended when Mercurial acts as data source
         in a pipe.
 
         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.
         '''
         dest = self._fout
 
         # inlined _write() for speed
         if self._buffers:
             label = opts.get('label', b'')
             if label and self._bufferapplylabels:
                 self._buffers[-1].extend(self.label(a, label) for a in args)
             else:
                 self._buffers[-1].extend(args)
             return
 
         # inlined _writenobuf() for speed
         if not opts.get('keepprogressbar', False):
             self._progclear()
         msg = b''.join(args)
 
         # opencode timeblockedsection because this is a critical path
         starttime = util.timer()
         try:
             if self._colormode == b'win32':
                 # windows color printing is its own can of crab, defer to
                 # the color module and that is it.
                 color.win32print(self, dest.write, msg, **opts)
             else:
                 if self._colormode is not None:
                     label = opts.get('label', b'')
                     msg = self.label(msg, label)
                 dest.write(msg)
         except IOError as err:
             raise error.StdioError(err)
         finally:
             self._blockedtimes[b'stdio_blocked'] += (
                 util.timer() - starttime
             ) * 1000
 
     def write_err(self, *args, **opts):
         self._write(self._ferr, *args, **opts)
 
     def _write(self, dest, *args, **opts):
         # update write() as well if you touch this code
         if self._isbuffered(dest):
             label = opts.get('label', b'')
             if label and self._bufferapplylabels:
                 self._buffers[-1].extend(self.label(a, label) for a in args)
             else:
                 self._buffers[-1].extend(args)
         else:
             self._writenobuf(dest, *args, **opts)
 
     def _writenobuf(self, dest, *args, **opts):
         # update write() as well if you touch this code
         if not opts.get('keepprogressbar', False):
             self._progclear()
         msg = b''.join(args)
 
         # opencode timeblockedsection because this is a critical path
         starttime = util.timer()
         try:
             if dest is self._ferr and not getattr(self._fout, 'closed', False):
                 self._fout.flush()
             if getattr(dest, 'structured', False):
                 # channel for machine-readable output with metadata, where
                 # no extra colorization is necessary.
                 dest.write(msg, **opts)
             elif self._colormode == b'win32':
                 # windows color printing is its own can of crab, defer to
                 # the color module and that is it.
                 color.win32print(self, dest.write, msg, **opts)
             else:
                 if self._colormode is not None:
                     label = opts.get('label', b'')
                     msg = self.label(msg, label)
                 dest.write(msg)
             # stderr may be buffered under win32 when redirected to files,
             # including stdout.
             if dest is self._ferr and not getattr(dest, 'closed', False):
                 dest.flush()
         except IOError as err:
             if dest is self._ferr and err.errno in (
                 errno.EPIPE,
                 errno.EIO,
                 errno.EBADF,
             ):
                 # no way to report the error, so ignore it
                 return
             raise error.StdioError(err)
         finally:
             self._blockedtimes[b'stdio_blocked'] += (
                 util.timer() - starttime
             ) * 1000
 
     def _writemsg(self, dest, *args, **opts):
+        timestamp = self.showtimestamp and opts.get('type') in {
+            b'debug',
+            b'error',
+            b'note',
+            b'status',
+            b'warning',
+        }
+        if timestamp:
+            args = (
+                b'[%s] ' % bytes(datetime.datetime.now().isoformat(), 'ASCII'),
+            ) + args
         _writemsgwith(self._write, dest, *args, **opts)
+        if timestamp:
+            dest.flush()
 
     def _writemsgnobuf(self, dest, *args, **opts):
         _writemsgwith(self._writenobuf, dest, *args, **opts)
 
     def flush(self):
         # opencode timeblockedsection because this is a critical path
         starttime = util.timer()
         try:
             try:
                 self._fout.flush()
             except IOError as err:
                 if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
                     raise error.StdioError(err)
             finally:
                 try:
                     self._ferr.flush()
                 except IOError as err:
                     if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
                         raise error.StdioError(err)
         finally:
             self._blockedtimes[b'stdio_blocked'] += (
                 util.timer() - starttime
             ) * 1000
 
     def _isatty(self, fh):
         if self.configbool(b'ui', b'nontty'):
             return False
         return procutil.isatty(fh)
 
     def protectfinout(self):
         """Duplicate ui streams and redirect original if they are stdio
 
         Returns (fin, fout) which point to the original ui fds, but may be
         copy of them. The returned streams can be considered "owned" in that
         print(), exec(), etc. never reach to them.
         """
         if self._finoutredirected:
             # if already redirected, protectstdio() would just create another
             # nullfd pair, which is equivalent to returning self._fin/_fout.
             return self._fin, self._fout
         fin, fout = procutil.protectstdio(self._fin, self._fout)
         self._finoutredirected = (fin, fout) != (self._fin, self._fout)
         return fin, fout
 
     def restorefinout(self, fin, fout):
         """Restore ui streams from possibly duplicated (fin, fout)"""
         if (fin, fout) == (self._fin, self._fout):
             return
         procutil.restorestdio(self._fin, self._fout, fin, fout)
         # protectfinout() won't create more than one duplicated streams,
         # so we can just turn the redirection flag off.
         self._finoutredirected = False
 
     @contextlib.contextmanager
     def protectedfinout(self):
         """Run code block with protected standard streams"""
         fin, fout = self.protectfinout()
         try:
             yield fin, fout
         finally:
             self.restorefinout(fin, fout)
 
     def disablepager(self):
         self._disablepager = True
 
     def pager(self, command):
         """Start a pager for subsequent command output.
 
         Commands which produce a long stream of output should call
         this function to activate the user's preferred pagination
         mechanism (which may be no pager). Calling this function
         precludes any future use of interactive functionality, such as
         prompting the user or activating curses.
 
         Args:
           command: The full, non-aliased name of the command. That is, "log"
                    not "history, "summary" not "summ", etc.
         """
         if self._disablepager or self.pageractive:
             # how pager should do is already determined
             return
 
         if not command.startswith(b'internal-always-') and (
             # explicit --pager=on (= 'internal-always-' prefix) should
             # take precedence over disabling factors below
             command in self.configlist(b'pager', b'ignore')
             or not self.configbool(b'ui', b'paginate')
             or not self.configbool(b'pager', b'attend-' + command, True)
             or encoding.environ.get(b'TERM') == b'dumb'
             # TODO: if we want to allow HGPLAINEXCEPT=pager,
             # formatted() will need some adjustment.
             or not self.formatted()
             or self.plain()
             or self._buffers
             # TODO: expose debugger-enabled on the UI object
             or b'--debugger' in pycompat.sysargv
         ):
             # We only want to paginate if the ui appears to be
             # interactive, the user didn't say HGPLAIN or
             # HGPLAINEXCEPT=pager, and the user didn't specify --debug.
             return
 
         pagercmd = self.config(b'pager', b'pager', rcutil.fallbackpager)
         if not pagercmd:
             return
 
         pagerenv = {}
         for name, value in rcutil.defaultpagerenv().items():
             if name not in encoding.environ:
                 pagerenv[name] = value
 
         self.debug(
             b'starting pager for command %s\n' % stringutil.pprint(command)
         )
         self.flush()
 
         wasformatted = self.formatted()
         if util.safehasattr(signal, b"SIGPIPE"):
             signal.signal(signal.SIGPIPE, _catchterm)
         if self._runpager(pagercmd, pagerenv):
             self.pageractive = True
             # Preserve the formatted-ness of the UI. This is important
             # because we mess with stdout, which might confuse
             # auto-detection of things being formatted.
             self.setconfig(b'ui', b'formatted', wasformatted, b'pager')
             self.setconfig(b'ui', b'interactive', False, b'pager')
 
             # If pagermode differs from color.mode, reconfigure color now that
             # pageractive is set.
             cm = self._colormode
             if cm != self.config(b'color', b'pagermode', cm):
                 color.setup(self)
         else:
             # If the pager can't be spawned in dispatch when --pager=on is
             # given, don't try again when the command runs, to avoid a duplicate
             # warning about a missing pager command.
             self.disablepager()
 
     def _runpager(self, command, env=None):
         """Actually start the pager and set up file descriptors.
 
         This is separate in part so that extensions (like chg) can
         override how a pager is invoked.
         """
         if command == b'cat':
             # Save ourselves some work.
             return False
         # If the command doesn't contain any of these characters, we
         # assume it's a binary and exec it directly. This means for
         # simple pager command configurations, we can degrade
         # gracefully and tell the user about their broken pager.
         shell = any(c in command for c in b"|&;<>()$`\\\"' \t\n*?[#~=%")
 
         if pycompat.iswindows and not shell:
             # Window's built-in `more` cannot be invoked with shell=False, but
             # its `more.com` can.  Hide this implementation detail from the
             # user so we can also get sane bad PAGER behavior.  MSYS has
             # `more.exe`, so do a cmd.exe style resolution of the executable to
             # determine which one to use.
             fullcmd = procutil.findexe(command)
             if not fullcmd:
                 self.warn(
                     _(b"missing pager command '%s', skipping pager\n") % command
                 )
                 return False
 
             command = fullcmd
 
         try:
             pager = subprocess.Popen(
                 procutil.tonativestr(command),
                 shell=shell,
                 bufsize=-1,
                 close_fds=procutil.closefds,
                 stdin=subprocess.PIPE,
                 stdout=procutil.stdout,
                 stderr=procutil.stderr,
                 env=procutil.tonativeenv(procutil.shellenviron(env)),
             )
         except OSError as e:
             if e.errno == errno.ENOENT and not shell:
                 self.warn(
                     _(b"missing pager command '%s', skipping pager\n") % command
                 )
                 return False
             raise
 
         # back up original file descriptors
         stdoutfd = os.dup(procutil.stdout.fileno())
         stderrfd = os.dup(procutil.stderr.fileno())
 
         os.dup2(pager.stdin.fileno(), procutil.stdout.fileno())
         if self._isatty(procutil.stderr):
             os.dup2(pager.stdin.fileno(), procutil.stderr.fileno())
 
         @self.atexit
         def killpager():
             if util.safehasattr(signal, b"SIGINT"):
                 signal.signal(signal.SIGINT, signal.SIG_IGN)
             # restore original fds, closing pager.stdin copies in the process
             os.dup2(stdoutfd, procutil.stdout.fileno())
             os.dup2(stderrfd, procutil.stderr.fileno())
             pager.stdin.close()
             pager.wait()
 
         return True
 
     @property
     def _exithandlers(self):
         return _reqexithandlers
 
     def atexit(self, func, *args, **kwargs):
         '''register a function to run after dispatching a request
 
         Handlers do not stay registered across request boundaries.'''
         self._exithandlers.append((func, args, kwargs))
         return func
 
     def interface(self, feature):
         """what interface to use for interactive console features?
 
         The interface is controlled by the value of `ui.interface` but also by
         the value of feature-specific configuration. For example:
 
         ui.interface.histedit = text
         ui.interface.chunkselector = curses
 
         Here the features are "histedit" and "chunkselector".
 
         The configuration above means that the default interfaces for commands
         is curses, the interface for histedit is text and the interface for
         selecting chunk is crecord (the best curses interface available).
 
         Consider the following example:
         ui.interface = curses
         ui.interface.histedit = text
 
         Then histedit will use the text interface and chunkselector will use
         the default curses interface (crecord at the moment).
         """
         alldefaults = frozenset([b"text", b"curses"])
 
         featureinterfaces = {
             b"chunkselector": [b"text", b"curses",],
             b"histedit": [b"text", b"curses",],
         }
 
         # Feature-specific interface
         if feature not in featureinterfaces.keys():
             # Programming error, not user error
             raise ValueError(b"Unknown feature requested %s" % feature)
 
         availableinterfaces = frozenset(featureinterfaces[feature])
         if alldefaults > availableinterfaces:
             # Programming error, not user error. We need a use case to
             # define the right thing to do here.
             raise ValueError(
                 b"Feature %s does not handle all default interfaces" % feature
             )
 
         if self.plain() or encoding.environ.get(b'TERM') == b'dumb':
             return b"text"
 
         # Default interface for all the features
         defaultinterface = b"text"
         i = self.config(b"ui", b"interface")
         if i in alldefaults:
             defaultinterface = i
 
         choseninterface = defaultinterface
         f = self.config(b"ui", b"interface.%s" % feature)
         if f in availableinterfaces:
             choseninterface = f
 
         if i is not None and defaultinterface != i:
             if f is not None:
                 self.warn(_(b"invalid value for ui.interface: %s\n") % (i,))
             else:
                 self.warn(
                     _(b"invalid value for ui.interface: %s (using %s)\n")
                     % (i, choseninterface)
                 )
         if f is not None and choseninterface != f:
             self.warn(
                 _(b"invalid value for ui.interface.%s: %s (using %s)\n")
                 % (feature, f, choseninterface)
             )
 
         return choseninterface
 
     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(b"ui", b"interactive")
         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 b'COLUMNS' in encoding.environ:
             try:
                 return int(encoding.environ[b'COLUMNS'])
             except ValueError:
                 pass
         return scmutil.termsize(self)[0]
 
     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(b"ui", b"formatted")
         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=b' ', promptopts=None):
         # Replacing stdin/stdout temporarily is a hard problem on Python 3
         # because they have to be text streams with *no buffering*. Instead,
         # we use rawinput() only if call_readline() will be invoked by
         # PyOS_Readline(), so no I/O will be made at Python layer.
         usereadline = (
             self._isatty(self._fin)
             and self._isatty(self._fout)
             and procutil.isstdin(self._fin)
             and procutil.isstdout(self._fout)
         )
         if usereadline:
             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:
                 usereadline = False
 
         if self._colormode == b'win32' or not usereadline:
             if not promptopts:
                 promptopts = {}
             self._writemsgnobuf(
                 self._fmsgout, prompt, type=b'prompt', **promptopts
             )
             self.flush()
             prompt = b' '
         else:
             prompt = self.label(prompt, b'ui.prompt') + b' '
 
         # prompt ' ' must exist; otherwise readline may delete entire line
         # - http://bugs.python.org/issue12833
         with self.timeblockedsection(b'stdio'):
             if usereadline:
                 self.flush()
                 prompt = encoding.strfromlocal(prompt)
                 line = encoding.strtolocal(pycompat.rawinput(prompt))
                 # When stdin is in binary mode on Windows, it can cause
                 # raw_input() to emit an extra trailing carriage return
                 if pycompat.oslinesep == b'\r\n' and line.endswith(b'\r'):
                     line = line[:-1]
             else:
                 self._fout.write(pycompat.bytestr(prompt))
                 self._fout.flush()
                 line = self._fin.readline()
                 if not line:
                     raise EOFError
                 line = line.rstrip(pycompat.oslinesep)
 
         return line
 
     def prompt(self, msg, default=b"y"):
         """Prompt user with msg, read response.
         If ui is not interactive, the default is returned.
         """
         return self._prompt(msg, default=default)
 
     def _prompt(self, msg, **opts):
         default = opts['default']
         if not self.interactive():
             self._writemsg(self._fmsgout, msg, b' ', type=b'prompt', **opts)
             self._writemsg(
                 self._fmsgout, default or b'', b"\n", type=b'promptecho'
             )
             return default
         try:
             r = self._readline(prompt=msg, promptopts=opts)
             if not r:
                 r = default
             if self.configbool(b'ui', b'promptecho'):
                 self._writemsg(self._fmsgout, r, b"\n", type=b'promptecho')
             return r
         except EOFError:
             raise error.ResponseExpected()
 
     @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 &)".
 
         >>> ui.extractchoices(b"awake? $$ &Yes $$ &No")
         ('awake? ', [('y', 'Yes'), ('n', 'No')])
         >>> ui.extractchoices(b"line\\nbreak? $$ &Yes $$ &No")
         ('line\\nbreak? ', [('y', 'Yes'), ('n', 'No')])
         >>> ui.extractchoices(b"want lots of $$money$$?$$Ye&s$$N&o")
         ('want lots of $$money$$?', [('s', 'Yes'), ('o', 'No')])
         """
 
         # Sadly, the prompt string may have been built with a filename
         # containing "$$" so let's try to find the first valid-looking
         # prompt to start parsing. Sadly, we also can't rely on
         # choices containing spaces, ASCII, or basically anything
         # except an ampersand followed by a character.
         m = re.match(br'(?s)(.+?)\$\$([^$]*&[^ $].*)', prompt)
         msg = m.group(1)
         choices = [p.strip(b' ') for p in m.group(2).split(b'$$')]
 
         def choicetuple(s):
             ampidx = s.index(b'&')
             return s[ampidx + 1 : ampidx + 2].lower(), s.replace(b'&', b'', 1)
 
         return (msg, [choicetuple(s) 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, default=resps[default], choices=choices)
             if r.lower() in resps:
                 return resps.index(r.lower())
             # TODO: shouldn't it be a warning?
             self._writemsg(self._fmsgout, _(b"unrecognized response\n"))
 
     def getpass(self, prompt=None, default=None):
         if not self.interactive():
             return default
         try:
             self._writemsg(
                 self._fmsgerr,
                 prompt or _(b'password: '),
                 type=b'prompt',
                 password=True,
             )
             # disable getpass() only if explicitly specified. it's still valid
             # to interact with tty even if fin is not a tty.
             with self.timeblockedsection(b'stdio'):
                 if self.configbool(b'ui', b'nontty'):
                     l = self._fin.readline()
                     if not l:
                         raise EOFError
                     return l.rstrip(b'\n')
                 else:
                     return getpass.getpass('')
         except EOFError:
             raise error.ResponseExpected()
 
     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:
             self._writemsg(self._fmsgout, type=b'status', *msg, **opts)
 
     def warn(self, *msg, **opts):
         '''write warning message to output (stderr)
 
         This adds an output label of "ui.warning".
         '''
         self._writemsg(self._fmsgerr, type=b'warning', *msg, **opts)
 
     def error(self, *msg, **opts):
         '''write error message to output (stderr)
 
         This adds an output label of "ui.error".
         '''
         self._writemsg(self._fmsgerr, type=b'error', *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:
             self._writemsg(self._fmsgout, type=b'note', *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:
             self._writemsg(self._fmsgout, type=b'debug', *msg, **opts)
             self.log(b'debug', b'%s', b''.join(msg))
 
     # Aliases to defeat check-code.
     statusnoi18n = status
     notenoi18n = note
     warnnoi18n = warn
     writenoi18n = write
 
     def edit(
         self,
         text,
         user,
         extra=None,
         editform=None,
         pending=None,
         repopath=None,
         action=None,
     ):
         if action is None:
             self.develwarn(
                 b'action is None but will soon be a required '
                 b'parameter to ui.edit()'
             )
         extra_defaults = {
             b'prefix': b'editor',
             b'suffix': b'.txt',
         }
         if extra is not None:
             if extra.get(b'suffix') is not None:
                 self.develwarn(
                     b'extra.suffix is not None but will soon be '
                     b'ignored by ui.edit()'
                 )
             extra_defaults.update(extra)
         extra = extra_defaults
 
         if action == b'diff':
             suffix = b'.diff'
         elif action:
             suffix = b'.%s.hg.txt' % action
         else:
             suffix = extra[b'suffix']
 
         rdir = None
         if self.configbool(b'experimental', b'editortmpinhg'):
             rdir = repopath
         (fd, name) = pycompat.mkstemp(
             prefix=b'hg-' + extra[b'prefix'] + b'-', suffix=suffix, dir=rdir
         )
         try:
             with os.fdopen(fd, 'wb') as f:
                 f.write(util.tonativeeol(text))
 
             environ = {b'HGUSER': user}
             if b'transplant_source' in extra:
                 environ.update(
                     {b'HGREVISION': hex(extra[b'transplant_source'])}
                 )
             for label in (b'intermediate-source', b'source', b'rebase_source'):
                 if label in extra:
                     environ.update({b'HGREVISION': extra[label]})
                     break
             if editform:
                 environ.update({b'HGEDITFORM': editform})
             if pending:
                 environ.update({b'HG_PENDING': pending})
 
             editor = self.geteditor()
 
             self.system(
                 b"%s \"%s\"" % (editor, name),
                 environ=environ,
                 onerr=error.Abort,
                 errprefix=_(b"edit failed"),
                 blockedtag=b'editor',
             )
 
             with open(name, 'rb') as f:
                 t = util.fromnativeeol(f.read())
         finally:
             os.unlink(name)
 
         return t
 
     def system(
         self,
         cmd,
         environ=None,
         cwd=None,
         onerr=None,
         errprefix=None,
         blockedtag=None,
     ):
         '''execute shell command with appropriate output stream. command
         output will be redirected if fout is not stdout.
 
         if command fails and onerr is None, return status, else raise onerr
         object as exception.
         '''
         if blockedtag is None:
             # Long cmds tend to be because of an absolute path on cmd. Keep
             # the tail end instead
             cmdsuffix = cmd.translate(None, _keepalnum)[-85:]
             blockedtag = b'unknown_system_' + cmdsuffix
         out = self._fout
         if any(s[1] for s in self._bufferstates):
             out = self
         with self.timeblockedsection(blockedtag):
             rc = self._runsystem(cmd, environ=environ, cwd=cwd, out=out)
         if rc and onerr:
             errmsg = b'%s %s' % (
                 procutil.shellsplit(cmd)[0],
                 procutil.explainexit(rc),
             )
             if errprefix:
                 errmsg = b'%s: %s' % (errprefix, errmsg)
             raise onerr(errmsg)
         return rc
 
     def _runsystem(self, cmd, environ, cwd, out):
         """actually execute the given shell command (can be overridden by
         extensions like chg)"""
         return procutil.system(cmd, environ=environ, cwd=cwd, out=out)
 
     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(
                     b'Traceback (most recent call last):\n',
                     encoding.strtolocal(''.join(exctb[:-1])),
                     encoding.strtolocal(''.join(causetb)),
                     encoding.strtolocal(''.join(exconly)),
                 )
             else:
                 output = traceback.format_exception(exc[0], exc[1], exc[2])
                 self.write_err(encoding.strtolocal(''.join(output)))
         return self.tracebackflag or force
 
     def geteditor(self):
         '''return editor to use'''
         if pycompat.sysplatform == b'plan9':
             # vi is the MIPS instruction simulator on Plan 9. We
             # instead default to E to plumb commit messages to
             # avoid confusion.
             editor = b'E'
         elif pycompat.isdarwin:
             # vi on darwin is POSIX compatible to a fault, and that includes
             # exiting non-zero if you make any mistake when running an ex
             # command. Proof: `vi -c ':unknown' -c ':qa'; echo $?` produces 1,
             # while s/vi/vim/ doesn't.
             editor = b'vim'
         else:
             editor = b'vi'
         return encoding.environ.get(b"HGEDITOR") or self.config(
             b"ui", b"editor", editor
         )
 
     @util.propertycache
     def _progbar(self):
         """setup the progbar singleton to the ui object"""
         if (
             self.quiet
             or self.debugflag
             or self.configbool(b'progress', b'disable')
             or not progress.shouldprint(self)
         ):
             return None
         return getprogbar(self)
 
     def _progclear(self):
         """clear progress bar output if any. use it before any output"""
         if not haveprogbar():  # nothing loaded yet
             return
         if self._progbar is not None and self._progbar.printed:
             self._progbar.clear()
 
     def makeprogress(self, topic, unit=b"", total=None):
         """Create a progress helper for the specified topic"""
         if getattr(self._fmsgerr, 'structured', False):
             # channel for machine-readable output with metadata, just send
             # raw information
             # TODO: consider porting some useful information (e.g. estimated
             # time) from progbar. we might want to support update delay to
             # reduce the cost of transferring progress messages.
             def updatebar(topic, pos, item, unit, total):
                 self._fmsgerr.write(
                     None,
                     type=b'progress',
                     topic=topic,
                     pos=pos,
                     item=item,
                     unit=unit,
                     total=total,
                 )
 
         elif self._progbar is not None:
             updatebar = self._progbar.progress
         else:
 
             def updatebar(topic, pos, item, unit, total):
                 pass
 
         return scmutil.progress(self, updatebar, topic, unit, total)
 
     def getlogger(self, name):
         """Returns a logger of the given name; or None if not registered"""
         return self._loggers.get(name)
 
     def setlogger(self, name, logger):
         """Install logger which can be identified later by the given name
 
         More than one loggers can be registered. Use extension or module
         name to uniquely identify the logger instance.
         """
         self._loggers[name] = logger
 
     def log(self, event, msgfmt, *msgargs, **opts):
         '''hook for logging facility extensions
 
         event should be a readily-identifiable subsystem, which will
         allow filtering.
 
         msgfmt should be a newline-terminated format string to log, and
         *msgargs are %-formatted into it.
 
         **opts currently has no defined meanings.
         '''
         if not self._loggers:
             return
         activeloggers = [
             l for l in pycompat.itervalues(self._loggers) if l.tracked(event)
         ]
         if not activeloggers:
             return
         msg = msgfmt % msgargs
         opts = pycompat.byteskwargs(opts)
         # guard against recursion from e.g. ui.debug()
         registeredloggers = self._loggers
         self._loggers = {}
         try:
             for logger in activeloggers:
                 logger.log(self, event, msg, opts)
         finally:
             self._loggers = registeredloggers
 
     def label(self, msg, label):
         '''style msg based on supplied label
 
         If some color mode is enabled, this will add the necessary control
         characters to apply such color. In addition, 'debug' color mode adds
         markup showing which label affects a piece of text.
 
         ui.write(s, 'label') is equivalent to
         ui.write(ui.label(s, 'label')).
         '''
         if self._colormode is not None:
             return color.colorlabel(self, msg, label)
         return msg
 
     def develwarn(self, msg, stacklevel=1, config=None):
         """issue a developer warning message
 
         Use 'stacklevel' to report the offender some layers further up in the
         stack.
         """
         if not self.configbool(b'devel', b'all-warnings'):
             if config is None or not self.configbool(b'devel', config):
                 return
         msg = b'devel-warn: ' + msg
         stacklevel += 1  # get in develwarn
         if self.tracebackflag:
             util.debugstacktrace(msg, stacklevel, self._ferr, self._fout)
             self.log(
                 b'develwarn',
                 b'%s at:\n%s'
                 % (msg, b''.join(util.getstackframes(stacklevel))),
             )
         else:
             curframe = inspect.currentframe()
             calframe = inspect.getouterframes(curframe, 2)
             fname, lineno, fmsg = calframe[stacklevel][1:4]
             fname, fmsg = pycompat.sysbytes(fname), pycompat.sysbytes(fmsg)
             self.write_err(b'%s at: %s:%d (%s)\n' % (msg, fname, lineno, fmsg))
             self.log(
                 b'develwarn', b'%s at: %s:%d (%s)\n', msg, fname, lineno, fmsg
             )
 
             # avoid cycles
             del curframe
             del calframe
 
     def deprecwarn(self, msg, version, stacklevel=2):
         """issue a deprecation warning
 
         - msg: message explaining what is deprecated and how to upgrade,
         - version: last version where the API will be supported,
         """
         if not (
             self.configbool(b'devel', b'all-warnings')
             or self.configbool(b'devel', b'deprec-warn')
         ):
             return
         msg += (
             b"\n(compatibility will be dropped after Mercurial-%s,"
             b" update your code.)"
         ) % version
         self.develwarn(msg, stacklevel=stacklevel, config=b'deprec-warn')
 
     def exportableenviron(self):
         """The environment variables that are safe to export, e.g. through
         hgweb.
         """
         return self._exportableenviron
 
     @contextlib.contextmanager
     def configoverride(self, overrides, source=b""):
         """Context manager for temporary config overrides
         `overrides` must be a dict of the following structure:
         {(section, name) : value}"""
         backups = {}
         try:
             for (section, name), value in overrides.items():
                 backups[(section, name)] = self.backupconfig(section, name)
                 self.setconfig(section, name, value, source)
             yield
         finally:
             for __, backup in backups.items():
                 self.restoreconfig(backup)
             # just restoring ui.quiet config to the previous value is not enough
             # as it does not update ui.quiet class member
             if (b'ui', b'quiet') in overrides:
                 self.fixconfig(section=b'ui')
 
 
 class paths(dict):
     """Represents a collection of paths and their configs.
 
     Data is initially derived from ui instances and the config files they have
     loaded.
     """
 
     def __init__(self, ui):
         dict.__init__(self)
 
         for name, loc in ui.configitems(b'paths', ignoresub=True):
             # No location is the same as not existing.
             if not loc:
                 continue
             loc, sub = ui.configsuboptions(b'paths', name)
             self[name] = path(ui, name, rawloc=loc, suboptions=sub)
 
     def getpath(self, name, default=None):
         """Return a ``path`` from a string, falling back to default.
 
         ``name`` can be a named path or locations. Locations are filesystem
         paths or URIs.
 
         Returns None if ``name`` is not a registered path, a URI, or a local
         path to a repo.
         """
         # Only fall back to default if no path was requested.
         if name is None:
             if not default:
                 default = ()
             elif not isinstance(default, (tuple, list)):
                 default = (default,)
             for k in default:
                 try:
                     return self[k]
                 except KeyError:
                     continue
             return None
 
         # Most likely empty string.
         # This may need to raise in the future.
         if not name:
             return None
 
         try:
             return self[name]
         except KeyError:
             # Try to resolve as a local path or URI.
             try:
                 # We don't pass sub-options in, so no need to pass ui instance.
                 return path(None, None, rawloc=name)
             except ValueError:
                 raise error.RepoError(_(b'repository %s does not exist') % name)
 
 
 _pathsuboptions = {}
 
 
 def pathsuboption(option, attr):
     """Decorator used to declare a path sub-option.
 
     Arguments are the sub-option name and the attribute it should set on
     ``path`` instances.
 
     The decorated function will receive as arguments a ``ui`` instance,
     ``path`` instance, and the string value of this option from the config.
     The function should return the value that will be set on the ``path``
     instance.
 
     This decorator can be used to perform additional verification of
     sub-options and to change the type of sub-options.
     """
 
     def register(func):
         _pathsuboptions[option] = (attr, func)
         return func
 
     return register
 
 
 @pathsuboption(b'pushurl', b'pushloc')
 def pushurlpathoption(ui, path, value):
     u = util.url(value)
     # Actually require a URL.
     if not u.scheme:
         ui.warn(_(b'(paths.%s:pushurl not a URL; ignoring)\n') % path.name)
         return None
 
     # Don't support the #foo syntax in the push URL to declare branch to
     # push.
     if u.fragment:
         ui.warn(
             _(
                 b'("#fragment" in paths.%s:pushurl not supported; '
                 b'ignoring)\n'
             )
             % path.name
         )
         u.fragment = None
 
     return bytes(u)
 
 
 @pathsuboption(b'pushrev', b'pushrev')
 def pushrevpathoption(ui, path, value):
     return value
 
 
 class path(object):
     """Represents an individual path and its configuration."""
 
     def __init__(self, ui, name, rawloc=None, suboptions=None):
         """Construct a path from its config options.
 
         ``ui`` is the ``ui`` instance the path is coming from.
         ``name`` is the symbolic name of the path.
         ``rawloc`` is the raw location, as defined in the config.
         ``pushloc`` is the raw locations pushes should be made to.
 
         If ``name`` is not defined, we require that the location be a) a local
         filesystem path with a .hg directory or b) a URL. If not,
         ``ValueError`` is raised.
         """
         if not rawloc:
             raise ValueError(b'rawloc must be defined')
 
         # Locations may define branches via syntax <base>#<branch>.
         u = util.url(rawloc)
         branch = None
         if u.fragment:
             branch = u.fragment
             u.fragment = None
 
         self.url = u
         self.branch = branch
 
         self.name = name
         self.rawloc = rawloc
         self.loc = b'%s' % u
 
         # When given a raw location but not a symbolic name, validate the
         # location is valid.
         if not name and not u.scheme and not self._isvalidlocalpath(self.loc):
             raise ValueError(
                 b'location is not a URL or path to a local '
                 b'repo: %s' % rawloc
             )
 
         suboptions = suboptions or {}
 
         # Now process the sub-options. If a sub-option is registered, its
         # attribute will always be present. The value will be None if there
         # was no valid sub-option.
         for suboption, (attr, func) in pycompat.iteritems(_pathsuboptions):
             if suboption not in suboptions:
                 setattr(self, attr, None)
                 continue
 
             value = func(ui, self, suboptions[suboption])
             setattr(self, attr, value)
 
     def _isvalidlocalpath(self, path):
         """Returns True if the given path is a potentially valid repository.
         This is its own function so that extensions can change the definition of
         'valid' in this case (like when pulling from a git repo into a hg
         one)."""
         try:
             return os.path.isdir(os.path.join(path, b'.hg'))
         # Python 2 may return TypeError. Python 3, ValueError.
         except (TypeError, ValueError):
             return False
 
     @property
     def suboptions(self):
         """Return sub-options and their values for this path.
 
         This is intended to be used for presentation purposes.
         """
         d = {}
         for subopt, (attr, _func) in pycompat.iteritems(_pathsuboptions):
             value = getattr(self, attr)
             if value is not None:
                 d[subopt] = value
         return d
 
 
 # we instantiate one globally shared progress bar to avoid
 # competing progress bars when multiple UI objects get created
 _progresssingleton = None
 
 
 def getprogbar(ui):
     global _progresssingleton
     if _progresssingleton is None:
         # passing 'ui' object to the singleton is fishy,
         # this is how the extension used to work but feel free to rework it.
         _progresssingleton = progress.progbar(ui)
     return _progresssingleton
 
 
 def haveprogbar():
     return _progresssingleton is not None
 
 
 def _selectmsgdests(ui):
     name = ui.config(b'ui', b'message-output')
     if name == b'channel':
         if ui.fmsg:
             return ui.fmsg, ui.fmsg
         else:
             # fall back to ferr if channel isn't ready so that status/error
             # messages can be printed
             return ui.ferr, ui.ferr
     if name == b'stdio':
         return ui.fout, ui.ferr
     if name == b'stderr':
         return ui.ferr, ui.ferr
     raise error.Abort(b'invalid ui.message-output destination: %s' % name)
 
 
 def _writemsgwith(write, dest, *args, **opts):
     """Write ui message with the given ui._write*() function
 
     The specified message type is translated to 'ui.<type>' label if the dest
     isn't a structured channel, so that the message will be colorized.
     """
     # TODO: maybe change 'type' to a mandatory option
     if 'type' in opts and not getattr(dest, 'structured', False):
         opts['label'] = opts.get('label', b'') + b' ui.%s' % opts.pop('type')
     write(dest, *args, **opts)

tests/test-progress.t

@@ -1,363 +1,403 b''
 
   $ cat > loop.py <<EOF
   > from __future__ import absolute_import
   > import time
   > from mercurial import commands, registrar
   > 
   > cmdtable = {}
   > command = registrar.command(cmdtable)
   > 
   > class incrementingtime(object):
   >     def __init__(self):
   >         self._time = 0.0
   >     def __call__(self):
   >         self._time += 0.25
   >         return self._time
   > time.time = incrementingtime()
   > 
   > @command(b'loop',
   >     [(b'', b'total', b'', b'override for total'),
   >     (b'', b'nested', False, b'show nested results'),
-  >     (b'', b'parallel', False, b'show parallel sets of results')],
+  >     (b'', b'parallel', False, b'show parallel sets of results'),
+  >     (b'', b'warn', False, b'show warning if step divisible by 3')],
   >     b'hg loop LOOPS',
   >     norepo=True)
   > def loop(ui, loops, **opts):
   >     loops = int(loops)
   >     total = None
   >     if loops >= 0:
   >         total = loops
   >     if opts.get('total', None):
   >         total = int(opts.get('total'))
   >     nested = False
   >     if opts.get('nested', None):
   >         nested = True
   >     loops = abs(loops)
+  >     showwarn = opts.get('warn', False)
   > 
   >     progress = ui.makeprogress(topiclabel, unit=b'loopnum', total=total)
   >     other = ui.makeprogress(b'other', unit=b'othernum', total=total)
   >     for i in range(loops):
   >         progress.update(i, item=getloopitem(i))
   >         if opts.get('parallel'):
   >             other.update(i, item=b'other.%d' % i)
   >         if nested:
   >             nested_steps = 2
   >             if i and i % 4 == 0:
   >                 nested_steps = 5
   >             nested = ui.makeprogress(b'nested', unit=b'nestnum',
   >                                      total=nested_steps)
   >             for j in range(nested_steps):
   >                 nested.update(j, item=b'nested.%d' % j)
   >             nested.complete()
+  >         if showwarn and i % 3 == 0:
+  >             ui.warn(b'reached step %d\n' %i)
   >     progress.complete()
   > 
   > topiclabel = b'loop'
   > def getloopitem(i):
   >     return b'loop.%d' % i
   > 
   > EOF
 
   $ cp $HGRCPATH $HGRCPATH.orig
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "progress=" >> $HGRCPATH
   $ echo "loop=`pwd`/loop.py" >> $HGRCPATH
   $ echo "[progress]" >> $HGRCPATH
   $ echo "format = topic bar number" >> $HGRCPATH
   $ echo "assume-tty=1" >> $HGRCPATH
   $ echo "width=60" >> $HGRCPATH
 
 test default params, display nothing because of delay
 
   $ hg -y loop 3
   $ echo "delay=0" >> $HGRCPATH
   $ echo "refresh=0" >> $HGRCPATH
 
 test with delay=0, refresh=0
 
   $ hg -y loop 3
   \r (no-eol) (esc)
   loop [                                                ] 0/3\r (no-eol) (esc)
   loop [===============>                                ] 1/3\r (no-eol) (esc)
   loop [===============================>                ] 2/3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 no progress with --quiet
   $ hg -y loop 3 --quiet
 
 test plain mode exception
   $ HGPLAINEXCEPT=progress hg -y loop 1
   \r (no-eol) (esc)
   loop [                                                ] 0/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
 test nested short-lived topics (which shouldn't display with nestdelay):
 
   $ hg -y loop 3 --nested
   \r (no-eol) (esc)
   loop [                                                ] 0/3\r (no-eol) (esc)
   loop [===============>                                ] 1/3\r (no-eol) (esc)
   loop [===============================>                ] 2/3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
 Test nested long-lived topic which has the same name as a short-lived
 peer. We shouldn't get stuck showing the short-lived inner steps, and
 should go back to skipping the inner steps when the slow nested step
 finishes.
 
   $ hg -y loop 7 --nested
   \r (no-eol) (esc)
   loop [                                                ] 0/7\r (no-eol) (esc)
   loop [=====>                                          ] 1/7\r (no-eol) (esc)
   loop [============>                                   ] 2/7\r (no-eol) (esc)
   loop [===================>                            ] 3/7\r (no-eol) (esc)
   loop [==========================>                     ] 4/7\r (no-eol) (esc)
   nested [==========================>                   ] 3/5\r (no-eol) (esc)
   nested [===================================>          ] 4/5\r (no-eol) (esc)
   loop [=================================>              ] 5/7\r (no-eol) (esc)
   loop [========================================>       ] 6/7\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
 
   $ hg --config progress.changedelay=0 -y loop 3 --nested
   \r (no-eol) (esc)
   loop [                                                ] 0/3\r (no-eol) (esc)
   nested [                                              ] 0/2\r (no-eol) (esc)
   nested [======================>                       ] 1/2\r (no-eol) (esc)
   loop [===============>                                ] 1/3\r (no-eol) (esc)
   nested [                                              ] 0/2\r (no-eol) (esc)
   nested [======================>                       ] 1/2\r (no-eol) (esc)
   loop [===============================>                ] 2/3\r (no-eol) (esc)
   nested [                                              ] 0/2\r (no-eol) (esc)
   nested [======================>                       ] 1/2\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
 
 test two topics being printed in parallel (as when we're doing a local
 --pull clone, where you get the unbundle and bundle progress at the
 same time):
   $ hg loop 3 --parallel
   \r (no-eol) (esc)
   loop [                                                ] 0/3\r (no-eol) (esc)
   loop [===============>                                ] 1/3\r (no-eol) (esc)
   loop [===============================>                ] 2/3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 test refresh is taken in account
 
   $ hg -y --config progress.refresh=100 loop 3
 
 test format options 1
 
   $ hg -y --config 'progress.format=number topic item+2' loop 2
   \r (no-eol) (esc)
   0/2 loop lo\r (no-eol) (esc)
   1/2 loop lo\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
 test format options 2
 
   $ hg -y --config 'progress.format=number item-3 bar' loop 2
   \r (no-eol) (esc)
   0/2 p.0 [                                                 ]\r (no-eol) (esc)
   1/2 p.1 [=======================>                         ]\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
 test format options and indeterminate progress
 
   $ hg -y --config 'progress.format=number item bar' loop -- -2
   \r (no-eol) (esc)
   0 loop.0               [ <=>                              ]\r (no-eol) (esc)
   1 loop.1               [  <=>                             ]\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
 make sure things don't fall over if count > total
 
   $ hg -y loop --total 4 6
   \r (no-eol) (esc)
   loop [                                                ] 0/4\r (no-eol) (esc)
   loop [===========>                                    ] 1/4\r (no-eol) (esc)
   loop [=======================>                        ] 2/4\r (no-eol) (esc)
   loop [===================================>            ] 3/4\r (no-eol) (esc)
   loop [===============================================>] 4/4\r (no-eol) (esc)
   loop [ <=>                                            ] 5/4\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
+test interaction with ui.warn
+
+  $ hg loop --warn 6
+  \r (no-eol) (esc)
+  loop [                                                ] 0/6\r (no-eol) (esc)
+                                                              \r (no-eol) (esc)
+  reached step 0
+  \r (no-eol) (esc)
+  loop [=======>                                        ] 1/6\r (no-eol) (esc)
+  loop [===============>                                ] 2/6\r (no-eol) (esc)
+  loop [=======================>                        ] 3/6\r (no-eol) (esc)
+                                                              \r (no-eol) (esc)
+  reached step 3
+  \r (no-eol) (esc)
+  loop [===============================>                ] 4/6\r (no-eol) (esc)
+  loop [=======================================>        ] 5/6\r (no-eol) (esc)
+                                                              \r (no-eol) (esc)
+
+test interaction with ui.timestamp-output
+
+  $ hg loop --warn --config ui.timestamp-output=true 6
+  \r (no-eol) (esc)
+  loop [                                                ] 0/6\r (no-eol) (esc)
+                                                              \r (no-eol) (esc)
+  \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] reached step 0 (re)
+  \r (no-eol) (esc)
+  loop [=======>                                        ] 1/6\r (no-eol) (esc)
+  loop [===============>                                ] 2/6\r (no-eol) (esc)
+  loop [=======================>                        ] 3/6\r (no-eol) (esc)
+                                                              \r (no-eol) (esc)
+  \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] reached step 3 (re)
+  \r (no-eol) (esc)
+  loop [===============================>                ] 4/6\r (no-eol) (esc)
+  loop [=======================================>        ] 5/6\r (no-eol) (esc)
+                                                              \r (no-eol) (esc)
+
 test immediate progress completion
 
   $ hg -y loop 0
 
 test delay time estimates
 
 #if no-chg
 
   $ cp $HGRCPATH.orig $HGRCPATH
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mocktime=$TESTDIR/mocktime.py" >> $HGRCPATH
   $ echo "progress=" >> $HGRCPATH
   $ echo "loop=`pwd`/loop.py" >> $HGRCPATH
   $ echo "[progress]" >> $HGRCPATH
   $ echo "assume-tty=1" >> $HGRCPATH
   $ echo "delay=25" >> $HGRCPATH
   $ echo "width=60" >> $HGRCPATH
 
   $ MOCKTIME=11 hg -y loop 8
   \r (no-eol) (esc)
   loop [=========>                                ] 2/8 1m07s\r (no-eol) (esc)
   loop [===============>                            ] 3/8 56s\r (no-eol) (esc)
   loop [=====================>                      ] 4/8 45s\r (no-eol) (esc)
   loop [==========================>                 ] 5/8 34s\r (no-eol) (esc)
   loop [================================>           ] 6/8 23s\r (no-eol) (esc)
   loop [=====================================>      ] 7/8 12s\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
   $ MOCKTIME=10000 hg -y loop 4
   \r (no-eol) (esc)
   loop [                                                ] 0/4\r (no-eol) (esc)
   loop [=========>                                ] 1/4 8h21m\r (no-eol) (esc)
   loop [====================>                     ] 2/4 5h34m\r (no-eol) (esc)
   loop [==============================>           ] 3/4 2h47m\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
   $ MOCKTIME=1000000 hg -y loop 4
   \r (no-eol) (esc)
   loop [                                                ] 0/4\r (no-eol) (esc)
   loop [=========>                                ] 1/4 5w00d\r (no-eol) (esc)
   loop [====================>                     ] 2/4 3w03d\r (no-eol) (esc)
   loop [=============================>           ] 3/4 11d14h\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
 
   $ MOCKTIME=14000000 hg -y loop 4
   \r (no-eol) (esc)
   loop [                                                ] 0/4\r (no-eol) (esc)
   loop [=========>                                ] 1/4 1y18w\r (no-eol) (esc)
   loop [===================>                     ] 2/4 46w03d\r (no-eol) (esc)
   loop [=============================>           ] 3/4 23w02d\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
 Non-linear progress:
 
   $ MOCKTIME='20 20 20 20 20 20 20 20 20 20 500 500 500 500 500 20 20 20 20 20' hg -y loop 20
   \r (no-eol) (esc)
   loop [=>                                      ]  1/20 6m21s\r (no-eol) (esc)
   loop [===>                                    ]  2/20 6m01s\r (no-eol) (esc)
   loop [=====>                                  ]  3/20 5m41s\r (no-eol) (esc)
   loop [=======>                                ]  4/20 5m21s\r (no-eol) (esc)
   loop [=========>                              ]  5/20 5m01s\r (no-eol) (esc)
   loop [===========>                            ]  6/20 4m41s\r (no-eol) (esc)
   loop [=============>                          ]  7/20 4m21s\r (no-eol) (esc)
   loop [===============>                        ]  8/20 4m01s\r (no-eol) (esc)
   loop [================>                      ]  9/20 25m40s\r (no-eol) (esc)
   loop [===================>                    ] 10/20 1h06m\r (no-eol) (esc)
   loop [=====================>                  ] 11/20 1h13m\r (no-eol) (esc)
   loop [=======================>                ] 12/20 1h07m\r (no-eol) (esc)
   loop [========================>              ] 13/20 58m19s\r (no-eol) (esc)
   loop [===========================>            ] 14/20 7m09s\r (no-eol) (esc)
   loop [=============================>          ] 15/20 3m38s\r (no-eol) (esc)
   loop [===============================>        ] 16/20 2m15s\r (no-eol) (esc)
   loop [=================================>      ] 17/20 1m27s\r (no-eol) (esc)
   loop [====================================>     ] 18/20 52s\r (no-eol) (esc)
   loop [======================================>   ] 19/20 25s\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
 Time estimates should not fail when there's no end point:
   $ MOCKTIME=11 hg -y loop -- -4
   \r (no-eol) (esc)
   loop [ <=>                                              ] 2\r (no-eol) (esc)
   loop [  <=>                                             ] 3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
 
 #endif
 
 test line trimming by '[progress] width', when progress topic contains
 multi-byte characters, of which length of byte sequence and columns in
 display are different from each other.
 
   $ cp $HGRCPATH.orig $HGRCPATH
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > progress=
   > loop=`pwd`/loop.py
   > [progress]
   > assume-tty = 1
   > delay = 0
   > refresh = 0
   > EOF
 
   $ rm -f loop.pyc
   $ cat >> loop.py <<EOF
   > # use non-ascii characters as topic label of progress
   > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes
   > topiclabel = u'\u3042\u3044\u3046\u3048'.encode('utf-8')
   > EOF
 
   $ cat >> $HGRCPATH <<EOF
   > [progress]
   > format = topic number
   > width= 12
   > EOF
 
   $ hg --encoding utf-8 -y loop --total 3 3
   \r (no-eol) (esc)
   \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88 0/3\r (no-eol) (esc)
   \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88 1/3\r (no-eol) (esc)
   \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88 2/3\r (no-eol) (esc)
               \r (no-eol) (esc)
 
 test calculation of bar width, when progress topic contains multi-byte
 characters, of which length of byte sequence and columns in display
 are different from each other.
 
   $ cat >> $HGRCPATH <<EOF
   > [progress]
   > format = topic bar
   > width= 21
   > # progwidth should be 9 (= 21 - (8+1) - 3)
   > EOF
 
   $ hg --encoding utf-8 -y loop --total 3 3
   \r (no-eol) (esc)
   \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88 [         ]\r (no-eol) (esc)
   \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88 [==>      ]\r (no-eol) (esc)
   \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88 [=====>   ]\r (no-eol) (esc)
                        \r (no-eol) (esc)
 
 test trimming progress items, when they contain multi-byte characters,
 of which length of byte sequence and columns in display are different
 from each other.
 
   $ rm -f loop.pyc
   $ rm -Rf __pycache__
   $ cat >> loop.py <<EOF
   > # use non-ascii characters as loop items of progress
   > loopitems = [
   >     u'\u3042\u3044'.encode('utf-8'), # 2 x 2 = 4 columns
   >     u'\u3042\u3044\u3046'.encode('utf-8'), # 2 x 3 = 6 columns
   >     u'\u3042\u3044\u3046\u3048'.encode('utf-8'), # 2 x 4 = 8 columns
   > ]
   > def getloopitem(i):
   >     return loopitems[i % len(loopitems)]
   > EOF
 
   $ cat >> $HGRCPATH <<EOF
   > [progress]
   > # trim at tail side
   > format = item+6
   > EOF
 
   $ hg --encoding utf-8 -y loop --total 3 3
   \r (no-eol) (esc)
   \xe3\x81\x82\xe3\x81\x84  \r (no-eol) (esc)
   \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\r (no-eol) (esc)
   \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\r (no-eol) (esc)
                        \r (no-eol) (esc)
 
   $ cat >> $HGRCPATH <<EOF
   > [progress]
   > # trim at left side
   > format = item-6
   > EOF
 
   $ hg --encoding utf-8 -y loop --total 3 3
   \r (no-eol) (esc)
   \xe3\x81\x82\xe3\x81\x84  \r (no-eol) (esc)
   \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\r (no-eol) (esc)
   \xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\r (no-eol) (esc)
                        \r (no-eol) (esc)

tests/test-pull.t

@@ -1,152 +1,152 b''
 #require serve
 
 #testcases sshv1 sshv2
 
 #if sshv2
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > sshpeer.advertise-v2 = true
   > sshserver.support-v2 = true
   > EOF
 #endif
 
   $ hg init test
   $ cd test
 
   $ echo foo>foo
   $ hg addremove
   adding foo
   $ hg commit -m 1
 
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 1 changesets with 1 changes to 1 files
 
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
 
   $ hg clone --pull http://foo:bar@localhost:$HGPORT/ copy
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 340e38bdcde4
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd copy
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 1 changesets with 1 changes to 1 files
 
   $ hg co
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat foo
   foo
 
   $ hg manifest --debug
   2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   foo
 
   $ hg pull
   pulling from http://foo@localhost:$HGPORT/
   searching for changes
   no changes found
 
   $ hg rollback --dry-run --verbose
   repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)
 
 Test pull of non-existing 20 character revision specification, making sure plain ascii identifiers
 not are encoded like a node:
 
   $ hg pull -r 'xxxxxxxxxxxxxxxxxxxy'
   pulling from http://foo@localhost:$HGPORT/
   abort: unknown revision 'xxxxxxxxxxxxxxxxxxxy'!
   [255]
   $ hg pull -r 'xxxxxxxxxxxxxxxxxx y'
   pulling from http://foo@localhost:$HGPORT/
   abort: unknown revision 'xxxxxxxxxxxxxxxxxx y'!
   [255]
 
 Test pull of working copy revision
   $ hg pull -r 'ffffffffffff'
   pulling from http://foo@localhost:$HGPORT/
   abort: unknown revision 'ffffffffffff'!
   [255]
 
 Issue622: hg init && hg pull -u URL doesn't checkout default branch
 
   $ cd ..
   $ hg init empty
   $ cd empty
   $ hg pull -u ../test
   pulling from ../test
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets 340e38bdcde4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Test 'file:' uri handling:
 
   $ hg pull -q file://../test-does-not-exist
   abort: file:// URLs can only refer to localhost
   [255]
 
   $ hg pull -q file://../test
   abort: file:// URLs can only refer to localhost
   [255]
 
 MSYS changes 'file:' into 'file;'
 
 #if no-msys
   $ hg pull -q file:../test  # no-msys
 #endif
 
 It's tricky to make file:// URLs working on every platform with
 regular shell commands.
 
   $ URL=`"$PYTHON" -c "from __future__ import print_function; import os; print('file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test')"`
   $ hg pull -q "$URL"
   abort: file:// URLs can only refer to localhost
   [255]
 
   $ URL=`"$PYTHON" -c "from __future__ import print_function; import os; print('file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test')"`
   $ hg pull -q "$URL"
 
 SEC: check for unsafe ssh url
 
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > ssh = sh -c "read l; read l; read l"
   > EOF
 
   $ hg pull 'ssh://-oProxyCommand=touch${IFS}owned/path'
   pulling from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
   abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
   [255]
   $ hg pull 'ssh://%2DoProxyCommand=touch${IFS}owned/path'
   pulling from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
   abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
   [255]
   $ hg pull 'ssh://fakehost|touch${IFS}owned/path'
   pulling from ssh://fakehost%7Ctouch%24%7BIFS%7Downed/path
   abort: no suitable response from remote hg!
   [255]
-  $ hg pull 'ssh://fakehost%7Ctouch%20owned/path'
-  pulling from ssh://fakehost%7Ctouch%20owned/path
-  abort: no suitable response from remote hg!
+  $ hg --config ui.timestamp-output=true pull 'ssh://fakehost%7Ctouch%20owned/path'
+  \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] pulling from ssh://fakehost%7Ctouch%20owned/path (re)
+  \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] abort: no suitable response from remote hg! (re)
   [255]
 
   $ [ ! -f owned ] || echo 'you got owned'
 
   $ cd ..