Mercurial > hg > gcmultimerge

changeset 52:b87dbc887f63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jul 2016 19:26:42 +0300
parents 54644b29a9a3
children ea62e0ed05ae
files multimerge.py
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/multimerge.py	Tue Jul 05 18:51:25 2016 +0300
+++ b/multimerge.py	Tue Jul 05 19:26:42 2016 +0300
@@ -371,16 +371,13 @@
 
         # If summary or summaryOverride match the regexp, add calendar
         mre = src_re.match(calendar["summary"])
+        if not mre and u"summaryOverride" in calendar:
+            mre = src_re.match(calendar[u"summaryOverride"])
+
         if mre:
             calendar["gcm_title"] = mre.group(cfg.source_regmap[0])
             calendar["gcm_id"] = mre.group(cfg.source_regmap[1])
             src_calendars.append(calendar)
-        elif u"summaryOverride" in calendar:
-            mre = src_re.match(calendar[u"summaryOverride"])
-            if mre:
-                calendar["gcm_title"] = mre.group(cfg.source_regmap[0])
-                calendar["gcm_id"] = mre.group(cfg.source_regmap[1])
-                src_calendars.append(calendar)
 
 gcm_debug(u"{0} source calendars found.".format(len(src_calendars)))