Mercurial > public > mercurial-scm > hg
comparison mercurial/mdiff.py @ 32371:151cc3b3d799
mpatch: switch to policy importer
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 13 Aug 2016 12:18:58 +0900 |
parents | 3b88a7fa97d8 |
children | 1b6946f87c50 |
comparison
equal
deleted
inserted
replaced
32370:017ad85e5ac8 | 32371:151cc3b3d799 |
---|---|
12 import zlib | 12 import zlib |
13 | 13 |
14 from .i18n import _ | 14 from .i18n import _ |
15 from . import ( | 15 from . import ( |
16 error, | 16 error, |
17 mpatch, | |
18 policy, | 17 policy, |
19 pycompat, | 18 pycompat, |
20 util, | 19 util, |
21 ) | 20 ) |
22 | 21 |
23 bdiff = policy.importmod(r'bdiff') | 22 bdiff = policy.importmod(r'bdiff') |
23 mpatch = policy.importmod(r'mpatch') | |
24 | 24 |
25 blocks = bdiff.blocks | 25 blocks = bdiff.blocks |
26 fixws = bdiff.fixws | 26 fixws = bdiff.fixws |
27 patches = mpatch.patches | 27 patches = mpatch.patches |
28 patchedsize = mpatch.patchedsize | 28 patchedsize = mpatch.patchedsize |