Mercurial > hg > gcmultimerge

comparison multimerge.py @ 88:1d7d4dc5cf68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove default dest_name and dest_regex settings.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 26 Jul 2016 15:56:29 +0300
parents c3f8af496f46
children d68acec7cb99
comparison
equal deleted inserted replaced
87:c3f8af496f46 88:1d7d4dc5cf68
357 357
358 cfg.mdef("source_regex", True, cfg.is_string, None, u"^R:\s*(.*?)\s*\(\s*(.+?)\s*\)\s*$") 358 cfg.mdef("source_regex", True, cfg.is_string, None, u"^R:\s*(.*?)\s*\(\s*(.+?)\s*\)\s*$")
359 cfg.mdef("source_regmap", False, cfg.is_list, cfg.trans_list, [1, 2]) 359 cfg.mdef("source_regmap", False, cfg.is_list, cfg.trans_list, [1, 2])
360 cfg.mdef("source_regmap_len", False, None, None, len(cfg.source_regmap)) 360 cfg.mdef("source_regmap_len", False, None, None, len(cfg.source_regmap))
361 361
362 cfg.mdef("dest_name", True, cfg.is_string, None, u"Raahen kansainvälisyystoiminta [{0}]") 362 cfg.mdef("dest_name", True, cfg.is_string, None, None)
363 cfg.mdef("dest_regex", True, cfg.is_string, None, u"^Raahen kansainvälisyystoiminta") 363 cfg.mdef("dest_regex", True, cfg.is_string, None, None)
364 cfg.mdef("dest_id", True, cfg.is_string, None, None) 364 cfg.mdef("dest_id", True, cfg.is_string, None, None)
365 365
366 cfg.mdef("noauth_local_webserver", False, None, None, True) 366 cfg.mdef("noauth_local_webserver", False, None, None, True)
367 #cfg.mdef("auth_host_name", False, None, None, "localhost") 367 #cfg.mdef("auth_host_name", False, None, None, "localhost")
368 #cfg.mdef("auth_host_port", False, None, None, [8080, 8090]) 368 #cfg.mdef("auth_host_port", False, None, None, [8080, 8090])