mercurial/commands.py
changeset 37084 f0b6fbea00cf
parent 37066 b33b91ca2ec2
child 37113 704932ef8913
--- a/mercurial/commands.py	Thu Mar 22 21:19:31 2018 +0900
+++ b/mercurial/commands.py	Thu Mar 22 21:56:20 2018 +0900
@@ -61,7 +61,10 @@
     util,
     wireprotoserver,
 )
-from .utils import dateutil
+from .utils import (
+    dateutil,
+    stringutil,
+)
 
 release = lockmod.release
 
@@ -2469,7 +2472,7 @@
         @util.cachefunc
         def binary():
             flog = getfile(fn)
-            return util.binary(flog.read(ctx.filenode(fn)))
+            return stringutil.binary(flog.read(ctx.filenode(fn)))
 
         fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
         if opts.get('all'):
@@ -3914,7 +3917,7 @@
         try:
             return hg.updatetotally(ui, repo, checkout, brev)
         except error.UpdateAbort as inst:
-            msg = _("not updating: %s") % util.forcebytestr(inst)
+            msg = _("not updating: %s") % stringutil.forcebytestr(inst)
             hint = inst.hint
             raise error.UpdateAbort(msg, hint=hint)
     if modheads > 1: