mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
Bug 1415922 - "Stylo packages not installed during mach bootstrap if .hgrc file has alias for log set to log -G" [r=gps]
This commit is contained in:
parent
efbd6f5a20
commit
77619aeb6e
@ -321,6 +321,7 @@ class Bootstrapper(object):
|
|||||||
state_dir_available = os.path.exists(state_dir)
|
state_dir_available = os.path.exists(state_dir)
|
||||||
|
|
||||||
r = current_firefox_checkout(check_output=self.instance.check_output,
|
r = current_firefox_checkout(check_output=self.instance.check_output,
|
||||||
|
env=self.instance._hgplain_env(),
|
||||||
hg=self.instance.which('hg'))
|
hg=self.instance.which('hg'))
|
||||||
(checkout_type, checkout_root) = r
|
(checkout_type, checkout_root) = r
|
||||||
|
|
||||||
@ -504,7 +505,7 @@ def clone_firefox(hg, dest):
|
|||||||
return True
|
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.
|
"""Determine whether we're in a Firefox checkout.
|
||||||
|
|
||||||
Returns one of None, ``git``, or ``hg``.
|
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):
|
if hg and os.path.exists(hg_dir):
|
||||||
# Verify the hg repo is a Firefox repo by looking at rev 0.
|
# Verify the hg repo is a Firefox repo by looking at rev 0.
|
||||||
try:
|
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:
|
if node in HG_ROOT_REVISIONS:
|
||||||
return ('hg', path)
|
return ('hg', path)
|
||||||
# Else the root revision is different. There could be nested
|
# Else the root revision is different. There could be nested
|
||||||
|
Loading…
Reference in New Issue
Block a user