Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 767f950

Browse files
author
Bryce Seager van Dyk
committed
Bug 1588947 - Refer to mozilla-unified rather than mozilla-central in bootstrap.py. r=firefox-build-system-reviewers,chmanchester
Since bootstrap now pulls mozilla-unified it makes sense to reference the unified repo as well as central. Differential Revision: https://phabricator.services.mozilla.com/D49478 --HG-- extra : moz-landing-system : lando
1 parent 8f20970 commit 767f950

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

python/mozboot/mozboot/bootstrap.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@
9696
'''
9797

9898
STYLE_NODEJS_REQUIRES_CLONE = '''
99-
Installing Stylo and NodeJS packages requires a checkout of mozilla-central.
100-
Once you have such a checkout, please re-run `./mach bootstrap` from the
101-
checkout directory.
99+
Installing Stylo and NodeJS packages requires a checkout of mozilla-central
100+
(or mozilla-unified). Once you have such a checkout, please re-run
101+
`./mach bootstrap` from the checkout directory.
102102
'''
103103

104104
FINISHED = '''
@@ -128,7 +128,8 @@
128128
optimally configured?'''
129129

130130
CONFIGURE_GIT = '''
131-
Mozilla recommends using git-cinnabar to work with mozilla-central.
131+
Mozilla recommends using git-cinnabar to work with mozilla-central (or
132+
mozilla-unified).
132133
133134
Would you like to run a few configuration steps to ensure Git is
134135
optimally configured?'''
@@ -649,7 +650,7 @@ def current_firefox_checkout(check_output, env, hg=None):
649650
Returns one of None, ``git``, or ``hg``.
650651
"""
651652
HG_ROOT_REVISIONS = set([
652-
# From mozilla-central.
653+
# From mozilla-unified.
653654
'8ba995b74e18334ab3707f27e9eb8f4e37ba3d29',
654655
])
655656

@@ -672,7 +673,7 @@ def current_firefox_checkout(check_output, env, hg=None):
672673
pass
673674

674675
# Just check for known-good files in the checkout, to prevent attempted
675-
# foot-shootings. Determining a canonical git checkout of mozilla-central
676+
# foot-shootings. Determining a canonical git checkout of mozilla-unified
676677
# is...complicated
677678
elif os.path.exists(git_dir):
678679
moz_configure = os.path.join(path, 'moz.configure')

0 commit comments

Comments
 (0)