nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1870175 - Only run check_for_hgrc_state_dir_mismatch() if hg is installed r=firefox-build-system-reviewers,glandium

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D196507
This commit is contained in:
ahochheiden 2023-12-15 20:50:52 +00:00
parent 8905b2cca6
commit e074614f1f
1 changed files with 6 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
python/mozboot/mozboot/bootstrap.py
View file

@ -355,7 +355,12 @@ class Bootstrapper(object):
def bootstrap(self, settings): def bootstrap(self, settings):
state_dir = Path(get_state_dir()) state_dir = Path(get_state_dir())
check_for_hgrc_state_dir_mismatch(state_dir)
hg = to_optional_path(which("hg"))
hg_installed = bool(hg)
if hg_installed:
check_for_hgrc_state_dir_mismatch(state_dir)
if self.choice is None: if self.choice is None:
applications = APPLICATIONS applications = APPLICATIONS
@ -404,8 +409,6 @@ class Bootstrapper(object):
self.instance.state_dir = state_dir self.instance.state_dir = state_dir
hg = to_optional_path(which("hg"))
# We need to enable the loading of hgrc in case extensions are # We need to enable the loading of hgrc in case extensions are
# required to open the repo. # required to open the repo.
(checkout_type, checkout_root) = current_firefox_checkout( (checkout_type, checkout_root) = current_firefox_checkout(
@ -433,7 +436,6 @@ class Bootstrapper(object):
# Possibly configure Mercurial, but not if the current checkout or repo # Possibly configure Mercurial, but not if the current checkout or repo
# type is Git. # type is Git.
hg_installed = bool(hg)
if checkout_type == "hg": if checkout_type == "hg":
hg_installed, hg_modern = self.instance.ensure_mercurial_modern() hg_installed, hg_modern = self.instance.ensure_mercurial_modern()