Mercurial > hg
diff hgext/win32text.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 | 01496e9269f9 |
children | e7aa113b14f7 |
line wrap: on
line diff
--- a/hgext/win32text.py Thu Mar 22 21:19:31 2018 +0900 +++ b/hgext/win32text.py Thu Mar 22 21:56:20 2018 +0900 @@ -50,7 +50,9 @@ ) from mercurial import ( registrar, - util, +) +from mercurial.utils import ( + stringutil, ) # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for @@ -100,22 +102,22 @@ return s.replace('\r', '\n') def cleverdecode(s, cmd, **kwargs): - if not util.binary(s): + if not stringutil.binary(s): return dumbdecode(s, cmd, **kwargs) return s def cleverencode(s, cmd): - if not util.binary(s): + if not stringutil.binary(s): return dumbencode(s, cmd) return s def macdecode(s, cmd, **kwargs): - if not util.binary(s): + if not stringutil.binary(s): return macdumbdecode(s, cmd, **kwargs) return s def macencode(s, cmd): - if not util.binary(s): + if not stringutil.binary(s): return macdumbencode(s, cmd) return s @@ -146,7 +148,7 @@ continue seen.add(f) data = c[f].data() - if not util.binary(data) and newline in data: + if not stringutil.binary(data) and newline in data: if not halt: ui.warn(_('attempt to commit or push text file(s) ' 'using %s line endings\n') %