Fix push when --out contains the wiki clone directory.

Keep wiki_clone* across convert --clean and skip copying the clone into itself (0.3.5).

Co-authored-by: Cursor <cursoragent@cursor.com>

export1c_help/export.py

@@ -248,7 +248,8 @@ def export_help(
 
     if clean and out_dir.exists():
         for child in out_dir.iterdir():
-            if child.name == ".git":
+            if child.name == ".git" or child.name.startswith("wiki_clone"):
+                # never wipe an in-tree wiki working clone
                 continue
             if child.is_dir():
                 shutil.rmtree(child)

export1c_help/wiki.py

@@ -126,12 +126,21 @@ def push_wiki(
     for src in content_dir.iterdir():
         if src.name == ".git":
             continue
+        # -o pointed at parent of the clone: do not copy the clone into itself
+        try:
+            if src.resolve() == work_dir.resolve():
+                continue
+            src.resolve().relative_to(work_dir.resolve())
+            continue  # src is inside work_dir
+        except ValueError:
+            pass
         dst = work_dir / src.name
         if src.is_dir():
             if dst.exists():
                 shutil.rmtree(dst)
             shutil.copytree(src, dst)
         else:
+            dst.parent.mkdir(parents=True, exist_ok=True)
             shutil.copy2(src, dst)
 
     _run(["git", "add", "-A"], cwd=work_dir)