Mercurial > public > mercurial-scm > hg-stable
diff mercurial/match.py @ 37087:f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
This might conflict with other patches floating around, sorry.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Thu, 22 Mar 2018 21:56:20 +0900 |
| parents | 9adfa48792a7 |
| children | 2f406142d7b4 |
line wrap: on
line diff
--- a/mercurial/match.py Thu Mar 22 21:19:31 2018 +0900 +++ b/mercurial/match.py Thu Mar 22 21:56:20 2018 +0900 @@ -19,6 +19,9 @@ pycompat, util, ) +from .utils import ( + stringutil, +) allpatternkinds = ('re', 'glob', 'path', 'relglob', 'relpath', 'relre', 'listfile', 'listfile0', 'set', 'include', 'subinclude', @@ -227,7 +230,7 @@ except IOError as inst: if warn: warn(_("skipping unreadable pattern file '%s': %s\n") % - (pat, util.forcebytestr(inst.strerror))) + (pat, stringutil.forcebytestr(inst.strerror))) continue # else: re or relre - which cannot be normalized kindpats.append((kind, pat, ''))