[treescript] Add android_l10n_import and android_l10n_sync actions (#862)

* move check_treestatus into util

* add source_repo parameter to checkout_repo

* [treescript] Add android_l10n_import and android_l10n_sync actions

* use run_command instead of subprocess

* address review comments

Author: gbrownmozilla

treescript/requirements/base.in

@@ -1,3 +1,4 @@
+compare-locales
 mercurial
 mozilla-version
 scriptworker  # required for docker, even if treescript doesn't import it

treescript/requirements/base.py38.txt

@@ -1,4 +1,4 @@
-# SHA1:5bd38a9e4688c17608e779dbb340066592215acf
+# SHA1:76dd9dadb8b39e24aa22a3259b12d61d75994a1f
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -356,7 +356,13 @@ charset-normalizer==3.3.2 \
     --hash=sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33 \
     --hash=sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519 \
     --hash=sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561
-    # via requests
+    # via
+    #   aiohttp
+    #   requests
+compare-locales==9.0.2 \
+    --hash=sha256:588780f837942926760847f43b223056e6cf97f0b3029f51d41d6b9edc0269eb \
+    --hash=sha256:8ec46e2333718ba81a8c23f120e1b2380bd944f58bd69dac15de40e619e8904b
+    # via -r requirements/base.in
 cryptography==41.0.5 \
     --hash=sha256:0c327cac00f082013c7c9fb6c46b7cc9fa3c288ca702c74773968173bda421bf \
     --hash=sha256:0d2a6a598847c46e3e321a7aef8af1436f11c27f1254933746304ff014664d84 \
@@ -388,6 +394,10 @@ dictdiffer==0.9.0 \
     --hash=sha256:17bacf5fbfe613ccf1b6d512bd766e6b21fb798822a133aa86098b8ac9997578 \
     --hash=sha256:442bfc693cfcadaf46674575d2eba1c53b42f5e404218ca2c2ff549f2df56595
     # via scriptworker
+fluent-syntax==0.19.0 \
+    --hash=sha256:920326d7f46864b9758f0044e9968e3112198bc826acee16ddd8f11d359004fd \
+    --hash=sha256:b352b3475fac6c6ed5f06527921f432aac073d764445508ee5218aeccc7cc5c4
+    # via compare-locales
 frozenlist==1.4.0 \
     --hash=sha256:007df07a6e3eb3e33e9a1fe6a9db7af152bbd8a185f9aaa6ece10a3529e3e1c6 \
     --hash=sha256:008eb8b31b3ea6896da16c38c1b136cb9fec9e249e77f6211d479db79a4eaf01 \
@@ -836,6 +846,7 @@ six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
     # via
+    #   compare-locales
     #   mohawk
     #   python-dateutil
 slugid==2.0.0 \
@@ -853,10 +864,18 @@ taskcluster-urls==13.0.1 \
     --hash=sha256:b25e122ecec249c4299ac7b20b08db76e3e2025bdaeb699a9d444556de5fd367 \
     --hash=sha256:f66dcbd6572a6216ab65949f0fa0b91f2df647918028436c384e6af5cd12ae2b
     # via taskcluster
+toml==0.10.2 \
+    --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \
+    --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f
+    # via compare-locales
 types-python-dateutil==2.8.19.14 \
     --hash=sha256:1f4f10ac98bb8b16ade9dbee3518d9ace017821d94b057a425b069f834737f4b \
     --hash=sha256:f977b8de27787639986b4e28963263fd0e5158942b3ecef91b9335c130cb1ce9
     # via arrow
+typing-extensions==4.8.0 \
+    --hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \
+    --hash=sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef
+    # via fluent-syntax
 uritemplate==4.1.1 \
     --hash=sha256:4346edfc5c3b79f694bccd6d6099a322bbeb628dbf2cd86eea55a456ce5124f0 \
     --hash=sha256:830c08b8d99bdd312ea4ead05994a38e8936266f84b9a7878232db50b044e02e

treescript/requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:5bd38a9e4688c17608e779dbb340066592215acf
+# SHA1:76dd9dadb8b39e24aa22a3259b12d61d75994a1f
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -356,7 +356,13 @@ charset-normalizer==3.3.2 \
     --hash=sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33 \
     --hash=sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519 \
     --hash=sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561
-    # via requests
+    # via
+    #   aiohttp
+    #   requests
+compare-locales==9.0.2 \
+    --hash=sha256:588780f837942926760847f43b223056e6cf97f0b3029f51d41d6b9edc0269eb \
+    --hash=sha256:8ec46e2333718ba81a8c23f120e1b2380bd944f58bd69dac15de40e619e8904b
+    # via -r requirements/base.in
 cryptography==41.0.5 \
     --hash=sha256:0c327cac00f082013c7c9fb6c46b7cc9fa3c288ca702c74773968173bda421bf \
     --hash=sha256:0d2a6a598847c46e3e321a7aef8af1436f11c27f1254933746304ff014664d84 \
@@ -388,6 +394,10 @@ dictdiffer==0.9.0 \
     --hash=sha256:17bacf5fbfe613ccf1b6d512bd766e6b21fb798822a133aa86098b8ac9997578 \
     --hash=sha256:442bfc693cfcadaf46674575d2eba1c53b42f5e404218ca2c2ff549f2df56595
     # via scriptworker
+fluent-syntax==0.19.0 \
+    --hash=sha256:920326d7f46864b9758f0044e9968e3112198bc826acee16ddd8f11d359004fd \
+    --hash=sha256:b352b3475fac6c6ed5f06527921f432aac073d764445508ee5218aeccc7cc5c4
+    # via compare-locales
 frozenlist==1.4.0 \
     --hash=sha256:007df07a6e3eb3e33e9a1fe6a9db7af152bbd8a185f9aaa6ece10a3529e3e1c6 \
     --hash=sha256:008eb8b31b3ea6896da16c38c1b136cb9fec9e249e77f6211d479db79a4eaf01 \
@@ -826,6 +836,7 @@ six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
     # via
+    #   compare-locales
     #   mohawk
     #   python-dateutil
 slugid==2.0.0 \
@@ -843,10 +854,18 @@ taskcluster-urls==13.0.1 \
     --hash=sha256:b25e122ecec249c4299ac7b20b08db76e3e2025bdaeb699a9d444556de5fd367 \
     --hash=sha256:f66dcbd6572a6216ab65949f0fa0b91f2df647918028436c384e6af5cd12ae2b
     # via taskcluster
+toml==0.10.2 \
+    --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \
+    --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f
+    # via compare-locales
 types-python-dateutil==2.8.19.14 \
     --hash=sha256:1f4f10ac98bb8b16ade9dbee3518d9ace017821d94b057a425b069f834737f4b \
     --hash=sha256:f977b8de27787639986b4e28963263fd0e5158942b3ecef91b9335c130cb1ce9
     # via arrow
+typing-extensions==4.8.0 \
+    --hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \
+    --hash=sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef
+    # via fluent-syntax
 uritemplate==4.1.1 \
     --hash=sha256:4346edfc5c3b79f694bccd6d6099a322bbeb628dbf2cd86eea55a456ce5124f0 \
     --hash=sha256:830c08b8d99bdd312ea4ead05994a38e8936266f84b9a7878232db50b044e02e

treescript/requirements/test.py38.txt

@@ -290,10 +290,6 @@ snowballstemmer==2.2.0 \
     --hash=sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1 \
     --hash=sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a
     # via pydocstyle
-toml==0.10.2 \
-    --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \
-    --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f
-    # via pytest-black
 tomli==2.0.1 \
     --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
     --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f

treescript/requirements/test.txt

@@ -290,10 +290,6 @@ snowballstemmer==2.2.0 \
     --hash=sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1 \
     --hash=sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a
     # via pydocstyle
-toml==0.10.2 \
-    --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \
-    --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f
-    # via pytest-black
 tomli==2.0.1 \
     --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
     --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f

treescript/src/treescript/data/treescript_task_schema.json

@@ -186,6 +186,66 @@
                         "files"
                     ]
                 },
