Mercurial > hg > gcmultimerge

comparison multimerge.py @ 102:7ab6beb4c709

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only generate summaries and colors for non-deleted/cancelled events.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 17 Oct 2016 12:43:56 +0300
parents b5c381f9b51f
children fc361e368630
comparison
equal deleted inserted replaced
101:b5c381f9b51f 102:7ab6beb4c709
540 540
541 # Add events, if any, to main list 541 # Add events, if any, to main list
542 events = gcm_generate_ids(result.get("items", []), calendar["id"], "___") 542 events = gcm_generate_ids(result.get("items", []), calendar["id"], "___")
543 if events: 543 if events:
544 for event in events: 544 for event in events:
545 if c_found != None: 545 if event["status"] != u"cancelled":
546 event["colorId"] = c_found 546 if c_found != None:
547 event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"]) 547 event["colorId"] = c_found
548 event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"])
548 src_events.extend(events) 549 src_events.extend(events)
549 if gcm_check_debug(4): 550 if gcm_check_debug(4):
550 gcm_dump_events(events, True) 551 gcm_dump_events(events, True)
551 552
552 553