From fdfba9b17d4a61ebbaefebb0d7e60f2a0cfb1786 Mon Sep 17 00:00:00 2001 From: Jun Wu Date: Wed, 30 Nov 2016 21:22:52 +0000 Subject: [PATCH] fastannotate: fix perfhack with the new annotate wrapper The new wrapper may pass aopts=None, which could be troublesome if perfhack is enabled. Fix it by using the default aopts instead. --- fastannotate/commands.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastannotate/commands.py b/fastannotate/commands.py index 106f84434f..2e9f4ab81f 100644 --- a/fastannotate/commands.py +++ b/fastannotate/commands.py @@ -29,7 +29,7 @@ from . import ( cmdtable = {} command = cmdutil.command(cmdtable) -def _matchpaths(repo, rev, pats, opts, aopts): +def _matchpaths(repo, rev, pats, opts, aopts=facontext.defaultopts): """generate paths matching given patterns""" perfhack = repo.ui.configbool('fastannotate', 'perfhack') @@ -204,7 +204,7 @@ def _annotatewrapper(orig, ui, repo, *pats, **opts): # check if we need to do prefetch (client-side) rev = opts.get('rev') if util.safehasattr(repo, 'prefetchfastannotate') and rev is not None: - paths = list(_matchpaths(repo, rev, pats, opts, aopts=None)) + paths = list(_matchpaths(repo, rev, pats, opts)) repo.prefetchfastannotate(paths) return orig(ui, repo, *pats, **opts)