( )⚙ D2935 fancyopts: fix rendering of customopt defaults in help text

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2935

fancyopts: fix rendering of customopt defaults in help text
ClosedPublic

Authored by dploch on Mar 22 2018, 8:10 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG979c8ce9022d: fancyopts: fix rendering of customopt defaults in help text
Summary

Also make a getdefaultvalue() function to prevent unwanted mutation.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

dploch created this revision.Mar 22 2018, 8:10 PM
dploch added a subscriber: yuja.Mar 22 2018, 8:16 PM
yuja requested changes to this revision.Mar 23 2018, 10:17 AM

Looks good, but can you split this to two patches?

https://www.mercurial-scm.org/wiki/ContributingChanges#Submission_checklist

This revision now requires changes to proceed.Mar 23 2018, 10:17 AM
dploch added a comment.Mar 23 2018, 2:24 PM
In D2935#47329, @yuja wrote:

Looks good, but can you split this to two patches?
https://www.mercurial-scm.org/wiki/ContributingChanges#Submission_checklist

Done, sorry.

getdefaultvalue() change is now in D2937

yuja accepted this revision.Mar 23 2018, 10:54 PM
This revision is now accepted and ready to land.Mar 23 2018, 10:54 PM
yuja added a comment.Mar 23 2018, 10:55 PM

Moved test-help.t change back to this patch, and queued, thanks.

Closed by commit rHG979c8ce9022d: fancyopts: fix rendering of customopt defaults in help text (authored by dploch). · Explain WhyMar 23 2018, 11:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/help.py (6 lines)

Diff 7257

mercurial/help.py

_, _,
gettext, gettext,
) )
from . import ( from . import (
cmdutil, cmdutil,
encoding, encoding,
error, error,
extensions, extensions,
fancyopts,
filemerge, filemerge,
fileset, fileset,
minirst, minirst,
pycompat, pycompat,
revset, revset,
templatefilters, templatefilters,
templatefuncs, templatefuncs,
templatekw, templatekw,
if not verbose and any(w in desc for w in _exclkeywords): if not verbose and any(w in desc for w in _exclkeywords):
continue continue
so = '' so = ''
if shortopt: if shortopt:
so = '-' + shortopt so = '-' + shortopt
lo = '--' + longopt 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 # default is of unknown type, and in Python 2 we abused
# the %s-shows-repr property to handle integers etc. To # the %s-shows-repr property to handle integers etc. To
# match that behavior on Python 3, we do str(default) and # match that behavior on Python 3, we do str(default) and
# then convert it to bytes. # then convert it to bytes.
desc += _(" (default: %s)") % pycompat.bytestr(default) desc += _(" (default: %s)") % pycompat.bytestr(default)
if isinstance(default, list): if isinstance(default, list):
lo += " %s [+]" % optlabel lo += " %s [+]" % optlabel