--- a/mercurial/server.py Sat Mar 24 15:09:33 2018 +0900
+++ b/mercurial/server.py Sat Mar 24 15:10:51 2018 +0900
@@ -46,7 +46,7 @@
os.close(lockfd)
try:
if not runargs:
- runargs = util.hgcmd() + pycompat.sysargv[1:]
+ runargs = procutil.hgcmd() + pycompat.sysargv[1:]
runargs.append('--daemon-postexec=unlink:%s' % lockpath)
# Don't pass --cwd to the child process, because we've already
# changed directory.
@@ -59,7 +59,7 @@
break
def condfn():
return not os.path.exists(lockpath)
- pid = util.rundetached(runargs, condfn)
+ pid = procutil.rundetached(runargs, condfn)
if pid < 0:
raise error.Abort(_('child process failed to start'))
writepid(pid)
@@ -74,7 +74,7 @@
initfn()
if not opts['daemon']:
- writepid(util.getpid())
+ writepid(procutil.getpid())
if opts['daemon_postexec']:
try:
@@ -90,7 +90,7 @@
elif inst != 'none':
raise error.Abort(_('invalid value for --daemon-postexec: %s')
% inst)
- util.hidewindow()
+ procutil.hidewindow()
procutil.stdout.flush()
procutil.stderr.flush()