comparison mercurial/dispatch.py @ 33052:45b0e9d05ee9

extensions: register functions always at loading extension (issue5601)

Before this patch, functions defined in extensions are registered via
extra loaders only in _dispatch(). Therefore, loading extensions in
other code paths like below omits registration of functions.

  - WSGI service
  - operation across repositories (e.g. subrepo)
  - test-duplicateoptions.py, using extensions.loadall() directly

To register functions always at loading new extension, this patch
moves implementation for extra loading from dispatch._dispatch() to
extensions.loadall().

AFAIK, only commands module causes cyclic dependency between
extensions module, but this patch imports all related modules just
before extra loading in loadall(), in order to centralize them.

This patch makes extensions.py depend on many other modules, even
though extensions.py itself doesn't. It should be avoided if possible,
but I don't have any better idea. Some other places like below aren't
reasonable for extra loading, IMHO.

  - specific function in newly added module:
    existing callers of extensions.loadall() should invoke it, too

  - hg.repository() or so:
    no-repo commands aren't covered by this.

BTW, this patch removes _loaded.add(name) on relocation, because
dispatch._loaded is used only for extraloaders (for similar reason,
"exts" variable is removed, too).

33051:15a79ac823e8

    demandimport,
    encoding,
    error,
    extensions,
    fancyopts,
    fileset,
    help,
    hg,
    hook,
    profiling,
    pycompat,
    revset,
    scmutil,
    templatefilters,
    templatekw,
    templater,
    ui as uimod,
    util,
)

class request(object):

        return lambda: runcommand(lui, None, cmd, args[:1], ui, options, d,
                                  [], {})

_loaded = set()

# 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
extraloaders = [
    ('cmdtable', commands, 'loadcmdtable'),
    ('colortable', color, 'loadcolortable'),
    ('filesetpredicate', fileset, 'loadpredicate'),
    ('revsetpredicate', revset, 'loadpredicate'),
    ('templatefilter', templatefilters, 'loadfilter'),
    ('templatefunc', templater, 'loadfunction'),
    ('templatekeyword', templatekw, 'loadkeyword'),
]

def _dispatch(req):
    args = req.args
    ui = req.ui

    # check for cwd

    with profiling.profile(lui, enabled=profile) as profiler:
        # Configure extensions in phases: uisetup, extsetup, cmdtable, and
        # reposetup. Programs like TortoiseHg will call _dispatch several
        # times so we keep track of configured extensions in _loaded.
        extensions.loadall(lui)
        exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded]
        # Propagate any changes to lui.__class__ by extensions
        ui.__class__ = lui.__class__

        # (uisetup and extsetup are handled in extensions.loadall)

        for name, module in exts:
            for objname, loadermod, loadername in extraloaders:
                extraobj = getattr(module, objname, None)
                if extraobj is not None:
                    getattr(loadermod, loadername)(ui, name, extraobj)
            _loaded.add(name)

        # (reposetup is handled in hg.repository)

        addaliases(lui, commands.table)

33052:45b0e9d05ee9

    demandimport,
    encoding,
    error,
    extensions,
    fancyopts,
    help,
    hg,
    hook,
    profiling,
    pycompat,
    scmutil,
    ui as uimod,
    util,
)

class request(object):

        return lambda: runcommand(lui, None, cmd, args[:1], ui, options, d,
                                  [], {})

_loaded = set()

def _dispatch(req):
    args = req.args
    ui = req.ui

    # check for cwd

    with profiling.profile(lui, enabled=profile) as profiler:
        # Configure extensions in phases: uisetup, extsetup, cmdtable, and
        # reposetup. Programs like TortoiseHg will call _dispatch several
        # times so we keep track of configured extensions in _loaded.
        extensions.loadall(lui)
        # Propagate any changes to lui.__class__ by extensions
        ui.__class__ = lui.__class__

        # (uisetup and extsetup are handled in extensions.loadall)

        # (reposetup is handled in hg.repository)

        addaliases(lui, commands.table)