##// END OF EJS Templates
setdiscovery: don't call "heads" wire command when heads specified...
setdiscovery: don't call "heads" wire command when heads specified Our custom server has too many heads to announce (one per code review, plus a public head), but it still lets the user request one of them by doing hg pull -r <some expression> After the client has resolved the expression to a set of nodeids by calling the "lookup" wire command, it will start the discovery phase. Before this patch, that doesn't take the requested heads into account and unconditionally calls the server's "heads" command to find all its heads. One consequence of that the "all remote heads known locally" case triggers if the client already had the public head and the user will see a "no changes found" message that's unrelated to the head they requested. That message confused me for a while. More imporantly, it also means that pullop.cgresult incorrectly (given our arguably misbehaving server) gets set to 0 (no changesets added), which confused some of our extensions. This patch makes it so the client skips the "heads" command if the user requested specific revisions. Since the "heads" command is normally batched with the first "known" command and calculating the list of heads is probably cheap, I don't expect much improvement in speed from this. Differential Revision: https://phab.mercurial-scm.org/D1962

File last commit:

r35476:8652ab40 default
r35867:5cfdf613 default
Show More
policy.py
116 lines | 3.8 KiB | text/x-python | PythonLexer
timeless
debuginstall: expose modulepolicy...
r29266 # policy.py - module policy logic for Mercurial.
#
# Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import os
import sys
# Rules for how modules can be loaded. Values are:
#
# c - require C extensions
# allow - allow pure Python implementation when C loading fails
Maciej Fijalkowski
policy: add cffi policy for PyPy...
r29490 # cffi - required cffi versions (implemented within pure module)
# cffi-allow - allow pure Python implementation if cffi version is missing
timeless
debuginstall: expose modulepolicy...
r29266 # py - only load pure Python modules
#
Yuya Nishihara
policy: relax the default for in-place build...
r32251 # By default, fall back to the pure modules so the in-place build can
# run without recompiling the C extensions. This will be overridden by
# __modulepolicy__ generated by setup.py.
policy = b'allow'
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 _packageprefs = {
# policy: (versioned package, pure package)
b'c': (r'cext', None),
b'allow': (r'cext', r'pure'),
Yuya Nishihara
cffi: split modules from pure...
r32512 b'cffi': (r'cffi', None),
b'cffi-allow': (r'cffi', r'pure'),
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 b'py': (None, r'pure'),
}
Maciej Fijalkowski
policy: add cffi policy for PyPy...
r29490
timeless
debuginstall: expose modulepolicy...
r29266 try:
from . import __modulepolicy__
policy = __modulepolicy__.modulepolicy
except ImportError:
pass
# PyPy doesn't load C extensions.
#
# The canonical way to do this is to test platform.python_implementation().
# But we don't import platform and don't bloat for it here.
Yuya Nishihara
policy: mark all string literals as sysstr or bytes...
r32205 if r'__pypy__' in sys.builtin_module_names:
policy = b'cffi'
timeless
debuginstall: expose modulepolicy...
r29266
# Our C extensions aren't yet compatible with Python 3. So use pure Python
# on Python 3 for now.
if sys.version_info[0] >= 3:
Augie Fackler
policy: try and always have a bytes for module policy...
r31308 policy = b'py'
timeless
debuginstall: expose modulepolicy...
r29266
# Environment variable can always force settings.
FUJIWARA Katsunori
py3: add "b" prefix to string literals related to module policy...
r31361 if sys.version_info[0] >= 3:
Yuya Nishihara
policy: mark all string literals as sysstr or bytes...
r32205 if r'HGMODULEPOLICY' in os.environ:
policy = os.environ[r'HGMODULEPOLICY'].encode(r'utf-8')
FUJIWARA Katsunori
py3: add "b" prefix to string literals related to module policy...
r31361 else:
Yuya Nishihara
policy: mark all string literals as sysstr or bytes...
r32205 policy = os.environ.get(r'HGMODULEPOLICY', policy)
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366
def _importfrom(pkgname, modname):
# from .<pkgname> import <modname> (where . is looked through this module)
fakelocals = {}
pkg = __import__(pkgname, globals(), fakelocals, [modname], level=1)
try:
fakelocals[modname] = mod = getattr(pkg, modname)
except AttributeError:
raise ImportError(r'cannot import name %s' % modname)
# force import; fakelocals[modname] may be replaced with the real module
getattr(mod, r'__doc__', None)
return fakelocals[modname]
Jun Wu
policy: define C module versions individually...
r32428 # keep in sync with "version" in C modules
_cextversions = {
Yuya Nishihara
policy: extend API version checks for cffi...
r32511 (r'cext', r'base85'): 1,
(r'cext', r'bdiff'): 1,
(r'cext', r'diffhelpers'): 1,
(r'cext', r'mpatch'): 1,
Matt Harbison
osutil: implement getfsmountpoint() on BSD systems...
r35533 (r'cext', r'osutil'): 3,
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 (r'cext', r'parsers'): 4,
Jun Wu
policy: define C module versions individually...
r32428 }
Yuya Nishihara
policy: reroute proxy modules internally...
r33755 # map import request to other package or module
_modredirects = {
Yuya Nishihara
encoding: drop circular import by proxying through '<policy>.charencode'...
r33756 (r'cext', r'charencode'): (r'cext', r'parsers'),
Yuya Nishihara
policy: reroute proxy modules internally...
r33755 (r'cffi', r'base85'): (r'pure', r'base85'),
Yuya Nishihara
encoding: drop circular import by proxying through '<policy>.charencode'...
r33756 (r'cffi', r'charencode'): (r'pure', r'charencode'),
Yuya Nishihara
policy: reroute proxy modules internally...
r33755 (r'cffi', r'diffhelpers'): (r'pure', r'diffhelpers'),
(r'cffi', r'parsers'): (r'pure', r'parsers'),
}
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 def _checkmod(pkgname, modname, mod):
Yuya Nishihara
policy: extend API version checks for cffi...
r32511 expected = _cextversions.get((pkgname, modname))
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 actual = getattr(mod, r'version', None)
if actual != expected:
raise ImportError(r'cannot import module %s.%s '
r'(expected version: %d, actual: %r)'
% (pkgname, modname, expected, actual))
def importmod(modname):
"""Import module according to policy and check API version"""
try:
verpkg, purepkg = _packageprefs[policy]
except KeyError:
raise ImportError(r'invalid HGMODULEPOLICY %r' % policy)
assert verpkg or purepkg
if verpkg:
Yuya Nishihara
policy: reroute proxy modules internally...
r33755 pn, mn = _modredirects.get((verpkg, modname), (verpkg, modname))
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 try:
Yuya Nishihara
policy: reroute proxy modules internally...
r33755 mod = _importfrom(pn, mn)
if pn == verpkg:
_checkmod(pn, mn, mod)
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 return mod
except ImportError:
if not purepkg:
raise
Yuya Nishihara
policy: reroute proxy modules internally...
r33755 pn, mn = _modredirects.get((purepkg, modname), (purepkg, modname))
return _importfrom(pn, mn)