Merge m-c and inbound.

b2g/config/gaia.json

@@ -1,4 +1,4 @@
 {
-    "revision": "3320c4f90ffb0c372f06f7b72d14b54ce0f7a138", 
+    "revision": "36f36185e7c0710689452688aff4d79cfee99f22", 
     "repo_path": "/integration/gaia-central"
 }

python/mozboot/mozboot/base.py

@@ -5,12 +5,79 @@
 from __future__ import print_function, unicode_literals
 
 import os
+import re
 import subprocess
 import sys
 
+from distutils.version import StrictVersion
+
+
+NO_MERCURIAL = '''
+Could not find Mercurial (hg) in the current shell's path. Try starting a new
+shell and running the bootstrapper again.
+'''
+
+MERCURIAL_UNABLE_UPGRADE = '''
+You are currently running Mercurial %s. Running %s or newer is
+recommended for performance and stability reasons.
+
+Unfortunately, this bootstrapper currently does not know how to automatically
+upgrade Mercurial on your machine.
+
+You can usually install Mercurial through your package manager or by
+downloading a package from http://mercurial.selenic.com/.
+'''
+
+MERCURIAL_UPGRADE_FAILED = '''
+We attempted to upgrade Mercurial to a modern version (%s or newer).
+However, you appear to have version %s still.
+
+It's possible your package manager doesn't support a modern version of
+Mercurial. It's also possible Mercurial is not being installed in the search
+path for this shell. Try creating a new shell and run this bootstrapper again.
+
+If it continues to fail, consider installing Mercurial by following the
+instructions at http://mercurial.selenic.com/.
+'''
+
+PYTHON_UNABLE_UPGRADE = '''
+You are currently running Python %s. Running %s or newer (but
+not 3.x) is required.
+
+Unfortunately, this bootstrapper does not currently know how to automatically
+upgrade Python on your machine.
+
+Please search the Internet for how to upgrade your Python and try running this
+bootstrapper again to ensure your machine is up to date.
+'''
+
+PYTHON_UPGRADE_FAILED = '''
+We attempted to upgrade Python to a modern version (%s or newer).
+However, you appear to still have version %s.
+
+It's possible your package manager doesn't yet expose a modern version of
+Python. It's also possible Python is not being installed in the search path for
+this shell. Try creating a new shell and run this bootstrapper again.
+
+If this continues to fail and you are sure you have a modern Python on your
+system, ensure it is on the $PATH and try again. If that fails, you'll need to
+install Python manually. See http://www.python.org/.
+'''
+
+
+# Upgrade Mercurial older than this.
+MODERN_MERCURIAL_VERSION = StrictVersion('2.5')
+
+# Upgrade Python older than this.
+MODERN_PYTHON_VERSION = StrictVersion('2.7.3')
+
+
 class BaseBootstrapper(object):
     """Base class for system bootstrappers."""
 
+    def __init__(self):
+        self.package_manager_updated = False
+
     def install_system_packages(self):
         raise NotImplemented('%s must implement install_system_packages()' %
             __name__)
@@ -47,6 +114,12 @@ class BaseBootstrapper(object):
 
         self.run_as_root(command)
 
+    def yum_update(self, *packages):
+        command = ['yum', 'update']
+        command.extend(packages)
+
+        self.run_as_root(command)
+
     def apt_install(self, *packages):
         command = ['apt-get', 'install']
         command.extend(packages)
@@ -93,3 +166,98 @@ class BaseBootstrapper(object):
         else:
             raise Exception("Error! Reached max attempts of entering option.")
 
