Reolving some comments requirements

Author: MarcelGeo

mergin/client_pull.py

@@ -372,10 +372,6 @@ def dump(self):
             print("- {} {} {} {}".format(item.file_path, item.version, item.part_index, item.size))
         print("--- END ---")
 
-    def apply_changes(self):
-        """Apply changes to the project directory with MerginProject.apply_pull_changes"""
-        return self.mp.apply_pull_changes(self.pull_changes, self.temp_dir, self.project_info, self.mc)
-
 
 def pull_project_async(mc, directory):
     """
@@ -627,7 +623,7 @@ def pull_project_finalize(job: PullJob):
             raise ClientError("Cannot patch basefile {}! Please try syncing again.".format(basefile))
 
     try:
-        conflicts = job.apply_changes()
+        conflicts = job.mp.apply_pull_changes(job.pull_changes, job.temp_dir, job.project_info, job.mc)
     except Exception as e:
         job.mp.log.error("Failed to apply pull changes: " + str(e))
         job.mp.log.info("--- pull aborted")

mergin/editor.py

@@ -1,4 +1,5 @@
 from itertools import filterfalse
+from typing import Callable
 
 from .utils import is_mergin_config, is_qgis_file, is_versioned_file
 
@@ -10,7 +11,9 @@
 Returns:
     bool: True if the file change should be disallowed, False otherwise.
 """
-_disallowed_added_changes = lambda change: is_qgis_file(change["path"]) or is_mergin_config(change["path"])
+disallowed_added_changes: Callable[[dict], bool] = lambda change: is_qgis_file(change["path"]) or is_mergin_config(
+    change["path"]
+)
 """
 Determines whether a given file change should be disallowed from being updated.
 
@@ -22,7 +25,7 @@
 Returns:
     bool: True if the change should be disallowed, False otherwise.
 """
-_disallowed_updated_changes = (
+_disallowed_updated_changes: Callable[[dict], bool] = (
     lambda change: is_qgis_file(change["path"])
     or is_mergin_config(change["path"])
     or (is_versioned_file(change["path"]) and change.get("diff") is None)
@@ -37,7 +40,7 @@
 
 If any of these conditions are met, the change is considered disallowed from being removed.
 """
-_disallowed_removed_changes = (
+_disallowed_removed_changes: Callable[[dict], bool] = (
     lambda change: is_qgis_file(change["path"]) or is_mergin_config(change["path"]) or is_versioned_file(change["path"])
 )
 
@@ -67,7 +70,7 @@ def _apply_editor_filters(changes: dict[str, list[dict]]) -> dict[str, list[dict
     removed = changes.get("removed", [])
 
     # filter out files that are not in the editor's list of allowed files
-    changes["added"] = list(filterfalse(_disallowed_added_changes, added))
+    changes["added"] = list(filterfalse(disallowed_added_changes, added))
     changes["updated"] = list(filterfalse(_disallowed_updated_changes, updated))
     changes["removed"] = list(filterfalse(_disallowed_removed_changes, removed))
     return changes
@@ -91,4 +94,16 @@ def filter_changes(mc, project_info: dict, changes: dict[str, list[dict]]) -> di
 
 
 def prevent_conflicted_copy(path: str, mc, project_info: dict) -> bool:
+    """
+    Decides whether a file path should be blocked from creating a conflicted copy.
+    Note: This is used when the editor is active and attempting to modify files (e.g., .ggs) that are also updated on the server, preventing unnecessary conflict files creation.
+
+    Args:
+        path (str): The file path to check.
+        mc: The Mergin client object.
+        project_info (dict): Information about the Mergin project from server.
+
+    Returns:
+        bool: True if the file path should be prevented from ceating conflicted copy, False otherwise.
+    """
     return is_editor_enabled(mc, project_info) and any([is_qgis_file(path), is_mergin_config(path)])

mergin/merginproject.py

@@ -548,7 +548,7 @@ def apply_pull_changes(self, changes, temp_dir, server_project, mc):
                         # We just apply the diff between our copy and server to both the local copy and its basefile
                         self.update_without_rebase(path, src, dest, basefile, temp_dir)
                 else:
-                    # creating conflicitn copy if both server and local changes are present on the files
+                    # creating conflicted copy if both server and local changes are present on the files
                     if (
                         path in modified_local_paths
                         and item["checksum"] != local_files_map[path]["checksum"]

mergin/test/test_client.py

@@ -2632,7 +2632,7 @@ def test_editor_push(mc: MerginClient, mc2: MerginClient):
     # ggs and gpkg are still waiting to push
     assert any(file["path"] == qgs_file_name for file in push_changes.get("added")) is True
     assert any(file["path"] == gpkg_file_name for file in push_changes.get("updated")) is True
-    # push as owner do cleanup local changes and preparation to conflicitng copy simulate
+    # push as owner do cleanup local changes and preparation to conflicited copy simulate
     mc.push_project(project_dir)
 
     # simulate conflicting copy of qgis file