Mercurial > hg
changeset 33112:155d760da7b2
setup: move environment computation into a helper function
Add a helper function to compute the environment used for invoking mercurial,
rather than doing this computation entirely at global scope. This will make it
easier to do some subsequent refactoring.
| author | Adam Simpkins <simpkins@fb.com> |
|---|---|
| date | Mon, 26 Jun 2017 11:31:30 -0700 |
| parents | 87ee783f7299 |
| children | fc290a39590d |
| files | setup.py |
| diffstat | 1 files changed, 16 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/setup.py Mon Jun 26 11:31:30 2017 -0700 +++ b/setup.py Mon Jun 26 11:31:30 2017 -0700 @@ -165,20 +165,23 @@ return '' return out -version = '' -# Execute hg out of this directory with a custom environment which takes care -# to not use any hgrc files and do no localization. -env = {'HGMODULEPOLICY': 'py', - 'HGRCPATH': '', - 'LANGUAGE': 'C', - 'PATH': ''} # make pypi modules that use os.environ['PATH'] happy -if 'LD_LIBRARY_PATH' in os.environ: - env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] -if 'SystemRoot' in os.environ: - # SystemRoot is required by Windows to load various DLLs. See: - # https://bugs.python.org/issue13524#msg148850 - env['SystemRoot'] = os.environ['SystemRoot'] +def gethgenv(): + # Execute hg out of this directory with a custom environment which takes + # care to not use any hgrc files and do no localization. + env = {'HGMODULEPOLICY': 'py', + 'HGRCPATH': '', + 'LANGUAGE': 'C', + 'PATH': ''} # make pypi modules that use os.environ['PATH'] happy + if 'LD_LIBRARY_PATH' in os.environ: + env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] + if 'SystemRoot' in os.environ: + # SystemRoot is required by Windows to load various DLLs. See: + # https://bugs.python.org/issue13524#msg148850 + env['SystemRoot'] = os.environ['SystemRoot'] + +env = gethgenv() +version = '' if os.path.isdir('.hg'): cmd = [sys.executable, 'hg', 'log', '-r', '.', '--template', '{tags}\n']