Skip to content
Snippets Groups Projects
Commit eb6c0d47 authored by Yuya Nishihara's avatar Yuya Nishihara
Browse files

setup: set whole env for running hg even if .hg doesn't exist (issue3073)

The issue was partially fixed by b357a972d6cd, but there were missing
variables to run build_hgextindex.
parent 87248de0
Branches
Tags
No related merge requests found
......@@ -133,6 +133,19 @@
version = ''
env = {'HGRCPATH': '', 'LANGUAGE': 'C'}
# Execute hg out of this directory with a custom environment which
# includes the pure Python modules in mercurial/pure. We also take
# care to not use any hgrc files and do no localization.
pypath = ['mercurial', os.path.join('mercurial', 'pure')]
env = {'PYTHONPATH': os.pathsep.join(pypath),
'HGRCPATH': '',
'LANGUAGE': 'C'}
if 'LD_LIBRARY_PATH' in os.environ:
env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH']
if 'SystemRoot' in os.environ:
# Copy SystemRoot into the custom environment for Python 2.6
# under Windows. Otherwise, the subprocess will fail with
# error 0xc0150004. See: http://bugs.python.org/issue3440
env['SystemRoot'] = os.environ['SystemRoot']
if os.path.isdir('.hg'):
......@@ -137,17 +150,5 @@
if os.path.isdir('.hg'):
# Execute hg out of this directory with a custom environment which
# includes the pure Python modules in mercurial/pure. We also take
# care to not use any hgrc files and do no localization.
pypath = ['mercurial', os.path.join('mercurial', 'pure')]
env['PYTHONPATH'] = os.pathsep.join(pypath)
if 'LD_LIBRARY_PATH' in os.environ:
env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH']
if 'SystemRoot' in os.environ:
# Copy SystemRoot into the custom environment for Python 2.6
# under Windows. Otherwise, the subprocess will fail with
# error 0xc0150004. See: http://bugs.python.org/issue3440
env['SystemRoot'] = os.environ['SystemRoot']
cmd = [sys.executable, 'hg', 'id', '-i', '-t']
l = runhg(cmd, env).split()
while len(l) > 1 and l[-1][0].isalpha(): # remove non-numbered tags
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment