Mercurial > public > mercurial-scm > hg-stable
diff mercurial/simplemerge.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 | 93c4958d987c |
| children | e7aa113b14f7 |
line wrap: on
line diff
--- a/mercurial/simplemerge.py Thu Mar 22 21:19:31 2018 +0900 +++ b/mercurial/simplemerge.py Thu Mar 22 21:56:20 2018 +0900 @@ -23,7 +23,9 @@ error, mdiff, pycompat, - util, +) +from .utils import ( + stringutil, ) class CantReprocessAndShowBase(Exception): @@ -397,7 +399,7 @@ def _verifytext(text, path, ui, opts): """verifies that text is non-binary (unless opts[text] is passed, then we just warn)""" - if util.binary(text): + if stringutil.binary(text): msg = _("%s looks like a binary file.") % path if not opts.get('quiet'): ui.warn(_('warning: %s\n') % msg)