Mercurial > public > mercurial-scm > hg-stable
diff mercurial/util.py @ 10239:8e4be44a676f
Find right hg command for detached process
On Windows, Mercurial can be run from the python script of from a frozen
executable. In the first case, we have to call the python interpreter since the
script is not executable. Frozen executable can be called directly.
Fix 3/3 for issue421
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 06 Jan 2010 21:11:58 +0100 |
| parents | c2e2a5e6c36b |
| children | 3af4b39afe2a |
line wrap: on
line diff
--- a/mercurial/util.py Wed Jan 06 21:11:58 2010 +0100 +++ b/mercurial/util.py Wed Jan 06 21:11:58 2010 +0100 @@ -1274,3 +1274,14 @@ def expandpath(path): return os.path.expanduser(os.path.expandvars(path)) + +def hgcmd(): + """Return the command used to execute current hg + + This is different from hgexecutable() because on Windows we want + to avoid things opening new shell windows like batch files, so we + get either the python call or current executable. + """ + if main_is_frozen(): + return [sys.executable] + return gethgcmd()