Show More
@@ -17,7 +17,6 b' import traceback' | |||||
17 |
|
17 | |||
18 | # Modules that have both Python and C implementations. |
|
18 | # Modules that have both Python and C implementations. | |
19 | _dualmodules = ( |
|
19 | _dualmodules = ( | |
20 | 'bdiff.py', |
|
|||
21 | 'diffhelpers.py', |
|
20 | 'diffhelpers.py', | |
22 | 'mpatch.py', |
|
21 | 'mpatch.py', | |
23 | 'parsers.py', |
|
22 | 'parsers.py', |
@@ -26,7 +26,6 b' allowsymbolimports = (' | |||||
26 |
|
26 | |||
27 | # Modules that have both Python and C implementations. |
|
27 | # Modules that have both Python and C implementations. | |
28 | _dualmodules = ( |
|
28 | _dualmodules = ( | |
29 | 'bdiff.py', |
|
|||
30 | 'diffhelpers.py', |
|
29 | 'diffhelpers.py', | |
31 | 'mpatch.py', |
|
30 | 'mpatch.py', | |
32 | 'parsers.py', |
|
31 | 'parsers.py', |
@@ -13,7 +13,7 b'' | |||||
13 | <Component Id="libOutput" Guid="$(var.lib.guid)" Win64='$(var.IsX64)'> |
|
13 | <Component Id="libOutput" Guid="$(var.lib.guid)" Win64='$(var.IsX64)'> | |
14 | <File Name="library.zip" KeyPath="yes" /> |
|
14 | <File Name="library.zip" KeyPath="yes" /> | |
15 | <File Name="mercurial.cext.base85.pyd" /> |
|
15 | <File Name="mercurial.cext.base85.pyd" /> | |
16 | <File Name="mercurial.bdiff.pyd" /> |
|
16 | <File Name="mercurial.cext.bdiff.pyd" /> | |
17 | <File Name="mercurial.diffhelpers.pyd" /> |
|
17 | <File Name="mercurial.diffhelpers.pyd" /> | |
18 | <File Name="mercurial.mpatch.pyd" /> |
|
18 | <File Name="mercurial.mpatch.pyd" /> | |
19 | <File Name="mercurial.cext.osutil.pyd" /> |
|
19 | <File Name="mercurial.cext.osutil.pyd" /> |
@@ -23,7 +23,6 b' modulepolicy = policy.policy' | |||||
23 | # Modules that have both Python and C implementations. See also the |
|
23 | # Modules that have both Python and C implementations. See also the | |
24 | # set of .py files under mercurial/pure/. |
|
24 | # set of .py files under mercurial/pure/. | |
25 | _dualmodules = { |
|
25 | _dualmodules = { | |
26 | 'mercurial.bdiff', |
|
|||
27 | 'mercurial.diffhelpers', |
|
26 | 'mercurial.diffhelpers', | |
28 | 'mercurial.mpatch', |
|
27 | 'mercurial.mpatch', | |
29 | 'mercurial.parsers', |
|
28 | 'mercurial.parsers', |
1 | NO CONTENT: file renamed from mercurial/bdiff_module.c to mercurial/cext/bdiff.c |
|
NO CONTENT: file renamed from mercurial/bdiff_module.c to mercurial/cext/bdiff.c |
@@ -1026,11 +1026,11 b' def debuginstall(ui, **opts):' | |||||
1026 | err = None |
|
1026 | err = None | |
1027 | try: |
|
1027 | try: | |
1028 | from . import ( |
|
1028 | from . import ( | |
1029 | bdiff, |
|
|||
1030 | mpatch, |
|
1029 | mpatch, | |
1031 | ) |
|
1030 | ) | |
1032 | from .cext import ( |
|
1031 | from .cext import ( | |
1033 | base85, |
|
1032 | base85, | |
|
1033 | bdiff, | |||
1034 | osutil, |
|
1034 | osutil, | |
1035 | ) |
|
1035 | ) | |
1036 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes |
|
1036 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes |
@@ -13,13 +13,15 b' import zlib' | |||||
13 |
|
13 | |||
14 | from .i18n import _ |
|
14 | from .i18n import _ | |
15 | from . import ( |
|
15 | from . import ( | |
16 | bdiff, |
|
|||
17 | error, |
|
16 | error, | |
18 | mpatch, |
|
17 | mpatch, | |
|
18 | policy, | |||
19 | pycompat, |
|
19 | pycompat, | |
20 | util, |
|
20 | util, | |
21 | ) |
|
21 | ) | |
22 |
|
22 | |||
|
23 | bdiff = policy.importmod(r'bdiff') | |||
|
24 | ||||
23 | blocks = bdiff.blocks |
|
25 | blocks = bdiff.blocks | |
24 | fixws = bdiff.fixws |
|
26 | fixws = bdiff.fixws | |
25 | patches = mpatch.patches |
|
27 | patches = mpatch.patches |
@@ -11,7 +11,7 b' import difflib' | |||||
11 | import re |
|
11 | import re | |
12 | import struct |
|
12 | import struct | |
13 |
|
13 | |||
14 | from . import policy |
|
14 | from .. import policy | |
15 | policynocffi = policy.policynocffi |
|
15 | policynocffi = policy.policynocffi | |
16 | modulepolicy = policy.policy |
|
16 | modulepolicy = policy.policy | |
17 |
|
17 |
@@ -624,8 +624,8 b' extmodules = [' | |||||
624 | Extension('mercurial.cext.base85', ['mercurial/cext/base85.c'], |
|
624 | Extension('mercurial.cext.base85', ['mercurial/cext/base85.c'], | |
625 | include_dirs=common_include_dirs, |
|
625 | include_dirs=common_include_dirs, | |
626 | depends=common_depends), |
|
626 | depends=common_depends), | |
627 | Extension('mercurial.bdiff', ['mercurial/bdiff.c', |
|
627 | Extension('mercurial.cext.bdiff', ['mercurial/bdiff.c', | |
628 |
'mercurial/bdiff |
|
628 | 'mercurial/cext/bdiff.c'], | |
629 | include_dirs=common_include_dirs, |
|
629 | include_dirs=common_include_dirs, | |
630 | depends=common_depends + ['mercurial/bdiff.h']), |
|
630 | depends=common_depends + ['mercurial/bdiff.h']), | |
631 | Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c'], |
|
631 | Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c'], |
General Comments 0
You need to be logged in to leave comments.
Login now