Mercurial > hg > gcmultimerge

comparison multimerge.py @ 39:693db3f8cbe5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Begin importing event comparision stuff.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jul 2016 11:25:25 +0300
parents 54405de302d0
children 56558cd6d035
comparison
equal deleted inserted replaced
38:54405de302d0 39:693db3f8cbe5
418 418
419 for event in src_events: 419 for event in src_events:
420 # Does the event exist already in the target? 420 # Does the event exist already in the target?
421 if event["gcm_id"] in dst_gcm_ids: 421 if event["gcm_id"] in dst_gcm_ids:
422 ## Yes. Thus, we just update the event. 422 ## Yes. Thus, we just update the event.
423 try: 423 print "IS in dst_gcm_ids: "+ event["id"] +" : "+ event["gcm_id"]
424 new_event = service.events().update(calendarId=cfg.dest_id, eventId=event["id"], body=event).execute() 424 # Check if event NEEDS updating .. aka compare data
425 except Exception as e: 425 #d_event = gcm_get_event_by_gcm_id(dst_events, event["gcm_id"])
426 gcm_fatal("Failed to update event:\n{0}\n\nERROR: {1}\n".format(event, str(e))) 426 #if d_event and gcm_compare_events(event, d_event):
427 if True:
428 try:
429 new_event = service.events().update(calendarId=cfg.dest_id, eventId=event["id"], body=event).execute()
430 except Exception as e:
431 gcm_fatal("Failed to update event:\n{0}\n\nERROR: {1}\n".format(event, str(e)))
432 else:
433 gcm_debug("No need to update event {0}.".format(event["gcm_id"])
427 else: 434 else:
428 ## Event does not seem to exist. Insert new event. 435 ## Event does not seem to exist. Insert new event.
429 event.pop("iCalUID", None) # Remove the iCalUID, having it conflicts with event ID 436 event.pop("iCalUID", None) # Remove the iCalUID, having it conflicts with event ID
430 event["id"] = event["gcm_id"] # Replace Google generated ID with our own 437 event["id"] = event["gcm_id"] # Replace Google generated ID with our own
431 try: 438 try: