dynamic-import: use sysstr for importing extension and others

This logic is used by extensions, and python hooks and merge-tools. All this
logic eventually deals with native string (unicode in Python 3). This patch
makes it handle `str` directly instead of relying on some pycompat low lever
layer to do the conversion at the last minutes.

We adjust the Python version filtering of a test as the output seems to be present with Python 3.7 too.

mercurial/extensions.py

@@ -1,1011 +1,1011 b''
 # extensions.py - extension handling for mercurial
 #
 # Copyright 2005-2007 Olivia 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.
 
 
 import ast
 import collections
 import functools
 import importlib
 import inspect
 import os
 import sys
 
 from .i18n import (
     _,
     gettext,
 )
 from .pycompat import (
     getattr,
     open,
     setattr,
 )
 
 from . import (
     cmdutil,
     configitems,
     error,
     pycompat,
     util,
 )
 
 from .utils import stringutil
 
 _extensions = {}
 _disabledextensions = {}
 _aftercallbacks = {}
 _order = []
 _builtin = {
     b'hbisect',
     b'bookmarks',
     b'color',
     b'parentrevspec',
     b'progress',
     b'interhg',
     b'inotify',
     b'hgcia',
     b'shelve',
 }
 
 
 def extensions(ui=None):
     if ui:
 
         def enabled(name):
             for format in [b'%s', b'hgext.%s']:
                 conf = ui.config(b'extensions', format % name)
                 if conf is not None and not conf.startswith(b'!'):
                     return True
 
     else:
         enabled = lambda name: True
     for name in _order:
         module = _extensions[name]
         if module and enabled(name):
             yield name, module
 
 
 def find(name):
     '''return module with given extension name'''
     mod = None
     try:
         mod = _extensions[name]
     except KeyError:
         for k, v in _extensions.items():
             if k.endswith(b'.' + name) or k.endswith(b'/' + name):
                 mod = v
                 break
     if not mod:
         raise KeyError(name)
     return mod
 
 
 def loadpath(path, module_name):
-    module_name = module_name.replace(b'.', b'_')
+    module_name = module_name.replace('.', '_')
     path = util.normpath(util.expandpath(path))
-    module_name = pycompat.fsdecode(module_name)
     path = pycompat.fsdecode(path)
     if os.path.isdir(path):
         # module/__init__.py style
         init_py_path = os.path.join(path, '__init__.py')
         if not os.path.exists(init_py_path):
             raise ImportError("No module named '%s'" % os.path.basename(path))
         path = init_py_path
 
     loader = importlib.machinery.SourceFileLoader(module_name, path)
     spec = importlib.util.spec_from_file_location(module_name, loader=loader)
     assert spec is not None  # help Pytype
     module = importlib.util.module_from_spec(spec)
     sys.modules[module_name] = module
     spec.loader.exec_module(module)
     return module
 
 
 def _importh(name):
     """import and return the <name> module"""
-    mod = __import__(pycompat.sysstr(name))
-    components = name.split(b'.')
+    mod = __import__(name)
+    components = name.split('.')
     for comp in components[1:]:
         mod = getattr(mod, comp)
     return mod
 
 
 def _importext(name, path=None, reportfunc=None):
+    name = pycompat.fsdecode(name)
     if path:
         # the module will be loaded in sys.modules
         # choose an unique name so that it doesn't
         # conflicts with other modules
-        mod = loadpath(path, b'hgext.%s' % name)
+        mod = loadpath(path, 'hgext.%s' % name)
     else:
         try:
-            mod = _importh(b"hgext.%s" % name)
+            mod = _importh("hgext.%s" % name)
         except ImportError as err:
             if reportfunc:
-                reportfunc(err, b"hgext.%s" % name, b"hgext3rd.%s" % name)
+                reportfunc(err, "hgext.%s" % name, "hgext3rd.%s" % name)
             try:
-                mod = _importh(b"hgext3rd.%s" % name)
+                mod = _importh("hgext3rd.%s" % name)
             except ImportError as err:
                 if reportfunc:
