Mercurial > hg > gcmultimerge

comparison multimerge.py @ 49:cc30383f5f0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More Unicode fixes.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jul 2016 18:00:59 +0300
parents a8fdecd4be61
children f8618bae162a
comparison
equal deleted inserted replaced
48:1ce5ccd949b6 49:cc30383f5f0d
254 254
255 cfg.mdef("email_ok", False, None, None, False) 255 cfg.mdef("email_ok", False, None, None, False)
256 cfg.mdef("email", True, cfg.is_bool, cfg.trans_bool, False) 256 cfg.mdef("email", True, cfg.is_bool, cfg.trans_bool, False)
257 cfg.mdef("email_to", True, cfg.is_email_list, cfg.trans_email_list, None) 257 cfg.mdef("email_to", True, cfg.is_email_list, cfg.trans_email_list, None)
258 cfg.mdef("email_sender", True, cfg.is_email, None, None) 258 cfg.mdef("email_sender", True, cfg.is_email, None, None)
259 cfg.mdef("email_subject", True, cfg.is_string, None, "Google Calendar MultiMerge status") 259 cfg.mdef("email_subject", True, cfg.is_string, None, u"Google Calendar MultiMerge status")
260 260
261 cfg.mdef("source_regex", True, cfg.is_string, None, "^R:\s*(.*?)\s*\(\s*(.+?)\s*\)\s*$") 261 cfg.mdef("source_regex", True, cfg.is_string, None, u"^R:\s*(.*?)\s*\(\s*(.+?)\s*\)\s*$")
262 cfg.mdef("source_regmap", False, cfg.is_list, cfg.trans_list, [1, 2]) 262 cfg.mdef("source_regmap", False, cfg.is_list, cfg.trans_list, [1, 2])
263 cfg.mdef("source_regmap_len", False, None, None, len(cfg.source_regmap)) 263 cfg.mdef("source_regmap_len", False, None, None, len(cfg.source_regmap))
264 264
265 cfg.mdef("dest_name", True, cfg.is_string, None, u"Raahen kansainvälisyystoiminta") 265 cfg.mdef("dest_name", True, cfg.is_string, None, u"Raahen kansainvälisyystoiminta")
266 cfg.mdef("dest_id", True, cfg.is_string, None, None) 266 cfg.mdef("dest_id", True, cfg.is_string, None, None)
357 if len(calendars) == 0: 357 if len(calendars) == 0:
358 gcm_fatal("No calendars found?") 358 gcm_fatal("No calendars found?")
359 359
360 360
361 ## Filter desired SOURCE calendars based on specified regexp 361 ## Filter desired SOURCE calendars based on specified regexp
362 src_re = re.compile(cfg.source_regex) 362 src_re = re.compile(cfg.source_regex, re.UNICODE)
363 src_calendars = [] 363 src_calendars = []
364 for calendar in calendars: 364 for calendar in calendars:
365 if "summary" in calendar: 365 if "summary" in calendar:
366 if not cfg.dest_id and cfg.dest_name == calendar["summary"].strip(): 366 if not cfg.dest_id and cfg.dest_name == calendar["summary"].strip():
367 cfg.mset("dest_id", calendar["id"]) 367 cfg.mset("dest_id", calendar["id"])