sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #915 from pimutils/formatting

Browse source 
Make command bit more readable
This commit is contained in:
Hugo Osvaldo Barrera 2021-07-10 17:33:34 +02:00 committed by GitHub
commit f2a1afe6d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
contrib/conflict_resolution/resolve_interactively.py
View file

@ -48,14 +48,9 @@ def main(ical1_filename, ical2_filename):
KDIALOG, KDIALOG,
"--warningyesnocancel", "--warningyesnocancel",
"There was a sync conflict, do you prefer the first entry: \n" "There was a sync conflict, do you prefer the first entry: \n"
+ get_summary(ical1) f"{get_summary(ical1)}...\n(full contents: {ical1_filename})\n\n"
+ "...\n(full contents: " "or the second entry:\n"
+ str(ical1_filename) f"{get_summary(ical2)}...\n(full contents: {ical2_filename})?",
+ " )\n\nor the second entry: \n"
+ get_summary(ical2)
+ "...\n(full contents: "
+ str(ical2_filename)
+ " )?",
] ]
+ additional_args + additional_args
) )