equal
deleted
inserted
replaced
20 |
20 |
21 import os |
21 import os |
22 import re |
22 import re |
23 import time |
23 import time |
24 |
24 |
|
25 from mercurial.i18n import _ |
25 from mercurial import ( |
26 from mercurial import ( |
26 bookmarks, |
27 bookmarks, |
27 context, |
28 context, |
28 error, |
29 error, |
29 exchange, |
30 exchange, |
35 scmutil, |
36 scmutil, |
36 util, |
37 util, |
37 ) |
38 ) |
38 stringio = util.stringio |
39 stringio = util.stringio |
39 |
40 |
40 from mercurial.i18n import _ |
|
41 from . import common |
41 from . import common |
42 mapfile = common.mapfile |
42 mapfile = common.mapfile |
43 NoRepo = common.NoRepo |
43 NoRepo = common.NoRepo |
44 |
44 |
45 sha1re = re.compile(r'\b[0-9a-f]{12,40}\b') |
45 sha1re = re.compile(r'\b[0-9a-f]{12,40}\b') |