Mercurial > public > mercurial-scm > hg
comparison mercurial/ui.py @ 44581:b746a22349f9
ui: use "procutil.shellsplit" to parse command
A commandline containing a space ('"C:\\Program Files\\bar.exe" "..."')
must not simply split at whitespace, instead quoting has to be taken into
account. Use "shlex.split()" to parse it instead.
This can improve the error message if we fail to launch a user
configured
editor which does not exist. Consider
[ui]
editor = "C:\Program Files\editor\editor.exe"
where the path does not exist. "hg histedit" currently aborts with
> Abort: edit failed: Program exited with status 1
here "Program" is not part of the message but the name of the program
that failed (i.e. `basename("C:\\Program ")`). With this change the message
instead reads
> Abort: edit failed: C:\Program Files\editor\editor.exe exited with
> status 1
which is also not ideal since infact "cmd.exe" exited with code 1, not
the editor. But the real error message ("File not found") gets swallowed by
`procutil` and including the correct path improves the error message
nevertheless.
author | Micha Wiedenmann <mw-u2@posteo.de> |
---|---|
date | Thu, 19 Mar 2020 16:06:24 +0100 |
parents | df2162672d24 |
children | e147748f750b |
comparison
equal
deleted
inserted
replaced
44579:a7f8c657a3f0 | 44581:b746a22349f9 |
---|---|
1866 out = self | 1866 out = self |
1867 with self.timeblockedsection(blockedtag): | 1867 with self.timeblockedsection(blockedtag): |
1868 rc = self._runsystem(cmd, environ=environ, cwd=cwd, out=out) | 1868 rc = self._runsystem(cmd, environ=environ, cwd=cwd, out=out) |
1869 if rc and onerr: | 1869 if rc and onerr: |
1870 errmsg = b'%s %s' % ( | 1870 errmsg = b'%s %s' % ( |
1871 os.path.basename(cmd.split(None, 1)[0]), | 1871 procutil.shellsplit(cmd)[0], |
1872 procutil.explainexit(rc), | 1872 procutil.explainexit(rc), |
1873 ) | 1873 ) |
1874 if errprefix: | 1874 if errprefix: |
1875 errmsg = b'%s: %s' % (errprefix, errmsg) | 1875 errmsg = b'%s: %s' % (errprefix, errmsg) |
1876 raise onerr(errmsg) | 1876 raise onerr(errmsg) |