diff -r f99d64e8a4e4 -r f0b6fbea00cf mercurial/fileset.py --- a/mercurial/fileset.py Thu Mar 22 21:19:31 2018 +0900 +++ b/mercurial/fileset.py Thu Mar 22 21:56:20 2018 +0900 @@ -20,6 +20,9 @@ scmutil, util, ) +from .utils import ( + stringutil, +) elements = { # token-type: binding-strength, primary, prefix, infix, suffix @@ -445,7 +448,7 @@ s = [] for f in mctx.existing(): d = mctx.ctx[f].data() - if util.binary(d): + if stringutil.binary(d): continue if (enc == 'dos' or enc == 'win') and '\r\n' in d: s.append(f)