# HG changeset patch # User Matt Harbison # Date 1530238988 14400 # Node ID 72286f9e324f359d6090ae78883428adc97037cc # Parent 5d88fd1bc2af0af02129f0ad2b267d778349d95a procutil: add a shim for translating shell commands to native commands diff -r 5d88fd1bc2af -r 72286f9e324f mercurial/hook.py --- a/mercurial/hook.py Sat Jun 16 23:26:40 2018 +0900 +++ b/mercurial/hook.py Thu Jun 28 22:23:08 2018 -0400 @@ -139,9 +139,7 @@ v = stringutil.pprint(v) env['HG_' + k.upper()] = v - if pycompat.iswindows: - environ = procutil.shellenviron(env) - cmd = util.platform.shelltocmdexe(cmd, environ) + cmd = procutil.shelltonative(cmd, env) ui.note(_("running hook %s: %s\n") % (name, cmd)) diff -r 5d88fd1bc2af -r 72286f9e324f mercurial/utils/procutil.py --- a/mercurial/utils/procutil.py Sat Jun 16 23:26:40 2018 +0900 +++ b/mercurial/utils/procutil.py Thu Jun 28 22:23:08 2018 -0400 @@ -317,6 +317,13 @@ env['HG'] = hgexecutable() return env +if pycompat.iswindows: + def shelltonative(cmd, env): + return platform.shelltocmdexe(cmd, shellenviron(env)) +else: + def shelltonative(cmd, env): + return cmd + def system(cmd, environ=None, cwd=None, out=None): '''enhanced shell command execution. run with environment maybe modified, maybe in different dir.