Update merge.py

egeakman · web-flow · commit 8424d07472bd · 2023-01-16T01:11:48.000+03:00
diff --git a/merge.py b/merge.py
@@ -1,12 +1,16 @@
-"""Tool to merge cpython pot files to python-docs-fr po files for a
+"""Tool to merge cpython pot files to python-docs-tr po files for a
 given branch.
+
+A CPython clone present in the venv/ directory is required if the --cpython_repo is not specified.
+
+This script is run automatically by the GitHub Actions workflow every first day of the month.
 """
 
 import re
 import shutil
-from pathlib import Path
 import argparse
 import subprocess
+from pathlib import Path
 from subprocess import PIPE
 from tqdm import tqdm
 
@@ -80,9 +84,7 @@ def update_makefile(cpython_repo: Path) -> None:
     used to generate the `po` files.
     """
     makefile = Path("Makefile").read_text(encoding="UTF-8")
-    head = run(
-        "git", "-C", cpython_repo, "rev-parse", "HEAD", stdout=PIPE
-    ).stdout.strip()
+    head = run("git", "-C", cpython_repo, "rev-parse", "HEAD", stdout=PIPE).stdout.strip()
     makefile = re.sub(
         "^CPYTHON_CURRENT_COMMIT :=.*$",
         f"CPYTHON_CURRENT_COMMIT := {head}",
@@ -93,6 +95,23 @@ def update_makefile(cpython_repo: Path) -> None:
     run("git", "add", "Makefile")
 
 
+def git_add_relevant_files():
+    """Add only files with relevant modifications.
+
+    This only add files with actual modifications, not just metadata
+    modifications, to avoid noise in history.
+    """
+    modified_files = run("git", "ls-files", "-m", stdout=PIPE).stdout.split("\n")
+    modified_po_files = [line for line in modified_files if line.endswith(".po")]
+    for file in modified_po_files:
+        diff = run("git", "diff", "-U0", file, stdout=PIPE).stdout
+        if len(diff.split("\n")) > 8:
+            run("git", "add", file)
+        else:
+            run("git", "checkout", "--", file)
+    run("rm", "-f", "whatsnew/changelog.po")  # We don't translate this file.
+
+
 def main():
     args = parse_args()
     setup_repo(args.cpython_repo, args.branch)
@@ -101,21 +120,16 @@ def main():
         cwd=args.cpython_repo / "Doc",
     )
     pot_path = args.cpython_repo / "pot"
-    upstream = {
-        file.relative_to(pot_path).with_suffix(".po")
-        for file in pot_path.glob("**/*.pot")
-    }
-    downstream = {
-        Path(po)
-        for po in run("git", "ls-files", "*.po", stdout=PIPE).stdout.splitlines()
-    }
+    upstream = {file.relative_to(pot_path).with_suffix(".po") for file in pot_path.glob("**/*.pot")}
+    downstream = {Path(po) for po in run("git", "ls-files", "*.po", stdout=PIPE).stdout.splitlines()}
     copy_new_files(upstream - downstream, pot_path=pot_path)
     update_known_files(upstream & downstream, pot_path=pot_path)
     remove_old_files(downstream - upstream)
     clean_paths((upstream - downstream) | (upstream & downstream))
     shutil.rmtree(pot_path)
-    run("powrap", "-m")
+    run("powrap", "*.po", "*/*.po")
     update_makefile(args.cpython_repo)
+    git_add_relevant_files()
 
 
 if __name__ == "__main__":
