equal
deleted
inserted
replaced
31 encoding, |
31 encoding, |
32 error, |
32 error, |
33 mail, |
33 mail, |
34 mdiff, |
34 mdiff, |
35 pathutil, |
35 pathutil, |
36 policy, |
|
37 pycompat, |
36 pycompat, |
38 scmutil, |
37 scmutil, |
39 similar, |
38 similar, |
40 util, |
39 util, |
41 vfs as vfsmod, |
40 vfs as vfsmod, |
42 ) |
41 ) |
|
42 from .pure import diffhelpers |
43 from .utils import ( |
43 from .utils import ( |
44 dateutil, |
44 dateutil, |
45 procutil, |
45 procutil, |
46 stringutil, |
46 stringutil, |
47 ) |
47 ) |
48 |
48 |
49 diffhelpers = policy.importmod(r'diffhelpers') |
|
50 stringio = util.stringio |
49 stringio = util.stringio |
51 |
50 |
52 gitre = re.compile(br'diff --git a/(.*) b/(.*)') |
51 gitre = re.compile(br'diff --git a/(.*) b/(.*)') |
53 tabsplitter = re.compile(br'(\t+|[^\t]+)') |
52 tabsplitter = re.compile(br'(\t+|[^\t]+)') |
54 _nonwordre = re.compile(br'([^a-zA-Z0-9_\x80-\xff])') |
53 _nonwordre = re.compile(br'([^a-zA-Z0-9_\x80-\xff])') |