diff --git a/hgext/lfs/__init__.py b/hgext/lfs/__init__.py --- a/hgext/lfs/__init__.py +++ b/hgext/lfs/__init__.py @@ -385,6 +385,6 @@ [('r', 'rev', [], _('upload large files introduced by REV'))]) def debuglfsupload(ui, repo, **opts): """upload lfs blobs added by the working copy parent or given revisions""" - revs = opts.get('rev', []) + revs = opts.get(r'rev', []) pointers = wrapper.extractpointers(repo, scmutil.revrange(repo, revs)) wrapper.uploadblobs(repo, pointers) diff --git a/hgext/narrow/narrowcommands.py b/hgext/narrow/narrowcommands.py --- a/hgext/narrow/narrowcommands.py +++ b/hgext/narrow/narrowcommands.py @@ -122,8 +122,8 @@ def pullbundle2extraprepare_widen(orig, pullop, kwargs): orig(pullop, kwargs) - if opts.get('depth'): - kwargs['depth'] = opts['depth'] + if opts.get(r'depth'): + kwargs['depth'] = opts[r'depth'] wrappedextraprepare = extensions.wrappedfunction(exchange, '_pullbundle2extraprepare', pullbundle2extraprepare_widen) diff --git a/mercurial/templatekw.py b/mercurial/templatekw.py --- a/mercurial/templatekw.py +++ b/mercurial/templatekw.py @@ -791,7 +791,7 @@ data.append({'successors': successors, 'markers': finalmarkers}) - f = _showlist('succsandmarkers', data, args) + f = _showlist('succsandmarkers', data, pycompat.byteskwargs(args)) return _hybrid(f, data, lambda x: x, pycompat.identity) @templatekeyword('p1rev')