-                    reportfunc(err, b"hgext3rd.%s" % name, name)
+                    reportfunc(err, "hgext3rd.%s" % name, name)
                 mod = _importh(name)
     return mod
 
 
 def _reportimporterror(ui, err, failed, next):
     # note: this ui.log happens before --debug is processed,
     #       Use --config ui.debug=1 to see them.
     ui.log(
         b'extension',
         b'    - could not import %s (%s): trying %s\n',
-        failed,
+        stringutil.forcebytestr(failed),
         stringutil.forcebytestr(err),
-        next,
+        stringutil.forcebytestr(next),
     )
     if ui.debugflag and ui.configbool(b'devel', b'debug.extensions'):
         ui.traceback()
 
 
 def _rejectunicode(name, xs):
     if isinstance(xs, (list, set, tuple)):
         for x in xs:
             _rejectunicode(name, x)
     elif isinstance(xs, dict):
         for k, v in xs.items():
             _rejectunicode(name, k)
             k = pycompat.sysstr(k)
             _rejectunicode('%s.%s' % (name, k), v)
     elif isinstance(xs, str):
         raise error.ProgrammingError(
             b"unicode %r found in %s" % (xs, stringutil.forcebytestr(name)),
             hint=b"use b'' to make it byte string",
         )
 
 
 # attributes set by registrar.command
 _cmdfuncattrs = ('norepo', 'optionalrepo', 'inferrepo')
 
 
 def _validatecmdtable(ui, cmdtable):
     """Check if extension commands have required attributes"""
     for c, e in cmdtable.items():
         f = e[0]
         missing = [a for a in _cmdfuncattrs if not util.safehasattr(f, a)]
         if not missing:
             continue
         msg = b'missing attributes: %s'
         msg %= b', '.join([stringutil.forcebytestr(m) for m in missing])
         hint = b"use @command decorator to register '%s'" % c
         raise error.ProgrammingError(msg, hint=hint)
 
 
 def _validatetables(ui, mod):
     """Sanity check for loadable tables provided by extension module"""
     for t in ['cmdtable', 'colortable', 'configtable']:
         _rejectunicode(t, getattr(mod, t, {}))
     for t in [
         'filesetpredicate',
         'internalmerge',
         'revsetpredicate',
         'templatefilter',
         'templatefunc',
         'templatekeyword',
     ]:
         o = getattr(mod, t, None)
         if o:
             _rejectunicode(t, o._table)
     _validatecmdtable(ui, getattr(mod, 'cmdtable', {}))
 
 
 def load(ui, name, path, loadingtime=None):
     if name.startswith(b'hgext.') or name.startswith(b'hgext/'):
         shortname = name[6:]
     else:
         shortname = name
     if shortname in _builtin:
         return None
     if shortname in _extensions:
         return _extensions[shortname]
     ui.log(b'extension', b'  - loading extension: %s\n', shortname)
     _extensions[shortname] = None
     with util.timedcm('load extension %s', shortname) as stats:
         mod = _importext(name, path, bind(_reportimporterror, ui))
     ui.log(b'extension', b'  > %s extension loaded in %s\n', shortname, stats)
     if loadingtime is not None:
         loadingtime[shortname] += stats.elapsed
 
     # Before we do anything with the extension, check against minimum stated
     # compatibility. This gives extension authors a mechanism to have their
     # extensions short circuit when loaded with a known incompatible version
     # of Mercurial.
     minver = getattr(mod, 'minimumhgversion', None)
     if minver:
         curver = util.versiontuple(n=2)
         extmin = util.versiontuple(stringutil.forcebytestr(minver), 2)
 
         if None in extmin:
             extmin = (extmin[0] or 0, extmin[1] or 0)
 
         if None in curver or extmin > curver:
             msg = _(
                 b'(third party extension %s requires version %s or newer '
                 b'of Mercurial (current: %s); disabling)\n'
             )
             ui.warn(msg % (shortname, minver, util.version()))
             return
     ui.log(b'extension', b'    - validating extension tables: %s\n', shortname)
     _validatetables(ui, mod)
 
     _extensions[shortname] = mod
     _order.append(shortname)
     ui.log(
         b'extension', b'    - invoking registered callbacks: %s\n', shortname
     )
     with util.timedcm('callbacks extension %s', shortname) as stats:
         for fn in _aftercallbacks.get(shortname, []):
             fn(loaded=True)
     ui.log(b'extension', b'    > callbacks completed in %s\n', stats)
     return mod
 
 
 def _runuisetup(name, ui):
     uisetup = getattr(_extensions[name], 'uisetup', None)
     if uisetup:
         try:
             uisetup(ui)
         except Exception as inst:
             ui.traceback(force=True)
             msg = stringutil.forcebytestr(inst)
             ui.warn(_(b"*** failed to set up extension %s: %s\n") % (name, msg))
             return False
     return True
 
 
 def _runextsetup(name, ui):
     extsetup = getattr(_extensions[name], 'extsetup', None)
     if extsetup:
         try:
             extsetup(ui)
         except Exception as inst:
             ui.traceback(force=True)
             msg = stringutil.forcebytestr(inst)
             ui.warn(_(b"*** failed to set up extension %s: %s\n") % (name, msg))
             return False
     return True
 
 
 def loadall(ui, whitelist=None):
     loadingtime = collections.defaultdict(int)
     result = ui.configitems(b"extensions")
     if whitelist is not None:
         result = [(k, v) for (k, v) in result if k in whitelist]
     result = [(k, v) for (k, v) in result if b':' not in k]
     newindex = len(_order)
     ui.log(
         b'extension',
         b'loading %sextensions\n',
         b'additional ' if newindex else b'',
     )
     ui.log(b'extension', b'- processing %d entries\n', len(result))
     with util.timedcm('load all extensions') as stats:
         default_sub_options = ui.configsuboptions(b"extensions", b"*")[1]
 
         for (name, path) in result:
             if path:
                 if path[0:1] == b'!':
                     if name not in _disabledextensions:
                         ui.log(
                             b'extension',
                             b'  - skipping disabled extension: %s\n',
                             name,
                         )
                     _disabledextensions[name] = path[1:]
                     continue
             try:
                 load(ui, name, path, loadingtime)
             except Exception as inst:
                 msg = stringutil.forcebytestr(inst)
                 if path:
                     error_msg = _(
                         b'failed to import extension "%s" from %s: %s'
                     )
                     error_msg %= (name, path, msg)
                 else:
                     error_msg = _(b'failed to import extension "%s": %s')
                     error_msg %= (name, msg)
 
                 options = default_sub_options.copy()
                 ext_options = ui.configsuboptions(b"extensions", name)[1]
                 options.update(ext_options)
                 if stringutil.parsebool(options.get(b"required", b'no')):
                     hint = None
                     if isinstance(inst, error.Hint) and inst.hint:
                         hint = inst.hint
                     if hint is None:
                         hint = _(
                             b"loading of this extension was required, "
                             b"see `hg help config.extensions` for details"
                         )
                     raise error.Abort(error_msg, hint=hint)
                 else:
                     ui.warn((b"*** %s\n") % error_msg)
                     if isinstance(inst, error.Hint) and inst.hint:
                         ui.warn(_(b"*** (%s)\n") % inst.hint)
                     ui.traceback()
 
     ui.log(
         b'extension',
         b'> loaded %d extensions, total time %s\n',
         len(_order) - newindex,
         stats,
     )
     # list of (objname, loadermod, loadername) tuple:
     # - objname is the name of an object in extension module,
     #   from which extra information is loaded
     # - loadermod is the module where loader is placed
     # - loadername is the name of the function,
     #   which takes (ui, extensionname, extraobj) arguments
     #
     # This one is for the list of item that must be run before running any setup
     earlyextraloaders = [
         ('configtable', configitems, 'loadconfigtable'),
     ]
 
     ui.log(b'extension', b'- loading configtable attributes\n')
     _loadextra(ui, newindex, earlyextraloaders)
 
     broken = set()
     ui.log(b'extension', b'- executing uisetup hooks\n')
     with util.timedcm('all uisetup') as alluisetupstats:
         for name in _order[newindex:]:
             ui.log(b'extension', b'  - running uisetup for %s\n', name)
             with util.timedcm('uisetup %s', name) as stats:
                 if not _runuisetup(name, ui):
                     ui.log(
                         b'extension',
                         b'    - the %s extension uisetup failed\n',
                         name,
                     )
                     broken.add(name)
             ui.log(b'extension', b'  > uisetup for %s took %s\n', name, stats)
             loadingtime[name] += stats.elapsed
     ui.log(b'extension', b'> all uisetup took %s\n', alluisetupstats)
 
     ui.log(b'extension', b'- executing extsetup hooks\n')
     with util.timedcm('all extsetup') as allextetupstats:
         for name in _order[newindex:]:
             if name in broken:
                 continue
             ui.log(b'extension', b'  - running extsetup for %s\n', name)
             with util.timedcm('extsetup %s', name) as stats:
                 if not _runextsetup(name, ui):
                     ui.log(
                         b'extension',
                         b'    - the %s extension extsetup failed\n',
                         name,
                     )
                     broken.add(name)
             ui.log(b'extension', b'  > extsetup for %s took %s\n', name, stats)
             loadingtime[name] += stats.elapsed
     ui.log(b'extension', b'> all extsetup took %s\n', allextetupstats)
 
     for name in broken:
         ui.log(b'extension', b'    - disabling broken %s extension\n', name)
         _extensions[name] = None
 
     # Call aftercallbacks that were never met.
     ui.log(b'extension', b'- executing remaining aftercallbacks\n')
     with util.timedcm('aftercallbacks') as stats:
         for shortname in _aftercallbacks:
             if shortname in _extensions:
                 continue
 
             for fn in _aftercallbacks[shortname]:
                 ui.log(
                     b'extension',
                     b'  - extension %s not loaded, notify callbacks\n',
                     shortname,
                 )
                 fn(loaded=False)
     ui.log(b'extension', b'> remaining aftercallbacks completed in %s\n', stats)
 
     # loadall() is called multiple times and lingering _aftercallbacks
     # entries could result in double execution. See issue4646.
     _aftercallbacks.clear()
 
     # delay importing avoids cyclic dependency (especially commands)
     from . import (
         color,
         commands,
         filemerge,
         fileset,
         revset,
         templatefilters,
         templatefuncs,
         templatekw,
     )
 
     # list of (objname, loadermod, loadername) tuple:
     # - objname is the name of an object in extension module,
     #   from which extra information is loaded
     # - loadermod is the module where loader is placed
     # - loadername is the name of the function,
     #   which takes (ui, extensionname, extraobj) arguments
     ui.log(b'extension', b'- loading extension registration objects\n')
     extraloaders = [
         ('cmdtable', commands, 'loadcmdtable'),
         ('colortable', color, 'loadcolortable'),
         ('filesetpredicate', fileset, 'loadpredicate'),
         ('internalmerge', filemerge, 'loadinternalmerge'),
         ('revsetpredicate', revset, 'loadpredicate'),
         ('templatefilter', templatefilters, 'loadfilter'),
         ('templatefunc', templatefuncs, 'loadfunction'),
         ('templatekeyword', templatekw, 'loadkeyword'),
     ]
     with util.timedcm('load registration objects') as stats:
         _loadextra(ui, newindex, extraloaders)
     ui.log(
         b'extension',
         b'> extension registration object loading took %s\n',
         stats,
     )
 
     # Report per extension loading time (except reposetup)
     for name in sorted(loadingtime):
         ui.log(
             b'extension',
             b'> extension %s take a total of %s to load\n',
             name,
             util.timecount(loadingtime[name]),
         )
 
     ui.log(b'extension', b'extension loading complete\n')
 
 
 def _loadextra(ui, newindex, extraloaders):
     for name in _order[newindex:]:
         module = _extensions[name]
         if not module:
             continue  # loading this module failed
 
         for objname, loadermod, loadername in extraloaders:
             extraobj = getattr(module, objname, None)
             if extraobj is not None:
                 getattr(loadermod, loadername)(ui, name, extraobj)
 
 
 def afterloaded(extension, callback):
     """Run the specified function after a named extension is loaded.
 
     If the named extension is already loaded, the callback will be called
     immediately.
 
     If the named extension never loads, the callback will be called after
     all extensions have been loaded.
 
     The callback receives the named argument ``loaded``, which is a boolean
     indicating whether the dependent extension actually loaded.
     """
 
     if extension in _extensions:
         # Report loaded as False if the extension is disabled
         loaded = _extensions[extension] is not None
         callback(loaded=loaded)
     else:
         _aftercallbacks.setdefault(extension, []).append(callback)
 
 
 def populateui(ui):
     """Run extension hooks on the given ui to populate additional members,
     extend the class dynamically, etc.
 
     This will be called after the configuration is loaded, and/or extensions
     are loaded. In general, it's once per ui instance, but in command-server
     and hgweb, this may be called more than once with the same ui.
     """
     for name, mod in extensions(ui):
         hook = getattr(mod, 'uipopulate', None)
         if not hook:
             continue
         try:
             hook(ui)
         except Exception as inst:
             ui.traceback(force=True)
             ui.warn(
                 _(b'*** failed to populate ui by extension %s: %s\n')
                 % (name, stringutil.forcebytestr(inst))
             )
 
 
 def bind(func, *args):
     """Partial function application
 
     Returns a new function that is the partial application of args and kwargs
     to func.  For example,
 
         f(1, 2, bar=3) === bind(f, 1)(2, bar=3)"""
     assert callable(func)
 
     def closure(*a, **kw):
         return func(*(args + a), **kw)
 
     return closure
 
 
 def _updatewrapper(wrap, origfn, unboundwrapper):
     '''Copy and add some useful attributes to wrapper'''
     try:
         wrap.__name__ = origfn.__name__
     except AttributeError:
         pass
     wrap.__module__ = getattr(origfn, '__module__')
     wrap.__doc__ = getattr(origfn, '__doc__')
     wrap.__dict__.update(getattr(origfn, '__dict__', {}))
     wrap._origfunc = origfn
     wrap._unboundwrapper = unboundwrapper
 
 
 def wrapcommand(table, command, wrapper, synopsis=None, docstring=None):
     '''Wrap the command named `command' in table
 
     Replace command in the command table with wrapper. The wrapped command will
     be inserted into the command table specified by the table argument.
 
     The wrapper will be called like
 
       wrapper(orig, *args, **kwargs)
 
     where orig is the original (wrapped) function, and *args, **kwargs
     are the arguments passed to it.
 
     Optionally append to the command synopsis and docstring, used for help.
     For example, if your extension wraps the ``bookmarks`` command to add the
     flags ``--remote`` and ``--all`` you might call this function like so:
 
       synopsis = ' [-a] [--remote]'
       docstring = """
 
       The ``remotenames`` extension adds the ``--remote`` and ``--all`` (``-a``)
       flags to the bookmarks command. Either flag will show the remote bookmarks
       known to the repository; ``--remote`` will also suppress the output of the
       local bookmarks.
       """
 
       extensions.wrapcommand(commands.table, 'bookmarks', exbookmarks,
                              synopsis, docstring)
     '''
     assert callable(wrapper)
     aliases, entry = cmdutil.findcmd(command, table)
     for alias, e in table.items():
         if e is entry:
             key = alias
             break
 
     origfn = entry[0]
     wrap = functools.partial(
         util.checksignature(wrapper), util.checksignature(origfn)
     )
     _updatewrapper(wrap, origfn, wrapper)
     if docstring is not None:
         wrap.__doc__ += docstring
 
     newentry = list(entry)
     newentry[0] = wrap
     if synopsis is not None:
         newentry[2] += synopsis
     table[key] = tuple(newentry)
     return entry
 
 
 def wrapfilecache(cls, propname, wrapper):
     """Wraps a filecache property.
 
     These can't be wrapped using the normal wrapfunction.
     """
     propname = pycompat.sysstr(propname)
     assert callable(wrapper)
     for currcls in cls.__mro__:
         if propname in currcls.__dict__:
             origfn = currcls.__dict__[propname].func
             assert callable(origfn)
 
             def wrap(*args, **kwargs):
                 return wrapper(origfn, *args, **kwargs)
 
             currcls.__dict__[propname].func = wrap
             break
 
     if currcls is object:
         raise AttributeError("type '%s' has no property '%s'" % (cls, propname))
 
 
 class wrappedfunction:
     '''context manager for temporarily wrapping a function'''
 
     def __init__(self, container, funcname, wrapper):
         assert callable(wrapper)
         if not isinstance(funcname, str):
             msg = b"pass wrappedfunction target name as `str`, not `bytes`"
             util.nouideprecwarn(msg, b"6.6", stacklevel=2)
             funcname = pycompat.sysstr(funcname)
         self._container = container
         self._funcname = funcname
         self._wrapper = wrapper
 
     def __enter__(self):
         wrapfunction(self._container, self._funcname, self._wrapper)
 
     def __exit__(self, exctype, excvalue, traceback):
         unwrapfunction(self._container, self._funcname, self._wrapper)
 
 
 def wrapfunction(container, funcname, wrapper):
     """Wrap the function named funcname in container
 
     Replace the funcname member in the given container with the specified
     wrapper. The container is typically a module, class, or instance.
 
     The wrapper will be called like
 
       wrapper(orig, *args, **kwargs)
 
     where orig is the original (wrapped) function, and *args, **kwargs
     are the arguments passed to it.
 
     Wrapping methods of the repository object is not recommended since
     it conflicts with extensions that extend the repository by
     subclassing. All extensions that need to extend methods of
     localrepository should use this subclassing trick: namely,
     reposetup() should look like
 
       def reposetup(ui, repo):
           class myrepo(repo.__class__):
               def whatever(self, *args, **kwargs):
                   [...extension stuff...]
                   super(myrepo, self).whatever(*args, **kwargs)
                   [...extension stuff...]
 
           repo.__class__ = myrepo
 
     In general, combining wrapfunction() with subclassing does not
     work. Since you cannot control what other extensions are loaded by
     your end users, you should play nicely with others by using the
     subclass trick.
     """
     assert callable(wrapper)
 
     if not isinstance(funcname, str):
         msg = b"pass wrapfunction target name as `str`, not `bytes`"
         util.nouideprecwarn(msg, b"6.6", stacklevel=2)
         funcname = pycompat.sysstr(funcname)
 
     origfn = getattr(container, funcname)
     assert callable(origfn)
     if inspect.ismodule(container):
         # origfn is not an instance or class method. "partial" can be used.
         # "partial" won't insert a frame in traceback.
         wrap = functools.partial(wrapper, origfn)
     else:
         # "partial" cannot be safely used. Emulate its effect by using "bind".
         # The downside is one more frame in traceback.
         wrap = bind(wrapper, origfn)
     _updatewrapper(wrap, origfn, wrapper)
     setattr(container, funcname, wrap)
     return origfn
 
 
 def unwrapfunction(container, funcname, wrapper=None):
     """undo wrapfunction
 
     If wrappers is None, undo the last wrap. Otherwise removes the wrapper
     from the chain of wrappers.
 
     Return the removed wrapper.
     Raise IndexError if wrapper is None and nothing to unwrap; ValueError if
     wrapper is not None but is not found in the wrapper chain.
     """
     chain = getwrapperchain(container, funcname)
     origfn = chain.pop()
     if wrapper is None:
         wrapper = chain[0]
     chain.remove(wrapper)
     setattr(container, funcname, origfn)
     for w in reversed(chain):
         wrapfunction(container, funcname, w)
     return wrapper
 
 
 def getwrapperchain(container, funcname):
     """get a chain of wrappers of a function
 
     Return a list of functions: [newest wrapper, ..., oldest wrapper, origfunc]
 
     The wrapper functions are the ones passed to wrapfunction, whose first
     argument is origfunc.
     """
     result = []
     fn = getattr(container, funcname)
     while fn:
         assert callable(fn)
         result.append(getattr(fn, '_unboundwrapper', fn))
         fn = getattr(fn, '_origfunc', None)
     return result
 
 
 def _disabledpaths():
     '''find paths of disabled extensions. returns a dict of {name: path}'''
     import hgext
 
     exts = {}
 
     # The hgext might not have a __file__ attribute (e.g. in PyOxidizer) and
     # it might not be on a filesystem even if it does.
     if util.safehasattr(hgext, '__file__'):
         extpath = os.path.dirname(
             util.abspath(pycompat.fsencode(hgext.__file__))
         )
         try:
             files = os.listdir(extpath)
         except OSError:
             pass
         else:
             for e in files:
                 if e.endswith(b'.py'):
                     name = e.rsplit(b'.', 1)[0]
                     path = os.path.join(extpath, e)
                 else:
                     name = e
                     path = os.path.join(extpath, e, b'__init__.py')
                     if not os.path.exists(path):
                         continue
                 if name in exts or name in _order or name == b'__init__':
                     continue
                 exts[name] = path
 
     for name, path in _disabledextensions.items():
         # If no path was provided for a disabled extension (e.g. "color=!"),
         # don't replace the path we already found by the scan above.
         if path:
             exts[name] = path
     return exts
 
 
 def _moduledoc(file):
     """return the top-level python documentation for the given file
 
     Loosely inspired by pydoc.source_synopsis(), but rewritten to
     handle triple quotes and to return the whole text instead of just
     the synopsis"""
     result = []
 
     line = file.readline()
     while line[:1] == b'#' or not line.strip():
         line = file.readline()
         if not line:
             break
 
     start = line[:3]
     if start == b'"""' or start == b"'''":
         line = line[3:]
         while line:
             if line.rstrip().endswith(start):
                 line = line.split(start)[0]
                 if line:
                     result.append(line)
                 break
             elif not line:
                 return None  # unmatched delimiter
             result.append(line)
             line = file.readline()
     else:
         return None
 
     return b''.join(result)
 
 
 def _disabledhelp(path):
     '''retrieve help synopsis of a disabled extension (without importing)'''
     try:
         with open(path, b'rb') as src:
             doc = _moduledoc(src)
     except IOError:
         return
 
     if doc:  # extracting localized synopsis
         return gettext(doc)
     else:
         return _(b'(no help text available)')
 
 
 def disabled():
     '''find disabled extensions from hgext. returns a dict of {name: desc}'''
     try:
         from hgext import __index__  # pytype: disable=import-error
 
         return {
             name: gettext(desc)
             for name, desc in __index__.docs.items()
             if name not in _order
         }
     except (ImportError, AttributeError):
         pass
 
     paths = _disabledpaths()
     if not paths:
         return {}
 
     exts = {}
     for name, path in paths.items():
         doc = _disabledhelp(path)
         if doc and name != b'__index__':
             exts[name] = stringutil.firstline(doc)
 
     return exts
 
 
 def disabled_help(name):
     """Obtain the full help text for a disabled extension, or None."""
     paths = _disabledpaths()
     if name in paths:
         return _disabledhelp(paths[name])
     else:
         try:
             import hgext
             from hgext import __index__  # pytype: disable=import-error
 
             # The extensions are filesystem based, so either an error occurred
             # or all are enabled.
             if util.safehasattr(hgext, '__file__'):
                 return
 
             if name in _order:  # enabled
                 return
             else:
                 return gettext(__index__.docs.get(name))
         except (ImportError, AttributeError):
             pass
 
 
 def _walkcommand(node):
     """Scan @command() decorators in the tree starting at node"""
     todo = collections.deque([node])
     while todo:
         node = todo.popleft()
         if not isinstance(node, ast.FunctionDef):
             todo.extend(ast.iter_child_nodes(node))
             continue
         for d in node.decorator_list:
             if not isinstance(d, ast.Call):
                 continue
             if not isinstance(d.func, ast.Name):
                 continue
             if d.func.id != 'command':
                 continue
             yield d
 
 
 def _disabledcmdtable(path):
     """Construct a dummy command table without loading the extension module
 
     This may raise IOError or SyntaxError.
     """
     with open(path, b'rb') as src:
         root = ast.parse(src.read(), path)
     cmdtable = {}
 
     # Python 3.12 started removing Bytes and Str and deprecate harder
     use_constant = 'Bytes' not in vars(ast)
 
     for node in _walkcommand(root):
         if not node.args:
             continue
         a = node.args[0]
         if use_constant:  # Valid since Python 3.8
             if isinstance(a, ast.Constant):
                 if isinstance(a.value, str):
                     name = pycompat.sysbytes(a.value)
                 elif isinstance(a.value, bytes):
                     name = a.value
                 else:
                     continue
             else:
                 continue
         else:  # Valid until 3.11
             if isinstance(a, ast.Str):
                 name = pycompat.sysbytes(a.s)
             elif isinstance(a, ast.Bytes):
                 name = a.s
             else:
                 continue
         cmdtable[name] = (None, [], b'')
     return cmdtable
 
 
 def _finddisabledcmd(ui, cmd, name, path, strict):
     try:
         cmdtable = _disabledcmdtable(path)
     except (IOError, SyntaxError):
         return
     try:
         aliases, entry = cmdutil.findcmd(cmd, cmdtable, strict)
     except (error.AmbiguousCommand, error.UnknownCommand):
         return
     for c in aliases:
         if c.startswith(cmd):
             cmd = c
             break
     else:
         cmd = aliases[0]
     doc = _disabledhelp(path)
     return (cmd, name, doc)
 
 
 def disabledcmd(ui, cmd, strict=False):
     """find cmd from disabled extensions without importing.
     returns (cmdname, extname, doc)"""
 
     paths = _disabledpaths()
     if not paths:
         raise error.UnknownCommand(cmd)
 
     ext = None
     # first, search for an extension with the same name as the command
     path = paths.pop(cmd, None)
     if path:
         ext = _finddisabledcmd(ui, cmd, cmd, path, strict=strict)
     if not ext:
         # otherwise, interrogate each extension until there's a match
         for name, path in paths.items():
             ext = _finddisabledcmd(ui, cmd, name, path, strict=strict)
             if ext:
                 break
     if ext:
         return ext
 
     raise error.UnknownCommand(cmd)
 
 
 def enabled(shortname=True):
     '''return a dict of {name: desc} of extensions'''
     exts = {}
     for ename, ext in extensions():
         doc = gettext(ext.__doc__) or _(b'(no help text available)')
         assert doc is not None  # help pytype
         if shortname:
             ename = ename.split(b'.')[-1]
         exts[ename] = stringutil.firstline(doc).strip()
 
     return exts
 
 
 def notloaded():
     '''return short names of extensions that failed to load'''
     return [name for name, mod in _extensions.items() if mod is None]
 
 
 def moduleversion(module):
     '''return version information from given module as a string'''
     if util.safehasattr(module, 'getversion') and callable(module.getversion):
         try:
             version = module.getversion()
         except Exception:
             version = b'unknown'
 
     elif util.safehasattr(module, '__version__'):
         version = module.__version__
     else:
         version = b''
     if isinstance(version, (list, tuple)):
         version = b'.'.join(pycompat.bytestr(o) for o in version)
     else:
         # version data should be bytes, but not all extensions are ported
         # to py3.
         version = stringutil.forcebytestr(version)
     return version
 
 
 def ismoduleinternal(module):
     exttestedwith = getattr(module, 'testedwith', None)
     return exttestedwith == b"ships-with-hg-core"

mercurial/filemerge.py

