From d9a9f5848c7efb3887fcc5a10fdfe4e503c8feeb Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 8 Oct 2020 09:40:25 +0000
Subject: [PATCH] Bug 1669879 - Always use `hg` in run-task on mac.
 r=releng-reviewers,mtabara

All the workers that had hg under /tools/python27-mercurial are gone.
This also fixes run-task for workers running > 10.14.

Differential Revision: https://phabricator.services.mozilla.com/D92867
---
 taskcluster/scripts/run-task | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/taskcluster/scripts/run-task b/taskcluster/scripts/run-task
index e57b70a361d0..7403168e9756 100755
--- a/taskcluster/scripts/run-task
+++ b/taskcluster/scripts/run-task
@@ -414,14 +414,7 @@ def vcs_checkout(source_repo, dest, store_path,
         print('revision is not specified for checkout')
         sys.exit(1)
 
-    if IS_MACOSX:
-        release = platform.mac_ver()
-        versionNums = release[0].split('.')[:2]
-        os_version = "%s.%s" % (versionNums[0], versionNums[1])
-        hg_bin = '/tools/python27-mercurial/bin/hg'
-        if os_version == "10.14":
-            hg_bin = 'hg'
-    elif IS_POSIX:
+    if IS_MACOSX or IS_POSIX:
         hg_bin = 'hg'
     elif IS_WINDOWS:
         # This is where OCC installs it in the AMIs.