Mercurial > hg > gcmultimerge

comparison multimerge.py @ 127:bb8b455218ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve comments.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 07 Nov 2016 10:14:46 +0200
parents 977ecff4bd7d
children 31e3100b5ed9
comparison
equal deleted inserted replaced
124:977ecff4bd7d 127:bb8b455218ec
73 msg["To"] = ",".join(cfg.email_to) 73 msg["To"] = ",".join(cfg.email_to)
74 gcm_print("Sending mail to {0} from {1}, subj: {2} ..".format(";".join(cfg.email_to), cfg.email_sender, cfg.email_subject)) 74 gcm_print("Sending mail to {0} from {1}, subj: {2} ..".format(";".join(cfg.email_to), cfg.email_sender, cfg.email_subject))
75 try: 75 try:
76 # Act based on email mode 76 # Act based on email mode
77 if cfg.email == "smtp": 77 if cfg.email == "smtp":
78 # Connect via SMTP
78 gcm_print("Using SMTP server {0}, login {1}".format(cfg.email_smtp_server, cfg.email_smtp_user)) 79 gcm_print("Using SMTP server {0}, login {1}".format(cfg.email_smtp_server, cfg.email_smtp_user))
79 server = smtplib.SMTP(cfg.email_smtp_server) 80 server = smtplib.SMTP(cfg.email_smtp_server)
80 if gcm_check_debug(4): 81 if gcm_check_debug(4):
81 server.set_debuglevel(10) 82 server.set_debuglevel(10)
82 83
85 86
86 server.login(cfg.email_smtp_user, cfg.email_smtp_password) 87 server.login(cfg.email_smtp_user, cfg.email_smtp_password)
87 server.sendmail(cfg.email_sender, cfg.email_to, msg.as_string()) 88 server.sendmail(cfg.email_sender, cfg.email_to, msg.as_string())
88 server.quit() 89 server.quit()
89 elif cfg.email == "sendmail": 90 elif cfg.email == "sendmail":
91 # Use local sendmail
90 gcm_print("Using sendmail {0}".format(cfg.email_sendmail)) 92 gcm_print("Using sendmail {0}".format(cfg.email_sendmail))
91 p = Popen([cfg.email_sendmail, "-t", "-oi"], stdin=PIPE) 93 p = Popen([cfg.email_sendmail, "-t", "-oi"], stdin=PIPE)
92 p.communicate(msg.as_string()) 94 p.communicate(msg.as_string())
93 except Exception as e: 95 except Exception as e:
94 gcm_print(u"FATAL: Oh noes, e-mail sending failed: {0}".format(str(e))) 96 gcm_print(u"FATAL: Oh noes, e-mail sending failed: {0}".format(str(e)))
482 484
483 485
484 if len(cfg.src_regmap) != cfg.src_regmap_len: 486 if len(cfg.src_regmap) != cfg.src_regmap_len:
485 gcm_fatal(u"Setting src_regmap list must be {0} items.".format(cfg.src_regmap_len)) 487 gcm_fatal(u"Setting src_regmap list must be {0} items.".format(cfg.src_regmap_len))
486 else: 488 else:
487 # Force to integers 489 # Force convert values to integers
488 try: 490 try:
489 cfg.src_regmap = [int(x) for x in cfg.src_regmap] 491 cfg.src_regmap = [int(x) for x in cfg.src_regmap]
490 except Exception as e: 492 except Exception as e:
491 gcm_fatal(u"Invalid src_regmap: {0}".format(str(e))) 493 gcm_fatal(u"Invalid src_regmap: {0}".format(str(e)))
492 494