L10n:Migration: Difference between revisions
(→Merge) |
(→Merge) |
||
Line 57: | Line 57: | ||
<pre style="overflow-x:scroll">cd releases/l10n | <pre style="overflow-x:scroll">cd releases/l10n | ||
# This function can be used to ignore locales working on central, e.g. | |||
# isCentralLocale $loc | |||
# if [ $? -eq 1 ] ; then | |||
# # Ignore locales working on mozilla-central | |||
# continue | |||
# else | |||
# # Do something for other locales | |||
# fi | |||
function isCentralLocale () { | function isCentralLocale () { |
Revision as of 14:05, 20 December 2016
Preparations
mkdir releases && cd releases mkdir -p l10n/mozilla-aurora mkdir -p l10n/mozilla-beta export LOCS=`wget -qO- 'https://hg.mozilla.org/releases/l10n/mozilla-beta/?style=raw' | grep -v x-testing | awk -F/ '{print $5;}'`
Put this script (upclones.sh) in your $PATH:
#!/bin/bash HERE=`pwd` for channel in aurora beta; do for loc in $LOCS; do CLONE="$HERE/mozilla-$channel/$loc" if [[ -d $CLONE/.hg ]]; then hg -R $CLONE pull -u -r default else hg clone -r default https://hg.mozilla.org/releases/l10n/mozilla-$channel/$loc $CLONE fi done done
Then, enable Axel's merge helper extension to hg:
hg clone https://hg.mozilla.org/users/axel_mozilla.com/branch-l10n/ ~/src/branch-l10n
Edit your ~/.hgrc accordingly:
[extensions] ... merge-l10n = ~/src/branch-l10n/merge_l10n.py
Try it out with:
hg help no-op-merge
There's also a test-suite in branch-l10n, which you can run to verify your version of mercurial works.
cd ~/src/branch-l10n/ python test.py
If the extension works, you can proceed with the merge
Merge
Have LOCS set. Also, make sure ssh works for hg, we're pulling over https to speed things up.
The actual merge wants to happen closely to/after the en-US merge and its push to beta.
First, visit the l10n dashboard, and migrate the database. Adjust the time to just before the push to beta of en-US. Or either, if aurora at one point was pushed first. The page is https://l10n.mozilla.org/shipping/release/. Also, on that page, switch off `fallback` for Lightning.
cd releases/l10n # This function can be used to ignore locales working on central, e.g. # isCentralLocale $loc # if [ $? -eq 1 ] ; then # # Ignore locales working on mozilla-central # continue # else # # Do something for other locales # fi function isCentralLocale () { central_locales=(eo es-ES fr it pl ru) for locale in ${central_locales[@]}; do if [[ $locale == $1 ]]; then return 1 fi done return 0 } # Path to migration script, without trailing slash (removed if present) # Use $HOME instead of ~ if needed # migration_path="$HOME/mozilla-central/python/devtools/migrate-l10n/migrate" # migration_path=${migration_path%/} for loc in $LOCS; do # Default migration actions hg -R mozilla-beta/$loc pull -u -r default hg -R mozilla-aurora/$loc pull -u -r default hg -R mozilla-beta/$loc no-op-merge -m"Migrating aurora to beta for Firefox 52" $PWD/mozilla-aurora/$loc hg -R mozilla-beta/$loc push -r default ssh://hg.mozilla.org/releases/l10n/mozilla-beta/$loc hg -R mozilla-aurora/$loc pull -u -r default mozilla-beta/$loc # Specific for 53 on aurora: hg --cwd mozilla-aurora/$loc rm toolkit/chrome/mozapps/downloads/downloads.dtd hg --cwd mozilla-aurora/$loc ci -m 'Bug 1319762 - Remove download.xul and related unused files' hg --cwd mozilla-aurora/$loc rm toolkit/chrome/formautofill/requestAutocomplete.dtd hg --cwd mozilla-aurora/$loc ci -m 'Bug 1322622 - Rename the obsolete requestAutocomplete package out of the way of form autofill' # Push to aurora hg --cwd mozilla-aurora/$loc push -r default ssh://hg.mozilla.org/releases/l10n/mozilla-aurora/$loc done
This goes through all locales, does a final pull, does the no-op-merge, and pushes to aurora, and then beta. That way, you minimize the time when commits can create heads.