Mercurial > hg-stable
changeset 23934:975c4fc4a512 stable
hg.bat: return exit code explicitly for indirect invocation
When "hg.bat" is invoked via interactive shell "cmd.exe" on Windows,
it can store own exit code into ERRORLEVEL correctly, regardless of
explicit "exit" statement in it: "cmd.exe" seems to hold ERRORLEVEL
updated by the last command in the batch file (= "python hg", in
"hg.bat" case).
On the other hand, "hg.bat" is invoked indirectly via
"subprocess.Popen" (e.g. shell alias, hooks, hgclient and so on), the
parent process always receives exit code 0 from spawned "hg.bat":
batch files on Windows seem not to be really spawned like as shell
scripts on UNIX, but to be executed in the "cmd.exe" process.
This patch returns exit code explicitly for indirect invocation.
"/b" should be specified for "exit" to prevent "cmd.exe" from being
terminated when "hg.bat" is invoked interactively from it.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Thu, 22 Jan 2015 00:07:06 +0900 |
parents | 769027075e21 |
children | d64dd1252386 |
files | contrib/win32/hg.bat tests/test-alias.t |
diffstat | 2 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/win32/hg.bat Thu Jan 22 00:03:58 2015 +0900 +++ b/contrib/win32/hg.bat Thu Jan 22 00:07:06 2015 +0900 @@ -15,3 +15,5 @@ python "%~dp0hg" %* ) endlocal + +exit /b %ERRORLEVEL%
--- a/tests/test-alias.t Thu Jan 22 00:03:58 2015 +0900 +++ b/tests/test-alias.t Thu Jan 22 00:07:06 2015 +0900 @@ -525,3 +525,12 @@ [1] $ hg exit1 [1] + +#if no-outer-repo + $ hg root + abort: no repository found in '$TESTTMP' (.hg not found)! + [255] + $ hg --config alias.hgroot='!hg root' hgroot + abort: no repository found in '$TESTTMP' (.hg not found)! + [255] +#endif