Mercurial > hg > gcmultimerge

changeset 28:90886d9296cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix unique ID generation.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 04 Jul 2016 23:46:51 +0300
parents 824c3e5c6757
children 50711871fd1e
files multimerge.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/multimerge.py	Mon Jul 04 23:46:36 2016 +0300
+++ b/multimerge.py	Mon Jul 04 23:46:51 2016 +0300
@@ -99,8 +99,8 @@
         return events
 
     for ev in events:
-        ev["cal_id"] = calendar_id
-        ev["gcm_id"] = "{0}_{1}".format(calendar_id, ev["id"])
+        ev["gcm_cal_id"] = calendar_id
+        ev["gcm_id"] = re.sub("[^a-v0-9]", "00", calendar_id.lower()) + ev["id"]
 
     return events