Mercurial > hg > gcmultimerge

changeset 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
files multimerge.py
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/multimerge.py	Mon Oct 17 12:42:42 2016 +0300
+++ b/multimerge.py	Mon Oct 17 12:43:56 2016 +0300
@@ -542,9 +542,10 @@
     events = gcm_generate_ids(result.get("items", []), calendar["id"], "___")
     if events:
         for event in events:
-            if c_found != None:
-                event["colorId"] = c_found
-            event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"])
+            if event["status"] != u"cancelled":
+                if c_found != None:
+                    event["colorId"] = c_found
+                event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"])
         src_events.extend(events)
         if gcm_check_debug(4):
             gcm_dump_events(events, True)