Bug 1274092 - Use "branch" instead of "revision" with hg tool; r=jlund
authorGregory Szorc <gps@mozilla.com>
Wed, 18 May 2016 16:46:24 -0700
changeset 297959 370cc2de9b99588532be789e816a0fafb1e58b29
parent 297958 55016b253dde7da0b07348bd66ee313c748c0a0c
child 297960 e0fa395e4982a5225e73908a4a0816932043440d
push id19284
push usergszorc@mozilla.com
push dateThu, 19 May 2016 00:21:09 +0000
treeherderfx-team@370cc2de9b99 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund
bugs1274092
milestone49.0a1
Bug 1274092 - Use "branch" instead of "revision" with hg tool; r=jlund The new tool has different behavior for "revision" and "branch:" if you pass a name to "revision" and it already resolves, it won't attempt a pull because it thinks it already has the revision. That would be bad. So convert consumers using the "hg" tool to pass "branch" when using symbol names. MozReview-Commit-ID: Ix2jt3XabW2
testing/mozharness/configs/single_locale/alder.py
testing/mozharness/configs/single_locale/ash.py
testing/mozharness/configs/single_locale/dev-mozilla-beta.py
testing/mozharness/configs/single_locale/dev-mozilla-release.py
testing/mozharness/configs/single_locale/mozilla-aurora.py
testing/mozharness/configs/single_locale/mozilla-beta.py
testing/mozharness/configs/single_locale/mozilla-central.py
testing/mozharness/configs/single_locale/mozilla-esr45.py
testing/mozharness/configs/single_locale/mozilla-release.py
testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_15.py
testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_9.py
testing/mozharness/configs/single_locale/try.py
--- a/testing/mozharness/configs/single_locale/alder.py
+++ b/testing/mozharness/configs/single_locale/alder.py
@@ -29,17 +29,17 @@ config = {
     # mar
     "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s",
 
     # repositories
     "mozilla_dir": "alder",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools",
     }, {
         "vcs": "hgtool",
         "repo": "https://hg.mozilla.org/mozilla-central",
         "revision": "default",
         "dest": "alder",
     }, {
         "vcs": "hgtool",
--- a/testing/mozharness/configs/single_locale/ash.py
+++ b/testing/mozharness/configs/single_locale/ash.py
@@ -29,17 +29,17 @@ config = {
     # mar
     "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s",
 
     # repositories
     "mozilla_dir": "ash",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools",
     }, {
         "vcs": "hgtool",
         "repo": "https://hg.mozilla.org/mozilla-central",
         "revision": "default",
         "dest": "ash",
     }, {
         "vcs": "hgtool",
--- a/testing/mozharness/configs/single_locale/dev-mozilla-beta.py
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-beta.py
@@ -10,17 +10,17 @@ config = {
     "latest_mar_dir": "fake_kill_me",
 
     # repositories
     # staging beta dev releases use date repo for now
     "mozilla_dir": "date",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools",
     }, {
         "vcs": "hgtool",
         "repo": "https://hg.mozilla.org/projects/date",
         "revision": "default",
         "dest": "date",
     }, {
         "vcs": "hgtool",
--- a/testing/mozharness/configs/single_locale/dev-mozilla-release.py
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-release.py
@@ -8,17 +8,17 @@ config = {
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
 
     # repositories
     # staging release uses jamun
     "mozilla_dir": "jamun",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools",
     }, {
         "vcs": "hgtool",
         "repo": "https://hg.mozilla.org/projects/jamun",
         "revision": "default",
         "dest": "jamun",
     }, {
         "vcs": "hgtool",
--- a/testing/mozharness/configs/single_locale/mozilla-aurora.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora.py
@@ -11,17 +11,17 @@ config = {
     # mar
     "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-aurora/mar-tools/%(platform)s",
 
     # repositories
     "mozilla_dir": "mozilla-aurora",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools",
     }, {
         "vcs": "hgtool",
         "repo": "https://hg.mozilla.org/releases/mozilla-aurora",
         "revision": "default",
         "dest": "mozilla-aurora",
     }, {
         "vcs": "hgtool",
--- a/testing/mozharness/configs/single_locale/mozilla-beta.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta.py
@@ -8,17 +8,17 @@ config = {
     # l10n
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
 
     # repositories
     "mozilla_dir": "mozilla-beta",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools",
     }, {
         "vcs": "hgtool",
         "repo": "https://hg.mozilla.org/releases/mozilla-beta",
         "revision": "default",
         "dest": "mozilla-beta",
     }, {
         "vcs": "hgtool",
--- a/testing/mozharness/configs/single_locale/mozilla-central.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central.py
@@ -11,17 +11,17 @@ config = {
     # mar
     "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s",
 
     # repositories
     "mozilla_dir": "mozilla-central",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools",
     }, {
         "vcs": "hgtool",
         "repo": "https://hg.mozilla.org/mozilla-central",
         "revision": "default",
         "dest": "mozilla-central",
     }, {
         "vcs": "hgtool",
--- a/testing/mozharness/configs/single_locale/mozilla-esr45.py
+++ b/testing/mozharness/configs/single_locale/mozilla-esr45.py
@@ -8,17 +8,17 @@ config = {
     # l10n
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
 
     # repositories
     "mozilla_dir": "mozilla-esr45",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools",
     }, {
         "vcs": "hgtool",
         "repo": "https://hg.mozilla.org/releases/mozilla-esr45",
         "revision": "default",
         "dest": "mozilla-esr45",
     }, {
         "vcs": "hgtool",
--- a/testing/mozharness/configs/single_locale/mozilla-release.py
+++ b/testing/mozharness/configs/single_locale/mozilla-release.py
@@ -8,17 +8,17 @@ config = {
     # l10n
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
 
     # repositories
     "mozilla_dir": "mozilla-release",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools",
     }, {
         "vcs": "hgtool",
         "repo": "https://hg.mozilla.org/releases/mozilla-release",
         "revision": "default",
         "dest": "mozilla-release",
     }, {
         "vcs": "hgtool",
--- a/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_15.py
+++ b/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_15.py
@@ -24,25 +24,25 @@ config = {
         "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
         "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
     },
     "exes": {
         'tooltool.py': '/builds/tooltool.py',
     },
     "repos": [{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-beta",
-        "revision": "default",
+        "branch": "default",
         "dest": MOZILLA_DIR,
     }, {
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "revision": "default",
+        "branch": "default",
         "dest": "buildbot-configs"
     }, {
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools"
     }, {
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/compare-locales",
         "revision": "RELEASE_AUTOMATION"
     }],
     "hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s/",
     "hg_l10n_tag": "default",
     'vcs_share_base': HG_SHARE_BASE_DIR,
--- a/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_9.py
+++ b/testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_9.py
@@ -24,25 +24,25 @@ config = {
         "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
         "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
     },
     "exes": {
         'tooltool.py': '/builds/tooltool.py',
     },
     "repos": [{
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-beta",
-        "revision": "default",
+        "branch": "default",
         "dest": MOZILLA_DIR,
     }, {
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
-        "revision": "default",
+        "branch": "default",
         "dest": "buildbot-configs"
     }, {
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools"
     }, {
         "repo": "https://hg.mozilla.org/%(user_repo_override)s/compare-locales",
         "revision": "RELEASE_AUTOMATION"
     }],
     "hg_l10n_base": "https://hg.mozilla.org/%(user_repo_override)s/",
     "hg_l10n_tag": "default",
     'vcs_share_base': HG_SHARE_BASE_DIR,
--- a/testing/mozharness/configs/single_locale/try.py
+++ b/testing/mozharness/configs/single_locale/try.py
@@ -13,17 +13,17 @@ config = {
     "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s",
 
     # repositories
     "mozilla_dir": "try",
     "hgtool_base_bundle_urls": ["https://archive.mozilla.org/pub/firefox/bundles"],
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools",
     }, {
         "vcs": "hgtool",
         "repo": "https://hg.mozilla.org/try",
         "revision": "%(revision)s",
         "dest": "try",
         "clone_upstream_url": "https://hg.mozilla.org/mozilla-central",
         "clone_by_revision": True,