Mercurial > hg > gcmultimerge
changeset 114:591cc558bbcd
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 | 89a43917ad18 |
files | multimerge.py |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/multimerge.py Tue Oct 18 13:26:20 2016 +0300 +++ b/multimerge.py Tue Oct 18 13:38:59 2016 +0300 @@ -539,7 +539,8 @@ # 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"]) + mre = src_re.match(calendar["summaryOverride"]) + calendar["summary"] = calendar["summaryOverride"] if mre: calendar["gcm_title"] = mre.group(cfg.src_regmap[0])