equal
deleted
inserted
replaced
14 import email.Generator |
14 import email.Generator |
15 import email.Parser |
15 import email.Parser |
16 |
16 |
17 from i18n import _ |
17 from i18n import _ |
18 from node import hex, short |
18 from node import hex, short |
19 import cStringIO |
|
20 import base85, mdiff, scmutil, util, diffhelpers, copies, encoding, error |
19 import base85, mdiff, scmutil, util, diffhelpers, copies, encoding, error |
21 import pathutil |
20 import pathutil |
22 |
21 |
23 gitre = re.compile('diff --git a/(.*) b/(.*)') |
22 gitre = re.compile('diff --git a/(.*) b/(.*)') |
24 tabsplitter = re.compile(r'(\t+|[^\t]+)') |
23 tabsplitter = re.compile(r'(\t+|[^\t]+)') |