Skip to content

Commit f6aea66

Browse files
committed
Fix arguments of pull changes
1 parent c3dd5ec commit f6aea66

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

mergin/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,7 @@ def project_status(self, directory):
11621162
mp = MerginProject(directory)
11631163
server_info = self.project_info(mp.project_full_name(), since=mp.version())
11641164

1165-
pull_changes = mp.get_pull_changes(server_info["files"])
1165+
pull_changes = mp.get_pull_changes(server_info.get("files", []), server_info.get("version"))
11661166

11671167
push_changes = mp.get_push_changes()
11681168
push_changes_summary = mp.get_list_of_push_changes(push_changes)

mergin/test/test_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3296,7 +3296,7 @@ def test_pull_project(mc: MerginClient, mc2: MerginClient):
32963296
assert mp_to_pull.version() == mp.version()
32973297
assert mp_to_pull.project_id() == mp.project_id()
32983298
assert len(project_info.get("files")) == len(mp.files())
3299-
delta = mp.get_pull_delta({"files": mp_to_pull.files(), "version": mp_to_pull.version()})
3299+
delta = mp.get_pull_delta(mp_to_pull.files(), mp_to_pull.version())
33003300
for item in [item for item in delta.items if item.type == DeltaChangeType.CREATE]:
33013301
assert os.path.exists(mp_to_pull.fpath(item.path))
33023302
assert os.path.exists(mp_to_pull.fpath_meta("base.gpkg"))

0 commit comments

Comments
 (0)