Mercurial > hg-stable
changeset 36342:94a1ff16f362
debuginstall: do not parse editor command in posix way on Windows
An editor command is executed by a system shell, which is cmd.exe on Windows.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 17 Feb 2018 13:13:04 +0900 |
| parents | 548316560a05 |
| children | ea62c2df882d |
| files | mercurial/debugcommands.py tests/test-install.t |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/debugcommands.py Sun Feb 18 22:13:25 2018 +0900 +++ b/mercurial/debugcommands.py Sat Feb 17 13:13:04 2018 +0900 @@ -1240,7 +1240,7 @@ # editor editor = ui.geteditor() editor = util.expandpath(editor) - editorbin = pycompat.shlexsplit(editor)[0] + editorbin = pycompat.shlexsplit(editor, posix=not pycompat.iswindows)[0] fm.write('editor', _("checking commit editor... (%s)\n"), editorbin) cmdpath = util.findexe(editorbin) fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
--- a/tests/test-install.t Sun Feb 18 22:13:25 2018 +0900 +++ b/tests/test-install.t Sat Feb 17 13:13:04 2018 +0900 @@ -140,8 +140,10 @@ checking "re2" regexp engine \((available|missing)\) (re) checking templates (*mercurial?templates)... (glob) checking default template (*mercurial?templates?map-cmdline.default) (glob) - checking commit editor... (c:foobarbaz.exe) - Can't find editor 'c:foobarbaz.exe' in PATH + checking commit editor... (c:\foo\bar\baz.exe) (windows !) + Can't find editor 'c:\foo\bar\baz.exe' in PATH (windows !) + checking commit editor... (c:foobarbaz.exe) (no-windows !) + Can't find editor 'c:foobarbaz.exe' in PATH (no-windows !) (specify a commit editor in your configuration file) checking username (test) 1 problems detected, please check your install!