L10n:Migration: Difference between revisions

From MozillaWiki
Jump to navigation Jump to search
 
(15 intermediate revisions by 2 users not shown)
Line 55: Line 55:
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.
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.


Notes:
* Do not use wildcards in Mercurial commands, they won't work with --cwd


<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 () {
Line 71: Line 82:
# Path to migration script, without trailing slash (removed if present)
# Path to migration script, without trailing slash (removed if present)
# Use $HOME instead of ~ if needed
# Use $HOME instead of ~ if needed
migration_path="$HOME/mozilla-central/python/devtools/migrate-l10n/migrate"
# migration_path="$HOME/mozilla-central/python/devtools/migrate-l10n/migrate"
migration_path=${migration_path%/}
# migration_path=${migration_path%/}
    
    
for loc in $LOCS; do
for loc in $LOCS; do
   hg -R mozilla-beta/$loc pull -u -r default
  # Default migration actions
   hg -R mozilla-aurora/$loc pull -u -r default
   hg -R releases/l10n/mozilla-beta/$loc pull -u -r default
   hg -R mozilla-beta/$loc no-op-merge -m"Migrating aurora to beta for Firefox 51" $PWD/mozilla-aurora/$loc
   hg -R l10n-central/$loc pull -u -r default
   hg -R mozilla-beta/$loc push -r default ssh://hg.mozilla.org/releases/l10n/mozilla-beta/$loc
   hg -R releases/l10n/mozilla-beta/$loc no-op-merge -m"Migrating central to beta for Firefox 56" $PWD/l10n-central/$loc
  hg -R mozilla-aurora/$loc pull -u -r default mozilla-beta/$loc
   hg -R releases/l10n/mozilla-beta/$loc push -r default ssh://hg.mozilla.org/releases/l10n/mozilla-beta/$loc
  # Specific for 52 on aurora:
done
  hg --cwd mozilla-aurora/$loc rm browser/searchplugins/list.txt
</pre>
  hg --cwd mozilla-aurora/$loc ci -m 'Bug 1276739 - Switch search to use a JSON based format'
As we're continuing the localization with 56 on central, we stop pushing the beta merge to aurora,
  hg --cwd mozilla-aurora/$loc rm browser/searchplugins
so nothing like
  hg --cwd mozilla-aurora/$loc ci -m 'Bug 1276740 - Centralize all search plugins into mozilla-central'
<pre style="overflow-x:scroll">  hg -R mozilla-aurora/$loc pull -u -r default mozilla-beta/$loc
  hg --cwd mozilla-aurora/$loc rm mail/searchplugins/list.txt
</pre>
  hg --cwd mozilla-aurora/$loc ci -m 'Bug 1300199 - Switch search to use a JSON based format'
  hg --cwd mozilla-aurora/$loc rm devtools/client/promisedebugger.dtd
  hg --cwd mozilla-aurora/$loc ci -m 'Bug 1311506 - Remove promise debugger'


  # Migrate devtools strings https://bugzilla.mozilla.org/show_bug.cgi?id=1294186
The following code is to be run for locales we merge from aurora to central:
   isCentralLocale $loc
 
   if [ $? -eq 1 ] ; then
The following should work:  <code>ls | egrep -v "eo|es-ES|fr|it|pl|ru"</code>
    # Ignore locales working on mozilla-central
 
    continue
<pre style="overflow-x:scroll">  # Specific for 55 on central, post 54 aurora:
   else
for loc in $LOCS; do
    python ${migration_path}/main.py mozilla-aurora/$loc -c ${migration_path}/conf/bug1294186
  hg --cwd l10n-central/$loc pull -u -r default releases/l10n/mozilla-aurora/$loc
    hg --cwd mozilla-aurora/$loc rm devtools/client/font-inspector.dtd
   hg --cwd l10n-central/$loc rm mobile/searchplugins
    hg --cwd mozilla-aurora/$loc rm devtools/client/inspector.dtd
   hg --cwd l10n-central/$loc ci -m 'Bug 1347830, Bug 1324045 - Remove mobile/searchplugins'
    hg --cwd mozilla-aurora/$loc rm devtools/client/layoutview.dtd
 
    hg --cwd mozilla-aurora/$loc rm devtools/client/styleinspector.dtd
   hg --cwd l10n-central/$loc mv devtools/client/eyedropper.properties devtools/shared
    hg --cwd mozilla-aurora/$loc add devtools/client/boxmodel.properties
  hg --cwd l10n-central/$loc ci -m 'Bug 1354647 - Move the eyedropper l10n strings to /devtools/shared/'
    hg --cwd mozilla-aurora/$loc add devtools/client/font-inspector.properties
 
    hg --cwd mozilla-aurora/$loc add devtools/client/inspector.properties
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/advanced.dtd browser/chrome/browser/preferences-old/advanced.dtd
    hg --cwd mozilla-aurora/$loc add devtools/client/styleinspector.properties
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/applications.dtd browser/chrome/browser/preferences-old/applications.dtd
    hg --cwd mozilla-aurora/$loc ci -m 'Bug 1294186 - Migrate inspector.xul from .dtd to .properties'
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/containers.dtd browser/chrome/browser/preferences-old/containers.dtd
    python ${migration_path}/main.py mozilla-aurora/$loc -c ${migration_path}/conf/bug1308500_1309191
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/containers.properties browser/chrome/browser/preferences-old/containers.properties
    hg --cwd mozilla-aurora/$loc rm devtools/client/netmonitor.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/content.dtd browser/chrome/browser/preferences-old/content.dtd
    hg --cwd mozilla-aurora/$loc add devtools/client/netmonitor.properties
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/main.dtd browser/chrome/browser/preferences-old/main.dtd
    hg --cwd mozilla-aurora/$loc ci -m 'Bug 1308500, Bug 1309191 - Migrate NetMonitor from .dtd to .properties'
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/preferences.dtd browser/chrome/browser/preferences-old/preferences.dtd
  fi
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/preferences.properties browser/chrome/browser/preferences-old/preferences.properties
   # Push to aurora
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/privacy.dtd browser/chrome/browser/preferences-old/privacy.dtd
   hg --cwd mozilla-aurora/$loc push -r default ssh://hg.mozilla.org/releases/l10n/mozilla-aurora/$loc
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/search.dtd browser/chrome/browser/preferences-old/search.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/security.dtd browser/chrome/browser/preferences-old/security.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/sync.dtd browser/chrome/browser/preferences-old/sync.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/tabs.dtd browser/chrome/browser/preferences-old/tabs.dtd
  hg --cwd l10n-central/$loc ci -m 'Bug 1343682 - Create temporary killswitch for preference reorg'
 
   # Push to central
   hg --cwd mozilla-aurora/$loc push -r default ssh://hg.mozilla.org/l10n-central/$loc
done
done
</pre>
</pre>
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.

Latest revision as of 08:35, 2 August 2017

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.

Notes:

  • Do not use wildcards in Mercurial commands, they won't work with --cwd
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 releases/l10n/mozilla-beta/$loc pull -u -r default
  hg -R l10n-central/$loc pull -u -r default
  hg -R releases/l10n/mozilla-beta/$loc no-op-merge -m"Migrating central to beta for Firefox 56" $PWD/l10n-central/$loc
  hg -R releases/l10n/mozilla-beta/$loc push -r default ssh://hg.mozilla.org/releases/l10n/mozilla-beta/$loc
done

As we're continuing the localization with 56 on central, we stop pushing the beta merge to aurora, so nothing like

  hg -R mozilla-aurora/$loc pull -u -r default mozilla-beta/$loc

The following code is to be run for locales we merge from aurora to central:

The following should work: ls | egrep -v "eo|es-ES|fr|it|pl|ru"

  # Specific for 55 on central, post 54 aurora:
for loc in $LOCS; do
  hg --cwd l10n-central/$loc pull -u -r default releases/l10n/mozilla-aurora/$loc
  hg --cwd l10n-central/$loc rm mobile/searchplugins
  hg --cwd l10n-central/$loc ci -m 'Bug 1347830, Bug 1324045 - Remove mobile/searchplugins'

  hg --cwd l10n-central/$loc mv devtools/client/eyedropper.properties devtools/shared
  hg --cwd l10n-central/$loc ci -m 'Bug 1354647 - Move the eyedropper l10n strings to /devtools/shared/'

  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/advanced.dtd browser/chrome/browser/preferences-old/advanced.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/applications.dtd browser/chrome/browser/preferences-old/applications.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/containers.dtd browser/chrome/browser/preferences-old/containers.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/containers.properties browser/chrome/browser/preferences-old/containers.properties
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/content.dtd browser/chrome/browser/preferences-old/content.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/main.dtd browser/chrome/browser/preferences-old/main.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/preferences.dtd browser/chrome/browser/preferences-old/preferences.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/preferences.properties browser/chrome/browser/preferences-old/preferences.properties
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/privacy.dtd browser/chrome/browser/preferences-old/privacy.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/search.dtd browser/chrome/browser/preferences-old/search.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/security.dtd browser/chrome/browser/preferences-old/security.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/sync.dtd browser/chrome/browser/preferences-old/sync.dtd
  hg --cwd l10n-central/$loc cp browser/chrome/browser/preferences/tabs.dtd browser/chrome/browser/preferences-old/tabs.dtd
  hg --cwd l10n-central/$loc ci -m 'Bug 1343682 - Create temporary killswitch for preference reorg'

  # Push to central
  hg --cwd mozilla-aurora/$loc push -r default ssh://hg.mozilla.org/l10n-central/$loc
done