Bug 988611 - update relman scripts based on notes from first usage. r=hwine
authorRail Aliiev <rail@mozilla.com>
Wed, 30 Apr 2014 14:09:21 -0400
changeset 4581 6ae2aa728cae0b773b1d3ade08b155c5fa524603
parent 4580 58165b25abd4088ca5d76b252b1ed482cf806672
child 4582 e4d63d145b396a9094bff0075075293752281a58
push id3367
push userraliiev@mozilla.com
push dateWed, 30 Apr 2014 18:09:24 +0000
reviewershwine
bugs988611
Bug 988611 - update relman scripts based on notes from first usage. r=hwine
release/merge_helper.py
--- a/release/merge_helper.py
+++ b/release/merge_helper.py
@@ -32,16 +32,21 @@ profiling_files = ["mobile/android/confi
                    "browser/config/mozconfigs/linux64/nightly",
                    "browser/config/mozconfigs/macosx-universal/nightly",
                    "browser/config/mozconfigs/win32/nightly",
                    "browser/config/mozconfigs/win64/nightly"]
 elf_hack_files = ["mobile/android/config/mozconfigs/android/nightly",
                   "browser/config/mozconfigs/linux32/nightly",
                   "browser/config/mozconfigs/linux64/nightly"]
 
+locale_files = ["browser/locales/shipped-locales",
+                "browser/locales/all-locales",
+                "mobile/android/locales/maemo-locales",
+                "mobile/android/locales/all-locales"]
+
 
 def get_major_version(d):
     with open(path.join(d, "browser/config/version.txt")) as f:
         version = f.readline().split(".")[0]
     return version
 
 
 def bump_version(d, curr_version, next_version, curr_suffix, next_suffix,
@@ -113,16 +118,19 @@ def main():
     pull(mc_dir, dest=ma_dir, revision=new_mc_revision)
     merge_via_debugsetparents(
         ma_dir, old_head=ma_revision, new_head=new_mc_revision,
         user=hg_user, msg="Merge old head via |hg debugsetparents %s %s|. "
         "CLOSED TREE DONTBUILD a=release" % (new_mc_revision, ma_revision))
     tag(ma_dir, tags=[ma_tag, ma_end_tag], rev=ma_revision, user=hg_user,
         msg="Added %s %s tags for changeset %s. IGNORE BROKEN CHANGESETS DONTBUILD CLOSED TREE NO BUG a=release" %
         (ma_tag, ma_end_tag,  ma_revision))
+    log.info("Reverting locales")
+    for f in locale_files:
+        run_cmd(["hg", "revert", "-r", ma_end_tag, f], cwd=ma_dir)
     bump_version(ma_dir, next_ma_version, next_ma_version, "a1", "a2")
     raw_input("Hit 'return' to display diffs onscreen")
     run_cmd(["hg", "diff"], cwd=ma_dir)
     raw_input("If the diff looks good hit return to commit those changes")
     commit(ma_dir, user=hg_user, msg="Version bump. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release")
 
     replace(path.join(ma_dir, "browser/confvars.sh"),
             "MOZ_BRANDING_DIRECTORY=browser/branding/nightly",