Mercurial > hg > gcmultimerge

comparison multimerge.py @ 40:56558cd6d035

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Oops. A typo.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jul 2016 14:11:04 +0300
parents 693db3f8cbe5
children 9eadb97a2e98
comparison
equal deleted inserted replaced
39:693db3f8cbe5 40:56558cd6d035
428 try: 428 try:
429 new_event = service.events().update(calendarId=cfg.dest_id, eventId=event["id"], body=event).execute() 429 new_event = service.events().update(calendarId=cfg.dest_id, eventId=event["id"], body=event).execute()
430 except Exception as e: 430 except Exception as e:
431 gcm_fatal("Failed to update event:\n{0}\n\nERROR: {1}\n".format(event, str(e))) 431 gcm_fatal("Failed to update event:\n{0}\n\nERROR: {1}\n".format(event, str(e)))
432 else: 432 else:
433 gcm_debug("No need to update event {0}.".format(event["gcm_id"]) 433 gcm_debug("No need to update event {0}.".format(event["gcm_id"]))
434 else: 434 else:
435 ## Event does not seem to exist. Insert new event. 435 ## Event does not seem to exist. Insert new event.
436 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
437 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
438 try: 438 try: