@@ -17,7 +17,6 @@ import traceback
# Modules that have both Python and C implementations.
_dualmodules = (
- 'diffhelpers.py',
'mpatch.py',
'parsers.py',
)
@@ -26,7 +26,6 @@ allowsymbolimports = (
# Modules that have both Python and C implementations.
_dualmodules = (
- 'diffhelpers.py',
'mpatch.py',
'parsers.py',
)
@@ -14,7 +14,7 @@
<File Name="library.zip" KeyPath="yes" />
<File Name="mercurial.cext.base85.pyd" />
<File Name="mercurial.cext.bdiff.pyd" />
- <File Name="mercurial.diffhelpers.pyd" />
+ <File Name="mercurial.cext.diffhelpers.pyd" />
<File Name="mercurial.mpatch.pyd" />
<File Name="mercurial.cext.osutil.pyd" />
<File Name="mercurial.parsers.pyd" />
@@ -23,7 +23,6 @@ modulepolicy = policy.policy
# Modules that have both Python and C implementations. See also the
# set of .py files under mercurial/pure/.
_dualmodules = {
- 'mercurial.diffhelpers',
'mercurial.mpatch',
'mercurial.parsers',
}
rename from mercurial/diffhelpers.c
rename to mercurial/cext/diffhelpers.c
@@ -27,18 +27,20 @@ from .node import (
)
from . import (
copies,
- diffhelpers,
encoding,
error,
mail,
mdiff,
pathutil,
+ policy,
pycompat,
scmutil,
similar,
util,
vfs as vfsmod,
)
+
+diffhelpers = policy.importmod(r'diffhelpers')
stringio = util.stringio
gitre = re.compile(br'diff --git a/(.*) b/(.*)')
@@ -628,7 +628,7 @@ extmodules = [
'mercurial/cext/bdiff.c'],
include_dirs=common_include_dirs,
depends=common_depends + ['mercurial/bdiff.h']),
- Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c'],
+ Extension('mercurial.cext.diffhelpers', ['mercurial/cext/diffhelpers.c'],
include_dirs=common_include_dirs,
depends=common_depends),
Extension('mercurial.mpatch', ['mercurial/mpatch.c',