merge.py: Use git ls-files to get list of downstream PO files

jeanas · JulienPalard · commit 3fc81dd82c5f · 2022-05-23T01:33:40.000+02:00
The previous method could lead to problems if a dependency installed
within venv/ shipped with its own PO files.
diff --git a/merge.py b/merge.py
@@ -123,9 +123,8 @@ def main():
         for file in pot_path.glob("**/*.pot")
     }
     downstream = {
-        po
-        for po in Path(".").glob("**/*.po")
-        if not (po.is_relative_to(Path("locales")) or po.is_relative_to(Path(".git")))
+        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)

Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,8 @@ def main():`
`123`	`123`	`for file in pot_path.glob("*/.pot")`
`124`	`124`	`}`
`125`	`125`	`downstream = {`
`126`		`- po`
`127`		`- for po in Path(".").glob("*/.po")`
`128`		`- if not (po.is_relative_to(Path("locales")) or po.is_relative_to(Path(".git")))`
	`126`	`+ Path(po)`
	`127`	`+ for po in run("git", "ls-files", "*.po", stdout=PIPE).stdout.splitlines()`
`129`	`128`	`}`
`130`	`129`	`copy_new_files(upstream - downstream, pot_path=pot_path)`
`131`	`130`	`update_known_files(upstream & downstream, pot_path=pot_path)`