uEdition-Editor 2.0.0b7__py3-none-any.whl → 2.0.0b9__py3-none-any.whl

uedition_editor/__about__.py

@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: MIT
 """About this package."""
 
-__version__ = "2.0.0b7"
+__version__ = "2.0.0b9"

uedition_editor/api/__init__.py

@@ -34,6 +34,7 @@ class APIStatusGit(BaseModel):
 
     enabled: bool
     default_branch: str | None = None
+    protect_default_branch: bool | None = None
 
 
 class APIStatus(BaseModel):
@@ -61,6 +62,7 @@ def api() -> dict:
         Repository(init_settings.base_path, flags=RepositoryOpenFlag.NO_SEARCH)
         api_status["git"]["enabled"] = True
         api_status["git"]["default_branch"] = init_settings.git.default_branch
+        api_status["git"]["protect_default_branch"] = init_settings.git.protect_default_branch
     except GitError:
         pass
     return api_status

uedition_editor/api/branches.py

@@ -147,12 +147,14 @@ async def merge_from_default(
                 Signature(current_user["name"], current_user["sub"]),
                 extra_parents=[default_branch_head.id],
             )
+        await cron.insecure_track_branches()
 
 
 @router.delete("/{branch_id}", status_code=204)
 async def delete_branch(
     branch_id: str,
     current_user: Annotated[dict, Depends(get_current_user)],  # noqa:ARG001
+    local_delete: Annotated[bool, Header(alias="x-ueditor-delete-local-only")] = False,  # noqa:FBT002
 ) -> None:
     """Delete the given branch locally and remotely."""
     async with BranchContextManager(branch_id) as repo:
@@ -160,7 +162,7 @@ async def delete_branch(
         if init_settings.git.default_branch == branch_id:
             raise HTTPException(422, detail=[{"msg": "you cannot delete the default branch"}])
         repo.checkout(repo.branches[init_settings.git.default_branch])
-        if init_settings.git.remote_name in list(repo.remotes.names()):
+        if init_settings.git.remote_name in list(repo.remotes.names()) and not local_delete:
             if repo.branches[branch_id].upstream is not None:
                 repo.remotes[init_settings.git.remote_name].push(
                     [f":refs/heads/{branch_id}"], callbacks=RemoteRepositoryCallbacks()

uedition_editor/api/files.py

@@ -384,6 +384,16 @@ async def create_file(
 ) -> None:
     """Create a new file in the repo."""
     try:
+        if init_settings.git.protect_default_branch and init_settings.git.default_branch == branch_id:
+            raise HTTPException(
+                422,
+                detail=[
+                    {
+                        "loc": ["path", "path"],
+                        "msg": "this branch is protected",
+                    }
+                ],
+            )
         async with BranchContextManager(branch_id) as repo:
             if new_type in ("file", "folder"):
                 full_path = os.path.abspath(os.path.join(init_settings.base_path, *path.split("/")))
@@ -724,6 +734,16 @@ async def update_file(
 ) -> None:
     """Update the file in the repo."""
     try:
+        if init_settings.git.protect_default_branch and init_settings.git.default_branch == branch_id:
+            raise HTTPException(
+                422,
+                detail=[
+                    {
+                        "loc": ["path", "path"],
+                        "msg": "this branch is protected",
+                    }
+                ],
+            )
         async with BranchContextManager(branch_id) as repo:
             ueditor_settings = get_ueditor_settings()
             full_path = os.path.abspath(os.path.join(init_settings.base_path, *path.split("/")))
@@ -783,6 +803,16 @@ async def delete_file(
 ) -> None:
     """Delete a file in the repo."""
     try:
+        if init_settings.git.protect_default_branch and init_settings.git.default_branch == branch_id:
+            raise HTTPException(
+                422,
+                detail=[
+                    {
+                        "loc": ["path", "path"],
+                        "msg": "this branch is protected",
+                    }
+                ],
+            )
         async with BranchContextManager(branch_id) as repo:
             full_path = os.path.abspath(os.path.join(init_settings.base_path, *path.split("/")))
             if full_path.startswith(os.path.abspath(init_settings.base_path)):

uedition_editor/cron.py

@@ -16,11 +16,18 @@ from uedition_editor.state import local_branches, remote_branches
 logger = logging.getLogger(__name__)
 
 
+def format_remote_branch_title(title: str) -> str:
+    """Format the remote branch name as a title."""
+    if "/" in title:
+        return de_slugify(title[title.find("/") + 1 :])
+    return title
+
+
 async def insecure_track_branches():
     """
     Track the status of all git branches.
 
-    Use only when the uedition_lock is already completed.
+    Use only when the uedition_lock is already aquired.
     """
     remote_branches.clear()
     local_branches.clear()
@@ -37,9 +44,10 @@ async def insecure_track_branches():
             if init_settings.git.remote_name in list(repo.remotes.names()):
                 if repo.branches[branch_name].upstream is not None:
                     pull_branch(repo, branch_name)
-            diff = repo.diff(
-                repo.revparse_single(init_settings.git.default_branch),
+            merge_base = repo.merge_base(
+                repo.revparse_single(init_settings.git.default_branch).id, repo.revparse_single(branch_name).id
             )
+            diff = repo.diff(merge_base, repo.revparse_single(init_settings.git.default_branch))
             local_branches.append(
                 {
                     "id": branch_name,
@@ -49,7 +57,7 @@ async def insecure_track_branches():
             )
         for branch_name in repo.branches.remote:
             if repo.branches[branch_name].remote_name == init_settings.git.remote_name and "HEAD" not in branch_name:
-                remote_branches.append({"id": branch_name, "title": de_slugify(branch_name)})
+                remote_branches.append({"id": branch_name, "title": format_remote_branch_title(branch_name)})
         logger.debug("Tracking complete")
     except GitError as ge:
         logger.error(ge)