diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -20,6 +20,7 @@ encoding, error, extensions, + fancyopts, filemerge, fileset, minirst, @@ -84,7 +85,10 @@ if shortopt: so = '-' + shortopt lo = '--' + longopt - if default: + + if isinstance(default, fancyopts.customopt): + default = default.defaultvalue + if default and not callable(default): # default is of unknown type, and in Python 2 we abused # the %s-shows-repr property to handle integers etc. To # match that behavior on Python 3, we do str(default) and