D4588: py3: fix kwargs handling in hgext/fastannotate.py

[pulkit (Pulkit Goyal)]

pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D4588

AFFECTED FILES
  hgext/fastannotate/commands.py

CHANGE DETAILS

diff --git a/hgext/fastannotate/commands.py b/hgext/fastannotate/commands.py
--- a/hgext/fastannotate/commands.py
+++ b/hgext/fastannotate/commands.py
@@ -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,18 +243,18 @@
     The annotate cache will be built using the default diff and follow
     options and lives in '.hg/fastannotate/default'.
     """
-    rev = opts.get('REV') or ui.config('fastannotate', 'mainbranch')
+    rev = opts.get(r'REV') or ui.config('fastannotate', 'mainbranch')
     if not rev:
         raise error.Abort(_('you need to provide a revision'),
                           hint=_('set fastannotate.mainbranch or use --rev'))
     if ui.configbool('fastannotate', 'unfilteredrepo'):
         repo = repo.unfiltered()
     ctx = scmutil.revsingle(repo, rev)
-    m = scmutil.match(ctx, pats, opts)
+    m = scmutil.match(ctx, pats, pycompat.byteskwargs(opts))
     paths = list(ctx.walk(m))
     if util.safehasattr(repo, 'prefetchfastannotate'):
         # client
-        if opts.get('REV'):
+        if opts.get(r'REV'):
             raise error.Abort(_('--rev cannot be used for client'))
         repo.prefetchfastannotate(paths)
     else:



To: pulkit, #hg-reviewers
Cc: mercurial-devel