# HG changeset patch # User Yuya Nishihara # Date 2018-02-21 13:20:27 # Node ID 0cb09c322647931307a4adb6d3e70f567b17d5d7 # Parent 44c4a38bf5636aeafa97147d4c0853cad0611521 util: factor out shellsplit() function It turned out to be more than the simple posix=True|False flag, so let's introduce a platform function. I also made it py3 ready. diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -1240,9 +1240,7 @@ def debuginstall(ui, **opts): # editor editor = ui.geteditor() editor = util.expandpath(editor) - editorbin = pycompat.shlexsplit(editor, posix=not pycompat.iswindows)[0] - if pycompat.iswindows and editorbin[0] == '"' and editorbin[-1] == '"': - editorbin = editorbin[1:-1] + editorbin = util.shellsplit(editor)[0] fm.write('editor', _("checking commit editor... (%s)\n"), editorbin) cmdpath = util.findexe(editorbin) fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound', diff --git a/mercurial/posix.py b/mercurial/posix.py --- a/mercurial/posix.py +++ b/mercurial/posix.py @@ -461,6 +461,10 @@ def shellquote(s): else: return "'%s'" % s.replace("'", "'\\''") +def shellsplit(s): + """Parse a command string in POSIX shell way (best-effort)""" + return pycompat.shlexsplit(s, posix=True) + def quotecommand(cmd): return cmd diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -147,6 +147,7 @@ setbinary = platform.setbinary setflags = platform.setflags setsignalhandler = platform.setsignalhandler shellquote = platform.shellquote +shellsplit = platform.shellsplit spawndetached = platform.spawndetached split = platform.split sshargs = platform.sshargs diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -296,6 +296,15 @@ def shellquote(s): return s return '"%s"' % _quotere.sub(r'\1\1\\\2', s) +def _unquote(s): + if s.startswith(b'"') and s.endswith(b'"'): + return s[1:-1] + return s + +def shellsplit(s): + """Parse a command string in cmd.exe way (best-effort)""" + return pycompat.maplist(_unquote, pycompat.shlexsplit(s, posix=False)) + def quotecommand(cmd): """Build a command string suitable for os.popen* calls.""" if sys.version_info < (2, 7, 1):