Bug 1275777 - Stop using HgtoolVCS in SpiderMonkey builds; r=jlund

We remove the old config settings related to hgtool and switch
the "revision" option to "branch" because it defines a symbolic
revision.

MozReview-Commit-ID: Eq4R5a2tv2V

--HG--
extra : rebase_source : 4d85abbc2db6f499206d741f98c316b9c521b4ee

testing/mozharness/configs/users/sfink/spidermonkey.py

@@ -7,10 +7,6 @@ REPO = HOME + "/src/MI-GC"
 
 config = {
     "hgurl": "https://hg.mozilla.org/",
-    "hgtool_base_bundle_urls": [
-        "https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"
-    ],
-
     "python": "python",
     "sixgill": HOME + "/src/sixgill",
     "sixgill_bin": HOME + "/src/sixgill/bin",
@@ -18,11 +14,11 @@ config = {
     "repo": REPO,
     "repos": [{
         "repo": REPO,
-        "revision": "default",
+        "branch": "default",
         "dest": BRANCH,
     }, {
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools"
     }],
 

testing/mozharness/scripts/spidermonkey_build.py

@@ -121,7 +121,7 @@ class SpidermonkeyBuild(MockMixin,
                 'check-expectations',
             ],
             config={
-                'default_vcs': 'hgtool',
+                'default_vcs': 'hg',
                 'vcs_share_base': os.environ.get('HG_SHARE_BASE_DIR'),
                 'ccache': True,
                 'buildbot_json_path': os.environ.get('PROPERTIES_FILE'),
@@ -150,8 +150,6 @@ class SpidermonkeyBuild(MockMixin,
 
         if self.buildbot_config:
             bb_props = [('mock_target', 'mock_target', None),
-                        ('base_bundle_urls', 'hgtool_base_bundle_urls', None),
-                        ('base_mirror_urls', 'hgtool_base_mirror_urls', None),
                         ('hgurl', 'hgurl', None),
                         ('clobberer_url', 'clobberer_url', 'https://api.pub.build.mozilla.org/clobberer/lastclobber'),
                         ('force_clobber', 'force_clobber', None),
@@ -362,7 +360,7 @@ class SpidermonkeyBuild(MockMixin,
                 raise Exception("Cannot run from source checkout to avoid overwriting subdirs")
 
         rev = self.vcs_checkout(
-            vcs='hg',  # Don't have hgtool.py yet
+            vcs='hg',
             repo=self.config['tools_repo'],
             clean=False,
             dest=dirs['abs_tools_dir'],