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

python/mozboot/mozboot/bootstrap.py

@@ -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