Mercurial > hg
changeset 6499:479847ccabe0
Added hgexecutable support for py2exe/frozen scripts
| author | "Paul Moore <p.f.moore@gmail.com>" |
|---|---|
| date | Thu, 20 Dec 2007 20:02:51 +0000 |
| parents | 9d6ad26fab10 |
| children | a3175cd7dbec |
| files | mercurial/util.py |
| diffstat | 1 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/util.py Tue Dec 18 15:40:46 2007 -0600 +++ b/mercurial/util.py Thu Dec 20 20:02:51 2007 +0000 @@ -15,7 +15,7 @@ from i18n import _ import cStringIO, errno, getpass, popen2, re, shutil, sys, tempfile, strutil import os, stat, threading, time, calendar, ConfigParser, locale, glob, osutil -import re, urlparse +import re, urlparse, imp try: set = set @@ -553,13 +553,28 @@ _hgexecutable = None +def main_is_frozen(): + """return True if we are a frozen executable. + + The code supports py2exe (most common, Windows only) and tools/freeze + (portable, not much used). + """ + return (hasattr(sys, "frozen") or # new py2exe + hasattr(sys, "importers") or # old py2exe + imp.is_frozen("__main__")) # tools/freeze + def hgexecutable(): """return location of the 'hg' executable. Defaults to $HG or 'hg' in the search path. """ if _hgexecutable is None: - set_hgexecutable(os.environ.get('HG') or find_exe('hg', 'hg')) + if os.environ.has_key('HG'): + set_hgexecutable(os.environ.get('HG')) + elif main_is_frozen(): + set_hgexecutable(sys.executable) + else: + sel_hgexecutable(find_exe('hg', 'hg')) return _hgexecutable def set_hgexecutable(path):