Skip to content

Commit 4d2a8a6

Browse files
committed
A bit more logging for pull/push for easier reading of logs
1 parent 61e3abc commit 4d2a8a6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

mergin/client_pull.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ def pull_project_async(mc, directory):
328328
server_info = mc.project_info(project_path, since=local_version)
329329
server_version = server_info["version"]
330330

331-
mp.log.info(f"got project info. version {server_version}")
331+
mp.log.info(f"got project info: local version {local_version} / server version {server_version}")
332332

333333
if local_version == server_version:
334334
mp.log.info("--- pull - nothing to do (already at server version)")
@@ -538,7 +538,7 @@ def pull_project_finalize(job):
538538
'files': job.project_info['files']
539539
}
540540

541-
job.mp.log.info("--- pull finished")
541+
job.mp.log.info("--- pull finished -- at version " + job.mp.metadata['version'])
542542

543543
shutil.rmtree(job.temp_dir)
544544
return conflicts

mergin/client_push.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def push_project_async(mc, directory):
8787
server_info = mc.project_info(project_path)
8888
server_version = server_info["version"] if server_info["version"] else "v0"
8989

90-
mp.log.info(f"got project info. version {server_version}")
90+
mp.log.info(f"got project info: local version {local_version} / server version {server_version}")
9191

9292
username = mc.username()
9393
if username not in server_info["access"]["writersnames"]:
@@ -237,7 +237,7 @@ def push_project_finalize(job):
237237
}
238238
job.mp.apply_push_changes(job.changes)
239239

240-
job.mp.log.info("--- push finished")
240+
job.mp.log.info("--- push finished - new project version " + job.server_resp['version'])
241241

242242

243243
def push_project_cancel(job):

0 commit comments

Comments
 (0)