comparison mercurial/util.py @ 15076:89d9f92f6fdd

util: improve finding of hgexecutable check the module __main__ before looking on the default path
author Simon Heimberg <simohe@besonet.ch>
date Sat, 23 Jul 2011 06:18:18 +0200
parents cc16323e748d
children d30ec2d16c5a
comparison
equal deleted inserted replaced
15072:91d2efecb245 15076:89d9f92f6fdd
372 hg = os.environ.get('HG') 372 hg = os.environ.get('HG')
373 if hg: 373 if hg:
374 _sethgexecutable(hg) 374 _sethgexecutable(hg)
375 elif mainfrozen(): 375 elif mainfrozen():
376 _sethgexecutable(sys.executable) 376 _sethgexecutable(sys.executable)
377 elif getattr(sys.modules['__main__'], '__file__', '').endswith('hg'):
378 _sethgexecutable(sys.modules['__main__'].__file__)
377 else: 379 else:
378 exe = findexe('hg') or os.path.basename(sys.argv[0]) 380 exe = findexe('hg') or os.path.basename(sys.argv[0])
379 _sethgexecutable(exe) 381 _sethgexecutable(exe)
380 return _hgexecutable 382 return _hgexecutable
381 383