@@ -1,1322 +1,1323 b''
 # filemerge.py - file-level merge handling for Mercurial
 #
 # Copyright 2006, 2007, 2008 Olivia 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.
 
 
 import contextlib
 import os
 import re
 import shutil
 
 from .i18n import _
 from .node import (
     hex,
     short,
 )
 from .pycompat import (
     getattr,
 )
 
 from . import (
     encoding,
     error,
     formatter,
     match,
     pycompat,
     registrar,
     scmutil,
     simplemerge,
     tagmerge,
     templatekw,
     templater,
     templateutil,
     util,
 )
 
 from .utils import (
     procutil,
     stringutil,
 )
 
 
 def _toolstr(ui, tool, part, *args):
     return ui.config(b"merge-tools", tool + b"." + part, *args)
 
 
 def _toolbool(ui, tool, part, *args):
     return ui.configbool(b"merge-tools", tool + b"." + part, *args)
 
 
 def _toollist(ui, tool, part):
     return ui.configlist(b"merge-tools", tool + b"." + part)
 
 
 internals = {}
 # Merge tools to document.
 internalsdoc = {}
 
 internaltool = registrar.internalmerge()
 
 # internal tool merge types
 nomerge = internaltool.nomerge
 mergeonly = internaltool.mergeonly  # just the full merge, no premerge
 fullmerge = internaltool.fullmerge  # both premerge and merge
 
 # IMPORTANT: keep the last line of this prompt very short ("What do you want to
 # do?") because of issue6158, ideally to <40 English characters (to allow other
 # languages that may take more columns to still have a chance to fit in an
 # 80-column screen).
 _localchangedotherdeletedmsg = _(
     b"file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n"
     b"You can use (c)hanged version, (d)elete, or leave (u)nresolved.\n"
     b"What do you want to do?"
     b"$$ &Changed $$ &Delete $$ &Unresolved"
 )
 
 _otherchangedlocaldeletedmsg = _(
     b"file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n"
     b"You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.\n"
     b"What do you want to do?"
     b"$$ &Changed $$ &Deleted $$ &Unresolved"
 )
 
 
 class absentfilectx:
     """Represents a file that's ostensibly in a context but is actually not
     present in it.
 
     This is here because it's very specific to the filemerge code for now --
     other code is likely going to break with the values this returns."""
 
     def __init__(self, ctx, f):
         self._ctx = ctx
         self._f = f
 
     def __bytes__(self):
         return b'absent file %s@%s' % (self._f, self._ctx)
 
     def path(self):
         return self._f
 
     def size(self):
         return None
 
     def data(self):
         return None
 
     def filenode(self):
         return self._ctx.repo().nullid
 
     _customcmp = True
 
     def cmp(self, fctx):
         """compare with other file context
 
         returns True if different from fctx.
         """
         return not (
             fctx.isabsent()
             and fctx.changectx() == self.changectx()
             and fctx.path() == self.path()
         )
 
     def flags(self):
         return b''
 
     def changectx(self):
         return self._ctx
 
     def isbinary(self):
         return False
 
     def isabsent(self):
         return True
 
 
 def _findtool(ui, tool):
     if tool in internals:
         return tool
     cmd = _toolstr(ui, tool, b"executable", tool)
     if cmd.startswith(b'python:'):
         return cmd
     return findexternaltool(ui, tool)
 
 
 def _quotetoolpath(cmd):
     if cmd.startswith(b'python:'):
         return cmd
     return procutil.shellquote(cmd)
 
 
 def findexternaltool(ui, tool):
     for kn in (b"regkey", b"regkeyalt"):
         k = _toolstr(ui, tool, kn)
         if not k:
             continue
         p = util.lookupreg(k, _toolstr(ui, tool, b"regname"))
         if p:
             p = procutil.findexe(p + _toolstr(ui, tool, b"regappend"))
             if p:
                 return p
     exe = _toolstr(ui, tool, b"executable", tool)
     return procutil.findexe(util.expandpath(exe))
 
 
 def _picktool(repo, ui, path, binary, symlink, changedelete):
     strictcheck = ui.configbool(b'merge', b'strict-capability-check')
 
     def hascapability(tool, capability, strict=False):
         if tool in internals:
             return strict and internals[tool].capabilities.get(capability)
         return _toolbool(ui, tool, capability)
 
     def supportscd(tool):
         return tool in internals and internals[tool].mergetype == nomerge
 
     def check(tool, pat, symlink, binary, changedelete):
         tmsg = tool
         if pat:
             tmsg = _(b"%s (for pattern %s)") % (tool, pat)
         if not _findtool(ui, tool):
             if pat:  # explicitly requested tool deserves a warning
                 ui.warn(_(b"couldn't find merge tool %s\n") % tmsg)
             else:  # configured but non-existing tools are more silent
                 ui.note(_(b"couldn't find merge tool %s\n") % tmsg)
         elif symlink and not hascapability(tool, b"symlink", strictcheck):
             ui.warn(_(b"tool %s can't handle symlinks\n") % tmsg)
         elif binary and not hascapability(tool, b"binary", strictcheck):
             ui.warn(_(b"tool %s can't handle binary\n") % tmsg)
         elif changedelete and not supportscd(tool):
             # the nomerge tools are the only tools that support change/delete
             # conflicts
             pass
         elif not procutil.gui() and _toolbool(ui, tool, b"gui"):
             ui.warn(_(b"tool %s requires a GUI\n") % tmsg)
         else:
             return True
         return False
 
     # internal config: ui.forcemerge
     # forcemerge comes from command line arguments, highest priority
     force = ui.config(b'ui', b'forcemerge')
     if force:
         toolpath = _findtool(ui, force)
         if changedelete and not supportscd(toolpath):
             return b":prompt", None
         else:
             if toolpath:
                 return (force, _quotetoolpath(toolpath))
             else:
                 # mimic HGMERGE if given tool not found
                 return (force, force)
 
     # HGMERGE takes next precedence
     hgmerge = encoding.environ.get(b"HGMERGE")
     if hgmerge:
         if changedelete and not supportscd(hgmerge):
             return b":prompt", None
         else:
             return (hgmerge, hgmerge)
 
     # then patterns
 
     # whether binary capability should be checked strictly
     binarycap = binary and strictcheck
 
     for pat, tool in ui.configitems(b"merge-patterns"):
         mf = match.match(repo.root, b'', [pat])
         if mf(path) and check(tool, pat, symlink, binarycap, changedelete):
             if binary and not hascapability(tool, b"binary", strict=True):
                 ui.warn(
                     _(
                         b"warning: check merge-patterns configurations,"
                         b" if %r for binary file %r is unintentional\n"
                         b"(see 'hg help merge-tools'"
                         b" for binary files capability)\n"
                     )
                     % (pycompat.bytestr(tool), pycompat.bytestr(path))
                 )
             toolpath = _findtool(ui, tool)
             return (tool, _quotetoolpath(toolpath))
 
     # then merge tools
     tools = {}
     disabled = set()
     for k, v in ui.configitems(b"merge-tools"):
         t = k.split(b'.')[0]
         if t not in tools:
             tools[t] = int(_toolstr(ui, t, b"priority"))
         if _toolbool(ui, t, b"disabled"):
             disabled.add(t)
     names = tools.keys()
     tools = sorted(
         [(-p, tool) for tool, p in tools.items() if tool not in disabled]
     )
     uimerge = ui.config(b"ui", b"merge")
     if uimerge:
         # external tools defined in uimerge won't be able to handle
         # change/delete conflicts
         if check(uimerge, path, symlink, binary, changedelete):
             if uimerge not in names and not changedelete:
                 return (uimerge, uimerge)
             tools.insert(0, (None, uimerge))  # highest priority
     tools.append((None, b"hgmerge"))  # the old default, if found
     for p, t in tools:
         if check(t, None, symlink, binary, changedelete):
             toolpath = _findtool(ui, t)
             return (t, _quotetoolpath(toolpath))
 
     # internal merge or prompt as last resort
     if symlink or binary or changedelete:
         if not changedelete and len(tools):
             # any tool is rejected by capability for symlink or binary
             ui.warn(_(b"no tool found to merge %s\n") % path)
         return b":prompt", None
     return b":merge", None
 
 
 def _eoltype(data):
     """Guess the EOL type of a file"""
     if b'\0' in data:  # binary
         return None
     if b'\r\n' in data:  # Windows
         return b'\r\n'
     if b'\r' in data:  # Old Mac
         return b'\r'
     if b'\n' in data:  # UNIX
         return b'\n'
     return None  # unknown
 
 
 def _matcheol(file, backup):
     """Convert EOL markers in a file to match origfile"""
     tostyle = _eoltype(backup.data())  # No repo.wread filters?
     if tostyle:
         data = util.readfile(file)
         style = _eoltype(data)
         if style:
             newdata = data.replace(style, tostyle)
             if newdata != data:
                 util.writefile(file, newdata)
 
 
 @internaltool(b'prompt', nomerge)
 def _iprompt(repo, mynode, local, other, base, toolconf):
     """Asks the user which of the local `p1()` or the other `p2()` version to
     keep as the merged version."""
     ui = repo.ui
     fd = local.fctx.path()
     uipathfn = scmutil.getuipathfn(repo)
 
     # Avoid prompting during an in-memory merge since it doesn't support merge
     # conflicts.
     if local.fctx.changectx().isinmemory():
         raise error.InMemoryMergeConflictsError(
             b'in-memory merge does not support file conflicts'
         )
 
     prompts = partextras([local.label, other.label])
     prompts[b'fd'] = uipathfn(fd)
     try:
         if other.fctx.isabsent():
             index = ui.promptchoice(_localchangedotherdeletedmsg % prompts, 2)
             choice = [b'local', b'other', b'unresolved'][index]
         elif local.fctx.isabsent():
             index = ui.promptchoice(_otherchangedlocaldeletedmsg % prompts, 2)
             choice = [b'other', b'local', b'unresolved'][index]
         else:
             # IMPORTANT: keep the last line of this prompt ("What do you want to
             # do?") very short, see comment next to _localchangedotherdeletedmsg
             # at the top of the file for details.
             index = ui.promptchoice(
                 _(
                     b"file '%(fd)s' needs to be resolved.\n"
                     b"You can keep (l)ocal%(l)s, take (o)ther%(o)s, or leave "
                     b"(u)nresolved.\n"
                     b"What do you want to do?"
                     b"$$ &Local $$ &Other $$ &Unresolved"
                 )
                 % prompts,
                 2,
             )
             choice = [b'local', b'other', b'unresolved'][index]
 
         if choice == b'other':
             return _iother(repo, mynode, local, other, base, toolconf)
         elif choice == b'local':
             return _ilocal(repo, mynode, local, other, base, toolconf)
         elif choice == b'unresolved':
             return _ifail(repo, mynode, local, other, base, toolconf)
     except error.ResponseExpected:
         ui.write(b"\n")
         return _ifail(repo, mynode, local, other, base, toolconf)
 
 
 @internaltool(b'local', nomerge)
 def _ilocal(repo, mynode, local, other, base, toolconf):
     """Uses the local `p1()` version of files as the merged version."""
     return 0, local.fctx.isabsent()
 
 
 @internaltool(b'other', nomerge)
 def _iother(repo, mynode, local, other, base, toolconf):
     """Uses the other `p2()` version of files as the merged version."""
     if other.fctx.isabsent():
         # local changed, remote deleted -- 'deleted' picked
         _underlyingfctxifabsent(local.fctx).remove()
         deleted = True
     else:
         _underlyingfctxifabsent(local.fctx).write(
             other.fctx.data(), other.fctx.flags()
         )
         deleted = False
     return 0, deleted
 
 
 @internaltool(b'fail', nomerge)
 def _ifail(repo, mynode, local, other, base, toolconf):
     """
     Rather than attempting to merge files that were modified on both
     branches, it marks them as unresolved. The resolve command must be
     used to resolve these conflicts."""
     # for change/delete conflicts write out the changed version, then fail
     if local.fctx.isabsent():
         _underlyingfctxifabsent(local.fctx).write(
             other.fctx.data(), other.fctx.flags()
         )
     return 1, False
 
 
 def _underlyingfctxifabsent(filectx):
     """Sometimes when resolving, our fcd is actually an absentfilectx, but
     we want to write to it (to do the resolve). This helper returns the
     underyling workingfilectx in that case.
     """
     if filectx.isabsent():
         return filectx.changectx()[filectx.path()]
     else:
         return filectx
 
 
 def _verifytext(input, ui):
     """verifies that text is non-binary"""
     if stringutil.binary(input.text()):
         msg = _(b"%s looks like a binary file.") % input.fctx.path()
         ui.warn(_(b'warning: %s\n') % msg)
         raise error.Abort(msg)
 
 
 def _premerge(repo, local, other, base, toolconf):
     tool, toolpath, binary, symlink, scriptfn = toolconf
     if symlink or local.fctx.isabsent() or other.fctx.isabsent():
         return 1
 
     ui = repo.ui
 
     validkeep = [b'keep', b'keep-merge3', b'keep-mergediff']
 
     # do we attempt to simplemerge first?
     try:
         premerge = _toolbool(ui, tool, b"premerge", not binary)
     except error.ConfigError:
         premerge = _toolstr(ui, tool, b"premerge", b"").lower()
         if premerge not in validkeep:
             _valid = b', '.join([b"'" + v + b"'" for v in validkeep])
             raise error.ConfigError(
                 _(b"%s.premerge not valid ('%s' is neither boolean nor %s)")
                 % (tool, premerge, _valid)
             )
 
     if premerge:
         mode = b'merge'
         if premerge == b'keep-mergediff':
             mode = b'mergediff'
         elif premerge == b'keep-merge3':
             mode = b'merge3'
         if any(
             stringutil.binary(input.text()) for input in (local, base, other)
         ):
             return 1  # continue merging
         merged_text, conflicts = simplemerge.simplemerge(
             local, base, other, mode=mode
         )
         if not conflicts or premerge in validkeep:
             # fcd.flags() already has the merged flags (done in
             # mergestate.resolve())
             local.fctx.write(merged_text, local.fctx.flags())
         if not conflicts:
             ui.debug(b" premerge successful\n")
             return 0
     return 1  # continue merging
 
 
 def _mergecheck(repo, mynode, fcd, fco, fca, toolconf):
     tool, toolpath, binary, symlink, scriptfn = toolconf
     uipathfn = scmutil.getuipathfn(repo)
     if symlink:
         repo.ui.warn(
             _(b'warning: internal %s cannot merge symlinks for %s\n')
             % (tool, uipathfn(fcd.path()))
         )
         return False
     if fcd.isabsent() or fco.isabsent():
         repo.ui.warn(
             _(
                 b'warning: internal %s cannot merge change/delete '
                 b'conflict for %s\n'
             )
             % (tool, uipathfn(fcd.path()))
         )
         return False
     return True
 
 
 def _merge(repo, local, other, base, mode):
     """
     Uses the internal non-interactive simple merge algorithm for merging
     files. It will fail if there are any conflicts and leave markers in
     the partially merged file. Markers will have two sections, one for each
     side of merge, unless mode equals 'union' or 'union-other-first' which
     suppresses the markers."""
     ui = repo.ui
 
     try:
         _verifytext(local, ui)
         _verifytext(base, ui)
         _verifytext(other, ui)
     except error.Abort:
         return True, True, False
     else:
         merged_text, conflicts = simplemerge.simplemerge(
             local, base, other, mode=mode
         )
         # fcd.flags() already has the merged flags (done in
         # mergestate.resolve())
         local.fctx.write(merged_text, local.fctx.flags())
         return True, conflicts, False
 
 
 @internaltool(
     b'union',
     fullmerge,
     _(
         b"warning: conflicts while merging %s! "
         b"(edit, then use 'hg resolve --mark')\n"
     ),
     precheck=_mergecheck,
 )
 def _iunion(repo, mynode, local, other, base, toolconf, backup):
     """
     Uses the internal non-interactive simple merge algorithm for merging
     files. It will use both local and other sides for conflict regions by
     adding local on top of other.
     No markers are inserted."""
     return _merge(repo, local, other, base, b'union')
 
 
 @internaltool(
     b'union-other-first',
     fullmerge,
     _(
         b"warning: conflicts while merging %s! "
         b"(edit, then use 'hg resolve --mark')\n"
     ),
     precheck=_mergecheck,
 )
 def _iunion_other_first(repo, mynode, local, other, base, toolconf, backup):
     """
     Like :union, but add other on top of local."""
     return _merge(repo, local, other, base, b'union-other-first')
 
 
 @internaltool(
     b'merge',
     fullmerge,
     _(
         b"warning: conflicts while merging %s! "
         b"(edit, then use 'hg resolve --mark')\n"
     ),
     precheck=_mergecheck,
 )
 def _imerge(repo, mynode, local, other, base, toolconf, backup):
     """
     Uses the internal non-interactive simple merge algorithm for merging
     files. It will fail if there are any conflicts and leave markers in
     the partially merged file. Markers will have two sections, one for each side
     of merge."""
     return _merge(repo, local, other, base, b'merge')
 
 
 @internaltool(
     b'merge3',
     fullmerge,
     _(
         b"warning: conflicts while merging %s! "
         b"(edit, then use 'hg resolve --mark')\n"
     ),
     precheck=_mergecheck,
 )
 def _imerge3(repo, mynode, local, other, base, toolconf, backup):
     """
     Uses the internal non-interactive simple merge algorithm for merging
     files. It will fail if there are any conflicts and leave markers in
     the partially merged file. Marker will have three sections, one from each
     side of the merge and one for the base content."""
     return _merge(repo, local, other, base, b'merge3')
 
 
 @internaltool(
     b'merge3-lie-about-conflicts',
     fullmerge,
     b'',
     precheck=_mergecheck,
 )
 def _imerge3alwaysgood(*args, **kwargs):
     # Like merge3, but record conflicts as resolved with markers in place.
     #
     # This is used for `diff.merge` to show the differences between
     # the auto-merge state and the committed merge state. It may be
     # useful for other things.
     b1, junk, b2 = _imerge3(*args, **kwargs)
     # TODO is this right? I'm not sure what these return values mean,
     # but as far as I can tell this will indicate to callers tha the
     # merge succeeded.
     return b1, False, b2
 
 
 @internaltool(
     b'mergediff',
     fullmerge,
     _(
         b"warning: conflicts while merging %s! "
         b"(edit, then use 'hg resolve --mark')\n"
     ),
     precheck=_mergecheck,
 )
 def _imerge_diff(repo, mynode, local, other, base, toolconf, backup):
     """
     Uses the internal non-interactive simple merge algorithm for merging
     files. It will fail if there are any conflicts and leave markers in
     the partially merged file. The marker will have two sections, one with the
     content from one side of the merge, and one with a diff from the base
     content to the content on the other side. (experimental)"""
     return _merge(repo, local, other, base, b'mergediff')
 
 
 @internaltool(b'merge-local', mergeonly, precheck=_mergecheck)
 def _imergelocal(repo, mynode, local, other, base, toolconf, backup):
     """
     Like :merge, but resolve all conflicts non-interactively in favor
     of the local `p1()` changes."""
     return _merge(repo, local, other, base, b'local')
 
 
 @internaltool(b'merge-other', mergeonly, precheck=_mergecheck)
 def _imergeother(repo, mynode, local, other, base, toolconf, backup):
     """
     Like :merge, but resolve all conflicts non-interactively in favor
     of the other `p2()` changes."""
     return _merge(repo, local, other, base, b'other')
 
 
 @internaltool(
     b'tagmerge',
     mergeonly,
     _(
         b"automatic tag merging of %s failed! "
         b"(use 'hg resolve --tool :merge' or another merge "
         b"tool of your choice)\n"
     ),
 )
 def _itagmerge(repo, mynode, local, other, base, toolconf, backup):
     """
     Uses the internal tag merge algorithm (experimental).
     """
     success, status = tagmerge.merge(repo, local.fctx, other.fctx, base.fctx)
     return success, status, False
 
 
 @internaltool(b'dump', fullmerge, binary=True, symlink=True)
 def _idump(repo, mynode, local, other, base, toolconf, backup):
     """
     Creates three versions of the files to merge, containing the
     contents of local, other and base. These files can then be used to
     perform a merge manually. If the file to be merged is named
     ``a.txt``, these files will accordingly be named ``a.txt.local``,
     ``a.txt.other`` and ``a.txt.base`` and they will be placed in the
     same directory as ``a.txt``.
 
     This implies premerge. Therefore, files aren't dumped, if premerge
     runs successfully. Use :forcedump to forcibly write files out.
     """
     a = _workingpath(repo, local.fctx)
     fd = local.fctx.path()
 
     from . import context
 
     if isinstance(local.fctx, context.overlayworkingfilectx):
         raise error.InMemoryMergeConflictsError(
             b'in-memory merge does not support the :dump tool.'
         )
 
     util.writefile(a + b".local", local.fctx.decodeddata())
     repo.wwrite(fd + b".other", other.fctx.data(), other.fctx.flags())
     repo.wwrite(fd + b".base", base.fctx.data(), base.fctx.flags())
     return False, 1, False
 
 
 @internaltool(b'forcedump', mergeonly, binary=True, symlink=True)
 def _forcedump(repo, mynode, local, other, base, toolconf, backup):
     """
     Creates three versions of the files as same as :dump, but omits premerge.
     """
     return _idump(repo, mynode, local, other, base, toolconf, backup)
 
 
 def _xmergeimm(repo, mynode, local, other, base, toolconf, backup):
     # In-memory merge simply raises an exception on all external merge tools,
     # for now.
     #
     # It would be possible to run most tools with temporary files, but this
     # raises the question of what to do if the user only partially resolves the
     # file -- we can't leave a merge state. (Copy to somewhere in the .hg/
     # directory and tell the user how to get it is my best idea, but it's
     # clunky.)
     raise error.InMemoryMergeConflictsError(
         b'in-memory merge does not support external merge tools'
     )
 
 
 def _describemerge(ui, repo, mynode, fcl, fcb, fco, env, toolpath, args):
     tmpl = ui.config(b'command-templates', b'pre-merge-tool-output')
     if not tmpl:
         return
 
     mappingdict = templateutil.mappingdict
     props = {
         b'ctx': fcl.changectx(),
         b'node': hex(mynode),
         b'path': fcl.path(),
         b'local': mappingdict(
             {
                 b'ctx': fcl.changectx(),
                 b'fctx': fcl,
                 b'node': hex(mynode),
                 b'name': _(b'local'),
                 b'islink': b'l' in fcl.flags(),
                 b'label': env[b'HG_MY_LABEL'],
             }
         ),
         b'base': mappingdict(
             {
                 b'ctx': fcb.changectx(),
                 b'fctx': fcb,
                 b'name': _(b'base'),
                 b'islink': b'l' in fcb.flags(),
                 b'label': env[b'HG_BASE_LABEL'],
             }
         ),
         b'other': mappingdict(
             {
                 b'ctx': fco.changectx(),
                 b'fctx': fco,
                 b'name': _(b'other'),
                 b'islink': b'l' in fco.flags(),
                 b'label': env[b'HG_OTHER_LABEL'],
             }
         ),
         b'toolpath': toolpath,
         b'toolargs': args,
     }
 
     # TODO: make all of this something that can be specified on a per-tool basis
     tmpl = templater.unquotestring(tmpl)
 
     # Not using cmdutil.rendertemplate here since it causes errors importing
     # things for us to import cmdutil.
     tres = formatter.templateresources(ui, repo)
     t = formatter.maketemplater(
         ui, tmpl, defaults=templatekw.keywords, resources=tres
     )
     ui.status(t.renderdefault(props))
 
 
 def _xmerge(repo, mynode, local, other, base, toolconf, backup):
     fcd = local.fctx
     fco = other.fctx
     fca = base.fctx
     tool, toolpath, binary, symlink, scriptfn = toolconf
     uipathfn = scmutil.getuipathfn(repo)
     if fcd.isabsent() or fco.isabsent():
         repo.ui.warn(
             _(b'warning: %s cannot merge change/delete conflict for %s\n')
             % (tool, uipathfn(fcd.path()))
         )
         return False, 1, None
     localpath = _workingpath(repo, fcd)
     args = _toolstr(repo.ui, tool, b"args")
 
     files = [
         (b"base", fca.path(), fca.decodeddata()),
         (b"other", fco.path(), fco.decodeddata()),
     ]
     outpath = b""
     if b"$output" in args:
         # read input from backup, write to original
         outpath = localpath
         localoutputpath = backup.path()
         # Remove the .orig to make syntax-highlighting more likely.
         if localoutputpath.endswith(b'.orig'):
             localoutputpath, ext = os.path.splitext(localoutputpath)
         files.append((b"local", localoutputpath, backup.data()))
 
     with _maketempfiles(files) as temppaths:
         basepath, otherpath = temppaths[:2]
         if len(temppaths) == 3:
             localpath = temppaths[2]
 
         def format_label(input):
             if input.label_detail:
                 return b'%s: %s' % (input.label, input.label_detail)
             else:
                 return input.label
 
         env = {
             b'HG_FILE': fcd.path(),
             b'HG_MY_NODE': short(mynode),
             b'HG_OTHER_NODE': short(fco.changectx().node()),
             b'HG_BASE_NODE': short(fca.changectx().node()),
             b'HG_MY_ISLINK': b'l' in fcd.flags(),
             b'HG_OTHER_ISLINK': b'l' in fco.flags(),
             b'HG_BASE_ISLINK': b'l' in fca.flags(),
             b'HG_MY_LABEL': format_label(local),
             b'HG_OTHER_LABEL': format_label(other),
             b'HG_BASE_LABEL': format_label(base),
         }
         ui = repo.ui
 
         replace = {
             b'local': localpath,
             b'base': basepath,
             b'other': otherpath,
             b'output': outpath,
             b'labellocal': format_label(local),
             b'labelother': format_label(other),
             b'labelbase': format_label(base),
         }
         args = util.interpolate(
             br'\$',
             replace,
             args,
             lambda s: procutil.shellquote(util.localpath(s)),
         )
         if _toolbool(ui, tool, b"gui"):
             repo.ui.status(
                 _(b'running merge tool %s for file %s\n')
                 % (tool, uipathfn(fcd.path()))
             )
         if scriptfn is None:
             cmd = toolpath + b' ' + args
             repo.ui.debug(b'launching merge tool: %s\n' % cmd)
             _describemerge(ui, repo, mynode, fcd, fca, fco, env, toolpath, args)
             r = ui.system(
                 cmd, cwd=repo.root, environ=env, blockedtag=b'mergetool'
             )
         else:
             repo.ui.debug(
                 b'launching python merge script: %s:%s\n' % (toolpath, scriptfn)
             )
             r = 0
             try:
                 # avoid cycle cmdutil->merge->filemerge->extensions->cmdutil
                 from . import extensions
 
