This is an archive of the discontinued Mercurial Phabricator instance.

Differential D875

hgweb: use parsebool for parsing diff query string options
ClosedPublic

Authored by indygreg on Oct 1 2017, 7:39 AM.

Details

Reviewers
simpkins
yuja
Group Reviewers
hg-reviewers
Commits
rHG407ebe7a9b93: hgweb: use parsebool for parsing diff query string options

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Oct 1 2017, 7:39 AM
simpkins accepted this revision.Oct 1 2017, 7:51 AM
yuja accepted this revision.Oct 1 2017, 9:26 AM
yuja added a subscriber: yuja.
yuja added inline comments.
mercurial/hgweb/webutil.py
181

It might be better to ignore an invalid boolean, instead of falling back to True.

This revision is now accepted and ready to land.Oct 1 2017, 9:26 AM
Closed by commit rHG407ebe7a9b93: hgweb: use parsebool for parsing diff query string options (authored by indygreg). · Explain WhyOct 1 2017, 9:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2285

mercurial/hgweb/webcommands.py

""" """
/annotate/{revision}/{path} /annotate/{revision}/{path}
--------------------------- ---------------------------
Show changeset information for each line in a file. Show changeset information for each line in a file.
The ``ignorews``, ``ignorewsamount``, ``ignorewseol``, and The ``ignorews``, ``ignorewsamount``, ``ignorewseol``, and
``ignoreblanklines`` query string arguments have the same meaning as ``ignoreblanklines`` query string arguments have the same meaning as
their ``[annotate]`` config equivalents. A value of ``0`` sets the their ``[annotate]`` config equivalents. It uses the hgrc boolean
whitespace option to false. All other values are true. If not defined, parsing logic to interpret the value. e.g. ``0`` and ``false`` are
the server default settings are used. false and ``1`` and ``true`` are true. If not defined, the server
default settings are used.
The ``fileannotate`` template is rendered. The ``fileannotate`` template is rendered.
""" """
fctx = webutil.filectx(web.repo, req) fctx = webutil.filectx(web.repo, req)
f = fctx.path() f = fctx.path()
parity = paritygen(web.stripecount) parity = paritygen(web.stripecount)
ishead = fctx.filerev() in fctx.filelog().headrevs() ishead = fctx.filerev() in fctx.filelog().headrevs()

mercurial/hgweb/webutil.py

def difffeatureopts(req, ui, section): def difffeatureopts(req, ui, section):
diffopts = patch.difffeatureopts(ui, untrusted=True, diffopts = patch.difffeatureopts(ui, untrusted=True,
section=section, whitespace=True) section=section, whitespace=True)
for k in ('ignorews', 'ignorewsamount', 'ignorewseol', 'ignoreblanklines'): for k in ('ignorews', 'ignorewsamount', 'ignorewseol', 'ignoreblanklines'):
v = req.form.get(k, [None])[0] v = req.form.get(k, [None])[0]
if v is not None: if v is not None:
try: v = util.parsebool(v)
v = bool(int(v)) setattr(diffopts, k, v if v is not None else True)
yujaUnsubmitted
Not Done

It might be better to ignore an invalid boolean, instead of falling back to True.

yuja: It might be better to ignore an invalid boolean, instead of falling back to True.
except ValueError:
v = True
setattr(diffopts, k, v)
return diffopts return diffopts
def annotate(req, fctx, ui): def annotate(req, fctx, ui):
diffopts = difffeatureopts(req, ui, 'annotate') diffopts = difffeatureopts(req, ui, 'annotate')
return fctx.annotate(follow=True, linenumber=True, diffopts=diffopts) return fctx.annotate(follow=True, linenumber=True, diffopts=diffopts)
def parents(ctx, hide=None): def parents(ctx, hide=None):