--- a/testing/mozharness/configs/merge_day/aurora_to_beta.py
+++ b/testing/mozharness/configs/merge_day/aurora_to_beta.py
@@ -4,16 +4,17 @@ ABS_WORK_DIR = os.path.join(os.getcwd(),
config = {
"log_name": "aurora_to_beta",
"version_files": [
{"file": "browser/config/version.txt", "suffix": ""},
{"file": "browser/config/version_display.txt", "suffix": "b1"},
{"file": "config/milestone.txt", "suffix": ""},
],
+ "locale_files": ["mobile/locales/l10n-changesets.json"],
"replacements": [
# File, from, to
("{}/{}".format(d, f),
"ac_add_options --with-branding=mobile/android/branding/aurora",
"ac_add_options --with-branding=mobile/android/branding/beta")
for d in ["mobile/android/config/mozconfigs/android-api-15/",
"mobile/android/config/mozconfigs/android-x86/"]
for f in ["debug", "nightly", "l10n-nightly"]
--- a/testing/mozharness/configs/merge_day/central_to_aurora.py
+++ b/testing/mozharness/configs/merge_day/central_to_aurora.py
@@ -55,18 +55,17 @@ config = {
"MAR_CHANNEL_ID=firefox-mozilla-aurora"),
("browser/config/mozconfigs/whitelist",
"ac_add_options --with-branding=browser/branding/nightly",
"ac_add_options --with-branding=browser/branding/aurora"),
],
"locale_files": [
"browser/locales/shipped-locales",
"browser/locales/all-locales",
- "mobile/android/locales/maemo-locales",
- "mobile/android/locales/all-locales"
+ "mobile/locales/l10n-changesets.json",
],
"vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'),
# "hg_share_base": None,
"tools_repo_url": "https://hg.mozilla.org/build/tools",
"tools_repo_branch": "default",
"from_repo_url": "ssh://hg.mozilla.org/mozilla-central",
"to_repo_url": "ssh://hg.mozilla.org/releases/mozilla-aurora",
--- a/testing/mozharness/configs/multi_locale/android-mozharness-build.json
+++ b/testing/mozharness/configs/multi_locale/android-mozharness-build.json
@@ -1,5 +1,6 @@
{
"work_dir": "build",
- "locales_file": "src/mobile/android/locales/maemo-locales",
+ "locales_file": "src/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"mozilla_dir": "src"
}
--- a/testing/mozharness/configs/multi_locale/ash_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/ash_android-x86.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/projects/ash",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/ash_android.json
+++ b/testing/mozharness/configs/multi_locale/ash_android.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/projects/ash",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/date_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/date_android-armv6.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/date",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/date_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/date_android-x86.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/date",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/date_android.json
+++ b/testing/mozharness/configs/multi_locale/date_android.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/date",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-aurora",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-aurora",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-aurora",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-beta_android.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-beta",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/mozilla-central",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/mozilla-central",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-central_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-central_android.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/mozilla-central",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/mozilla-release_android.json
+++ b/testing/mozharness/configs/multi_locale/mozilla-release_android.json
@@ -1,13 +1,14 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
- "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_file": "build/mobile/locales/l10n-changesets.json",
+ "locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-release",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
--- a/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
+++ b/testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
@@ -15,17 +15,18 @@ ANDROID_DIR = "mobile/android"
# Absolute path to your mozconfig.
# By default it looks at "./mozconfig"
MOZCONFIG = os.path.join(os.getcwd(), "mozconfig")
config = {
"work_dir": ".",
"log_name": "multilocale",
"objdir": OBJDIR,
- "locales_file": "%s/%s/locales/maemo-locales" % (BUILD_DIR, ANDROID_DIR),
+ "locales_file": "%s/mobile/locales/l10n-changesets.json" % BUILD_DIR,
+ "locales_platform": "android-multilocale",
"locales_dir": "%s/locales" % ANDROID_DIR,
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/%s" % REPO_PATH,
"branch": "default",
"dest": BUILD_DIR,
}],
"vcs_share_base": "/builds/hg-shared",
--- a/testing/mozharness/configs/single_locale/ash_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/ash_android-api-15.py
@@ -8,17 +8,17 @@ HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
"branch": BRANCH,
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"buildbot_json_path": "buildprops.json",
"force_clobber": True,
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
- "locales_file": "%s/mobile/android/locales/all-locales" % MOZILLA_DIR,
+ "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
'balrog_credentials_file': 'oauth.txt',
"tools_repo": "https://hg.mozilla.org/build/tools",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
--- a/testing/mozharness/configs/single_locale/date_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/date_android-api-15.py
@@ -8,17 +8,17 @@ EN_US_BINARY_URL = "http://archive.mozil
config = {
"branch": BRANCH,
"log_name": "single_locale",
"objdir": "obj-l10n",
"is_automation": True,
"buildbot_json_path": "buildprops.json",
"force_clobber": True,
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
- "locales_file": "%s/mobile/android/locales/all-locales" % MOZILLA_DIR,
+ "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
'balrog_credentials_file': 'oauth.txt',
"tools_repo": "https://hg.mozilla.org/build/tools",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-15.py
@@ -10,17 +10,17 @@ HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
"branch": BRANCH,
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"buildbot_json_path": "buildprops.json",
"force_clobber": True,
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
- "locales_file": "%s/mobile/android/locales/all-locales" % MOZILLA_DIR,
+ "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
'balrog_credentials_file': 'oauth.txt',
"tools_repo": "https://hg.mozilla.org/build/tools",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
--- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central_android-api-15.py
@@ -10,17 +10,17 @@ HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
"branch": BRANCH,
"log_name": "single_locale",
"objdir": OBJDIR,
"is_automation": True,
"buildbot_json_path": "buildprops.json",
"force_clobber": True,
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
- "locales_file": "%s/mobile/android/locales/all-locales" % MOZILLA_DIR,
+ "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": True,
'balrog_credentials_file': 'oauth.txt',
"tools_repo": "https://hg.mozilla.org/build/tools",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
--- a/testing/mozharness/configs/single_locale/tc_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/tc_android-api-15.py
@@ -1,11 +1,11 @@
config = {
"stage_platform": "android-api-15",
- "locales_file": "src/mobile/android/locales/all-locales",
+ "locales_file": "src/mobile/locales/l10n-changesets.json",
"tools_repo": "https://hg.mozilla.org/build/tools",
"mozconfig": "src/mobile/android/config/mozconfigs/android-api-15/l10n-nightly",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/src",
},
"tooltool_servers": ['http://relengapi/tooltool/'],
--- a/testing/mozharness/configs/single_locale/try_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/try_android-api-15.py
@@ -6,17 +6,17 @@ EN_US_BINARY_URL = "http://archive.mozil
config = {
"branch": "try",
"log_name": "single_locale",
"objdir": "obj-l10n",
"is_automation": True,
"buildbot_json_path": "buildprops.json",
"force_clobber": True,
"clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
- "locales_file": "%s/mobile/android/locales/all-locales" % MOZILLA_DIR,
+ "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US"],
"nightly_build": False,
'balrog_credentials_file': 'oauth.txt',
"tools_repo": "https://hg.mozilla.org/build/tools",
"tooltool_config": {
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
"output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
--- a/testing/mozharness/mozharness/mozilla/l10n/locales.py
+++ b/testing/mozharness/mozharness/mozilla/l10n/locales.py
@@ -4,16 +4,17 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
# ***** END LICENSE BLOCK *****
"""Localization.
"""
import os
from urlparse import urljoin
+import pprint
import sys
from copy import deepcopy
sys.path.insert(1, os.path.dirname(sys.path[0]))
from mozharness.base.config import parse_config_file
from mozharness.base.errors import PythonErrorList
from mozharness.base.parallel import ChunkingMixin
@@ -117,31 +118,34 @@ class LocalesMixin(ChunkingMixin):
def list_locales(self):
""" Stub action method.
"""
self.info("Locale list: %s" % str(self.query_locales()))
def parse_locales_file(self, locales_file):
locales = []
c = self.config
+ self.info("Parsing locales file %s" % locales_file)
platform = c.get("locales_platform", None)
if locales_file.endswith('json'):
locales_json = parse_config_file(locales_file)
- for locale in locales_json.keys():
+ for locale in sorted(locales_json.keys()):
if isinstance(locales_json[locale], dict):
if platform and platform not in locales_json[locale]['platforms']:
continue
self.l10n_revisions[locale] = locales_json[locale]['revision']
else:
# some other way of getting this?
self.l10n_revisions[locale] = 'default'
locales.append(locale)
else:
locales = self.read_from_file(locales_file).split()
+ self.info("self.l10n_revisions: %s" % pprint.pformat(self.l10n_revisions))
+ self.info("locales: %s" % locales)
return locales
def run_compare_locales(self, locale, halt_on_failure=False):
dirs = self.query_abs_dirs()
env = self.query_l10n_env()
python = self.query_exe('python2.7')
compare_locales_error_list = list(PythonErrorList)
self.rmtree(dirs['abs_merge_dir'])
--- a/testing/mozharness/scripts/merge_day/gecko_migration.py
+++ b/testing/mozharness/scripts/merge_day/gecko_migration.py
@@ -350,16 +350,25 @@ class GeckoMigration(MercurialScript, Ba
""" mozilla-aurora -> mozilla-beta behavior.
We could have all of these individually toggled by flags, but
by separating into workflow methods we can be more precise about
what happens in each workflow, while allowing for things like
staging beta user repo migrations.
"""
dirs = self.query_abs_dirs()
+ self.info("Reverting locales")
+ hg = self.query_exe("hg", return_type="list")
+ for f in self.config["locale_files"]:
+ self.run_command(
+ hg + ["revert", "-r", end_tag, f],
+ cwd=dirs['abs_to_dir'],
+ error_list=HgErrorList,
+ halt_on_failure=True,
+ )
mb_version = self.get_version(dirs['abs_to_dir'])[0]
self.bump_version(dirs['abs_to_dir'], mb_version, mb_version, "a2", "")
self.apply_replacements()
self.touch_clobber_file(dirs['abs_to_dir'])
# TODO mozconfig diffing
# The build/tools version only checks the mozconfigs from hgweb, so
# can't help pre-push. The in-tree mozconfig diffing requires a mach
# virtualenv to be installed. If we want this sooner we can put this