This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7023

hghave: document format for version feature checks as <name><vers>, no dots
ClosedPublic

Authored by spectral on Oct 8 2019, 2:17 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG37af48031d6f: hghave: document format for version feature checks as <name><vers>, no dots
Summary

I had a bit of a difficult time when attempting to fix a use of py-38 when
trying to figure out what the correct way of specifying the feature was. By
having the strings 'py-3*' and 'py3.8' in the hghave.checkvers docstring, I
would have had a much easier time of it instead of having to trace exactly what
was happening here.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

spectral created this revision.Oct 8 2019, 2:17 PM
pulkit accepted this revision.Oct 8 2019, 3:28 PM
This revision is now accepted and ready to land.Oct 8 2019, 3:28 PM
pulkit added a comment.Oct 8 2019, 3:44 PM

Looks like D7016 fixed it. +1 to the docs you have added, if you rebase and resend with the commit message updated, I will be happy to push it.

spectral retitled this revision from tests: fix test-archive to specify feature as py38, not py-38 to hghave: document format for version feature checks as <name><vers>, no dots.Oct 8 2019, 3:59 PM
spectral edited the summary of this revision. (Show Details)
spectral updated this revision to Diff 16974.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (8 lines)
Mtests/test-archive.t (2 lines)

Diff 16961

tests/hghave.py

return func return func
return decorator return decorator
def checkvers(name, desc, vers): def checkvers(name, desc, vers):
"""Registers a check function for each of a series of versions. """Registers a check function for each of a series of versions.
vers can be a list or an iterator""" vers can be a list or an iterator.
Produces a series of feature checks that have the form <name><vers> without
any punctuation (even if there's punctuation in 'vers'; i.e. this produces
'py38', not 'py3.8' or 'py-38')."""
def decorator(func): def decorator(func):
def funcv(v): def funcv(v):
def f(): def f():
return func(v) return func(v)
return f return f
@check("demandimport", "demandimport enabled") @check("demandimport", "demandimport enabled")
def has_demandimport(): def has_demandimport():
# chg disables demandimport intentionally for performance wins. # chg disables demandimport intentionally for performance wins.
return (not has_chg()) and os.environ.get('HGDEMANDIMPORT') != 'disable' return (not has_chg()) and os.environ.get('HGDEMANDIMPORT') != 'disable'
# Add "py27", "py35", ... as possible feature checks. Note that there's no
# punctuation here.
@checkvers("py", "Python >= %s", (2.7, 3.5, 3.6, 3.7, 3.8, 3.9)) @checkvers("py", "Python >= %s", (2.7, 3.5, 3.6, 3.7, 3.8, 3.9))
def has_python_range(v): def has_python_range(v):
major, minor = v.split('.')[0:2] major, minor = v.split('.')[0:2]
py_major, py_minor = sys.version_info.major, sys.version_info.minor py_major, py_minor = sys.version_info.major, sys.version_info.minor
return (py_major, py_minor) >= (int(major), int(minor)) return (py_major, py_minor) >= (int(major), int(minor))

tests/test-archive.t

content-disposition: attachment; filename=test-archive-1701ef1f1510.tar.gz content-disposition: attachment; filename=test-archive-1701ef1f1510.tar.gz
content-type: application/x-gzip content-type: application/x-gzip
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: testing stub value server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=408, sha1=8fa06531bddecc365a9f5edb0f88b65974bfe505 (no-py38 !) body: size=408, sha1=8fa06531bddecc365a9f5edb0f88b65974bfe505 (no-py38 !)
body: size=506, sha1=70926a04cb8887d0bcccf5380488100a10222def (py-38 !) body: size=506, sha1=70926a04cb8887d0bcccf5380488100a10222def (py38 !)
% tar.bz2 and zip disallowed should both give 403 % tar.bz2 and zip disallowed should both give 403
403 Archive type not allowed: bz2 403 Archive type not allowed: bz2
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: testing stub value server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked