--- a/hgext/narrow/narrowcommands.py Sun Nov 10 07:30:14 2019 -0800
+++ b/hgext/narrow/narrowcommands.py Fri Nov 08 11:19:20 2019 -0800
@@ -136,8 +136,8 @@
def pullbundle2extraprepare_widen(orig, pullop, kwargs):
orig(pullop, kwargs)
- if opts.get(r'depth'):
- kwargs[b'depth'] = opts[r'depth']
+ if opts.get('depth'):
+ kwargs[b'depth'] = opts['depth']
wrappedextraprepare = extensions.wrappedfunction(
exchange, b'_pullbundle2extraprepare', pullbundle2extraprepare_widen
@@ -151,15 +151,15 @@
"""Wraps archive command to narrow the default includes."""
if repository.NARROW_REQUIREMENT in repo.requirements:
repo_includes, repo_excludes = repo.narrowpats
- includes = set(opts.get(r'include', []))
- excludes = set(opts.get(r'exclude', []))
+ includes = set(opts.get('include', []))
+ excludes = set(opts.get('exclude', []))
includes, excludes, unused_invalid = narrowspec.restrictpatterns(
includes, excludes, repo_includes, repo_excludes
)
if includes:
- opts[r'include'] = includes
+ opts['include'] = includes
if excludes:
- opts[r'exclude'] = excludes
+ opts['exclude'] = excludes
return orig(ui, repo, *args, **opts)