Skip to content

Fix sync loop for too long path #316

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

Open
harminius wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Fix sync loop for too long path #316

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8e742c7
add safeguard for too long path
harminius Aug 11, 2026
77ae14b
docstring
harminius Aug 11, 2026
6cc7fc6
Add path length safeguards to pull and local create changeset
harminius Aug 14, 2026
2d38d24
Escape for windows long path
harminius Aug 17, 2026
096fa0a
black
harminius Aug 17, 2026
d2bf5f2
cleanup
harminius Aug 17, 2026
e8c2f75
black 2
harminius Aug 17, 2026
6bd80e3
rm long path from tests
harminius Aug 18, 2026
782603c
rm long path from tests 2
harminius Aug 18, 2026
bcc7ae6
introduce GeoDiffLongPath handler
harminius Aug 26, 2026
2051d4f
introduce fs handler for long paths
harminius Aug 26, 2026
8a342cf
cleanup
harminius Aug 26, 2026
fdfdb75
explicit topdown walk
harminius Aug 26, 2026
5c14a10
cover all Python filesystem operations
harminius Sep 10, 2026
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
Prev Previous commit
Next Next commit
black
  • Loading branch information
@harminius
harminius committed Aug 17, 2026
commit 096fa0a84a9aeac0b5bddb30b177bc1155bc5242
4 changes: 3 additions & 1 deletion mergin/merginproject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,9 @@ def update_with_rebase(self, path, src, dest, basefile, temp_dir, user_name):
dest_lp = long_path(dest)
basefile_lp = long_path(basefile)

server_diff = long_path(self.fpath(f"{path}-server_diff", temp_dir)) # diff between server file and local basefile
server_diff = long_path(
self.fpath(f"{path}-server_diff", temp_dir)
) # diff between server file and local basefile
local_diff = long_path(self.fpath(f"{path}-local_diff", temp_dir))

# temporary backup of file pulled from server for recovery
Expand Down
Loading