diff --git a/hgext/narrow/narrowbundle2.py b/hgext/narrow/narrowbundle2.py --- a/hgext/narrow/narrowbundle2.py +++ b/hgext/narrow/narrowbundle2.py @@ -309,9 +309,9 @@ def wrappedcgfn(*args, **kwargs): repo = args[1] if repo.ui.has_section(_NARROWACL_SECTION): - getbundlechangegrouppart_narrow( - *args, **exchange.applynarrowacl(repo, kwargs)) - elif kwargs.get(r'narrow', False): + kwargs = exchange.applynarrowacl(repo, kwargs) + + if kwargs.get(r'narrow', False): getbundlechangegrouppart_narrow(*args, **kwargs) else: origcgfn(*args, **kwargs) diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -1872,9 +1872,11 @@ new_args = {} new_args.update(kwargs) - new_args['includepats'] = req_includes + new_args[r'narrow'] = True + new_args[r'includepats'] = req_includes if req_excludes: - new_args['excludepats'] = req_excludes + new_args[r'excludepats'] = req_excludes + return new_args def _computeellipsis(repo, common, heads, known, match, depth=None):