From patchwork Thu Feb 22 03:24:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D2367: narrowcommands: add some missing strkwargs calls for py3 From: phabricator X-Patchwork-Id: 28230 Message-Id: <36e4b6967e3928384ab230e142ccd75c@localhost.localdomain> To: mercurial-devel@mercurial-scm.org Date: Thu, 22 Feb 2018 03:24:39 +0000 durin42 updated this revision to Diff 5980. durin42 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2367?vs=5947&id=5980 REVISION DETAIL https://phab.mercurial-scm.org/D2367 AFFECTED FILES hgext/narrow/narrowcommands.py CHANGE DETAILS To: durin42, #hg-reviewers, indygreg Cc: indygreg, pulkit, mercurial-devel diff --git a/hgext/narrow/narrowcommands.py b/hgext/narrow/narrowcommands.py --- a/hgext/narrow/narrowcommands.py +++ b/hgext/narrow/narrowcommands.py @@ -134,14 +134,14 @@ """Wraps archive command to narrow the default includes.""" if narrowrepo.REQUIREMENT in repo.requirements: repo_includes, repo_excludes = repo.narrowpats - includes = set(opts.get('include', [])) - excludes = set(opts.get('exclude', [])) + includes = set(opts.get(r'include', [])) + excludes = set(opts.get(r'exclude', [])) includes, excludes, unused_invalid = narrowspec.restrictpatterns( includes, excludes, repo_includes, repo_excludes) if includes: - opts['include'] = includes + opts[r'include'] = includes if excludes: - opts['exclude'] = excludes + opts[r'exclude'] = excludes return orig(ui, repo, *args, **opts) def pullbundle2extraprepare(orig, pullop, kwargs):