--- a/hgext/convert/cvsps.py	Sat Mar 24 15:09:33 2018 +0900
+++ b/hgext/convert/cvsps.py	Sat Mar 24 15:10:51 2018 +0900
@@ -19,6 +19,7 @@
 )
 from mercurial.utils import (
     dateutil,
+    procutil,
     stringutil,
 )
 
@@ -223,11 +224,11 @@
     state = 0
     store = False # set when a new record can be appended
 
-    cmd = [util.shellquote(arg) for arg in cmd]
+    cmd = [procutil.shellquote(arg) for arg in cmd]
     ui.note(_("running %s\n") % (' '.join(cmd)))
     ui.debug("prefix=%r directory=%r root=%r\n" % (prefix, directory, root))
 
-    pfp = util.popen(' '.join(cmd))
+    pfp = procutil.popen(' '.join(cmd))
     peek = pfp.readline()
     while True:
         line = peek