Mercurial > hg > gcmultimerge

changeset 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 80d566c1d061
files multimerge.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/multimerge.py	Mon Nov 07 09:10:29 2016 +0200
+++ b/multimerge.py	Mon Nov 07 10:14:46 2016 +0200
@@ -75,6 +75,7 @@
         try:
             # Act based on email mode
             if cfg.email == "smtp":
+                # Connect via SMTP
                 gcm_print("Using SMTP server {0}, login {1}".format(cfg.email_smtp_server, cfg.email_smtp_user))
                 server = smtplib.SMTP(cfg.email_smtp_server)
                 if gcm_check_debug(4):
@@ -87,6 +88,7 @@
                 server.sendmail(cfg.email_sender, cfg.email_to, msg.as_string())
                 server.quit()
             elif cfg.email == "sendmail":
+                # Use local sendmail
                 gcm_print("Using sendmail {0}".format(cfg.email_sendmail))
                 p = Popen([cfg.email_sendmail, "-t", "-oi"], stdin=PIPE)
                 p.communicate(msg.as_string())
@@ -484,7 +486,7 @@
 if len(cfg.src_regmap) != cfg.src_regmap_len:
     gcm_fatal(u"Setting src_regmap list must be {0} items.".format(cfg.src_regmap_len))
 else:
-    # Force to integers
+    # Force convert values to integers
     try:
         cfg.src_regmap = [int(x) for x in cfg.src_regmap]
     except Exception as e: