# HG changeset patch # User Pulkit Goyal # Date 1536958281 -10800 # Node ID b77f2ea51da54dcdd99283a831974f38b9f3158c # Parent c73c7653dfb9a2da91442304529fb3998f7cfb0f py3: fix kwargs handling in hgext/fastannotate.py Differential Revision: https://phab.mercurial-scm.org/D4588 diff -r c73c7653dfb9 -r b77f2ea51da5 hgext/fastannotate/commands.py --- a/hgext/fastannotate/commands.py Mon Sep 17 15:55:18 2018 +0300 +++ b/hgext/fastannotate/commands.py Fri Sep 14 23:51:21 2018 +0300 @@ -130,6 +130,8 @@ if ui.configbool('fastannotate', 'unfilteredrepo'): repo = repo.unfiltered() + opts = pycompat.byteskwargs(opts) + rev = opts.get('rev', '.') rebuild = opts.get('rebuild', False) @@ -207,12 +209,12 @@ # treat the file as text (skip the isbinary check) if ui.configbool('fastannotate', 'forcetext'): - opts['text'] = True + opts[r'text'] = True # check if we need to do prefetch (client-side) - rev = opts.get('rev') + rev = opts.get(r'rev') if util.safehasattr(repo, 'prefetchfastannotate') and rev is not None: - paths = list(_matchpaths(repo, rev, pats, opts)) + paths = list(_matchpaths(repo, rev, pats, pycompat.byteskwargs(opts))) repo.prefetchfastannotate(paths) return orig(ui, repo, *pats, **opts) @@ -241,6 +243,7 @@ The annotate cache will be built using the default diff and follow options and lives in '.hg/fastannotate/default'. """ + opts = pycompat.byteskwargs(opts) rev = opts.get('REV') or ui.config('fastannotate', 'mainbranch') if not rev: raise error.Abort(_('you need to provide a revision'),