##// END OF EJS Templates
py3: fix kwargs handling in hgext/fastannotate.py...
Pulkit Goyal -
r39702:b77f2ea5 default
parent child Browse files
Show More
@@ -130,6 +130,8 b' def fastannotate(ui, repo, *pats, **opts'
130 if ui.configbool('fastannotate', 'unfilteredrepo'):
130 if ui.configbool('fastannotate', 'unfilteredrepo'):
131 repo = repo.unfiltered()
131 repo = repo.unfiltered()
132
132
133 opts = pycompat.byteskwargs(opts)
134
133 rev = opts.get('rev', '.')
135 rev = opts.get('rev', '.')
134 rebuild = opts.get('rebuild', False)
136 rebuild = opts.get('rebuild', False)
135
137
@@ -207,12 +209,12 b' def _annotatewrapper(orig, ui, repo, *pa'
207
209
208 # treat the file as text (skip the isbinary check)
210 # treat the file as text (skip the isbinary check)
209 if ui.configbool('fastannotate', 'forcetext'):
211 if ui.configbool('fastannotate', 'forcetext'):
210 opts['text'] = True
212 opts[r'text'] = True
211
213
212 # check if we need to do prefetch (client-side)
214 # check if we need to do prefetch (client-side)
213 rev = opts.get('rev')
215 rev = opts.get(r'rev')
214 if util.safehasattr(repo, 'prefetchfastannotate') and rev is not None:
216 if util.safehasattr(repo, 'prefetchfastannotate') and rev is not None:
215 paths = list(_matchpaths(repo, rev, pats, opts))
217 paths = list(_matchpaths(repo, rev, pats, pycompat.byteskwargs(opts)))
216 repo.prefetchfastannotate(paths)
218 repo.prefetchfastannotate(paths)
217
219
218 return orig(ui, repo, *pats, **opts)
220 return orig(ui, repo, *pats, **opts)
@@ -241,6 +243,7 b' def debugbuildannotatecache(ui, repo, *p'
241 The annotate cache will be built using the default diff and follow
243 The annotate cache will be built using the default diff and follow
242 options and lives in '.hg/fastannotate/default'.
244 options and lives in '.hg/fastannotate/default'.
243 """
245 """
246 opts = pycompat.byteskwargs(opts)
244 rev = opts.get('REV') or ui.config('fastannotate', 'mainbranch')
247 rev = opts.get('REV') or ui.config('fastannotate', 'mainbranch')
245 if not rev:
248 if not rev:
246 raise error.Abort(_('you need to provide a revision'),
249 raise error.Abort(_('you need to provide a revision'),
General Comments 0
You need to be logged in to leave comments. Login now