Mercurial > hg > gcmultimerge

comparison multimerge.py @ 114:591cc558bbcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use summaryOverride field as summary for calendars where it is being matched instead of the main summary field.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 18 Oct 2016 13:38:59 +0300
parents f45115bfb17a
children f671602635b7
comparison
equal deleted inserted replaced
113:f45115bfb17a 114:591cc558bbcd
537 dst_calendar = calendar 537 dst_calendar = calendar
538 538
539 # If summary or summaryOverride match the regexp, add calendar 539 # If summary or summaryOverride match the regexp, add calendar
540 mre = src_re.match(calendar["summary"]) 540 mre = src_re.match(calendar["summary"])
541 if not mre and u"summaryOverride" in calendar: 541 if not mre and u"summaryOverride" in calendar:
542 mre = src_re.match(calendar[u"summaryOverride"]) 542 mre = src_re.match(calendar["summaryOverride"])
543 calendar["summary"] = calendar["summaryOverride"]
543 544
544 if mre: 545 if mre:
545 calendar["gcm_title"] = mre.group(cfg.src_regmap[0]) 546 calendar["gcm_title"] = mre.group(cfg.src_regmap[0])
546 calendar["gcm_id"] = mre.group(cfg.src_regmap[1]) 547 calendar["gcm_id"] = mre.group(cfg.src_regmap[1])
547 src_calendars.append(calendar) 548 src_calendars.append(calendar)