--- a/mercurial/fileset.py	Tue Jun 19 13:07:18 2018 +0300
+++ b/mercurial/fileset.py	Thu Jun 21 00:05:26 2018 -0400
@@ -448,9 +448,10 @@
 
     s = []
     for f in mctx.existing():
-        d = mctx.ctx[f].data()
-        if stringutil.binary(d):
+        fctx = mctx.ctx[f]
+        if fctx.isbinary():
             continue
+        d = fctx.data()
         if (enc == 'dos' or enc == 'win') and '\r\n' in d:
             s.append(f)
         elif enc == 'unix' and re.search('(?<!\r)\n', d):