Mercurial > hg > gcmultimerge

comparison multimerge.py @ 131:654b28ca9f39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor fix.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 11 Nov 2019 13:47:39 +0200
parents b33e3884182b
children 16404eaf35df
comparison
equal deleted inserted replaced
130:b33e3884182b 131:654b28ca9f39
643 except Exception as e: 643 except Exception as e:
644 gcm_fatal(u"Failed to update event {0} [{1}]:\n\n{2}\n\nERROR: {3}\n".format(event["id"], event["gcm_id"], event, str(e))) 644 gcm_fatal(u"Failed to update event {0} [{1}]:\n\n{2}\n\nERROR: {3}\n".format(event["id"], event["gcm_id"], event, str(e)))
645 else: 645 else:
646 evn_unchanged += 1 646 evn_unchanged += 1
647 gcm_debug(4, u"No need to update event {0} [{1}]".format(event["id"], event["gcm_id"])) 647 gcm_debug(4, u"No need to update event {0} [{1}]".format(event["id"], event["gcm_id"]))
648 elif event["status"] != u"cancelled": 648 elif event["status"] not in [u"cancelled", u"confirmed"]:
649 # Event does not seem to exist. Insert new event. 649 # Event does not seem to exist. Insert new event.
650 gcm_debug(4, u"Inserting new event {0} [{1}]".format(event["id"], event["gcm_id"])) 650 gcm_debug(4, u"Inserting new event {0} [{1}]".format(event["id"], event["gcm_id"]))
651 # Remove original id field, otherwise it will clash 651 # Remove original id field, otherwise it will clash
652 event.pop("id", None) 652 event.pop("id", None)
653 event["iCalUID"] = event["gcm_id"] # Replace Google generated ID with our own 653 event["iCalUID"] = event["gcm_id"] # Replace Google generated ID with our own