Mercurial > hg
comparison mercurial/patch.py @ 32370:017ad85e5ac8
diffhelpers: switch to policy importer
# no-check-commit
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 13 Aug 2016 12:15:49 +0900 |
parents | 0e29ce16ec38 |
children | 66117dae87f9 |
comparison
equal
deleted
inserted
replaced
32369:3b88a7fa97d8 | 32370:017ad85e5ac8 |
---|---|
25 hex, | 25 hex, |
26 short, | 26 short, |
27 ) | 27 ) |
28 from . import ( | 28 from . import ( |
29 copies, | 29 copies, |
30 diffhelpers, | |
31 encoding, | 30 encoding, |
32 error, | 31 error, |
33 mail, | 32 mail, |
34 mdiff, | 33 mdiff, |
35 pathutil, | 34 pathutil, |
35 policy, | |
36 pycompat, | 36 pycompat, |
37 scmutil, | 37 scmutil, |
38 similar, | 38 similar, |
39 util, | 39 util, |
40 vfs as vfsmod, | 40 vfs as vfsmod, |
41 ) | 41 ) |
42 | |
43 diffhelpers = policy.importmod(r'diffhelpers') | |
42 stringio = util.stringio | 44 stringio = util.stringio |
43 | 45 |
44 gitre = re.compile(br'diff --git a/(.*) b/(.*)') | 46 gitre = re.compile(br'diff --git a/(.*) b/(.*)') |
45 tabsplitter = re.compile(br'(\t+|[^\t]+)') | 47 tabsplitter = re.compile(br'(\t+|[^\t]+)') |
46 | 48 |