diffhelpers: switch to policy importer

# no-check-commit

contrib/check-py3-compat.py

@@ -17,7 +17,6 b' import traceback'
 
 # Modules that have both Python and C implementations.
 _dualmodules = (
-    'diffhelpers.py',
     'mpatch.py',
     'parsers.py',
 )

contrib/import-checker.py

@@ -26,7 +26,6 b' allowsymbolimports = ('
 
 # Modules that have both Python and C implementations.
 _dualmodules = (
-    'diffhelpers.py',
     'mpatch.py',
     'parsers.py',
 )

contrib/wix/dist.wxs

@@ -14,7 +14,7 b''
           <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" />

mercurial/__init__.py

@@ -23,7 +23,6 b' 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',
 }

mercurial/patch.py

@@ -27,18 +27,20 b' 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/(.*)')

setup.py

@@ -628,7 +628,7 b' 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',