Mercurial > hg-stable
diff mercurial/subrepo.py @ 37123:a8a902d7176e
procutil: bulk-replace function calls to point to new module
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 24 Mar 2018 15:10:51 +0900 |
parents | f0b6fbea00cf |
children | 335e19c6b7fa |
line wrap: on
line diff
--- a/mercurial/subrepo.py Sat Mar 24 15:09:33 2018 +0900 +++ b/mercurial/subrepo.py Sat Mar 24 15:10:51 2018 +0900 @@ -38,6 +38,7 @@ ) from .utils import ( dateutil, + procutil, stringutil, ) @@ -912,7 +913,7 @@ def __init__(self, ctx, path, state, allowcreate): super(svnsubrepo, self).__init__(ctx, path) self._state = state - self._exe = util.findexe('svn') + self._exe = procutil.findexe('svn') if not self._exe: raise error.Abort(_("'svn' executable not found for subrepo '%s'") % self._path) @@ -942,7 +943,7 @@ env['LANG'] = lc_all del env['LC_ALL'] env['LC_MESSAGES'] = 'C' - p = subprocess.Popen(cmd, bufsize=-1, close_fds=util.closefds, + p = subprocess.Popen(cmd, bufsize=-1, close_fds=procutil.closefds, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, env=env, **extrakw) stdout, stderr = p.communicate() @@ -1260,7 +1261,7 @@ # the end of git diff arguments is used for paths commands.insert(1, '--color') p = subprocess.Popen([self._gitexecutable] + commands, bufsize=-1, - cwd=cwd, env=env, close_fds=util.closefds, + cwd=cwd, env=env, close_fds=procutil.closefds, stdout=subprocess.PIPE, stderr=errpipe) if stream: return p.stdout, None