Mercurial > hg > mercurial-source
changeset 33152:3b88a7fa97d8
bdiff: switch to policy importer
# no-check-commit
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 13 Aug 2016 12:12:50 +0900 |
parents | 008d37c4d783 |
children | 017ad85e5ac8 |
files | contrib/check-py3-compat.py contrib/import-checker.py contrib/wix/dist.wxs mercurial/__init__.py mercurial/bdiff_module.c mercurial/cext/bdiff.c mercurial/debugcommands.py mercurial/mdiff.py mercurial/pure/bdiff.py setup.py |
diffstat | 9 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/check-py3-compat.py +++ b/contrib/check-py3-compat.py @@ -17,7 +17,6 @@ # Modules that have both Python and C implementations. _dualmodules = ( - 'bdiff.py', 'diffhelpers.py', 'mpatch.py', 'parsers.py',
--- a/contrib/import-checker.py +++ b/contrib/import-checker.py @@ -26,7 +26,6 @@ # Modules that have both Python and C implementations. _dualmodules = ( - 'bdiff.py', 'diffhelpers.py', 'mpatch.py', 'parsers.py',
--- a/contrib/wix/dist.wxs +++ b/contrib/wix/dist.wxs @@ -13,7 +13,7 @@ <Component Id="libOutput" Guid="$(var.lib.guid)" Win64='$(var.IsX64)'> <File Name="library.zip" KeyPath="yes" /> <File Name="mercurial.cext.base85.pyd" /> - <File Name="mercurial.bdiff.pyd" /> + <File Name="mercurial.cext.bdiff.pyd" /> <File Name="mercurial.diffhelpers.pyd" /> <File Name="mercurial.mpatch.pyd" /> <File Name="mercurial.cext.osutil.pyd" />
--- a/mercurial/__init__.py +++ b/mercurial/__init__.py @@ -23,7 +23,6 @@ # Modules that have both Python and C implementations. See also the # set of .py files under mercurial/pure/. _dualmodules = { - 'mercurial.bdiff', 'mercurial.diffhelpers', 'mercurial.mpatch', 'mercurial.parsers',
--- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -1026,11 +1026,11 @@ err = None try: from . import ( - bdiff, mpatch, ) from .cext import ( base85, + bdiff, osutil, ) dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
--- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -13,13 +13,15 @@ from .i18n import _ from . import ( - bdiff, error, mpatch, + policy, pycompat, util, ) +bdiff = policy.importmod(r'bdiff') + blocks = bdiff.blocks fixws = bdiff.fixws patches = mpatch.patches
--- a/mercurial/pure/bdiff.py +++ b/mercurial/pure/bdiff.py @@ -11,7 +11,7 @@ import re import struct -from . import policy +from .. import policy policynocffi = policy.policynocffi modulepolicy = policy.policy
--- a/setup.py +++ b/setup.py @@ -624,8 +624,8 @@ Extension('mercurial.cext.base85', ['mercurial/cext/base85.c'], include_dirs=common_include_dirs, depends=common_depends), - Extension('mercurial.bdiff', ['mercurial/bdiff.c', - 'mercurial/bdiff_module.c'], + Extension('mercurial.cext.bdiff', ['mercurial/bdiff.c', + 'mercurial/cext/bdiff.c'], include_dirs=common_include_dirs, depends=common_depends + ['mercurial/bdiff.h']), Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c'],