-                mod = extensions.loadpath(toolpath, b'hgmerge.%s' % tool)
+                mod_name = 'hgmerge.%s' % pycompat.sysstr(tool)
+                mod = extensions.loadpath(toolpath, mod_name)
             except Exception:
                 raise error.Abort(
                     _(b"loading python merge script failed: %s") % toolpath
                 )
-            mergefn = getattr(mod, scriptfn, None)
+            mergefn = getattr(mod, pycompat.sysstr(scriptfn), None)
             if mergefn is None:
                 raise error.Abort(
                     _(b"%s does not have function: %s") % (toolpath, scriptfn)
                 )
             argslist = procutil.shellsplit(args)
             # avoid cycle cmdutil->merge->filemerge->hook->extensions->cmdutil
             from . import hook
 
             ret, raised = hook.pythonhook(
                 ui, repo, b"merge", toolpath, mergefn, {b'args': argslist}, True
             )
             if raised:
                 r = 1
         repo.ui.debug(b'merge tool returned: %d\n' % r)
         return True, r, False
 
 
 def _populate_label_detail(input, template):
     """Applies the given template to the ctx and stores it in the input."""
     ctx = input.fctx.changectx()
     if ctx.node() is None:
         ctx = ctx.p1()
 
     props = {b'ctx': ctx}
     templateresult = template.renderdefault(props)
     input.label_detail = stringutil.firstline(templateresult)  # avoid '\n'
 
 
 def _populate_label_details(repo, inputs, tool=None):
     """Populates the label details using the conflict marker template."""
     ui = repo.ui
     template = ui.config(b'command-templates', b'mergemarker')
     if tool is not None:
         template = _toolstr(ui, tool, b'mergemarkertemplate', template)
     template = templater.unquotestring(template)
     tres = formatter.templateresources(ui, repo)
     tmpl = formatter.maketemplater(
         ui, template, defaults=templatekw.keywords, resources=tres
     )
 
     for input in inputs:
         _populate_label_detail(input, tmpl)
 
 
 def partextras(labels):
     """Return a dictionary of extra labels for use in prompts to the user
 
     Intended use is in strings of the form "(l)ocal%(l)s".
     """
     if labels is None:
         return {
             b"l": b"",
             b"o": b"",
         }
 
     return {
         b"l": b" [%s]" % labels[0],
         b"o": b" [%s]" % labels[1],
     }
 
 
 def _makebackup(repo, ui, fcd):
     """Makes and returns a filectx-like object for ``fcd``'s backup file.
 
     In addition to preserving the user's pre-existing modifications to `fcd`
     (if any), the backup is used to undo certain premerges, confirm whether a
     merge changed anything, and determine what line endings the new file should
     have.
 
     Backups only need to be written once since their content doesn't change
     afterwards.
     """
     if fcd.isabsent():
         return None
     # TODO: Break this import cycle somehow. (filectx -> ctx -> fileset ->
     # merge -> filemerge). (I suspect the fileset import is the weakest link)
     from . import context
 
     if isinstance(fcd, context.overlayworkingfilectx):
         # If we're merging in-memory, we're free to put the backup anywhere.
         fd, backup = pycompat.mkstemp(b'hg-merge-backup')
         with os.fdopen(fd, 'wb') as f:
             f.write(fcd.data())
     else:
         backup = scmutil.backuppath(ui, repo, fcd.path())
         a = _workingpath(repo, fcd)
         util.copyfile(a, backup)
 
     return context.arbitraryfilectx(backup, repo=repo)
 
 
 @contextlib.contextmanager
 def _maketempfiles(files):
     """Creates a temporary file for each (prefix, path, data) tuple in `files`,
     so an external merge tool may use them.
     """
     tmproot = pycompat.mkdtemp(prefix=b'hgmerge-')
 
     def maketempfrompath(prefix, path, data):
         fullbase, ext = os.path.splitext(path)
         pre = b"%s~%s" % (os.path.basename(fullbase), prefix)
         name = os.path.join(tmproot, pre)
         if ext:
             name += ext
         util.writefile(name, data)
         return name
 
     temp_files = []
     for prefix, path, data in files:
         temp_files.append(maketempfrompath(prefix, path, data))
     try:
         yield temp_files
     finally:
         shutil.rmtree(tmproot)
 
 
 def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
     """perform a 3-way merge in the working directory
 
     mynode = parent node before merge
     orig = original local filename before merge
     fco = other file context
     fca = ancestor file context
     fcd = local file context for current/destination file
 
     Returns whether the merge is complete, the return value of the merge, and
     a boolean indicating whether the file was deleted from disk."""
     ui = repo.ui
     fd = fcd.path()
     uipathfn = scmutil.getuipathfn(repo)
     fduipath = uipathfn(fd)
     binary = fcd.isbinary() or fco.isbinary() or fca.isbinary()
     symlink = b'l' in fcd.flags() + fco.flags()
     changedelete = fcd.isabsent() or fco.isabsent()
     tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete)
     scriptfn = None
     if tool in internals and tool.startswith(b'internal:'):
         # normalize to new-style names (':merge' etc)
         tool = tool[len(b'internal') :]
     if toolpath and toolpath.startswith(b'python:'):
         invalidsyntax = False
         if toolpath.count(b':') >= 2:
             script, scriptfn = toolpath[7:].rsplit(b':', 1)
             if not scriptfn:
                 invalidsyntax = True
             # missing :callable can lead to spliting on windows drive letter
             if b'\\' in scriptfn or b'/' in scriptfn:
                 invalidsyntax = True
         else:
             invalidsyntax = True
         if invalidsyntax:
             raise error.Abort(_(b"invalid 'python:' syntax: %s") % toolpath)
         toolpath = script
     ui.debug(
         b"picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n"
         % (
             tool,
             fduipath,
             pycompat.bytestr(binary),
             pycompat.bytestr(symlink),
             pycompat.bytestr(changedelete),
         )
     )
 
     if tool in internals:
         func = internals[tool]
         mergetype = func.mergetype
         onfailure = func.onfailure
         precheck = func.precheck
         isexternal = False
     else:
         if wctx.isinmemory():
             func = _xmergeimm
         else:
             func = _xmerge
         mergetype = fullmerge
         onfailure = _(b"merging %s failed!\n")
         precheck = None
         isexternal = True
 
     toolconf = tool, toolpath, binary, symlink, scriptfn
 
     if not labels:
         labels = [b'local', b'other']
     if len(labels) < 3:
         labels.append(b'base')
     local = simplemerge.MergeInput(fcd, labels[0])
     other = simplemerge.MergeInput(fco, labels[1])
     base = simplemerge.MergeInput(fca, labels[2])
     if mergetype == nomerge:
         return func(
             repo,
             mynode,
             local,
             other,
             base,
             toolconf,
         )
 
     if orig != fco.path():
         ui.status(
             _(b"merging %s and %s to %s\n")
             % (uipathfn(orig), uipathfn(fco.path()), fduipath)
         )
     else:
         ui.status(_(b"merging %s\n") % fduipath)
 
     ui.debug(b"my %s other %s ancestor %s\n" % (fcd, fco, fca))
 
     if precheck and not precheck(repo, mynode, fcd, fco, fca, toolconf):
         if onfailure:
             if wctx.isinmemory():
                 raise error.InMemoryMergeConflictsError(
                     b'in-memory merge does not support merge conflicts'
                 )
             ui.warn(onfailure % fduipath)
         return 1, False
 
     backup = _makebackup(repo, ui, fcd)
     r = 1
     try:
         internalmarkerstyle = ui.config(b'ui', b'mergemarkers')
         if isexternal:
             markerstyle = _toolstr(ui, tool, b'mergemarkers')
         else:
             markerstyle = internalmarkerstyle
 
         if mergetype == fullmerge:
             _run_partial_resolution_tools(repo, local, other, base)
             # conflict markers generated by premerge will use 'detailed'
             # settings if either ui.mergemarkers or the tool's mergemarkers
             # setting is 'detailed'. This way tools can have basic labels in
             # space-constrained areas of the UI, but still get full information
             # in conflict markers if premerge is 'keep' or 'keep-merge3'.
             labeltool = None
             if markerstyle != b'basic':
                 # respect 'tool's mergemarkertemplate (which defaults to
                 # command-templates.mergemarker)
                 labeltool = tool
             if internalmarkerstyle != b'basic' or markerstyle != b'basic':
                 _populate_label_details(
                     repo, [local, other, base], tool=labeltool
                 )
 
             r = _premerge(
                 repo,
                 local,
                 other,
                 base,
                 toolconf,
             )
             # we're done if premerge was successful (r is 0)
             if not r:
                 return r, False
 
             # Reset to basic labels
             local.label_detail = None
             other.label_detail = None
             base.label_detail = None
 
         if markerstyle != b'basic':
             _populate_label_details(repo, [local, other, base], tool=tool)
 
         needcheck, r, deleted = func(
             repo,
             mynode,
             local,
             other,
             base,
             toolconf,
             backup,
         )
 
         if needcheck:
             r = _check(repo, r, ui, tool, fcd, backup)
 
         if r:
             if onfailure:
                 if wctx.isinmemory():
                     raise error.InMemoryMergeConflictsError(
                         b'in-memory merge '
                         b'does not support '
                         b'merge conflicts'
                     )
                 ui.warn(onfailure % fduipath)
             _onfilemergefailure(ui)
 
         return r, deleted
     finally:
         if not r and backup is not None:
             backup.remove()
 
 
 def _run_partial_resolution_tools(repo, local, other, base):
     """Runs partial-resolution tools on the three inputs and updates them."""
     ui = repo.ui
     if ui.configbool(b'merge', b'disable-partial-tools'):
         return
     # Tuples of (order, name, executable path, args)
     tools = []
     seen = set()
     section = b"partial-merge-tools"
     for k, v in ui.configitems(section):
         name = k.split(b'.')[0]
         if name in seen:
             continue
         patterns = ui.configlist(section, b'%s.patterns' % name, [])
         is_match = True
         if patterns:
             m = match.match(
                 repo.root, b'', patterns, ctx=local.fctx.changectx()
             )
             is_match = m(local.fctx.path())
         if is_match:
             if ui.configbool(section, b'%s.disable' % name):
                 continue
             order = ui.configint(section, b'%s.order' % name, 0)
             executable = ui.config(section, b'%s.executable' % name, name)
             args = ui.config(section, b'%s.args' % name)
             tools.append((order, name, executable, args))
 
     if not tools:
         return
     # Sort in configured order (first in tuple)
     tools.sort()
 
     files = [
         (b"local", local.fctx.path(), local.text()),
         (b"base", base.fctx.path(), base.text()),
         (b"other", other.fctx.path(), other.text()),
     ]
 
     with _maketempfiles(files) as temppaths:
         localpath, basepath, otherpath = temppaths
 
         for order, name, executable, args in tools:
             cmd = procutil.shellquote(executable)
             replace = {
                 b'local': localpath,
                 b'base': basepath,
                 b'other': otherpath,
             }
             args = util.interpolate(
                 br'\$',
                 replace,
                 args,
                 lambda s: procutil.shellquote(util.localpath(s)),
             )
 
             cmd = b'%s %s' % (cmd, args)
             r = ui.system(cmd, cwd=repo.root, blockedtag=b'partial-mergetool')
             if r:
                 raise error.StateError(
                     b'partial merge tool %s exited with code %d' % (name, r)
                 )
             local_text = util.readfile(localpath)
             other_text = util.readfile(otherpath)
             if local_text == other_text:
                 # No need to run other tools if all conflicts have been resolved
                 break
 
         local.set_text(local_text)
         base.set_text(util.readfile(basepath))
         other.set_text(other_text)
 
 
 def _haltmerge():
     msg = _(b'merge halted after failed merge (see hg resolve)')
     raise error.InterventionRequired(msg)
 
 
 def _onfilemergefailure(ui):
     action = ui.config(b'merge', b'on-failure')
     if action == b'prompt':
         msg = _(b'continue merge operation (yn)?$$ &Yes $$ &No')
         if ui.promptchoice(msg, 0) == 1:
             _haltmerge()
     if action == b'halt':
         _haltmerge()
     # default action is 'continue', in which case we neither prompt nor halt
 
 
 def hasconflictmarkers(data):
     # Detect lines starting with a string of 7 identical characters from the
     # subset Mercurial uses for conflict markers, followed by either the end of
     # line or a space and some text. Note that using [<>=+|-]{7} would detect
     # `<><><><><` as a conflict marker, which we don't want.
     return bool(
         re.search(
             br"^([<>=+|-])\1{6}( .*)$",
             data,
             re.MULTILINE,
         )
     )
 
 
 def _check(repo, r, ui, tool, fcd, backup):
     fd = fcd.path()
     uipathfn = scmutil.getuipathfn(repo)
 
     if not r and (
         _toolbool(ui, tool, b"checkconflicts")
         or b'conflicts' in _toollist(ui, tool, b"check")
     ):
         if hasconflictmarkers(fcd.data()):
             r = 1
 
     checked = False
     if b'prompt' in _toollist(ui, tool, b"check"):
         checked = True
         if ui.promptchoice(
             _(b"was merge of '%s' successful (yn)?$$ &Yes $$ &No")
             % uipathfn(fd),
             1,
         ):
             r = 1
 
     if (
         not r
         and not checked
         and (
             _toolbool(ui, tool, b"checkchanged")
             or b'changed' in _toollist(ui, tool, b"check")
         )
     ):
         if backup is not None and not fcd.cmp(backup):
             if ui.promptchoice(
                 _(
                     b" output file %s appears unchanged\n"
                     b"was merge successful (yn)?"
                     b"$$ &Yes $$ &No"
                 )
                 % uipathfn(fd),
                 1,
             ):
                 r = 1
 
     if backup is not None and _toolbool(ui, tool, b"fixeol"):
         _matcheol(_workingpath(repo, fcd), backup)
 
     return r
 
 
 def _workingpath(repo, ctx):
     return repo.wjoin(ctx.path())
 
 
 def loadinternalmerge(ui, extname, registrarobj):
     """Load internal merge tool from specified registrarobj"""
     for name, func in registrarobj._table.items():
         fullname = b':' + name
         internals[fullname] = func
         internals[b'internal:' + name] = func
         internalsdoc[fullname] = func
 
         capabilities = sorted([k for k, v in func.capabilities.items() if v])
         if capabilities:
             capdesc = b"    (actual capabilities: %s)" % b', '.join(
                 capabilities
             )
             func.__doc__ = func.__doc__ + pycompat.sysstr(b"\n\n%s" % capdesc)
 
     # to put i18n comments into hg.pot for automatically generated texts
 
     # i18n: "binary" and "symlink" are keywords
     # i18n: this text is added automatically
     _(b"    (actual capabilities: binary, symlink)")
     # i18n: "binary" is keyword
     # i18n: this text is added automatically
     _(b"    (actual capabilities: binary)")
     # i18n: "symlink" is keyword
     # i18n: this text is added automatically
     _(b"    (actual capabilities: symlink)")
 
 
 # load built-in merge tools explicitly to setup internalsdoc
 loadinternalmerge(None, None, internaltool)
 
 # tell hggettext to extract docstrings from these functions:
 i18nfunctions = internals.values()

