Mercurial > hg-stable
changeset 30144:14031d183048
perf: get subsettable from appropriate module for Mercurial earlier than 2.9
Before this patch, using branchmap.subsettable prevents perfbranchmap
from measuring performance of Mercurial earlier than 2.9 (or
175c6fd8cacc), because 175c6fd8cacc moved subsettable from repoview.py
to branchmap.py, even though there are some code paths for Mercurial
earlier than 2.9 in perf.py.
For example, setting "_prereadsize" attribute in perfindex() and
perfnodelookup() is effective only with hg earlier than 1.8 (or
61c9bc3da402).
To get subsettable from appropriate module, this patch examines
existence of subsettable in branchmap and repoview.
This patch also adds check-perf-code.py an extra check entry to detect
direct usage of subsettable attribute in perf.py.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sun, 09 Oct 2016 01:03:17 +0900 |
parents | 2d858c771760 |
children | 113aa6145020 |
files | contrib/perf.py tests/check-perf-code.py |
diffstat | 2 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/perf.py Sun Oct 09 01:03:16 2016 +0900 +++ b/contrib/perf.py Sun Oct 09 01:03:17 2016 +0900 @@ -214,6 +214,24 @@ return attrutil() +# utilities to examine each internal API changes + +def getbranchmapsubsettable(): + # for "historical portability": + # subsettable is defined in: + # - branchmap since 2.9 (or 175c6fd8cacc) + # - repoview since 2.5 (or 59a9f18d4587) + for mod in (branchmap, repoview): + subsettable = getattr(mod, 'subsettable', None) + if subsettable: + return subsettable + + # bisecting in bcee63733aad::59a9f18d4587 can reach here (both + # branchmap and repoview modules exist, but subsettable attribute + # doesn't) + raise error.Abort(("perfbranchmap not available with this Mercurial"), + hint="use 2.5 or later") + # perf commands @command('perfwalk', formatteropts) @@ -848,10 +866,11 @@ return d # add filter in smaller subset to bigger subset possiblefilters = set(repoview.filtertable) + subsettable = getbranchmapsubsettable() allfilters = [] while possiblefilters: for name in possiblefilters: - subset = branchmap.subsettable.get(name) + subset = subsettable.get(name) if subset not in possiblefilters: break else:
--- a/tests/check-perf-code.py Sun Oct 09 01:03:16 2016 +0900 +++ b/tests/check-perf-code.py Sun Oct 09 01:03:17 2016 +0900 @@ -10,6 +10,8 @@ # write static check patterns here perfpypats = [ [ + (r'(branchmap|repoview)\.subsettable', + "use getbranchmapsubsettable() for early Mercurial"), ], # warnings [