Backed out changeset a8373914cbfd (bug 1384396)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 27 Jul 2017 14:53:41 +0200
changeset 371377 9090379eaa361e44a2664ef6b73029aeeb7009ba
parent 371365 e5693cea1ec944ca077c7a46c5f127c828a90f1b
child 371378 68231b38b01dbd5807ef75478c9c62888754bbd2
push id93057
push userarchaeopteryx@coole-files.de
push dateThu, 27 Jul 2017 12:59:23 +0000
treeherdermozilla-inbound@fc5d61f02791 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1384396
milestone56.0a1
backs outa8373914cbfd9b8595fc24f36c876cab0a26c02a
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
Backed out changeset a8373914cbfd (bug 1384396) MozReview-Commit-ID: I8IOrpGH89l
build/moz.configure/init.configure
moz.configure
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -348,38 +348,16 @@ def hg_version(hg):
     if not match:
         raise FatalCheckError('unable to determine Mercurial version: %s' % out)
 
     # The version string may be "unknown" for Mercurial run out of its own
     # source checkout or for bad builds. But LooseVersion handles it.
 
     return Version(match.group(1))
 
-# Resolve Mercurial config items so other checks have easy access.
-# Do NOT set this in the config because it may contain sensitive data
-# like API keys.
-@depends_all(check_build_environment, hg, hg_version)
-@imports('os')
-def hg_config(build_env, hg, version):
-    env = dict(os.environ)
-    env['HGPLAIN'] = '1'
-
-    # Warnings may get sent to stderr. But check_cmd_output() ignores
-    # stderr if exit code is 0. And the command should always succeed if
-    # `hg version` worked.
-    out = check_cmd_output(hg, 'config', env=env, cwd=build_env.topsrcdir)
-
-    config = {}
-
-    for line in out.strip().splitlines():
-        key, value = [s.strip() for s in line.split('=', 1)]
-        config[key] = value
-
-    return config
-
 @depends_if(git)
 @checking('for Git version')
 @imports('re')
 def git_version(git):
     out = check_cmd_output(git, '--version').rstrip()
 
     match = re.search('git version (.*)$', out)
 
--- a/moz.configure
+++ b/moz.configure
@@ -373,39 +373,16 @@ watchman = check_prog('WATCHMAN', ('watc
 @depends_if(watchman)
 @checking('for watchman version')
 @imports('json')
 def watchman_version(watchman):
     out = check_cmd_output(watchman, 'version')
     res = json.loads(out)
     return Version(res['version'])
 
-@depends_all(hg_version, hg_config, watchman)
-@checking('for watchman Mercurial integration')
-@imports('os')
-def watchman_hg(hg_version, hg_config, watchman):
-    if hg_version < Version('3.8'):
-        return 'no (Mercurial 3.8+ required)'
-
-    ext_enabled = False
-    mode_disabled = False
-
-    for k in ('extensions.fsmonitor', 'extensions.hgext.fsmonitor'):
-        if k in hg_config and hg_config[k] != '!':
-            ext_enabled = True
-
-    mode_disabled = hg_config.get('fsmonitor.mode') == 'off'
-
-    if not ext_enabled:
-        return 'no (fsmonitor extension not enabled)'
-    if mode_disabled:
-        return 'no (fsmonitor.mode=off disables fsmonitor)'
-
-    return True
-
 # Miscellaneous programs
 # ==============================================================
 check_prog('DOXYGEN', ('doxygen',), allow_missing=True)
 check_prog('XARGS', ('xargs',))
 
 @depends(target)
 def extra_programs(target):
     if target.kernel == 'Darwin':