feat: improve lint-from-demo.py in attempt to get it to work smoothly

Author: 56kyle

scripts/lint-from-demo.py

@@ -1,4 +1,3 @@
-import sys
 from pathlib import Path
 from typing import Annotated
 
@@ -11,6 +10,14 @@
 from util import in_new_demo
 
 
+# These still may need linted, but retrocookie shouldn't be used on them
+IGNORED_FILES: list[str] = [
+    "{{cookiecutter.project_name}}/pyproject.toml",
+    "{{cookiecutter.project_name}}/uv.lock",
+    ""
+]
+
+
 cli: typer.Typer = typer.Typer()
 
 
@@ -21,20 +28,21 @@ def lint_from_demo(
     no_cache: Annotated[bool, typer.Option("--no-cache", "-n")] = False
 ) -> None:
     """Runs precommit in a generated project and matches the template to the results."""
-    try:
-        with in_new_demo(
-            demos_cache_folder=demos_cache_folder,
-            add_rust_extension=add_rust_extension,
-            no_cache=no_cache
-        ) as demo_path:
-            pre_commit.main.main(["run", "--all-files", "--hook-stage=manual", "--show-diff-on-failure"])
-        try:
-            retrocookie(instance_path=demo_path, commits=["HEAD"])
-        finally:
-            git("checkout", "HEAD", "--", "{{cookiecutter.project_name}}/pyproject.toml")
-    except Exception as error:
-        typer.secho(f"error: {error}", fg="red")
-        sys.exit(1)
+    with in_new_demo(
+        demos_cache_folder=demos_cache_folder,
+        add_rust_extension=add_rust_extension,
+        no_cache=no_cache
+    ) as demo_path:
+        git("status", "--porcelain")
+        git("branch", "-D", "temp/lint-from-demo", ignore_error=True)
+        git("checkout", "-b", "temp/lint-from-demo", "develop")
+        pre_commit.main.main(["run", "--all-files", "--hook-stage=manual", "--show-diff-on-failure"])
+
+        for path in IGNORED_FILES:
+            git("checkout", "HEAD", "--", path)
+        git("add", ".")
+        git("commit", "-m", "meta: lint-from-demo", "--no-verify")
+    retrocookie(instance_path=demo_path, commits=["HEAD"], branch="temp/lint-from-demo")
 
 
 if __name__ == '__main__':

scripts/util.py

@@ -10,6 +10,9 @@
 from typing import Any
 from typing import Callable
 from typing import Generator
+from typing import Literal
+from typing import Optional
+from typing import overload
 
 import cruft
 import typer
@@ -35,12 +38,24 @@ def remove_readonly(func: Callable[[str], Any], path: str, _: Any) -> None:
     func(path)
 
 
-def run_command(command: str, *args: str) -> subprocess.CompletedProcess:
+@overload
+def run_command(command: str, *args: str, ignore_error: Literal[True]) -> Optional[subprocess.CompletedProcess]:
+    ...
+
+
+@overload
+def run_command(command: str, *args: str, ignore_error: Literal[False] = ...) -> subprocess.CompletedProcess:
+    ...
+
+
+def run_command(command: str, *args: str, ignore_error: bool = False) -> Optional[subprocess.CompletedProcess]:
     """Runs the provided command in a subprocess."""
     try:
         process = subprocess.run([command, *args], check=True, capture_output=True, text=True)
         return process
     except subprocess.CalledProcessError as error:
+        if ignore_error:
+            return None
         print(error.stdout, end="")
         print(error.stderr, end="", file=sys.stderr)
         raise