XXX add merge conflict, don't merge this

XXX create merge conflict
Skip www_folder if merge conflict marker found
2026-05-16 03:24:48 +00:00 · 2025-11-06 10:19:16 +01:00 · 2025-11-06 10:19:16 +01:00 · 2025-11-06 10:19:16 +01:00
3 changed files with 23 additions and 2 deletions
--- a/cmdeploy/src/cmdeploy/init.py
+++ b/cmdeploy/src/cmdeploy/init.py
@@ -681,7 +681,7 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
    check_config(config)
    mail_domain = config.mail_domain

-    from .www import build_webpages, get_paths
+    from .www import build_webpages, find_merge_conflict, get_paths

    server.group(name="Create vmail group", group="vmail", system=True)
    server.user(name="Create vmail user", user="vmail", group="vmail", system=True)
@@ -823,6 +823,8 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
    # if www_folder was set to a non-existing folder, skip upload
    if not www_path.is_dir():
        logger.warning("Building web pages is disabled in chatmail.ini, skipping")
+    elif (path := find_merge_conflict(src_dir)) is not None:
+        logger.warning(f"Merge conflict found in {path}, skipping")
    else:
        # if www_folder is a hugo page, build it
        if build_dir:
--- a/cmdeploy/src/cmdeploy/www.py
+++ b/cmdeploy/src/cmdeploy/www.py
@@ -4,6 +4,7 @@ import time
 import traceback
 import webbrowser
 from pathlib import Path
+import re

 import markdown
 from chatmaild.config import read_config
@@ -12,6 +13,9 @@ from jinja2 import Template
 from .genqr import gen_qr_png_data


+_MERGE_CONFLICT_RE = re.compile(r"^<<<<<<<.+^=======.+^>>>>>>>", re.DOTALL | re.MULTILINE)
+
+
 def snapshot_dir_stats(somedir):
    d = {}
    for path in somedir.iterdir():
@@ -116,6 +120,17 @@ def _build_webpages(src_dir, build_dir, config):
    return build_dir


+def find_merge_conflict(src_dir) -> Path:
+    assert src_dir.exists(), src_dir
+    result = None
+    for path in src_dir.iterdir():
+        if path.suffix in [".css", ".html", ".md"]:
+            if _MERGE_CONFLICT_RE.search(path.read_text()):
+                result = path
+                break
+    return result
+
+
 def main():
    path = importlib.resources.files(__package__)
    reporoot = path.joinpath("../../../").resolve()
--- a/www/src/page-layout.html
+++ b/www/src/page-layout.html
@@ -9,7 +9,11 @@
    <title>{{ config.mail_domain }} {{ pagename }}</title>
    <link rel="stylesheet" href="./main.css">
    <link rel="icon" href="/logo.svg">
-    <link rel=”mask-icon” href=”/logo.svg” color=”#000000">
+<<<<<<< HEAD
+    <link rel="mask-icon" href="/logo.svg" color="#000000">
+=======
+    <link rel=”mask-icon” href=”/logo.svg” color=”#000001">
+>>>>>>> 2da7de8 (make logo slightly brighter)
 </head>
 <body>
Author	SHA1	Message	Date
missytake	2521698093	XXX add merge conflict, don't merge this	2025-11-06 10:19:16 +01:00
missytake	8c85dddfa3	XXX create merge conflict	2025-11-06 10:19:16 +01:00
Alexander Dietrich	acf2bdefdf	Skip www_folder if merge conflict marker found	2025-11-06 10:19:16 +01:00