black

prevent conflcted copy fix

Author: MarcelGeo

mergin/cli.py

@@ -468,6 +468,7 @@ def pull(ctx):
     except Exception as e:
         _print_unhandled_exception()
 
+
 @cli.command()
 @click.pass_context
 def sync(ctx):
@@ -478,6 +479,7 @@ def sync(ctx):
     directory = os.getcwd()
     upload_job = None
     try:
+
         def on_progress(increment, push_job):
             nonlocal upload_job
             upload_job = push_job

mergin/editor.py

@@ -56,7 +56,7 @@ def filter_changes(mc, project_role: str, changes: Dict[str, List[dict]]) -> Dic
     return _apply_editor_filters(changes)
 
 
-def prevent_conflicted_copy(path: str, mc, project_info: dict) -> bool:
+def prevent_conflicted_copy(path: str, mc, project_role: str) -> 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.
@@ -69,4 +69,4 @@ def prevent_conflicted_copy(path: str, mc, project_info: dict) -> bool:
     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)])
+    return is_editor_enabled(mc, project_role) and any([is_qgis_file(path)])

mergin/merginproject.py

@@ -34,6 +34,7 @@
 except (ImportError, ModuleNotFoundError):
     import pygeodiff
 
+
 class MerginProject:
     """Base class for Mergin Maps local projects.
 
@@ -155,7 +156,7 @@ def workspace_name(self) -> str:
         full_name = self.project_full_name()
         slash_index = full_name.index("/")
         return full_name[:slash_index]
-    
+
     def project_role(self) -> str:
         self._read_metadata()
         return self._metadata.get("role")
@@ -555,7 +556,7 @@ def apply_pull_changes(self, changes, temp_dir, server_project, mc):
                     if (
                         path in modified_local_paths
                         and item["checksum"] != local_files_map[path]["checksum"]
-                        and not prevent_conflicted_copy(path, mc, server_project)
+                        and not prevent_conflicted_copy(path, mc, server_project.get("role"))
                     ):
                         conflict = self.create_conflicted_copy(path, mc.username())
                         conflicts.append(conflict)

mergin/test/test_client.py

@@ -406,7 +406,7 @@ def test_push_pull_changes(mc):
     f_conflict_checksum = generate_checksum(os.path.join(project_dir_2, f_updated))
 
     # not at latest server version
-    with pytest.raises(ClientError, match="Please update your local copy"):
+    with pytest.raises(ClientError, match="Version mismatch"):
         mc.push_project(project_dir_2)
 
     # check changes in project_dir_2 before applied
@@ -3172,9 +3172,7 @@ def test_client_project_sync_retry(mc):
             mc.sync_project(project_dir)
         assert mock_push_project_finalize.call_count == 1
 
-    with patch("mergin.client.push_project_async") as mock_push_project_async, patch(
-        "mergin.client.PUSH_ATTEMPTS", 2
-    ):
+    with patch("mergin.client.push_project_async") as mock_push_project_async, patch("mergin.client.PUSH_ATTEMPTS", 2):
         mock_push_project_async.side_effect = ClientError(
             detail="",
             server_code=ErrorCode.AnotherUploadRunning.value,
@@ -3184,9 +3182,7 @@ def test_client_project_sync_retry(mc):
     assert mock_push_project_async.call_count == 2
 
     # for v1 endpoints we are rising retry just from push start
-    with patch("mergin.client.push_project_async") as mock_push_project_async, patch(
-        "mergin.client.PUSH_ATTEMPTS", 2
-    ):
+    with patch("mergin.client.push_project_async") as mock_push_project_async, patch("mergin.client.PUSH_ATTEMPTS", 2):
         mock_push_project_async.side_effect = ClientError(
             detail="Another process is running. Please try later.",
             http_error=400,

mergin/utils.py

@@ -295,7 +295,8 @@ def bytes_to_human_size(bytes: int):
         return f"{round( bytes / 1024.0 / 1024.0 / 1024.0, precision )} GB"
     else:
         return f"{round( bytes / 1024.0 / 1024.0 / 1024.0 / 1024.0, precision )} TB"
-    
+
+
 def get_data_checksum(data: ByteString) -> str:
     """
     Generate sha1 checksum for given data.