Skip to content

import geodiff from deps in client_push #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarcelGeo merged 3 commits into from
Sep 16, 2025
Merged

import geodiff from deps in client_push #277

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f59c868
import geodiff from deps in client_push
harminius Sep 16, 2025
d8b3211
black
harminius Sep 16, 2025
4013d69
import pygeodiff form merginproject
harminius Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions mergin/client_push.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@
import tempfile
import concurrent.futures
import os
from pygeodiff import (
GeoDiff,
GeoDiffLibError,
GeoDiffLibConflictError,
GeoDiffLibUnsupportedChangeError,
GeoDiffLibVersionError,
)

try:
Copy link
Contributor

@MarcelGeo MarcelGeo Sep 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we use similar approach as with another files ...

from merginproject import pygeodiff ?

Copy link
Contributor Author

@harminius harminius Sep 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️

from .deps import pygeodiff
except (ImportError, ModuleNotFoundError):
import pygeodiff

from .common import UPLOAD_CHUNK_SIZE, ClientError
from .merginproject import MerginProject
Expand Down Expand Up @@ -338,12 +336,12 @@ def _geodiff_changes_count(mp: MerginProject, diff_rel_path: str):

diff_abs = mp.fpath_meta(diff_rel_path)
try:
return GeoDiff().changes_count(diff_abs)
return pygeodiff.GeoDiff().changes_count(diff_abs)
except (
GeoDiffLibError,
GeoDiffLibConflictError,
GeoDiffLibUnsupportedChangeError,
GeoDiffLibVersionError,
pygeodiff.GeoDiffLibError,
pygeodiff.GeoDiffLibConflictError,
pygeodiff.GeoDiffLibUnsupportedChangeError,
pygeodiff.GeoDiffLibVersionError,
FileNotFoundError,
):
return None
Expand Down