# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1285232361 -7200
# Node ID 8eedf53547b81794db7b02c1c83c99b19c86321f
# Parent  f1e8d6f6e682a74a135ba6509b2de26cc8172046# Parent  9a93f4fb141b89412084fcd23a03a09b11d43fbf
merge with stable

diff -r f1e8d6f6e682 -r 8eedf53547b8 doc/hgrc.5.txt
--- 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.
diff -r f1e8d6f6e682 -r 8eedf53547b8 mercurial/commands.py
--- 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'