Mercurial > hg > gcmultimerge

comparison multimerge.py @ 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
comparison
equal deleted inserted replaced
51:54644b29a9a3 52:b87dbc887f63
369 if not cfg.dest_id and cfg.dest_name == calendar["summary"].strip(): 369 if not cfg.dest_id and cfg.dest_name == calendar["summary"].strip():
370 cfg.mset("dest_id", calendar["id"]) 370 cfg.mset("dest_id", calendar["id"])
371 371
372 # If summary or summaryOverride match the regexp, add calendar 372 # If summary or summaryOverride match the regexp, add calendar
373 mre = src_re.match(calendar["summary"]) 373 mre = src_re.match(calendar["summary"])
374 if not mre and u"summaryOverride" in calendar:
375 mre = src_re.match(calendar[u"summaryOverride"])
376
374 if mre: 377 if mre:
375 calendar["gcm_title"] = mre.group(cfg.source_regmap[0]) 378 calendar["gcm_title"] = mre.group(cfg.source_regmap[0])
376 calendar["gcm_id"] = mre.group(cfg.source_regmap[1]) 379 calendar["gcm_id"] = mre.group(cfg.source_regmap[1])
377 src_calendars.append(calendar) 380 src_calendars.append(calendar)
378 elif u"summaryOverride" in calendar:
379 mre = src_re.match(calendar[u"summaryOverride"])
380 if mre:
381 calendar["gcm_title"] = mre.group(cfg.source_regmap[0])
382 calendar["gcm_id"] = mre.group(cfg.source_regmap[1])
383 src_calendars.append(calendar)
384 381
385 gcm_debug(u"{0} source calendars found.".format(len(src_calendars))) 382 gcm_debug(u"{0} source calendars found.".format(len(src_calendars)))
386 383
387 384
388 ## Check if we have destination calendar ID 385 ## Check if we have destination calendar ID