mercurial/hook.py

@@ -1,366 +1,371 b''
 # hook.py - hook support for mercurial
 #
 # Copyright 2007 Olivia 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.
 
 
 import contextlib
 import errno
 import os
 import sys
 
 from .i18n import _
 from .pycompat import getattr
 from . import (
     demandimport,
     encoding,
     error,
     extensions,
     pycompat,
     util,
 )
 from .utils import (
     procutil,
     resourceutil,
     stringutil,
 )
 
 
 def pythonhook(ui, repo, htype, hname, funcname, args, throw):
     """call python hook. hook is callable object, looked up as
     name in python module. if callable returns "true", hook
     fails, else passes. if hook raises exception, treated as
     hook failure. exception propagates if throw is "true".
 
     reason for "true" meaning "hook failed" is so that
     unmodified commands (e.g. mercurial.commands.update) can
     be run as hooks without wrappers to convert return values."""
 
     if callable(funcname):
         obj = funcname
-        funcname = pycompat.sysbytes(obj.__module__ + "." + obj.__name__)
+        funcname = obj.__module__ + "." + obj.__name__
     else:
-        d = funcname.rfind(b'.')
+        funcname = pycompat.sysstr(funcname)
+        d = funcname.rfind('.')
         if d == -1:
             raise error.HookLoadError(
                 _(b'%s hook is invalid: "%s" not in a module')
-                % (hname, funcname)
+                % (hname, stringutil.forcebytestr(funcname))
             )
         modname = funcname[:d]
         oldpaths = sys.path
         if resourceutil.mainfrozen():
             # binary installs require sys.path manipulation
             modpath, modfile = os.path.split(modname)
             if modpath and modfile:
                 sys.path = sys.path[:] + [modpath]
                 modname = modfile
         with demandimport.deactivated():
             try:
                 obj = __import__(pycompat.sysstr(modname))
             except (ImportError, SyntaxError):
                 e1 = sys.exc_info()
                 try:
                     # extensions are loaded with hgext_ prefix
                     obj = __import__("hgext_%s" % pycompat.sysstr(modname))
                 except (ImportError, SyntaxError):
                     e2 = sys.exc_info()
                     if ui.tracebackflag:
                         ui.warn(
                             _(
                                 b'exception from first failed import '
                                 b'attempt:\n'
                             )
                         )
                     ui.traceback(e1)
                     if ui.tracebackflag:
                         ui.warn(
                             _(
                                 b'exception from second failed import '
                                 b'attempt:\n'
                             )
                         )
                     ui.traceback(e2)
 
                     if not ui.tracebackflag:
                         tracebackhint = _(
                             b'run with --traceback for stack trace'
                         )
                     else:
                         tracebackhint = None
