Editor sync handling #207
Merged
Editor sync handling #207
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pull Request Test Coverage Report for Build 9345009734Details
💛 - Coveralls |
Updates: - added mc to PullJob class and apply_changes method - added scripts for backup of tests performed for editor
wonder-sk
approved these changes
Jun 2, 2024
mergin/client_pull.py
Outdated
| @@ -623,7 +627,7 @@ def pull_project_finalize(job): | |||
| raise ClientError("Cannot patch basefile {}! Please try syncing again.".format(basefile)) | |||
|
|
|||
| try: | |||
| conflicts = job.mp.apply_pull_changes(job.pull_changes, job.temp_dir, job.user_name) | |||
| conflicts = job.apply_changes() | |||
There was a problem hiding this comment.
I would prefer to keep the direct call to job.mp.apply_pull_changes() instead of introducing a new method in PullJob (it is meant just as a structure to keep everything that is needed for a pull)
probably not, it did not seem to be an issue even with projects with heavy use - and when sending logs to developers, we limit upload size (0.5 mb max if I recall correctly)
what's in the PR looks correct to me, the issue description was not complete... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #MerginMaps/qgis-plugin
Details
Added ➕
Refactor 🔨
❓
editor.py