Mercurial > hg > gcmultimerge

comparison multimerge.py @ 121:4500fbf91294 rel-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More comments.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 18 Oct 2016 15:12:54 +0300
parents 1f7967aa0133
children 977ecff4bd7d
comparison
equal deleted inserted replaced
120:1f7967aa0133 121:4500fbf91294
622 d_event = gcm_get_event_by_gcm_id(dst_events, event["gcm_id"]) 622 d_event = gcm_get_event_by_gcm_id(dst_events, event["gcm_id"])
623 if not gcm_compare_events(event, d_event): 623 if not gcm_compare_events(event, d_event):
624 # Seems we need to update 624 # Seems we need to update
625 gcm_debug(4, u"Updating event {0} [{1}]".format(event["id"], event["gcm_id"])) 625 gcm_debug(4, u"Updating event {0} [{1}]".format(event["id"], event["gcm_id"]))
626 try: 626 try:
627 # We need to remove the sequence and id fields, as they will be replaced by target
627 event.pop("sequence", None) 628 event.pop("sequence", None)
628 event.pop("id", None) 629 event.pop("id", None)
629 event["iCalUID"] = event["gcm_id"] 630 event["iCalUID"] = event["gcm_id"]
630 new_event = service.events().update(calendarId=cfg.dst_id, eventId=d_event["id"], body=event).execute() 631 new_event = service.events().update(calendarId=cfg.dst_id, eventId=d_event["id"], body=event).execute()
631 evn_updated += 1 632 evn_updated += 1
635 evn_unchanged += 1 636 evn_unchanged += 1
636 gcm_debug(4, u"No need to update event {0} [{1}]".format(event["id"], event["gcm_id"])) 637 gcm_debug(4, u"No need to update event {0} [{1}]".format(event["id"], event["gcm_id"]))
637 elif event["status"] != u"cancelled": 638 elif event["status"] != u"cancelled":
638 # Event does not seem to exist. Insert new event. 639 # Event does not seem to exist. Insert new event.
639 gcm_debug(4, u"Inserting new event {0} [{1}]".format(event["id"], event["gcm_id"])) 640 gcm_debug(4, u"Inserting new event {0} [{1}]".format(event["id"], event["gcm_id"]))
641 # Remove original id field, otherwise it will clash
640 event.pop("id", None) 642 event.pop("id", None)
641 event["iCalUID"] = event["gcm_id"] # Replace Google generated ID with our own 643 event["iCalUID"] = event["gcm_id"] # Replace Google generated ID with our own
642 try: 644 try:
643 new_event = service.events().insert(calendarId=cfg.dst_id, body=event).execute() 645 new_event = service.events().insert(calendarId=cfg.dst_id, body=event).execute()
644 evn_new += 1 646 evn_new += 1