Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1415922 - "Stylo packages not installed during mach bootstrap if .hgrc file has alias for log set to log -G" [r=gps]

Browse Source
This commit is contained in:
Michael Froman 2018-01-11 07:27:00 +02:00
parent efbd6f5a20
commit 77619aeb6e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/mozboot/mozboot/bootstrap.py
View File

@ -321,6 +321,7 @@ class Bootstrapper(object):
state_dir_available = os.path.exists(state_dir)
r = current_firefox_checkout(check_output=self.instance.check_output,
env=self.instance._hgplain_env(),
hg=self.instance.which('hg'))
(checkout_type, checkout_root) = r
@ -504,7 +505,7 @@ def clone_firefox(hg, dest):
return True
def current_firefox_checkout(check_output, hg=None):
def current_firefox_checkout(check_output, env, hg=None):
"""Determine whether we're in a Firefox checkout.
Returns one of None, ``git``, or ``hg``.
@ -521,7 +522,9 @@ def current_firefox_checkout(check_output, hg=None):
if hg and os.path.exists(hg_dir):
# Verify the hg repo is a Firefox repo by looking at rev 0.
try:
node = check_output([hg, 'log', '-r', '0', '--template', '{node}'], cwd=path)
node = check_output([hg, 'log', '-r', '0', '--template', '{node}'],
cwd=path,
env=env)
if node in HG_ROOT_REVISIONS:
return ('hg', path)
# Else the root revision is different. There could be nested