Mercurial > hg > gcmultimerge

comparison multimerge.py @ 57:1c2cf6170219

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comments.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jul 2016 23:46:18 +0300
parents 597875ef885b
children 87fda54f935c
comparison
equal deleted inserted replaced
56:597875ef885b 57:1c2cf6170219
453 src_ids = frozenset(map(lambda x: x["gcm_id"], src_events)) 453 src_ids = frozenset(map(lambda x: x["gcm_id"], src_events))
454 454
455 for event in src_events: 455 for event in src_events:
456 # Does the event exist already in the target? 456 # Does the event exist already in the target?
457 if event["gcm_id"] in dst_ids: 457 if event["gcm_id"] in dst_ids:
458 ## Yes. Thus, we just update the event.
459 #print "IS in dst_ids: "+ event["id"] +" : "+ event["gcm_id"]
460 # Check if event NEEDS updating .. aka compare data 458 # Check if event NEEDS updating .. aka compare data
461 gcm_debug(u"Event {0} exists, checking ..".format(event["gcm_id"])) 459 gcm_debug(u"Event {0} exists, checking ..".format(event["gcm_id"]))
462 d_event = gcm_get_event_by_gcm_id(dst_events, event["gcm_id"]) 460 d_event = gcm_get_event_by_gcm_id(dst_events, event["gcm_id"])
463 if not gcm_compare_events(event, d_event): 461 if not gcm_compare_events(event, d_event):
462 # Seems we need to update
464 gcm_debug(u"Updating event {0} ..".format(event["gcm_id"])) 463 gcm_debug(u"Updating event {0} ..".format(event["gcm_id"]))
465 try: 464 try:
466 event.pop("sequence", None) 465 event.pop("sequence", None)
467 new_event = service.events().update(calendarId=cfg.dest_id, eventId=event["id"], body=event).execute() 466 new_event = service.events().update(calendarId=cfg.dest_id, eventId=event["id"], body=event).execute()
468 except Exception as e: 467 except Exception as e: