pulkit updated this revision to Diff 11101. REPOSITORY rHG Mercurial
CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D4588?vs=11042&id=11101 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,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'), To: pulkit, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel