##// END OF EJS Templates
pyoxidizer: produce working Python 3 Windows installers (issue6366)...
pyoxidizer: produce working Python 3 Windows installers (issue6366) While we've had code to produce Python 3 Windows installers with PyOxidizer, we haven't been advertising them on the web site due to a bug in making TLS connections and issues around resource handling. This commit upgrades our PyOxidizer install and configuration to use a recent Git commit of PyOxidizer. This new version of PyOxidizer contains a *ton* of changes, improvements, and bug fixes. Notably, Windows shared distributions now mostly "just work" and the TLS bug and random problems with Python extension modules in the standard library go away. And Python has been upgraded from 3.7 to 3.8.6. The price we pay for this upgrade is a ton of backwards incompatible changes to Starlark. I applied this commit (the overall series actually) on stable to produce Windows installers for Mercurial 5.5.2, which I published shortly before submitting this commit for review. In order to get the stable branch working, I decided to take a less aggressive approach to Python resource management. Previously, we were attempting to load all Python modules from memory and were performing some hacks to copy Mercurial's non-module resources into additional directories in Starlark. This commit implements a resource callback function in Starlark (a new feature since PyOxidizer 0.7) to dynamically assign standard library resources to in-memory loading and all other resources to filesystem loading. This means that Mercurial's files and all the other packages we ship in the Windows installers (e.g. certifi and pygments) are loaded from the filesystem instead of from memory. This avoids issues due to lack of __file__ and enables us to ship a working Python 3 installer on Windows. The end state of the install layout after this patch is not ideal for @: we still copy resource files like templates and help text to directories next to the hg.exe executable. There is code in @ to use importlib.resources to load these files and we could likely remove these copies once this lands on @. But for now, the install layout mimics what we've shipped for seemingly forever and is backwards compatible. It allows us to achieve the milestone of working Python 3 Windows installers and gets us a giant step closer to deleting Python 2. Differential Revision: https://phab.mercurial-scm.org/D9148

File last commit:

