Bug 1235921 - Update modern Mercurial version to 3.5.2; r=me
authorGregory Szorc <gps@mozilla.com>
Thu, 31 Dec 2015 16:01:48 -0800
changeset 278149 75129f6ee55773f5f4436285e7ccfb5e096b9bab
parent 278148 471e252b7b301c81051efb6f16e1d1c964711408
child 278150 892fb649799978afac3e45b1f713979088379b43
push id69693
push usergszorc@mozilla.com
push dateFri, 01 Jan 2016 00:06:04 +0000
treeherdermozilla-inbound@75129f6ee557 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1235921
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1235921 - Update modern Mercurial version to 3.5.2; r=me 3.5.2 is what is listed in `mach mercurial-setup`. These should match. Add a comment to each file saying to change both.
python/mozboot/mozboot/base.py
tools/mercurial/hgsetup/wizard.py
--- a/python/mozboot/mozboot/base.py
+++ b/python/mozboot/mozboot/base.py
@@ -69,17 +69,19 @@ We recommend the following tools for ins
 
     pyenv   -- https://github.com/yyuu/pyenv)
     pythonz -- https://github.com/saghul/pythonz
     official installers -- http://www.python.org/
 '''
 
 
 # Upgrade Mercurial older than this.
-MODERN_MERCURIAL_VERSION = StrictVersion('3.2.4')
+# This should match OLDEST_NON_LEGACY_VERSION from
+# tools/mercurial/hgsetup/wizard.py.
+MODERN_MERCURIAL_VERSION = StrictVersion('3.5.2')
 
 # Upgrade Python older than this.
 MODERN_PYTHON_VERSION = LooseVersion('2.7.3')
 
 
 class BaseBootstrapper(object):
     """Base class for system bootstrappers."""
 
--- a/tools/mercurial/hgsetup/wizard.py
+++ b/tools/mercurial/hgsetup/wizard.py
@@ -37,16 +37,18 @@ you whether you want me to make changes:
 want me changing without your permission!
 
 If your config is up-to-date, I'm just going to ensure all 3rd party extensions
 are up to date and you won't have to do anything.
 
 To begin, press the enter/return key.
 '''.strip()
 
+# This should match MODERN_MERCURIAL_VERSION in
+# python/mozboot/mozboot/base.py.
 OLDEST_NON_LEGACY_VERSION = LooseVersion('3.5.2')
 LEGACY_MERCURIAL = '''
 You are running an out of date Mercurial client (%s).
 
 For a faster and better Mercurial experience, we HIGHLY recommend you
 upgrade.
 '''.strip()