+                "android_l10n_import_info": {
+                    "type": "object",
+                    "properties": {
+                        "from_repo_url": {
+                            "type": "string"
+                        },
+                        "toml_info": {
+                            "type": "array",
+                            "minItems": 1,
+                            "uniqueItems": true,
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "toml_path": {
+                                        "type": "string"
+                                    },
+                                    "dest_path": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "toml_path",
+                                    "dest_path"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "from_repo_url",
+                        "toml_info"
+                    ]
+                },
+                "android_l10n_sync_info": {
+                    "type": "object",
+                    "properties": {
+                        "from_repo_url": {
+                            "type": "string"
+                        },
+                        "toml_info": {
+                            "type": "array",
+                            "minItems": 1,
+                            "uniqueItems": true,
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "toml_path": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "toml_path"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "from_repo_url",
+                        "toml_info"
+                    ]
+                },
                 "l10n_bump_info": {
                     "type": "array",
                     "minItems": 1,
@@ -258,6 +318,8 @@
                             "version_bump",
                             "l10n_bump",
                             "merge_day",
+                            "android_l10n_import",
+                            "android_l10n_sync",
                             "push"
                         ]
                     }

treescript/src/treescript/gecko/__init__.py

@@ -2,6 +2,7 @@
 import os
 
 from treescript.gecko import mercurial as vcs
+from treescript.gecko.android_l10n import android_l10n_import, android_l10n_sync
 from treescript.gecko.l10n import l10n_bump
 from treescript.gecko.merges import do_merge
 from treescript.gecko.versionmanip import bump_version
@@ -51,7 +52,7 @@ async def do_actions(config, task):
     if not await vcs.validate_robustcheckout_works(config):
         raise TreeScriptError("Robustcheckout can't run on our version of hg, aborting")
 
-    await vcs.checkout_repo(config, task, repo_path)
+    await vcs.checkout_repo(config, task, get_source_repo(task), repo_path)
 
     # Split the action selection up due to complexity in do_actions
     # caused by different push behaviour, and action return values.
@@ -66,6 +67,10 @@ async def do_actions(config, task):
         num_changes += await bump_version(config, task, repo_path)
     if "l10n_bump" in actions:
         num_changes += await l10n_bump(config, task, repo_path)
+    if "android_l10n_import" in actions:
+        num_changes += await android_l10n_import(config, task, repo_path)
+    if "android_l10n_sync" in actions:
+        num_changes += await android_l10n_sync(config, task, repo_path)
 
     num_outgoing = await vcs.log_outgoing(config, task, repo_path)
     if num_outgoing != num_changes: