diff -r d4a2e0d5d042 -r a8a902d7176e mercurial/scmutil.py
--- a/mercurial/scmutil.py	Sat Mar 24 15:09:33 2018 +0900
+++ b/mercurial/scmutil.py	Sat Mar 24 15:10:51 2018 +0900
@@ -42,6 +42,7 @@
 )
 
 from .utils import (
+    procutil,
     stringutil,
 )
 
@@ -293,7 +294,7 @@
     if abort or warn:
         msg = util.checkwinfilename(f)
         if msg:
-            msg = "%s: %s" % (msg, util.shellquote(f))
+            msg = "%s: %s" % (msg, procutil.shellquote(f))
             if abort:
                 raise error.Abort(msg)
             ui.warn(_("warning: %s\n") % msg)
@@ -1090,7 +1091,7 @@
             # external commands should be run relative to the repo root
             cmd = spec[6:]
             proc = subprocess.Popen(cmd, shell=True, bufsize=-1,
-                                    close_fds=util.closefds,
+                                    close_fds=procutil.closefds,
                                     stdout=subprocess.PIPE, cwd=repo.root)
             src = proc.stdout
         else:
@@ -1114,7 +1115,7 @@
             src.close()
     if proc and proc.returncode != 0:
         raise error.Abort(_("extdata command '%s' failed: %s")
-                          % (cmd, util.explainexit(proc.returncode)[0]))
+                          % (cmd, procutil.explainexit(proc.returncode)[0]))
 
     return data