Patchwork D2367: narrowcommands: add some missing strkwargs calls for py3

login
register
mail settings
Submitter phabricator
Date Feb. 22, 2018, 3:52 a.m.
Message ID <d30a4a9872854ef9a133cb09093060e7@localhost.localdomain>
Download mbox | patch
Permalink /patch/28233/
State Not Applicable
Headers show

Comments

phabricator - Feb. 22, 2018, 3:52 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5dbeddbf164a: narrowcommands: add some missing strkwargs calls for py3 (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2367?vs=5980&id=5983

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

Patch

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):