Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMartin Geisler <mg@aragost.com>
Thu, 23 Sep 2010 10:59:21 +0200
changeset 12386 8eedf53547b8
parent 12383 f1e8d6f6e682 (current diff)
parent 12385 9a93f4fb141b (diff)
child 12387 4f8067c94729
merge with stable
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/doc/hgrc.5.txt	Thu Sep 23 01:59:02 2010 +0200
+++ b/doc/hgrc.5.txt	Thu Sep 23 10:59:21 2010 +0200
@@ -699,13 +699,12 @@
     Optional. Whether to connect to mail server using TLS. True or
     False. Default: False.
 ``username``
-    Optional. User name to authenticate to SMTP server with. If
-    username is specified, password must also be specified.
+    Optional. User name for authenticating with the SMTP server.
     Default: none.
 ``password``
-    Optional. Password to authenticate to SMTP server with. If
-    username is specified, password must also be specified.
-    Default: none.
+    Optional. Password for authenticating with the SMTP server. If not
+    specified, interactive sessions will prompt the user for a
+    password; non-interactive sessions will fail. Default: none.
 ``local_hostname``
     Optional. It's the hostname that the sender can use to identify
     itself to the MTA.
--- a/mercurial/commands.py	Thu Sep 23 01:59:02 2010 +0200
+++ b/mercurial/commands.py	Thu Sep 23 10:59:21 2010 +0200
@@ -1585,7 +1585,7 @@
         reflags |= re.I
     try:
         regexp = re.compile(pattern, reflags)
-    except Exception, inst:
+    except re.error, inst:
         ui.warn(_("grep: invalid match pattern: %s\n") % inst)
         return 1
     sep, eol = ':', '\n'
mercurial