Mercurial > hg > mercurial-source
changeset 33154:151cc3b3d799
mpatch: switch to policy importer
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 13 Aug 2016 12:18:58 +0900 |
parents | 017ad85e5ac8 |
children | df448de7cf3b |
files | contrib/check-py3-compat.py contrib/import-checker.py contrib/wix/dist.wxs mercurial/__init__.py mercurial/cext/mpatch.c mercurial/debugcommands.py mercurial/mdiff.py mercurial/mpatch_module.c mercurial/pure/mpatch.py setup.py tests/test-revlog.t |
diffstat | 10 files changed, 9 insertions(+), 15 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 = ( - '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 = ( - 'mpatch.py', 'parsers.py', )
--- a/contrib/wix/dist.wxs +++ b/contrib/wix/dist.wxs @@ -15,7 +15,7 @@ <File Name="mercurial.cext.base85.pyd" /> <File Name="mercurial.cext.bdiff.pyd" /> <File Name="mercurial.cext.diffhelpers.pyd" /> - <File Name="mercurial.mpatch.pyd" /> + <File Name="mercurial.cext.mpatch.pyd" /> <File Name="mercurial.cext.osutil.pyd" /> <File Name="mercurial.parsers.pyd" /> <File Name="pyexpat.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.mpatch', 'mercurial.parsers', }
rename from mercurial/mpatch_module.c rename to mercurial/cext/mpatch.c --- a/mercurial/mpatch_module.c +++ b/mercurial/cext/mpatch.c @@ -179,7 +179,7 @@ if (m == NULL) return NULL; - mpatch_Error = PyErr_NewException("mercurial.mpatch.mpatchError", + mpatch_Error = PyErr_NewException("mercurial.cext.mpatch.mpatchError", NULL, NULL); Py_INCREF(mpatch_Error); PyModule_AddObject(m, "mpatchError", mpatch_Error); @@ -193,7 +193,7 @@ { PyObject *m; m = Py_InitModule3("mpatch", methods, mpatch_doc); - mpatch_Error = PyErr_NewException("mercurial.mpatch.mpatchError", + mpatch_Error = PyErr_NewException("mercurial.cext.mpatch.mpatchError", NULL, NULL); PyModule_AddIntConstant(m, "version", version); }
--- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -1025,12 +1025,10 @@ if policy.policy in ('c', 'allow'): err = None try: - from . import ( - mpatch, - ) from .cext import ( base85, bdiff, + mpatch, osutil, ) dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
--- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -14,13 +14,13 @@ from .i18n import _ from . import ( error, - mpatch, policy, pycompat, util, ) bdiff = policy.importmod(r'bdiff') +mpatch = policy.importmod(r'mpatch') blocks = bdiff.blocks fixws = bdiff.fixws
--- a/mercurial/pure/mpatch.py +++ b/mercurial/pure/mpatch.py @@ -9,7 +9,7 @@ import struct -from . import policy, pycompat +from .. import policy, pycompat stringio = pycompat.stringio modulepolicy = policy.policy policynocffi = policy.policynocffi @@ -167,4 +167,3 @@ res = ffi.buffer(buf, outlen)[:] lib.mpatch_lfree(patch) return res -
--- a/setup.py +++ b/setup.py @@ -631,8 +631,8 @@ Extension('mercurial.cext.diffhelpers', ['mercurial/cext/diffhelpers.c'], include_dirs=common_include_dirs, depends=common_depends), - Extension('mercurial.mpatch', ['mercurial/mpatch.c', - 'mercurial/mpatch_module.c'], + Extension('mercurial.cext.mpatch', ['mercurial/mpatch.c', + 'mercurial/cext/mpatch.c'], include_dirs=common_include_dirs, depends=common_depends), Extension('mercurial.parsers', ['mercurial/dirs.c',
--- a/tests/test-revlog.t +++ b/tests/test-revlog.t @@ -12,4 +12,4 @@ 0 0 19 -1 2 99e0332bd498 000000000000 000000000000 1 19 12 0 3 6674f57a23d8 99e0332bd498 000000000000 $ hg debugdata a.i 1 2>&1 | egrep 'Error:.*decoded' - (mercurial.mpatch.)?mpatchError: patch cannot be decoded (re) + (mercurial\.\w+\.mpatch\.)?mpatchError: patch cannot be decoded (re)