+    def _ensure_package_manager_updated(self):
+        if self.package_manager_updated:
+            return
+
+        self._update_package_manager()
+        self.package_manager_updated = True
+
+    def _update_package_manager(self):
+        """Updates the package manager's manifests/package list.
+
+        This should be defined in child classes.
+        """
+
+    def is_mercurial_modern(self):
+        hg = self.which('hg')
+        if not hg:
+            print(NO_MERCURIAL)
+            return False, False, None
+
+        info = self.check_output([hg, '--version']).splitlines()[0]
+
+        match = re.search('version ([^\)]+)', info)
+        if not match:
+            print('ERROR: Unable to identify Mercurial version.')
+            return True, False, None
+
+        our = StrictVersion(match.group(1))
+
+        return True, our >= MODERN_MERCURIAL_VERSION, our
+
+    def ensure_mercurial_modern(self):
+        installed, modern, version = self.is_mercurial_modern()
+
+        if not installed or modern:
+            print('Your version of Mercurial (%s) is sufficiently modern.' %
+                version)
+            return
+
+        self._ensure_package_manager_updated()
+        self.upgrade_mercurial(version)
+
+        installed, modern, after = self.is_mercurial_modern()
+
+        if installed and not modern:
+            print(MERCURIAL_UPGRADE_FAILED % (MODERN_MERCURIAL_VERSION, after))
+
+    def upgrade_mercurial(self, current):
+        """Upgrade Mercurial.
+
+        Child classes should reimplement this.
+        """
+        print(MERCURIAL_UNABLE_UPGRADE % (current, MODERN_MERCURIAL_VERSION))
+
+    def is_python_modern(self):
+        python = None
+
+        for test in ['python2.7', 'python']:
+            python = self.which(test)
+            if python:
+                break
+
+        assert python
+
+        info = self.check_output([python, '--version'],
+            stderr=subprocess.STDOUT)
+        match = re.search('Python ([a-z0-9\.]+)', info)
+        if not match:
+            print('ERROR Unable to identify Python version.')
+            return False, None
+
+        our = StrictVersion(match.group(1))
+
+        return our >= MODERN_PYTHON_VERSION, our
+
+    def ensure_python_modern(self):
+        modern, version = self.is_python_modern()
+
+        if modern:
+            print('Your version of Python (%s) is new enough.' % version)
+            return
+
+        self._ensure_package_manager_updated()
+        self.upgrade_python(version)
+
+        modern, after = self.is_python_modern()
+
+        if not modern:
+            print(PYTHON_UPGRADE_FAILED % (MODERN_PYTHON_VERSION, after))
+
+    def upgrade_python(self, current):
+        """Upgrade Python.
+
+        Child classes should reimplement this.
+        """
+        print(PYTHON_UNABLE_UPGRADE % (current, MODERN_PYTHON_VERSION))

python/mozboot/mozboot/bootstrap.py

@@ -76,5 +76,7 @@ class Bootstrapper(object):
 
         instance = cls(**args)
         instance.install_system_packages()
+        instance.ensure_mercurial_modern()
+        instance.ensure_python_modern()
 
         print(FINISHED)

python/mozboot/mozboot/centos.py

@@ -40,3 +40,7 @@ class CentOSBootstrapper(BaseBootstrapper):
             yasm = 'http://pkgs.repoforge.org/yasm/yasm-1.1.0-1.el6.rf.x86_64.rpm'
 
         self.run_as_root(['rpm', '-ivh', yasm])
+
+    def upgrade_mercurial(self):
+        self.yum_update('mercurial')
+

python/mozboot/mozboot/fedora.py

@@ -29,3 +29,6 @@ class FedoraBootstrapper(BaseBootstrapper):
             'mesa-libGL-devel',
             'wireless-tools-devel',
             'yasm')
+
+    def upgrade_mercurial(self):
+        self.yum_update('mercurial')

python/mozboot/mozboot/gentoo.py

@@ -17,3 +17,9 @@ class GentooBootstrapper(BaseBootstrapper):
         self.run_as_root(['emerge', '--onlydeps', '--quiet', 'firefox'])
 
         self.run_as_root(['emerge', '--quiet', 'git', 'mercurial'])
+
+    def _update_package_manager(self):
+        self.run_as_root(['emerge', '--sync'])
+
+    def upgrade_mercurial(self):
+        self.run_as_root(['emerge', '--update', 'mercurial'])

python/mozboot/mozboot/mint.py

@@ -27,3 +27,6 @@ class MintBootstrapper(BaseBootstrapper):
             'mesa-common-dev',
             'uuid',
             'yasm')
+
+    def upgrade_mercurial(self):
+        self.apt_install('mercurial')

python/mozboot/mozboot/openbsd.py

@@ -24,3 +24,10 @@ class OpenBSDBootstrapper(BaseBootstrapper):
             'wget',
             'unzip',
             'zip'])
+
+    def _update_package_manager(self):
+        self.run_as_root(['port', 'sync'])
+
+    def upgrade_mercurial(self):
+        self.run_as_root(['pkg_add', '-u', 'mercurial'])
+

python/mozboot/mozboot/osx.py

@@ -132,6 +132,7 @@ class OSXBootstrapper(BaseBootstrapper):
         self.ensure_xcode()
 
         choice = self.ensure_package_manager()
