Mercurial > public > mercurial-scm > hg-stable

diff mercurial/fileset.py @ 38420:235d0bc11e1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fileset: use filectx.isbinary() to filter out binaries in eol() Since LFS stores the binary attribute in the pointer file, this means that the file doesn't need to be downloaded in order to be skipped. This function also catches an IOError if the data can't be loaded in the non-LFS case. I wonder if it's worth storing the unix/dos attributes in the pointer file as well, though I'd expect LFS files to be binary most of the time.
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 21 Jun 2018 00:05:26 -0400
parents 8783f128048e
children d046bf37f1ba
line wrap: on
line diff
--- 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):