Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.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: b33b91ca2ec2
children: 656ac240f392
--- a/mercurial/context.py	Thu Mar 22 21:19:31 2018 +0900
+++ b/mercurial/context.py	Thu Mar 22 21:56:20 2018 +0900
@@ -46,7 +46,10 @@
     subrepoutil,
     util,
 )
-from .utils import dateutil
+from .utils import (
+    dateutil,
+    stringutil,
+)
 
 propertycache = util.propertycache
 
@@ -818,7 +821,7 @@
 
     def isbinary(self):
         try:
-            return util.binary(self.data())
+            return stringutil.binary(self.data())
         except IOError:
             return False
     def isexec(self):
@@ -1500,7 +1503,8 @@
         for f in files:
             if self.flags(f) == 'l':
                 d = self[f].data()
-                if d == '' or len(d) >= 1024 or '\n' in d or util.binary(d):
+                if (d == '' or len(d) >= 1024 or '\n' in d
+                    or stringutil.binary(d)):
                     self._repo.ui.debug('ignoring suspect symlink placeholder'
                                         ' "%s"\n' % f)
                     continue