+        self.package_manager = choice
         getattr(self, 'ensure_%s_packages' % choice)()
 
     def ensure_xcode(self):
@@ -183,10 +184,10 @@ class OSXBootstrapper(BaseBootstrapper):
                 sys.exit(1)
 
     def ensure_homebrew_packages(self):
-        brew = self.which('brew')
-        assert brew is not None
+        self.brew = self.which('brew')
+        assert self.brew is not None
 
-        installed = self.check_output([brew, 'list']).split()
+        installed = self.check_output([self.brew, 'list']).split()
 
         packages = [
             # We need to install Python because Mercurial requires the Python
@@ -209,19 +210,19 @@ class OSXBootstrapper(BaseBootstrapper):
                 print(PACKAGE_MANAGER_PACKAGES % ('Homebrew',))
                 printed = True
 
-            subprocess.check_call([brew, '-v', 'install', package])
+            subprocess.check_call([self.brew, '-v', 'install', package])
 
         if self.os_version < StrictVersion('10.7') and 'llvm' not in installed:
             print(PACKAGE_MANAGER_OLD_CLANG % ('Homebrew',))
 
-            subprocess.check_call([brew, '-v', 'install', 'llvm',
+            subprocess.check_call([self.brew, '-v', 'install', 'llvm',
                 '--with-clang', '--all-targets'])
 
     def ensure_macports_packages(self):
-        port = self.which('port')
-        assert port is not None
+        self.port = self.which('port')
+        assert self.port is not None
 
-        installed = set(self.check_output([port, 'installed']).split())
+        installed = set(self.check_output([self.port, 'installed']).split())
 
         packages = ['python27',
                     'mercurial',
@@ -232,14 +233,14 @@ class OSXBootstrapper(BaseBootstrapper):
         missing = [package for package in packages if package not in installed]
         if missing:
             print(PACKAGE_MANAGER_PACKAGES % ('MacPorts',))
-            self.run_as_root([port, '-v', 'install'] + missing)
+            self.run_as_root([self.port, '-v', 'install'] + missing)
 
         if self.os_version < StrictVersion('10.7') and MACPORTS_CLANG_PACKAGE not in installed:
             print(PACKAGE_MANAGER_OLD_CLANG % ('MacPorts',))
-            self.run_as_root([port, '-v', 'install', MACPORTS_CLANG_PACKAGE])
+            self.run_as_root([self.port, '-v', 'install', MACPORTS_CLANG_PACKAGE])
 
-        self.run_as_root([port, 'select', '--set', 'python', 'python27'])
-        self.run_as_root([port, 'select', '--set', 'clang', 'mp-' + MACPORTS_CLANG_PACKAGE])
+        self.run_as_root([self.port, 'select', '--set', 'python', 'python27'])
+        self.run_as_root([self.port, 'select', '--set', 'clang', 'mp-' + MACPORTS_CLANG_PACKAGE])
 
     def ensure_package_manager(self):
         '''
@@ -294,3 +295,29 @@ class OSXBootstrapper(BaseBootstrapper):
             print(MACPORTS_POSTINSTALL_RESTART_REQUIRED)
             sys.exit(1)
 
+    def _update_package_manager(self):
+        if self.package_manager == 'homebrew':
+            subprocess.check_call([self.brew, '-v', 'update'])
+        else:
+            assert self.package_manager == 'macports'
+            self.run_as_root([self.port, 'selfupdate'])
+
+    def _upgrade_package(self, package):
+        self._ensure_package_manager_updated()
+
+        if self.package_manager == 'homebrew':
+            subprocess.check_call([self.brew, '-v', 'upgrade', package])
+        else:
+            assert self.package_manager == 'macports'
+
+            self.run_as_root([self.port, 'upgrade', package])
+
+    def upgrade_mercurial(self, current):
+        self._upgrade_package('mercurial')
+
+    def upgrade_python(self, current):
+        if self.package_manager == 'homebrew':
+            self._upgrade_package('python')
+        else:
+            self._upgrade_package('python27')
+

python/mozboot/mozboot/ubuntu.py

@@ -27,3 +27,11 @@ class UbuntuBootstrapper(BaseBootstrapper):
             'mesa-common-dev',
             'uuid',
             'yasm')
+
+    def _update_package_manager(self):
+        self.run_as_root(['apt-get', 'update'])
+
+    def upgrade_mercurial(self):
+        self._ensure_package_manager_updated()
+        self.apt_install('mercurial')
+