Mercurial > hg > gcmultimerge

changeset 133:3a3958edc813

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check that the "summary" attribute exists.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 26 Aug 2020 11:59:45 +0300
parents 16404eaf35df
children afdef805e9b7
files multimerge.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/multimerge.py	Thu Jan 30 13:40:40 2020 +0200
+++ b/multimerge.py	Wed Aug 26 11:59:45 2020 +0300
@@ -604,7 +604,10 @@
             if event["status"] != u"cancelled":
                 if c_found != None:
                     event["colorId"] = c_found
-                event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"])
+                if "summary" in event:
+                    event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"])
+                else:
+                    event["summary"] = u"[?] {0}".format(calendar["gcm_id"])
 
         # Add to list of source events
         src_events.extend(events)