--- a/hgext/convert/gnuarch.py Sat Mar 24 15:09:33 2018 +0900
+++ b/hgext/convert/gnuarch.py Sat Mar 24 15:10:51 2018 +0900
@@ -17,9 +17,11 @@
from mercurial import (
encoding,
error,
- util,
)
-from mercurial.utils import dateutil
+from mercurial.utils import (
+ dateutil,
+ procutil,
+)
from . import common
class gnuarch_source(common.converter_source, common.commandline):
@@ -46,10 +48,10 @@
# Could use checktool, but we want to check for baz or tla.
self.execmd = None
- if util.findexe('baz'):
+ if procutil.findexe('baz'):
self.execmd = 'baz'
else:
- if util.findexe('tla'):
+ if procutil.findexe('tla'):
self.execmd = 'tla'
else:
raise error.Abort(_('cannot find a GNU Arch tool'))
@@ -195,9 +197,9 @@
def _execute(self, cmd, *args, **kwargs):
cmdline = [self.execmd, cmd]
cmdline += args
- cmdline = [util.shellquote(arg) for arg in cmdline]
+ cmdline = [procutil.shellquote(arg) for arg in cmdline]
cmdline += ['>', os.devnull, '2>', os.devnull]
- cmdline = util.quotecommand(' '.join(cmdline))
+ cmdline = procutil.quotecommand(' '.join(cmdline))
self.ui.debug(cmdline, '\n')
return os.system(cmdline)