Backed out changeset a8373914cbfd (bug 1384396)

MozReview-Commit-ID: I8IOrpGH89l

build/moz.configure/init.configure

@@ -353,28 +353,6 @@ def hg_version(hg):
 
     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')

moz.configure

@@ -378,29 +378,6 @@ def watchman_version(watchman):
     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)