-                    raise error.HookLoadError(
-                        _(b'%s hook is invalid: import of "%s" failed')
-                        % (hname, modname),
-                        hint=tracebackhint,
+                    msg = _(b'%s hook is invalid: import of "%s" failed')
+                    msg %= (
+                        stringutil.forcebytestr(hname),
+                        stringutil.forcebytestr(modname),
                     )
+                    raise error.HookLoadError(msg, hint=tracebackhint)
         sys.path = oldpaths
         try:
-            for p in funcname.split(b'.')[1:]:
+            for p in funcname.split('.')[1:]:
                 obj = getattr(obj, p)
         except AttributeError:
             raise error.HookLoadError(
                 _(b'%s hook is invalid: "%s" is not defined')
-                % (hname, funcname)
+                % (hname, stringutil.forcebytestr(funcname))
             )
         if not callable(obj):
             raise error.HookLoadError(
                 _(b'%s hook is invalid: "%s" is not callable')
-                % (hname, funcname)
+                % (hname, stringutil.forcebytestr(funcname))
             )
 
-    ui.note(_(b"calling hook %s: %s\n") % (hname, funcname))
+    ui.note(
+        _(b"calling hook %s: %s\n") % (hname, stringutil.forcebytestr(funcname))
+    )
     starttime = util.timer()
 
     try:
         r = obj(ui=ui, repo=repo, hooktype=htype, **pycompat.strkwargs(args))
     except Exception as exc:
         if isinstance(exc, error.Abort):
             ui.warn(_(b'error: %s hook failed: %s\n') % (hname, exc.args[0]))
         else:
             ui.warn(
                 _(b'error: %s hook raised an exception: %s\n')
                 % (hname, stringutil.forcebytestr(exc))
             )
         if throw:
             raise
         if not ui.tracebackflag:
             ui.warn(_(b'(run with --traceback for stack trace)\n'))
         ui.traceback()
         return True, True
     finally:
         duration = util.timer() - starttime
         ui.log(
             b'pythonhook',
             b'pythonhook-%s: %s finished in %0.2f seconds\n',
             htype,
-            funcname,
+            stringutil.forcebytestr(funcname),
             duration,
         )
     if r:
         if throw:
             raise error.HookAbort(_(b'%s hook failed') % hname)
         ui.warn(_(b'warning: %s hook failed\n') % hname)
     return r, False
 
 
 def _exthook(ui, repo, htype, name, cmd, args, throw):
     starttime = util.timer()
     env = {}
 
     # make in-memory changes visible to external process
     if repo is not None:
         tr = repo.currenttransaction()
         repo.dirstate.write(tr)
         if tr and tr.writepending():
             env[b'HG_PENDING'] = repo.root
     env[b'HG_HOOKTYPE'] = htype
     env[b'HG_HOOKNAME'] = name
 
     if ui.config(b'hooks', b'%s:run-with-plain' % name) == b'auto':
         plain = ui.plain()
     else:
         plain = ui.configbool(b'hooks', b'%s:run-with-plain' % name)
     if plain:
         env[b'HGPLAIN'] = b'1'
     else:
         env[b'HGPLAIN'] = b''
 
     for k, v in args.items():
         # transaction changes can accumulate MBs of data, so skip it
         # for external hooks
         if k == b'changes':
             continue
         if callable(v):
             v = v()
         if isinstance(v, (dict, list)):
             v = stringutil.pprint(v)
         env[b'HG_' + k.upper()] = v
 
     if ui.configbool(b'hooks', b'tonative.%s' % name, False):
         oldcmd = cmd
         cmd = procutil.shelltonative(cmd, env)
         if cmd != oldcmd:
             ui.note(_(b'converting hook "%s" to native\n') % name)
 
     ui.note(_(b"running hook %s: %s\n") % (name, cmd))
 
     if repo:
         cwd = repo.root
     else:
         cwd = encoding.getcwd()
     r = ui.system(cmd, environ=env, cwd=cwd, blockedtag=b'exthook-%s' % (name,))
 
     if repo is not None and repo.currentwlock() is None:
         repo.invalidatedirstate()
     if repo is not None and repo.currentlock() is None:
         repo.invalidate()
 
     duration = util.timer() - starttime
     ui.log(
         b'exthook',
         b'exthook-%s: %s finished in %0.2f seconds\n',
         name,
         cmd,
         duration,
     )
     if r:
         desc = procutil.explainexit(r)
         if throw:
             raise error.HookAbort(_(b'%s hook %s') % (name, desc))
         ui.warn(_(b'warning: %s hook %s\n') % (name, desc))
     return r
 
 
 # represent an untrusted hook command
 _fromuntrusted = object()
 
 
 def _allhooks(ui):
     """return a list of (hook-id, cmd) pairs sorted by priority"""
     hooks = _hookitems(ui)
     # Be careful in this section, propagating the real commands from untrusted
     # sources would create a security vulnerability, make sure anything altered
     # in that section uses "_fromuntrusted" as its command.
     untrustedhooks = _hookitems(ui, _untrusted=True)
     for name, value in untrustedhooks.items():
         trustedvalue = hooks.get(name, ((), (), name, _fromuntrusted))
         if value != trustedvalue:
             (lp, lo, lk, lv) = trustedvalue
             hooks[name] = (lp, lo, lk, _fromuntrusted)
     # (end of the security sensitive section)
     return [(k, v) for p, o, k, v in sorted(hooks.values())]
 
 
 def _hookitems(ui, _untrusted=False):
     """return all hooks items ready to be sorted"""
     hooks = {}
     for name, cmd in ui.configitems(b'hooks', untrusted=_untrusted):
         if (
             name.startswith(b'priority.')
             or name.startswith(b'tonative.')
             or b':' in name
         ):
             continue
 
         priority = ui.configint(b'hooks', b'priority.%s' % name, 0)
         hooks[name] = ((-priority,), (len(hooks),), name, cmd)
     return hooks
 
 
 _redirect = False
 
 
 def redirect(state):
     global _redirect
     _redirect = state
 
 
 def hashook(ui, htype):
     """return True if a hook is configured for 'htype'"""
     if not ui.callhooks:
         return False
     for hname, cmd in _allhooks(ui):
         if hname.split(b'.')[0] == htype and cmd:
             return True
     return False
 
 
 def hook(ui, repo, htype, throw=False, **args):
     if not ui.callhooks:
         return False
 
     hooks = []
     for hname, cmd in _allhooks(ui):
         if hname.split(b'.')[0] == htype and cmd:
             hooks.append((hname, cmd))
 
     res = runhooks(ui, repo, htype, hooks, throw=throw, **args)
     r = False
     for hname, cmd in hooks:
         r = res[hname][0] or r
     return r
 
 
 @contextlib.contextmanager
 def redirect_stdio():
     """Redirects stdout to stderr, if possible."""
 
     oldstdout = -1
     try:
         if _redirect:
             try:
                 stdoutno = procutil.stdout.fileno()
                 stderrno = procutil.stderr.fileno()
                 # temporarily redirect stdout to stderr, if possible
                 if stdoutno >= 0 and stderrno >= 0:
                     procutil.stdout.flush()
                     oldstdout = os.dup(stdoutno)
                     os.dup2(stderrno, stdoutno)
             except (OSError, AttributeError):
                 # files seem to be bogus, give up on redirecting (WSGI, etc)
                 pass
 
         yield
 
     finally:
         # The stderr is fully buffered on Windows when connected to a pipe.
         # A forcible flush is required to make small stderr data in the
         # remote side available to the client immediately.
         try:
             procutil.stderr.flush()
         except IOError as err:
             if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
                 raise error.StdioError(err)
 
         if _redirect and oldstdout >= 0:
             try:
                 procutil.stdout.flush()  # write hook output to stderr fd
             except IOError as err:
                 if err.errno not in (errno.EPIPE, errno.EIO, errno.EBADF):
                     raise error.StdioError(err)
             os.dup2(oldstdout, stdoutno)
             os.close(oldstdout)
 
 
 def runhooks(ui, repo, htype, hooks, throw=False, **args):
     args = pycompat.byteskwargs(args)
     res = {}
 
     with redirect_stdio():
         for hname, cmd in hooks:
             if cmd is _fromuntrusted:
                 if throw:
                     raise error.HookAbort(
                         _(b'untrusted hook %s not executed') % hname,
                         hint=_(b"see 'hg help config.trusted'"),
                     )
                 ui.warn(_(b'warning: untrusted hook %s not executed\n') % hname)
                 r = 1
                 raised = False
             elif callable(cmd):
                 r, raised = pythonhook(ui, repo, htype, hname, cmd, args, throw)
             elif cmd.startswith(b'python:'):
                 if cmd.count(b':') >= 2:
                     path, cmd = cmd[7:].rsplit(b':', 1)
                     path = util.expandpath(path)
                     if repo:
                         path = os.path.join(repo.root, path)
                     try:
-                        mod = extensions.loadpath(path, b'hghook.%s' % hname)
+                        mod_name = 'hghook.%s' % pycompat.sysstr(hname)
+                        mod = extensions.loadpath(path, mod_name)
                     except Exception:
                         ui.write(_(b"loading %s hook failed:\n") % hname)
                         raise
-                    hookfn = getattr(mod, cmd)
+                    hookfn = getattr(mod, pycompat.sysstr(cmd))
                 else:
                     hookfn = cmd[7:].strip()
                 r, raised = pythonhook(
                     ui, repo, htype, hname, hookfn, args, throw
                 )
             else:
                 r = _exthook(ui, repo, htype, hname, cmd, args, throw)
                 raised = False
 
             res[hname] = r, raised
 
     return res

tests/test-hook.t

@@ -1,1463 +1,1463 b''
 commit hooks can see env vars
 (and post-transaction one are run unlocked)
 
 
   $ cat > $TESTTMP/txnabort.checkargs.py <<EOF
   > from mercurial import pycompat
   > def showargs(ui, repo, hooktype, **kwargs):
   >     kwargs = pycompat.byteskwargs(kwargs)
   >     ui.write(b'%s Python hook: %s\n' % (hooktype,
   >                                         b','.join(sorted(kwargs))))
   > EOF
 
   $ hg init a
   $ cd a
   $ cat > .hg/hgrc <<EOF
   > [hooks]
   > commit = sh -c "HG_LOCAL= HG_TAG= printenv.py --line commit"
   > commit.b = sh -c "HG_LOCAL= HG_TAG= printenv.py --line commit.b"
   > precommit = sh -c  "HG_LOCAL= HG_NODE= HG_TAG= printenv.py --line precommit"
   > pretxncommit = sh -c "HG_LOCAL= HG_TAG= printenv.py --line pretxncommit"
   > pretxncommit.tip = hg -q tip
   > pre-identify = sh -c "printenv.py --line pre-identify 1"
   > pre-cat = sh -c "printenv.py --line pre-cat"
   > post-cat = sh -c "printenv.py --line post-cat"
   > pretxnopen = sh -c "HG_LOCAL= HG_TAG= printenv.py --line pretxnopen"
   > pretxnclose = sh -c "HG_LOCAL= HG_TAG= printenv.py --line pretxnclose"
   > txnclose = sh -c "HG_LOCAL= HG_TAG= printenv.py --line txnclose"
   > txnabort.0 = python:$TESTTMP/txnabort.checkargs.py:showargs
   > txnabort.1 = sh -c "HG_LOCAL= HG_TAG= printenv.py --line txnabort"
   > txnclose.checklock = sh -c "hg debuglock > /dev/null"
   > EOF
   $ echo a > a
   $ hg add a
   $ hg commit -m a
   precommit hook: HG_HOOKNAME=precommit
   HG_HOOKTYPE=precommit
   HG_PARENT1=0000000000000000000000000000000000000000
   
   pretxnopen hook: HG_HOOKNAME=pretxnopen
   HG_HOOKTYPE=pretxnopen
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   pretxncommit hook: HG_HOOKNAME=pretxncommit
   HG_HOOKTYPE=pretxncommit
   HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
   HG_PARENT1=0000000000000000000000000000000000000000
   HG_PENDING=$TESTTMP/a
   
   0:cb9a9f314b8b
   pretxnclose hook: HG_HOOKNAME=pretxnclose
   HG_HOOKTYPE=pretxnclose
   HG_PENDING=$TESTTMP/a
   HG_PHASES_MOVED=1
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   txnclose hook: HG_HOOKNAME=txnclose
   HG_HOOKTYPE=txnclose
   HG_PHASES_MOVED=1
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   commit hook: HG_HOOKNAME=commit
   HG_HOOKTYPE=commit
   HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
   HG_PARENT1=0000000000000000000000000000000000000000
   
   commit.b hook: HG_HOOKNAME=commit.b
   HG_HOOKTYPE=commit
   HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
   HG_PARENT1=0000000000000000000000000000000000000000
   
 
   $ hg clone . ../b
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../b
 
 changegroup hooks can see env vars
 
   $ cat > .hg/hgrc <<EOF
   > [hooks]
   > prechangegroup = sh -c "printenv.py --line prechangegroup"
   > changegroup = sh -c "printenv.py --line changegroup"
   > incoming = sh -c "printenv.py --line incoming"
   > EOF
 
 pretxncommit and commit hooks can see both parents of merge
 
   $ cd ../a
   $ echo b >> a
   $ hg commit -m a1 -d "1 0"
   precommit hook: HG_HOOKNAME=precommit
   HG_HOOKTYPE=precommit
   HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
   
   pretxnopen hook: HG_HOOKNAME=pretxnopen
   HG_HOOKTYPE=pretxnopen
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   pretxncommit hook: HG_HOOKNAME=pretxncommit
   HG_HOOKTYPE=pretxncommit
   HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd
   HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
   HG_PENDING=$TESTTMP/a
   
   1:ab228980c14d
   pretxnclose hook: HG_HOOKNAME=pretxnclose
   HG_HOOKTYPE=pretxnclose
   HG_PENDING=$TESTTMP/a
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   txnclose hook: HG_HOOKNAME=txnclose
   HG_HOOKTYPE=txnclose
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   commit hook: HG_HOOKNAME=commit
   HG_HOOKTYPE=commit
   HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd
   HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
   
   commit.b hook: HG_HOOKNAME=commit.b
   HG_HOOKTYPE=commit
   HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd
   HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
   
   $ hg update -C 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b > b
   $ hg add b
   $ hg commit -m b -d '1 0'
   precommit hook: HG_HOOKNAME=precommit
   HG_HOOKTYPE=precommit
   HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
   
   pretxnopen hook: HG_HOOKNAME=pretxnopen
   HG_HOOKTYPE=pretxnopen
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   pretxncommit hook: HG_HOOKNAME=pretxncommit
   HG_HOOKTYPE=pretxncommit
   HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2
   HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
   HG_PENDING=$TESTTMP/a
   
   2:ee9deb46ab31
   pretxnclose hook: HG_HOOKNAME=pretxnclose
   HG_HOOKTYPE=pretxnclose
   HG_PENDING=$TESTTMP/a
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   created new head
   txnclose hook: HG_HOOKNAME=txnclose
   HG_HOOKTYPE=txnclose
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   commit hook: HG_HOOKNAME=commit
   HG_HOOKTYPE=commit
   HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2
   HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
   
   commit.b hook: HG_HOOKNAME=commit.b
   HG_HOOKTYPE=commit
   HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2
   HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
   
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m merge -d '2 0'
   precommit hook: HG_HOOKNAME=precommit
   HG_HOOKTYPE=precommit
   HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2
   HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
   
   pretxnopen hook: HG_HOOKNAME=pretxnopen
   HG_HOOKTYPE=pretxnopen
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   pretxncommit hook: HG_HOOKNAME=pretxncommit
   HG_HOOKTYPE=pretxncommit
   HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2
   HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2
   HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
   HG_PENDING=$TESTTMP/a
   
   3:07f3376c1e65
   pretxnclose hook: HG_HOOKNAME=pretxnclose
   HG_HOOKTYPE=pretxnclose
   HG_PENDING=$TESTTMP/a
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   txnclose hook: HG_HOOKNAME=txnclose
   HG_HOOKTYPE=txnclose
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   commit hook: HG_HOOKNAME=commit
   HG_HOOKTYPE=commit
   HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2
   HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2
   HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
   
   commit.b hook: HG_HOOKNAME=commit.b
   HG_HOOKTYPE=commit
   HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2
   HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2
   HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
   
 
 test generic hooks
 
   $ hg id
   pre-identify hook: HG_ARGS=id
   HG_HOOKNAME=pre-identify
   HG_HOOKTYPE=pre-identify
   HG_OPTS={'bookmarks': None, 'branch': None, 'id': None, 'insecure': None, 'num': None, 'remotecmd': '', 'rev': '', 'ssh': '', 'tags': None, 'template': ''}
   HG_PATS=[]
   
   abort: pre-identify hook exited with status 1
   [40]
   $ hg cat b
   pre-cat hook: HG_ARGS=cat b
   HG_HOOKNAME=pre-cat
   HG_HOOKTYPE=pre-cat
   HG_OPTS={'decode': None, 'exclude': [], 'include': [], 'output': '', 'rev': '', 'template': ''}
   HG_PATS=['b']
   
   b
   post-cat hook: HG_ARGS=cat b
   HG_HOOKNAME=post-cat
   HG_HOOKTYPE=post-cat
   HG_OPTS={'decode': None, 'exclude': [], 'include': [], 'output': '', 'rev': '', 'template': ''}
   HG_PATS=['b']
   HG_RESULT=0
   
 
   $ cd ../b
   $ hg pull ../a
   pulling from ../a
   searching for changes
   prechangegroup hook: HG_HOOKNAME=prechangegroup
   HG_HOOKTYPE=prechangegroup
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   file:/*/$TESTTMP/a (glob)
   HG_URL=file:$TESTTMP/a
   
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 2 changes to 2 files
   new changesets ab228980c14d:07f3376c1e65
   changegroup hook: HG_HOOKNAME=changegroup
   HG_HOOKTYPE=changegroup
   HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd
   HG_NODE_LAST=07f3376c1e655977439df2a814e3cc14b27abac2
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   file:/*/$TESTTMP/a (glob)
   HG_URL=file:$TESTTMP/a
   
   incoming hook: HG_HOOKNAME=incoming
   HG_HOOKTYPE=incoming
   HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   file:/*/$TESTTMP/a (glob)
   HG_URL=file:$TESTTMP/a
   
   incoming hook: HG_HOOKNAME=incoming
   HG_HOOKTYPE=incoming
   HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   file:/*/$TESTTMP/a (glob)
   HG_URL=file:$TESTTMP/a
   
   incoming hook: HG_HOOKNAME=incoming
   HG_HOOKTYPE=incoming
   HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   file:/*/$TESTTMP/a (glob)
   HG_URL=file:$TESTTMP/a
   
   (run 'hg update' to get a working copy)
 
 tag hooks can see env vars
 
   $ cd ../a
   $ cat >> .hg/hgrc <<EOF
   > pretag = sh -c "printenv.py --line pretag"
   > tag = sh -c "HG_PARENT1= HG_PARENT2= printenv.py --line tag"
   > EOF
   $ hg tag -d '3 0' a
   pretag hook: HG_HOOKNAME=pretag
   HG_HOOKTYPE=pretag
   HG_LOCAL=0
   HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2
   HG_TAG=a
   
   precommit hook: HG_HOOKNAME=precommit
   HG_HOOKTYPE=precommit
   HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
   
   pretxnopen hook: HG_HOOKNAME=pretxnopen
   HG_HOOKTYPE=pretxnopen
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   pretxncommit hook: HG_HOOKNAME=pretxncommit
   HG_HOOKTYPE=pretxncommit
   HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
   HG_PENDING=$TESTTMP/a
   
   4:539e4b31b6dc
   pretxnclose hook: HG_HOOKNAME=pretxnclose
   HG_HOOKTYPE=pretxnclose
   HG_PENDING=$TESTTMP/a
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   tag hook: HG_HOOKNAME=tag
   HG_HOOKTYPE=tag
   HG_LOCAL=0
   HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2
   HG_TAG=a
   
   txnclose hook: HG_HOOKNAME=txnclose
   HG_HOOKTYPE=txnclose
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   commit hook: HG_HOOKNAME=commit
   HG_HOOKTYPE=commit
   HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
   
   commit.b hook: HG_HOOKNAME=commit.b
   HG_HOOKTYPE=commit
   HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
   
   $ hg tag -l la
   pretag hook: HG_HOOKNAME=pretag
   HG_HOOKTYPE=pretag
   HG_LOCAL=1
   HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_TAG=la
   
   tag hook: HG_HOOKNAME=tag
   HG_HOOKTYPE=tag
   HG_LOCAL=1
   HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_TAG=la
   
 
 pretag hook can forbid tagging
 
   $ cat >> .hg/hgrc <<EOF
   > pretag.forbid = sh -c "printenv.py --line pretag.forbid 1"
   > EOF
   $ hg tag -d '4 0' fa
   pretag hook: HG_HOOKNAME=pretag
   HG_HOOKTYPE=pretag
   HG_LOCAL=0
   HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_TAG=fa
   
   pretag.forbid hook: HG_HOOKNAME=pretag.forbid
   HG_HOOKTYPE=pretag
   HG_LOCAL=0
   HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_TAG=fa
   
   abort: pretag.forbid hook exited with status 1
   [40]
   $ hg tag -l fla
   pretag hook: HG_HOOKNAME=pretag
   HG_HOOKTYPE=pretag
   HG_LOCAL=1
   HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_TAG=fla
   
   pretag.forbid hook: HG_HOOKNAME=pretag.forbid
   HG_HOOKTYPE=pretag
   HG_LOCAL=1
   HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_TAG=fla
   
   abort: pretag.forbid hook exited with status 1
   [40]
 
 pretxncommit hook can see changeset, can roll back txn, changeset no
 more there after
 
   $ cat >> .hg/hgrc <<EOF
   > pretxncommit.forbid0 = sh -c "hg tip -q"
   > pretxncommit.forbid1 = sh -c "printenv.py --line pretxncommit.forbid 1"
   > EOF
   $ echo z > z
   $ hg add z
   $ hg -q tip
   4:539e4b31b6dc
   $ hg commit -m 'fail' -d '4 0'
   precommit hook: HG_HOOKNAME=precommit
   HG_HOOKTYPE=precommit
   HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   
   pretxnopen hook: HG_HOOKNAME=pretxnopen
   HG_HOOKTYPE=pretxnopen
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   pretxncommit hook: HG_HOOKNAME=pretxncommit
   HG_HOOKTYPE=pretxncommit
   HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567
   HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_PENDING=$TESTTMP/a
   
   5:6f611f8018c1
   5:6f611f8018c1
   pretxncommit.forbid hook: HG_HOOKNAME=pretxncommit.forbid1
   HG_HOOKTYPE=pretxncommit
   HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567
   HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_PENDING=$TESTTMP/a
   
   transaction abort!
   txnabort Python hook: changes,txnid,txnname
   txnabort hook: HG_HOOKNAME=txnabort.1
   HG_HOOKTYPE=txnabort
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=commit
   
   rollback completed
   abort: pretxncommit.forbid1 hook exited with status 1
   [40]
   $ hg -q tip
   4:539e4b31b6dc
 
 (Check that no 'changelog.i.a' file were left behind)
 
   $ ls -1 .hg/store/
   00changelog.i
   00manifest.i
   data
   fncache (repofncache !)
   phaseroots
   requires
   undo
   undo.backup.fncache.bck (repofncache !)
   undo.backupfiles
 
 
 precommit hook can prevent commit
 
   $ cat >> .hg/hgrc <<EOF
   > precommit.forbid = sh -c "printenv.py --line precommit.forbid 1"
   > EOF
   $ hg commit -m 'fail' -d '4 0'
   precommit hook: HG_HOOKNAME=precommit
   HG_HOOKTYPE=precommit
   HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   
   precommit.forbid hook: HG_HOOKNAME=precommit.forbid
   HG_HOOKTYPE=precommit
   HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   
   abort: precommit.forbid hook exited with status 1
   [40]
   $ hg -q tip
   4:539e4b31b6dc
 
 preupdate hook can prevent update
 
   $ cat >> .hg/hgrc <<EOF
   > preupdate = sh -c "printenv.py --line preupdate"
   > EOF
   $ hg update 1
   preupdate hook: HG_HOOKNAME=preupdate
   HG_HOOKTYPE=preupdate
   HG_PARENT1=ab228980c14d
   
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
 update hook
 
   $ cat >> .hg/hgrc <<EOF
   > update = sh -c "printenv.py --line update"
   > EOF
   $ hg update
   preupdate hook: HG_HOOKNAME=preupdate
   HG_HOOKTYPE=preupdate
   HG_PARENT1=539e4b31b6dc
   
   update hook: HG_ERROR=0
   HG_HOOKNAME=update
   HG_HOOKTYPE=update
   HG_PARENT1=539e4b31b6dc
   
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 pushkey hook
 
   $ cat >> .hg/hgrc <<EOF
   > pushkey = sh -c "printenv.py --line pushkey"
   > EOF
   $ cd ../b
   $ hg bookmark -r null foo
   $ hg push -B foo ../a
   pushing to ../a
   searching for changes
   no changes found
   pretxnopen hook: HG_HOOKNAME=pretxnopen
   HG_HOOKTYPE=pretxnopen
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=push
   
   pretxnclose hook: HG_BOOKMARK_MOVED=1
   HG_BUNDLE2=1
   HG_HOOKNAME=pretxnclose
   HG_HOOKTYPE=pretxnclose
   HG_PENDING=$TESTTMP/a
   HG_SOURCE=push
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=push
   HG_URL=file:$TESTTMP/a
   
   pushkey hook: HG_BUNDLE2=1
   HG_HOOKNAME=pushkey
   HG_HOOKTYPE=pushkey
   HG_KEY=foo
   HG_NAMESPACE=bookmarks
   HG_NEW=0000000000000000000000000000000000000000
   HG_PUSHKEYCOMPAT=1
   HG_SOURCE=push
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=push
   HG_URL=file:$TESTTMP/a
   
   txnclose hook: HG_BOOKMARK_MOVED=1
   HG_BUNDLE2=1
   HG_HOOKNAME=txnclose
   HG_HOOKTYPE=txnclose
   HG_SOURCE=push
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=push
   HG_URL=file:$TESTTMP/a
   
   exporting bookmark foo
   [1]
   $ cd ../a
 
 listkeys hook
 
   $ cat >> .hg/hgrc <<EOF
   > listkeys = sh -c "printenv.py --line listkeys"
   > EOF
   $ hg bookmark -r null bar
   pretxnopen hook: HG_HOOKNAME=pretxnopen
   HG_HOOKTYPE=pretxnopen
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=bookmark
   
   pretxnclose hook: HG_BOOKMARK_MOVED=1
   HG_HOOKNAME=pretxnclose
   HG_HOOKTYPE=pretxnclose
   HG_PENDING=$TESTTMP/a
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=bookmark
   
   txnclose hook: HG_BOOKMARK_MOVED=1
   HG_HOOKNAME=txnclose
   HG_HOOKTYPE=txnclose
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=bookmark
   
   $ cd ../b
   $ hg pull -B bar ../a
   pulling from ../a
   listkeys hook: HG_HOOKNAME=listkeys
   HG_HOOKTYPE=listkeys
   HG_NAMESPACE=bookmarks
   HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
   
   no changes found
   adding remote bookmark bar
   $ cd ../a
 
 test that prepushkey can prevent incoming keys
 
   $ cat >> .hg/hgrc <<EOF
   > prepushkey = sh -c "printenv.py --line prepushkey.forbid 1"
   > EOF
   $ cd ../b
   $ hg bookmark -r null baz
   $ hg push -B baz ../a
   pushing to ../a
   searching for changes
   listkeys hook: HG_HOOKNAME=listkeys
   HG_HOOKTYPE=listkeys
   HG_NAMESPACE=phases
   HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'}
   
   listkeys hook: HG_HOOKNAME=listkeys
   HG_HOOKTYPE=listkeys
   HG_NAMESPACE=bookmarks
   HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
   
   no changes found
   pretxnopen hook: HG_HOOKNAME=pretxnopen
   HG_HOOKTYPE=pretxnopen
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=push
   
   prepushkey.forbid hook: HG_BUNDLE2=1
   HG_HOOKNAME=prepushkey
   HG_HOOKTYPE=prepushkey
   HG_KEY=baz
   HG_NAMESPACE=bookmarks
   HG_NEW=0000000000000000000000000000000000000000
   HG_PUSHKEYCOMPAT=1
   HG_SOURCE=push
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=push
   HG_URL=file:$TESTTMP/a
   
   txnabort Python hook: bundle2,changes,source,txnid,txnname,url
   txnabort hook: HG_BUNDLE2=1
   HG_HOOKNAME=txnabort.1
   HG_HOOKTYPE=txnabort
   HG_SOURCE=push
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=push
   HG_URL=file:$TESTTMP/a
   
   abort: prepushkey hook exited with status 1
   [40]
   $ cd ../a
 
 test that prelistkeys can prevent listing keys
 
   $ cat >> .hg/hgrc <<EOF
   > prelistkeys = sh -c "printenv.py --line prelistkeys.forbid 1"
   > EOF
   $ hg bookmark -r null quux
   pretxnopen hook: HG_HOOKNAME=pretxnopen
   HG_HOOKTYPE=pretxnopen
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=bookmark
   
   pretxnclose hook: HG_BOOKMARK_MOVED=1
   HG_HOOKNAME=pretxnclose
   HG_HOOKTYPE=pretxnclose
   HG_PENDING=$TESTTMP/a
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=bookmark
   
   txnclose hook: HG_BOOKMARK_MOVED=1
   HG_HOOKNAME=txnclose
   HG_HOOKTYPE=txnclose
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=bookmark
   
   $ cd ../b
   $ hg pull -B quux ../a
   pulling from ../a
   prelistkeys.forbid hook: HG_HOOKNAME=prelistkeys
   HG_HOOKTYPE=prelistkeys
   HG_NAMESPACE=bookmarks
   
   abort: prelistkeys hook exited with status 1
   [40]
   $ cd ../a
   $ rm .hg/hgrc
 
 prechangegroup hook can prevent incoming changes
 
   $ cd ../b
   $ hg -q tip
   3:07f3376c1e65
   $ cat > .hg/hgrc <<EOF
   > [hooks]
   > prechangegroup.forbid = sh -c "printenv.py --line prechangegroup.forbid 1"
   > EOF
   $ hg pull ../a
   pulling from ../a
   searching for changes
   prechangegroup.forbid hook: HG_HOOKNAME=prechangegroup.forbid
   HG_HOOKTYPE=prechangegroup
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   file:/*/$TESTTMP/a (glob)
   HG_URL=file:$TESTTMP/a
   
   abort: prechangegroup.forbid hook exited with status 1
   [40]
 
 pretxnchangegroup hook can see incoming changes, can roll back txn,
 incoming changes no longer there after
 
   $ cat > .hg/hgrc <<EOF
   > [hooks]
   > pretxnchangegroup.forbid0 = hg tip -q
   > pretxnchangegroup.forbid1 = sh -c "printenv.py --line pretxnchangegroup.forbid 1"
   > EOF
   $ hg pull ../a
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   4:539e4b31b6dc
   pretxnchangegroup.forbid hook: HG_HOOKNAME=pretxnchangegroup.forbid1
   HG_HOOKTYPE=pretxnchangegroup
   HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_NODE_LAST=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_PENDING=$TESTTMP/b
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
   HG_TXNNAME=pull
   file:/*/$TESTTMP/a (glob)
   HG_URL=file:$TESTTMP/a
   
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.forbid1 hook exited with status 1
   [40]
   $ hg -q tip
   3:07f3376c1e65
 
 outgoing hooks can see env vars
 
   $ rm .hg/hgrc
   $ cat > ../a/.hg/hgrc <<EOF
   > [hooks]
   > preoutgoing = sh -c "printenv.py --line preoutgoing"
   > outgoing = sh -c "printenv.py --line outgoing"
   > EOF
   $ hg pull ../a
   pulling from ../a
   searching for changes
   preoutgoing hook: HG_HOOKNAME=preoutgoing
   HG_HOOKTYPE=preoutgoing
   HG_SOURCE=pull
   
   outgoing hook: HG_HOOKNAME=outgoing
   HG_HOOKTYPE=outgoing
   HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
   HG_SOURCE=pull
   
   adding changesets
   adding manifests
   adding file changes
   adding remote bookmark quux
   added 1 changesets with 1 changes to 1 files
   new changesets 539e4b31b6dc
   (run 'hg update' to get a working copy)
   $ hg rollback
   repository tip rolled back to revision 3 (undo pull)
 
 preoutgoing hook can prevent outgoing changes
 
   $ cat >> ../a/.hg/hgrc <<EOF
   > preoutgoing.forbid = sh -c "printenv.py --line preoutgoing.forbid 1"
   > EOF
   $ hg pull ../a
   pulling from ../a
   searching for changes
   preoutgoing hook: HG_HOOKNAME=preoutgoing
   HG_HOOKTYPE=preoutgoing
   HG_SOURCE=pull
   
   preoutgoing.forbid hook: HG_HOOKNAME=preoutgoing.forbid
   HG_HOOKTYPE=preoutgoing
   HG_SOURCE=pull
   
   abort: preoutgoing.forbid hook exited with status 1
   [40]
 
 outgoing hooks work for local clones
 
   $ cd ..
   $ cat > a/.hg/hgrc <<EOF
   > [hooks]
   > preoutgoing = sh -c "printenv.py --line preoutgoing"
   > outgoing = sh -c "printenv.py --line outgoing"
   > EOF
   $ hg clone a c
   preoutgoing hook: HG_HOOKNAME=preoutgoing
   HG_HOOKTYPE=preoutgoing
   HG_SOURCE=clone
   
   outgoing hook: HG_HOOKNAME=outgoing
   HG_HOOKTYPE=outgoing
   HG_NODE=0000000000000000000000000000000000000000
   HG_SOURCE=clone
   
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf c
 
 preoutgoing hook can prevent outgoing changes for local clones
 
   $ cat >> a/.hg/hgrc <<EOF
   > preoutgoing.forbid = sh -c "printenv.py --line preoutgoing.forbid 1"
   > EOF
   $ hg clone a zzz
   preoutgoing hook: HG_HOOKNAME=preoutgoing
   HG_HOOKTYPE=preoutgoing
   HG_SOURCE=clone
   
   preoutgoing.forbid hook: HG_HOOKNAME=preoutgoing.forbid
   HG_HOOKTYPE=preoutgoing
   HG_SOURCE=clone
   
   abort: preoutgoing.forbid hook exited with status 1
   [40]
 
   $ cd "$TESTTMP/b"
 
   $ cat > hooktests.py <<EOF
   > from mercurial import (
   >     error,
   >     pycompat,
   > )
   > 
   > uncallable = 0
   > 
   > def printargs(ui, args):
   >     a = list(pycompat.byteskwargs(args).items())
   >     a.sort()
   >     ui.write(b'hook args:\n')
   >     for k, v in a:
   >        ui.write(b'  %s %s\n' % (k, v))
   > 
   > def passhook(ui, repo, **args):
   >     printargs(ui, args)
   > 
   > def failhook(ui, repo, **args):
   >     printargs(ui, args)
   >     return True
   > 
   > class LocalException(Exception):
   >     pass
   > 
   > def raisehook(**args):
   >     raise LocalException('exception from hook')
   > 
   > def aborthook(**args):
   >     raise error.Abort(b'raise abort from hook')
   > 
   > def brokenhook(**args):
   >     return 1 + {}
   > 
   > def verbosehook(ui, **args):
   >     ui.note(b'verbose output from hook\n')
   > 
   > def printtags(ui, repo, **args):
   >     ui.write(b'[%s]\n' % b', '.join(sorted(repo.tags())))
   > 
   > class container(object):
   >     unreachable = 1
   > EOF
 
   $ cat > syntaxerror.py << NO_CHECK_EOF
   > (foo
   > NO_CHECK_EOF
 
 test python hooks
 
 #if windows
   $ PYTHONPATH="$TESTTMP/b;$PYTHONPATH"
 #else
   $ PYTHONPATH="$TESTTMP/b:$PYTHONPATH"
 #endif
   $ export PYTHONPATH
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.broken = python:hooktests.brokenhook' >> ../a/.hg/hgrc
   $ hg pull ../a 2>&1 | grep 'raised an exception'
   error: preoutgoing.broken hook raised an exception: unsupported operand type(s) for +: 'int' and 'dict'
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.raise = python:hooktests.raisehook' >> ../a/.hg/hgrc
   $ hg pull ../a 2>&1 | grep 'raised an exception'
   error: preoutgoing.raise hook raised an exception: exception from hook
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.abort = python:hooktests.aborthook' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   error: preoutgoing.abort hook failed: raise abort from hook
   abort: raise abort from hook
   [255]
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.fail = python:hooktests.failhook' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   hook args:
     hooktype preoutgoing
     source pull
   abort: preoutgoing.fail hook failed
   [40]
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.uncallable = python:hooktests.uncallable' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   abort: preoutgoing.uncallable hook is invalid: "hooktests.uncallable" is not callable
   [255]
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.nohook = python:hooktests.nohook' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   abort: preoutgoing.nohook hook is invalid: "hooktests.nohook" is not defined
   [255]
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.nomodule = python:nomodule' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   abort: preoutgoing.nomodule hook is invalid: "nomodule" not in a module
   [255]
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.badmodule = python:nomodule.nowhere' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   abort: preoutgoing.badmodule hook is invalid: import of "nomodule" failed
   (run with --traceback for stack trace)
   [255]
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.unreachable = python:hooktests.container.unreachable' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   abort: preoutgoing.unreachable hook is invalid: import of "hooktests.container" failed
   (run with --traceback for stack trace)
   [255]
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.syntaxerror = python:syntaxerror.syntaxerror' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   abort: preoutgoing.syntaxerror hook is invalid: import of "syntaxerror" failed
   (run with --traceback for stack trace)
   [255]
 
   $ hg pull ../a --traceback 2>&1 | grep -E 'pulling|searching|^exception|Traceback|SyntaxError|ImportError|ModuleNotFoundError|HookLoadError|abort'
   pulling from ../a
   searching for changes
   exception from first failed import attempt:
   Traceback (most recent call last):
   SyntaxError: * (glob)
   exception from second failed import attempt:
   Traceback (most recent call last):
   SyntaxError: * (glob)
   Traceback (most recent call last):
   ModuleNotFoundError: No module named 'hgext_syntaxerror'
   Traceback (most recent call last):
   SyntaxError: * (glob)
   Traceback (most recent call last):
   ModuleNotFoundError: No module named 'hgext_syntaxerror'
   Traceback (most recent call last):
-      raise error.HookLoadError( (py38 !)
+      raise error.HookLoadError(msg, hint=tracebackhint) (py37 !)
   mercurial.error.HookLoadError: preoutgoing.syntaxerror hook is invalid: import of "syntaxerror" failed
   abort: preoutgoing.syntaxerror hook is invalid: import of "syntaxerror" failed
 
   $ echo '[hooks]' > ../a/.hg/hgrc
   $ echo 'preoutgoing.pass = python:hooktests.passhook' >> ../a/.hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   hook args:
     hooktype preoutgoing
     source pull
   adding changesets
   adding manifests
   adding file changes
   adding remote bookmark quux
   added 1 changesets with 1 changes to 1 files
   new changesets 539e4b31b6dc
   (run 'hg update' to get a working copy)
 
 post- python hooks that fail to *run* don't cause an abort
   $ rm ../a/.hg/hgrc
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'post-pull.broken = python:hooktests.brokenhook' >> .hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   no changes found
   error: post-pull.broken hook raised an exception: unsupported operand type(s) for +: 'int' and 'dict'
   (run with --traceback for stack trace)
 
 but post- python hooks that fail to *load* do
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'post-pull.nomodule = python:nomodule' >> .hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   no changes found
   abort: post-pull.nomodule hook is invalid: "nomodule" not in a module
   [255]
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'post-pull.badmodule = python:nomodule.nowhere' >> .hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   no changes found
   abort: post-pull.badmodule hook is invalid: import of "nomodule" failed
   (run with --traceback for stack trace)
   [255]
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'post-pull.nohook = python:hooktests.nohook' >> .hg/hgrc
   $ hg pull ../a
   pulling from ../a
   searching for changes
   no changes found
   abort: post-pull.nohook hook is invalid: "hooktests.nohook" is not defined
   [255]
 
 make sure --traceback works
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'commit.abort = python:hooktests.aborthook' >> .hg/hgrc
 
   $ echo aa > a
   $ hg --traceback commit -d '0 0' -ma 2>&1 | grep '^Traceback'
   Traceback (most recent call last):
 
   $ cd ..
   $ hg init c
   $ cd c
 
   $ cat > hookext.py <<EOF
   > def autohook(ui, **args):
   >     ui.write(b'Automatically installed hook\n')
   > 
   > def reposetup(ui, repo):
   >     repo.ui.setconfig(b"hooks", b"commit.auto", autohook)
   > EOF
   $ echo '[extensions]' >> .hg/hgrc
   $ echo 'hookext = hookext.py' >> .hg/hgrc
 
   $ touch foo
   $ hg add foo
   $ hg ci -d '0 0' -m 'add foo'
   Automatically installed hook
   $ echo >> foo
   $ hg ci --debug -d '0 0' -m 'change foo'
   committing files:
   foo
   committing manifest
   committing changelog
   updating the branch cache
   committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708
   calling hook commit.auto: hgext_hookext.autohook
   Automatically installed hook
 
   $ hg showconfig hooks
   hooks.commit.auto=<function autohook at *> (glob)
 
 test python hook configured with python:[file]:[hook] syntax
 
   $ cd ..
   $ mkdir d
   $ cd d
   $ hg init repo
   $ mkdir hooks
 
   $ cd hooks
   $ cat > testhooks.py <<EOF
   > def testhook(ui, **args):
   >     ui.write(b'hook works\n')
   > EOF
   $ echo '[hooks]' > ../repo/.hg/hgrc
   $ echo "pre-commit.test = python:`pwd`/testhooks.py:testhook" >> ../repo/.hg/hgrc
 
   $ cd ../repo
   $ hg commit -d '0 0'
   hook works
   nothing changed
   [1]
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo "update.ne = python:`pwd`/nonexistent.py:testhook" >> .hg/hgrc
   $ echo "pre-identify.npmd = python:`pwd`/:no_python_module_dir" >> .hg/hgrc
 
   $ hg up null
   loading update.ne hook failed:
   abort: $ENOENT$: '$TESTTMP/d/repo/nonexistent.py'
   [255]
 
   $ hg id
   loading pre-identify.npmd hook failed:
   abort: No module named 'repo'
   [255]
 
   $ cd ../../b
 
 make sure --traceback works on hook import failure
 
   $ cat > importfail.py <<EOF
   > import somebogusmodule
   > # dereference something in the module to force demandimport to load it
   > somebogusmodule.whatever
   > EOF
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'precommit.importfail = python:importfail.whatever' >> .hg/hgrc
 
   $ echo a >> a
   $ hg --traceback commit -ma 2>&1 | grep -E '^exception|ImportError|ModuleNotFoundError|Traceback|HookLoadError|abort'
   exception from first failed import attempt:
   Traceback (most recent call last):
   ModuleNotFoundError: No module named 'somebogusmodule'
   exception from second failed import attempt:
   Traceback (most recent call last):
   ModuleNotFoundError: No module named 'somebogusmodule'
   Traceback (most recent call last):
   ModuleNotFoundError: No module named 'hgext_importfail'
   Traceback (most recent call last):
   ModuleNotFoundError: No module named 'somebogusmodule'
   Traceback (most recent call last):
   ModuleNotFoundError: No module named 'hgext_importfail'
   Traceback (most recent call last):
-      raise error.HookLoadError( (py38 !)
+      raise error.HookLoadError(msg, hint=tracebackhint) (py37 !)
   mercurial.error.HookLoadError: precommit.importfail hook is invalid: import of "importfail" failed
   abort: precommit.importfail hook is invalid: import of "importfail" failed
 
 Issue1827: Hooks Update & Commit not completely post operation
 
 commit and update hooks should run after command completion.  The largefiles
 use demonstrates a recursive wlock, showing the hook doesn't run until the
 final release (and dirstate flush).
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'commit = hg id' >> .hg/hgrc
   $ echo 'update = hg id' >> .hg/hgrc
   $ echo bb > a
   $ hg ci -ma
   223eafe2750c tip
   $ hg up 0 --config extensions.largefiles=
   The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   cb9a9f314b8b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 make sure --verbose (and --quiet/--debug etc.) are propagated to the local ui
 that is passed to pre/post hooks
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'pre-identify = python:hooktests.verbosehook' >> .hg/hgrc
   $ hg id
   cb9a9f314b8b
   $ hg id --verbose
   calling hook pre-identify: hooktests.verbosehook
   verbose output from hook
   cb9a9f314b8b
 
 Ensure hooks can be prioritized
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'pre-identify.a = python:hooktests.verbosehook' >> .hg/hgrc
   $ echo 'pre-identify.b = python:hooktests.verbosehook' >> .hg/hgrc
   $ echo 'priority.pre-identify.b = 1' >> .hg/hgrc
   $ echo 'pre-identify.c = python:hooktests.verbosehook' >> .hg/hgrc
   $ hg id --verbose
   calling hook pre-identify.b: hooktests.verbosehook
   verbose output from hook
   calling hook pre-identify.a: hooktests.verbosehook
   verbose output from hook
   calling hook pre-identify.c: hooktests.verbosehook
   verbose output from hook
   cb9a9f314b8b
 
 new tags must be visible in pretxncommit (issue3210)
 
   $ echo 'pretxncommit.printtags = python:hooktests.printtags' >> .hg/hgrc
   $ hg tag -f foo
   [a, foo, tip]
 
 post-init hooks must not crash (issue4983)
 This also creates the `to` repo for the next test block.
 
   $ cd ..
   $ cat << EOF >> hgrc-with-post-init-hook
   > [hooks]
   > post-init = sh -c "printenv.py --line post-init"
   > EOF
   $ HGRCPATH=hgrc-with-post-init-hook hg init to
   post-init hook: HG_ARGS=init to
   HG_HOOKNAME=post-init
   HG_HOOKTYPE=post-init
   HG_OPTS={'insecure': None, 'remotecmd': '', 'ssh': ''}
   HG_PATS=['to']
   HG_RESULT=0
   
 
 new commits must be visible in pretxnchangegroup (issue3428)
 
   $ echo '[hooks]' >> to/.hg/hgrc
   $ echo 'prechangegroup = hg --traceback tip' >> to/.hg/hgrc
   $ echo 'pretxnchangegroup = hg --traceback tip' >> to/.hg/hgrc
   $ echo a >> to/a
   $ hg --cwd to ci -Ama
   adding a
   $ hg clone to from
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo aa >> from/a
   $ hg --cwd from ci -mb
   $ hg --cwd from push
   pushing to $TESTTMP/to
   searching for changes
   changeset:   0:cb9a9f314b8b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   adding changesets
   adding manifests
   adding file changes
   changeset:   1:9836a07b9b9d
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b
   
   added 1 changesets with 1 changes to 1 files
 
 pretxnclose hook failure should abort the transaction
 
   $ hg init txnfailure
   $ cd txnfailure
   $ touch a && hg commit -Aqm a
   $ cat >> .hg/hgrc <<EOF
   > [hooks]
   > pretxnclose.error = exit 1
   > EOF
   $ hg strip -r 0 --config extensions.strip=
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to * (glob)
   transaction abort!
   rollback completed
   strip failed, backup bundle stored in * (glob)
   abort: pretxnclose.error hook exited with status 1
   [40]
   $ hg recover
   no interrupted transaction available
   [1]
   $ cd ..
 
 check whether HG_PENDING makes pending changes only in related
 repositories visible to an external hook.
 
 (emulate a transaction running concurrently by copied
 .hg/store/00changelog.i.a in subsequent test)
 
   $ cat > $TESTTMP/savepending.sh <<EOF
   > cp .hg/store/00changelog.i.a  .hg/store/00changelog.i.a.saved
   > exit 1 # to avoid adding new revision for subsequent tests
   > EOF
   $ cd a
   $ hg tip -q
   4:539e4b31b6dc
   $ hg --config hooks.pretxnclose="sh $TESTTMP/savepending.sh" commit -m "invisible"
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
   [40]
   $ cp .hg/store/00changelog.i.a.saved .hg/store/00changelog.i.a
 
 (check (in)visibility of new changeset while transaction running in
 repo)
 
   $ cat > $TESTTMP/checkpending.sh <<EOF
   > echo '@a'
   > hg -R "$TESTTMP/a" tip -q
   > echo '@a/nested'
   > hg -R "$TESTTMP/a/nested" tip -q
   > exit 1 # to avoid adding new revision for subsequent tests
   > EOF
   $ hg init nested
   $ cd nested
   $ echo a > a
   $ hg add a
   $ hg --config hooks.pretxnclose="sh $TESTTMP/checkpending.sh" commit -m '#0'
   @a
   4:539e4b31b6dc
   @a/nested
   0:bf5e395ced2c
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
   [40]
 
 Hook from untrusted hgrc are reported as failure
 ================================================
 
   $ cat << EOF > $TESTTMP/untrusted.py
   > from mercurial import scmutil, util
   > def uisetup(ui):
   >     class untrustedui(ui.__class__):
   >         def _trusted(self, fp, f):
   >             if util.normpath(fp.name).endswith(b'untrusted/.hg/hgrc'):
   >                 return False
   >             return super(untrustedui, self)._trusted(fp, f)
   >     ui.__class__ = untrustedui
   > EOF
   $ cat << EOF >> $HGRCPATH
   > [extensions]
   > untrusted=$TESTTMP/untrusted.py
   > EOF
   $ hg init untrusted
   $ cd untrusted
 
 Non-blocking hook
 -----------------
 
   $ cat << EOF >> .hg/hgrc
   > [hooks]
   > txnclose.testing=echo txnclose hook called
   > EOF
   $ touch a && hg commit -Aqm a
   warning: untrusted hook txnclose.testing not executed
   $ hg log
   changeset:   0:3903775176ed
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
 
 Non-blocking hook
 -----------------
 
   $ cat << EOF >> .hg/hgrc
   > [hooks]
   > pretxnclose.testing=echo pre-txnclose hook called
   > EOF
   $ touch b && hg commit -Aqm a
   transaction abort!
   rollback completed
   abort: untrusted hook pretxnclose.testing not executed
   (see 'hg help config.trusted')
   [40]
   $ hg log
   changeset:   0:3903775176ed
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
 
 unsetup the test
 ----------------
 
 # touch the file to unconfuse chg with a diffrent mtime
   $ sleep 1
   $ touch $TESTTMP/untrusted.py
   $ cat << EOF >> $HGRCPATH
   > [extensions]
   > untrusted=!
   > EOF
 
 HGPLAIN setting in hooks
 ========================
 
   $ cat << EOF >> .hg/hgrc
   > [hooks]
   > pre-version.testing-default=sh -c "echo '### default ###' plain: \${HGPLAIN:-'<unset>'}"
   > pre-version.testing-yes=sh -c "echo '### yes #######' plain: \${HGPLAIN:-'<unset>'}"
   > pre-version.testing-yes:run-with-plain=yes
   > pre-version.testing-no=sh -c "echo '### no ########' plain: \${HGPLAIN:-'<unset>'}"
   > pre-version.testing-no:run-with-plain=no
   > pre-version.testing-auto=sh -c "echo '### auto ######' plain: \${HGPLAIN:-'<unset>'}"
   > pre-version.testing-auto:run-with-plain=auto
   > EOF
 
   $ (unset HGPLAIN; hg version --quiet)
   ### default ### plain: 1
   ### yes ####### plain: 1
   ### no ######## plain: <unset>
   ### auto ###### plain: <unset>
   Mercurial Distributed SCM (*) (glob)
 
   $ HGPLAIN=1 hg version --quiet
   ### default ### plain: 1
   ### yes ####### plain: 1
   ### no ######## plain: <unset>
   ### auto ###### plain: 1
   Mercurial Distributed SCM (*) (glob)
 
 Test hook that change the underlying repo
 =========================================
 
 blackbox access the dirstate afterward and can see a changelog / dirstate
 desync.
 
 
   $ cd $TESTTMP
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > blackbox=
   > [hooks]
   > post-merge = hg commit -m "auto merge"
   > EOF
 
   $ hg init t
   $ cd t
   $ touch ".hgignore"
   $ hg commit -Am "initial" -d'0 0'
   adding .hgignore
 
   $ echo This is file a1 > a
   $ hg commit -Am "commit #1" -d'0 0'
   adding a
 
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo This is file b1 > b
   $ hg commit -Am "commit #2" -d'0 0'
   adding b
   created new head
 
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cd ..