[PATCH 2 of 3] help: Do not print out defaults for options processed by calling a function

[Eric Hopper]

 mercurial/commands.py |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


# HG changeset patch
# User Eric Hopper <hopper at omnifarious.org>
# Date 1248458746 25200
# Node ID 63508fc4d03cb3b78a7a80f0131f3be22c6b92b9
# Parent  bf45c5ce3d0dafb7b9006ece189a578e8bf79947
help: Do not print out defaults for options processed by calling a function.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1584,7 +1584,8 @@
             opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
                                           longopt and " --%s" % longopt),
                                "%s%s" % (desc,
-                                         default
+                                         (default and not \
+                                              hasattr(default, '__call__'))
                                          and _(" (default: %s)") % default
                                          or "")))
 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 652 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20090724/9737bc95/attachment.pgp