Bug 1560826 - Backout changeset c9732a51552b (bug 1364511). r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 25 Jun 2019 16:49:30 +0000
changeset 480100 14659558eaad0da11cfe567cf9304ef67d666ddf
parent 480099 578f090c90856faf65e33296a1bcd60ba7e69eff
child 480101 bd4a8fb77389fc0f47979529bcb206c3064808f2
push id88505
push usermh@glandium.org
push dateTue, 25 Jun 2019 20:48:10 +0000
treeherderautoland@cac1aaff7d7b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1560826, 1364511
milestone69.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 1560826 - Backout changeset c9732a51552b (bug 1364511). r=nalexander This makes the bootstrap behavior wrt. Mercurial consistent on all platforms, making Windows bootstrap only upgrade Mercurial if the version is older than MODERN_MERCURIAL_VERSION. As a side effect, this avoids upgrading to version 5.0.1, which doesn't come with wheels at the moment. Differential Revision: https://phabricator.services.mozilla.com/D35754
python/mozboot/mozboot/mozillabuild.py
--- a/python/mozboot/mozboot/mozillabuild.py
+++ b/python/mozboot/mozboot/mozillabuild.py
@@ -46,21 +46,18 @@ class MozillaBuildBootstrapper(BaseBoots
         print("mach bootstrap is not fully implemented in MozillaBuild")
 
     def which(self, name, *extra_search_dirs):
         return BaseBootstrapper.which(self, name + '.exe', *extra_search_dirs)
 
     def install_system_packages(self):
         pass
 
-    def ensure_mercurial_modern(self):
-        # Overrides default implementation to always run pip because.
-        print('Running pip to ensure Mercurial is up-to-date...')
-        self.run([self.which('pip'), 'install', '--upgrade', 'Mercurial'])
-        return True, True
+    def upgrade_mercurial(self, current):
+        self.pip_install('mercurial')
 
     def upgrade_python(self, current):
         pass
 
     def install_browser_packages(self):
         pass
 
     def install_browser_artifact_mode_packages(self):