This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10894

benchmarks: restore `output` variable lost in D10884
ClosedPublic

Authored by martinvonz on Jun 22 2021, 11:32 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG50cd14dbd3b3: benchmarks: restore `output` variable lost in D10884
Summary

Noticed by pyflakes (which I didn't have installed for Python 3.9 when
I sent D10884).

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

martinvonz created this revision.Jun 22 2021, 11:32 AM
Alphare added a subscriber: Alphare.Jun 22 2021, 11:52 AM

Doesn't this lose the ui.silent feature?

martinvonz added a comment.Jun 22 2021, 12:06 PM
In D10894#166664, @Alphare wrote:

Doesn't this lose the ui.silent feature?

No, the pushbuffer+popbuffer sequence was very often used for silencing the ui, but that wasn't the (only) reason here -- the output is actually used for something. This is (AFAIK) what pushbuffer+popbuffer *should* be used for. I just missed that the output was used here when I wrote D10884.

martinvonz added a commit: rHG50cd14dbd3b3: benchmarks: restore `output` variable lost in D10884.Jun 22 2021, 6:22 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG50cd14dbd3b3: benchmarks: restore `output` variable lost in D10884 (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/benchmarks/__init__.py (5 lines)

Diff 28674

contrib/benchmarks/__init__.py

ui = uimod.ui.load() ui = uimod.ui.load()
else: else:
ui = uimod.ui() ui = uimod.ui()
repo = hg.repository(ui, os.path.join(reposdir, reponame)) repo = hg.repository(ui, os.path.join(reposdir, reponame))
perfext = extensions.load( perfext = extensions.load(
ui, 'perfext', os.path.join(basedir, 'contrib', 'perf.py') ui, 'perfext', os.path.join(basedir, 'contrib', 'perf.py')
) )
cmd = getattr(perfext, command) cmd = getattr(perfext, command)
with ui.silent(): ui.pushbuffer()
cmd(ui, repo, *args, **kwargs) cmd(ui, repo, *args, **kwargs)
output = ui.popbuffer()
match = outputre.search(output) match = outputre.search(output)
if not match: if not match:
raise ValueError("Invalid output {}".format(output)) raise ValueError("Invalid output {}".format(output))
return float(match.group(1)) return float(match.group(1))
def perfbench(repos=reposnames, name=None, params=None): def perfbench(repos=reposnames, name=None, params=None):
"""decorator to declare ASV benchmark based on contrib/perf.py extension """decorator to declare ASV benchmark based on contrib/perf.py extension