r43513:ecd3832a default
r46277:57b5452a default
Show More
exthelper.py
311 lines | 10.7 KiB | text/x-python | PythonLexer
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 # Copyright 2012 Logilab SA <contact@logilab.fr>
# Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Octobus <contact@octobus.net>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
#####################################################################
### Extension helper ###
#####################################################################
from __future__ import absolute_import
from . import (
commands,
Matt Harbison
exthelper: support the option argument when registering a command...
r41090 error,
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 extensions,
Augie Fackler
exthelper: add some semi-useful trace logs...
r42507 pycompat,
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 registrar,
)
Augie Fackler
exthelper: add some semi-useful trace logs...
r42507 from hgdemandimport import tracing
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 class exthelper(object):
"""Helper for modular extension setup
Matt Harbison
exthelper: add some examples for using registrar aliases...
r41101 A single helper should be instantiated for each module of an
extension, where a command or function needs to be wrapped, or a
command, extension hook, fileset, revset or template needs to be
registered. Helper methods are then used as decorators for
these various purposes. If an extension spans multiple modules,
all helper instances should be merged in the main module.
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074
All decorators return the original function and may be chained.
Matt Harbison
exthelper: add some examples for using registrar aliases...
r41101
Aside from the helper functions with examples below, several
registrar method aliases are available for adding commands,
configitems, filesets, revsets, and templates. Simply decorate
the appropriate methods, and assign the corresponding exthelper
variable to a module level variable of the extension. The
extension loading mechanism will handle the rest.
example::
# ext.py
eh = exthelper.exthelper()
# As needed:
cmdtable = eh.cmdtable
configtable = eh.configtable
filesetpredicate = eh.filesetpredicate
revsetpredicate = eh.revsetpredicate
templatekeyword = eh.templatekeyword
@eh.command('mynewcommand',
[('r', 'rev', [], _('operate on these revisions'))],
_('-r REV...'),
helpcategory=command.CATEGORY_XXX)
def newcommand(ui, repo, *revs, **opts):
# implementation goes here
eh.configitem('experimental', 'foo',
default=False,
)
@eh.filesetpredicate('lfs()')
def filesetbabar(mctx, x):
return mctx.predicate(...)
@eh.revsetpredicate('hidden')
def revsetbabar(repo, subset, x):
args = revset.getargs(x, 0, 0, 'babar accept no argument')
return [r for r in subset if 'babar' in repo[r].description()]
@eh.templatekeyword('babar')
def kwbabar(ctx):
return 'babar'
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 """
def __init__(self):
self._uipopulatecallables = []
self._uicallables = []
self._extcallables = []
self._repocallables = []
self._commandwrappers = []
self._extcommandwrappers = []
self._functionwrappers = []
self.cmdtable = {}
self.command = registrar.command(self.cmdtable)
self.configtable = {}
Matt Harbison
exthelper: simplify configitem registration
r41075 self.configitem = registrar.configitem(self.configtable)
Matt Harbison
exthelper: reintroduce the ability to register filesets...
r41100 self.filesetpredicate = registrar.filesetpredicate()
Matt Harbison
exthelper: reintroduce the ability to register revsets...
r41096 self.revsetpredicate = registrar.revsetpredicate()
Matt Harbison
exthelper: reintroduce the ability to register templates...
r41099 self.templatekeyword = registrar.templatekeyword()
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074
def merge(self, other):
self._uicallables.extend(other._uicallables)
self._uipopulatecallables.extend(other._uipopulatecallables)
self._extcallables.extend(other._extcallables)
self._repocallables.extend(other._repocallables)
Matt Harbison
exthelper: switch to using the registrar merging method
r41113 self.filesetpredicate._merge(other.filesetpredicate)
self.revsetpredicate._merge(other.revsetpredicate)
self.templatekeyword._merge(other.templatekeyword)
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 self._commandwrappers.extend(other._commandwrappers)
self._extcommandwrappers.extend(other._extcommandwrappers)
self._functionwrappers.extend(other._functionwrappers)
self.cmdtable.update(other.cmdtable)
Gregory Szorc
py3: finish porting iteritems() to pycompat and remove source transformer...
r43376 for section, items in pycompat.iteritems(other.configtable):
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 if section in self.configtable:
self.configtable[section].update(items)
else:
self.configtable[section] = items
def finaluisetup(self, ui):
"""Method to be used as the extension uisetup
The following operations belong here:
- Changes to ui.__class__ . The ui object that will be used to run the
command has not yet been created. Changes made here will affect ui
objects created after this, and in particular the ui that will be
passed to runcommand
- Command wraps (extensions.wrapcommand)
- Changes that need to be visible to other extensions: because
initialization occurs in phases (all extensions run uisetup, then all
run extsetup), a change made here will be visible to other extensions
during extsetup
- Monkeypatch or wrap function (extensions.wrapfunction) of dispatch
module members
- Setup of pre-* and post-* hooks
- pushkey setup
"""
for command, wrapper, opts in self._commandwrappers:
entry = extensions.wrapcommand(commands.table, command, wrapper)
if opts:
Matt Harbison
exthelper: support the option argument when registering a command...
r41090 for opt in opts:
entry[1].append(opt)
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 for cont, funcname, wrapper in self._functionwrappers:
extensions.wrapfunction(cont, funcname, wrapper)
for c in self._uicallables:
Augie Fackler
cleanup: hgdemandimport.tracing accepts strings, not bytes...
r43532 with tracing.log('finaluisetup: %s', repr(c)):
Augie Fackler
exthelper: add some semi-useful trace logs...
r42507 c(ui)
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074
def finaluipopulate(self, ui):
"""Method to be used as the extension uipopulate
This is called once per ui instance to:
- Set up additional ui members
- Update configuration by ``ui.setconfig()``
- Extend the class dynamically
"""
for c in self._uipopulatecallables:
c(ui)
def finalextsetup(self, ui):
"""Method to be used as a the extension extsetup
The following operations belong here:
- Changes depending on the status of other extensions. (if
extensions.find('mq'))
- Add a global option to all commands
"""
knownexts = {}
for ext, command, wrapper, opts in self._extcommandwrappers:
if ext not in knownexts:
try:
e = extensions.find(ext)
except KeyError:
# Extension isn't enabled, so don't bother trying to wrap
# it.
continue
knownexts[ext] = e.cmdtable
entry = extensions.wrapcommand(knownexts[ext], command, wrapper)
if opts:
Matt Harbison
exthelper: support the option argument when registering a command...
r41090 for opt in opts:
entry[1].append(opt)
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074
for c in self._extcallables:
Augie Fackler
cleanup: hgdemandimport.tracing accepts strings, not bytes...
r43532 with tracing.log('finalextsetup: %s', repr(c)):
Augie Fackler
exthelper: add some semi-useful trace logs...
r42507 c(ui)
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074
def finalreposetup(self, ui, repo):
"""Method to be used as the extension reposetup
The following operations belong here:
- All hooks but pre-* and post-*
- Modify configuration variables
- Changes to repo.__class__, repo.dirstate.__class__
"""
for c in self._repocallables:
Augie Fackler
cleanup: hgdemandimport.tracing accepts strings, not bytes...
r43532 with tracing.log('finalreposetup: %s', repr(c)):
Augie Fackler
exthelper: add some semi-useful trace logs...
r42507 c(ui, repo)
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074
def uisetup(self, call):
"""Decorated function will be executed during uisetup
example::
@eh.uisetup
def setupbabar(ui):
print 'this is uisetup!'
"""
self._uicallables.append(call)
return call
def uipopulate(self, call):
"""Decorated function will be executed during uipopulate
example::
@eh.uipopulate
def setupfoo(ui):
print 'this is uipopulate!'
"""
self._uipopulatecallables.append(call)
return call
def extsetup(self, call):
"""Decorated function will be executed during extsetup
example::
@eh.extsetup
def setupcelestine(ui):
print 'this is extsetup!'
"""
self._extcallables.append(call)
return call
def reposetup(self, call):
"""Decorated function will be executed during reposetup
example::
@eh.reposetup
def setupzephir(ui, repo):
print 'this is reposetup!'
"""
self._repocallables.append(call)
return call
def wrapcommand(self, command, extension=None, opts=None):
"""Decorated function is a command wrapper
The name of the command must be given as the decorator argument.
The wrapping is installed during `uisetup`.
If the second option `extension` argument is provided, the wrapping
will be applied in the extension commandtable. This argument must be a
string that will be searched using `extension.find` if not found and
Abort error is raised. If the wrapping applies to an extension, it is
installed during `extsetup`.
example::
@eh.wrapcommand('summary')
def wrapsummary(orig, ui, repo, *args, **kwargs):
ui.note('Barry!')
return orig(ui, repo, *args, **kwargs)
Matt Harbison
exthelper: support the option argument when registering a command...
r41090 The `opts` argument allows specifying a list of tuples for additional
arguments for the command. See ``mercurial.fancyopts.fancyopts()`` for
the format of the tuple.
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074
"""
if opts is None:
opts = []
Matt Harbison
exthelper: support the option argument when registering a command...
r41090 else:
for opt in opts:
if not isinstance(opt, tuple):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.ProgrammingError(b'opts must be list of tuples')
Matt Harbison
exthelper: support the option argument when registering a command...
r41090 if len(opt) not in (4, 5):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = b'each opt tuple must contain 4 or 5 values'
Matt Harbison
exthelper: support the option argument when registering a command...
r41090 raise error.ProgrammingError(msg)
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 def dec(wrapper):
if extension is None:
self._commandwrappers.append((command, wrapper, opts))
else:
Augie Fackler
formatting: blacken the codebase...
r43346 self._extcommandwrappers.append(
(extension, command, wrapper, opts)
)
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 return wrapper
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 return dec
def wrapfunction(self, container, funcname):
"""Decorated function is a function wrapper
This function takes two arguments, the container and the name of the
function to wrap. The wrapping is performed during `uisetup`.
(there is no extension support)
example::
@eh.function(discovery, 'checkheads')
def wrapfunction(orig, *args, **kwargs):
ui.note('His head smashed in and his heart cut out')
return orig(*args, **kwargs)
"""
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 def dec(wrapper):
self._functionwrappers.append((container, funcname, wrapper))
return wrapper
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
extensions: import the exthelper class from evolve 980565468003 (API)...
r41074 return dec