Mercurial > hg-stable
changeset 37460:a6c6b7beb025
procutil: unify platform.explainexit()
Since 4368f582c806 "use subprocess instead of os.system", posix.explainexit()
is the superset of Windows implementation.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 07 Apr 2018 21:14:16 +0900 |
| parents | 90c5ca718781 |
| children | 538353b80676 |
| files | mercurial/posix.py mercurial/utils/procutil.py mercurial/windows.py |
| diffstat | 3 files changed, 7 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/posix.py Sat Apr 07 21:09:21 2018 +0900 +++ b/mercurial/posix.py Sat Apr 07 21:14:16 2018 +0900 @@ -479,13 +479,6 @@ except OSError as inst: return inst.errno != errno.ESRCH -def explainexit(code): - """return a 2-tuple (desc, code) describing a subprocess status - (codes from kill are negative - not os.system/wait encoding)""" - if code >= 0: - return _("exited with status %d") % code, code - return _("killed by signal %d") % -code, -code - def isowner(st): """Return True if the stat object st is from the current user.""" return st.st_uid == os.getuid()
--- a/mercurial/utils/procutil.py Sat Apr 07 21:09:21 2018 +0900 +++ b/mercurial/utils/procutil.py Sat Apr 07 21:14:16 2018 +0900 @@ -52,7 +52,6 @@ else: from .. import posix as platform -explainexit = platform.explainexit findexe = platform.findexe _gethgcmd = platform.gethgcmd getuser = platform.getuser @@ -79,6 +78,13 @@ closefds = pycompat.isposix +def explainexit(code): + """return a 2-tuple (desc, code) describing a subprocess status + (codes from kill are negative - not os.system/wait encoding)""" + if code >= 0: + return _("exited with status %d") % code, code + return _("killed by signal %d") % -code, -code + class _pfile(object): """File-like wrapper for a stream opened by subprocess.Popen()"""
--- a/mercurial/windows.py Sat Apr 07 21:09:21 2018 +0900 +++ b/mercurial/windows.py Sat Apr 07 21:14:16 2018 +0900 @@ -311,9 +311,6 @@ return '"' + cmd + '"' return cmd -def explainexit(code): - return _("exited with status %d") % code, code - # if you change this stub into a real check, please try to implement the # username and groupname functions above, too. def isowner(st):