hgext/convert/cvs.py
changeset 37120 a8a902d7176e
parent 36607 c6061cadb400
child 37658 34758397ad1b
--- a/hgext/convert/cvs.py	Sat Mar 24 15:09:33 2018 +0900
+++ b/hgext/convert/cvs.py	Sat Mar 24 15:10:51 2018 +0900
@@ -18,7 +18,10 @@
     pycompat,
     util,
 )
-from mercurial.utils import dateutil
+from mercurial.utils import (
+    dateutil,
+    procutil,
+)
 
 from . import (
     common,
@@ -197,9 +200,9 @@
                     cmd = [rsh, host] + cmd
 
             # popen2 does not support argument lists under Windows
-            cmd = [util.shellquote(arg) for arg in cmd]
-            cmd = util.quotecommand(' '.join(cmd))
-            self.writep, self.readp = util.popen2(cmd)
+            cmd = [procutil.shellquote(arg) for arg in cmd]
+            cmd = procutil.quotecommand(' '.join(cmd))
+            self.writep, self.readp = procutil.popen2(cmd)
 
         self.realroot = root