refactor: rename script function to reflect usage only occurring in demo

Author: 56kyle

scripts/lint-from-demo.py

@@ -21,7 +21,7 @@
 from util import git
 from util import FolderOption
 from util import in_new_demo
-from util import require_clean_and_up_to_date_repo
+from util import require_clean_and_up_to_date_demo_repo
 
 
 # These still may need linted, but retrocookie shouldn't be used on them
@@ -46,7 +46,7 @@ def lint_from_demo(
         add_rust_extension=add_rust_extension,
         no_cache=no_cache
     ) as demo_path:
-        require_clean_and_up_to_date_repo(demo_path=demo_path)
+        require_clean_and_up_to_date_demo_repo(demo_path=demo_path)
         git("checkout", DEMO.develop_branch)
         git("branch", "-D", "temp/lint-from-demo", ignore_error=True)
         git("checkout", "-b", "temp/lint-from-demo", DEMO.develop_branch)

scripts/release-demo.py

@@ -22,7 +22,7 @@
 from util import gh
 from util import git
 from util import nox
-from util import require_clean_and_up_to_date_repo
+from util import require_clean_and_up_to_date_demo_repo
 from util import FolderOption
 from util import DEMO
 
@@ -40,7 +40,7 @@ def release_demo(
     demo_path: Path = demos_cache_folder / demo_name
 
     with work_in(demo_path):
-        require_clean_and_up_to_date_repo(demo_path)
+        require_clean_and_up_to_date_demo_repo(demo_path)
         git("checkout", DEMO.develop_branch)
         try:
             nox("setup-release", "--", "MINOR")

scripts/update-demo.py

@@ -8,7 +8,6 @@
 # ]
 # ///
 
-import sys
 from pathlib import Path
 from subprocess import CompletedProcess
 from typing import Annotated
@@ -20,14 +19,15 @@
 
 from util import DEMO
 from util import is_ancestor
+from util import is_merge_commit
 from util import get_current_branch
 from util import get_current_commit
 from util import get_demo_name
 from util import get_last_cruft_update_commit
 from util import git
 from util import FolderOption
 from util import REPO_FOLDER
-from util import require_clean_and_up_to_date_repo
+from util import require_clean_and_up_to_date_demo_repo
 from util import TEMPLATE
 from util import uv
 
@@ -48,9 +48,8 @@ def update_demo(
 
     current_branch: str = get_current_branch()
     template_commit: str = get_current_commit()
-
     _validate_template_main_not_checked_out(branch=current_branch)
-    require_clean_and_up_to_date_repo(demo_path=demo_path)
+    require_clean_and_up_to_date_demo_repo(demo_path=demo_path)
     _checkout_demo_develop_or_existing_branch(demo_path=demo_path, branch=current_branch)
     last_update_commit: str = get_last_cruft_update_commit(demo_path=demo_path)
 

scripts/util.py

@@ -126,7 +126,7 @@ def run_command(command: str, *args: str, ignore_error: bool = False) -> Optiona
 gh: partial[subprocess.CompletedProcess] = partial(run_command, "gh")
 
 
-def require_clean_and_up_to_date_repo(demo_path: Path) -> None:
+def require_clean_and_up_to_date_demo_repo(demo_path: Path) -> None:
     """Checks if the repo is clean and up to date with any important branches."""
     try:
         with work_in(demo_path):
@@ -162,6 +162,16 @@ def is_ancestor(ancestor: str, descendent: str) -> bool:
         return False
 
 
+def is_merge_commit() -> bool:
+    """Returns whether the latest commit was a merge commit."""
+    output: str = git("log", "--format=%P", "-n", "1", "HEAD").stdout.strip()
+    if output == "":
+        raise ValueError("No existing commit was found.")
+
+    parent_count: int = len(output.split(" "))
+    return parent_count > 1
+
+
 def get_current_branch() -> str:
     """Returns the current branch name."""
     return git("branch", "--show-current").stdout.strip()