Mercurial > public > mercurial-scm > hg
diff mercurial/templatekw.py @ 37084: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 | 2891079fb0c0 |
| children | be3f33f5e232 |
line wrap: on
line diff
--- a/mercurial/templatekw.py Thu Mar 22 21:19:31 2018 +0900 +++ b/mercurial/templatekw.py Thu Mar 22 21:56:20 2018 +0900 @@ -26,6 +26,9 @@ templateutil, util, ) +from .utils import ( + stringutil, +) _hybrid = templateutil.hybrid _mappable = templateutil.mappable @@ -72,7 +75,7 @@ cachename = 'latesttags' if pattern is not None: cachename += '-' + pattern - match = util.stringmatcher(pattern)[2] + match = stringutil.stringmatcher(pattern)[2] else: match = util.always @@ -307,7 +310,7 @@ c = [makemap(k) for k in extras] f = _showcompatlist(context, mapping, 'extra', c, plural='extras') return _hybrid(f, extras, makemap, - lambda k: '%s=%s' % (k, util.escapestr(extras[k]))) + lambda k: '%s=%s' % (k, stringutil.escapestr(extras[k]))) def _showfilesbystat(context, mapping, name, index): repo = context.resource(mapping, 'repo')