Mercurial > hg-stable
changeset 40966:05abb5fb146a
help: use "default: on" instead of "default: True"
"True" feels like a Python thing and not something that users should
see.
Differential Revision: https://phab.mercurial-scm.org/D5430
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 14 Dec 2018 13:20:00 -0800 |
| parents | 811f772b44aa |
| children | 8604f130eb43 |
| files | mercurial/help.py tests/test-help.t |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help.py Fri Dec 14 13:32:34 2018 -0800 +++ b/mercurial/help.py Fri Dec 14 13:20:00 2018 -0800 @@ -168,7 +168,10 @@ # the %s-shows-repr property to handle integers etc. To # match that behavior on Python 3, we do str(default) and # then convert it to bytes. - desc += _(" (default: %s)") % pycompat.bytestr(default) + defaultstr = pycompat.bytestr(default) + if default is True: + defaultstr = _("on") + desc += _(" (default: %s)") % defaultstr if isinstance(default, list): lo += " %s [+]" % optlabel
--- a/tests/test-help.t Fri Dec 14 13:32:34 2018 -0800 +++ b/tests/test-help.t Fri Dec 14 13:20:00 2018 -0800 @@ -809,6 +809,8 @@ > [(b'', b'longdesc', 3, b'x'*67), > (b'n', b'', None, b'normal desc'), > (b'', b'newline', b'', b'line1\nline2'), + > (b'', b'default-off', False, b'enable X'), + > (b'', b'default-on', True, b'enable Y'), > (b'', b'callableopt', func, b'adds foo'), > (b'', b'customopt', customopt(''), b'adds bar'), > (b'', b'customopt-withdefault', customopt('foo'), b'adds bar')], @@ -903,6 +905,8 @@ xxxxxxxxxxxxxxxxxxxxxxx (default: 3) -n -- normal desc --newline VALUE line1 line2 + --default-off enable X + --default-on enable Y (default: on) --callableopt VALUE adds foo --customopt VALUE adds bar --customopt-withdefault VALUE adds bar (default: foo)