Bug 1190525 - Print path to mach; r=smacleod

This commit is contained in:
Gregory Szorc 2015-08-18 17:04:57 -07:00
parent 4cb084db00
commit f95cc664f5

View File

@ -29,15 +29,15 @@ want to export this environment variable from your shell's init scripts.
NO_MERCURIAL_SETUP = '''
*** MERCURIAL NOT CONFIGURED ***
mach has detected that you have never run `mach mercurial-setup`.
mach has detected that you have never run `{mach} mercurial-setup`.
Running this command will ensure your Mercurial version control tool is up
to date and optimally configured for a better, more productive experience
when working on Mozilla projects.
Please run `mach mercurial-setup` now.
Please run `{mach} mercurial-setup` now.
Note: `mach mercurial-setup` does not make any changes without prompting
Note: `{mach} mercurial-setup` does not make any changes without prompting
you first.
'''.strip()
@ -45,18 +45,18 @@ OLD_MERCURIAL_TOOLS = '''
*** MERCURIAL CONFIGURATION POTENTIALLY OUT OF DATE ***
mach has detected that it has been a while since you have run
`mach mercurial-setup`.
`{mach} mercurial-setup`.
Having the latest Mercurial tools and configuration should lead to a better,
more productive experience when working on Mozilla projects.
Please run `mach mercurial-setup` now.
Please run `{mach} mercurial-setup` now.
Reminder: `mach mercurial-setup` does not make any changes without
Reminder: `{mach} mercurial-setup` does not make any changes without
prompting you first.
To avoid this message in the future, run `mach mercurial-setup` once a month.
Or, schedule `mach mercurial-setup --update-only` to run automatically in
To avoid this message in the future, run `{mach} mercurial-setup` once a month.
Or, schedule `{mach} mercurial-setup --update-only` to run automatically in
the background at least once a month.
'''.strip()
@ -275,10 +275,10 @@ def bootstrap(topsrcdir, mozilla_dir=None):
# No last run file means mercurial-setup has never completed.
if mtime is None:
print(NO_MERCURIAL_SETUP, file=sys.stderr)
print(NO_MERCURIAL_SETUP.format(mach=sys.argv[0]), file=sys.stderr)
sys.exit(2)
elif time.time() - mtime > MERCURIAL_SETUP_FATAL_INTERVAL:
print(OLD_MERCURIAL_TOOLS, file=sys.stderr)
print(OLD_MERCURIAL_TOOLS.format(mach=sys.argv[0]), file=sys.stderr)
sys.exit(2)
def populate_context(context, key=None):