D2367: narrowcommands: add some missing strkwargs calls for py3

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Wed Feb 21 17:42:04 UTC 2018


durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2367

AFFECTED FILES
  hgext/narrow/narrowcommands.py

CHANGE DETAILS

diff --git a/hgext/narrow/narrowcommands.py b/hgext/narrow/narrowcommands.py
--- a/hgext/narrow/narrowcommands.py
+++ b/hgext/narrow/narrowcommands.py
@@ -133,6 +133,7 @@
 def archivenarrowcmd(orig, ui, repo, *args, **opts):
     """Wraps archive command to narrow the default includes."""
     if narrowrepo.REQUIREMENT in repo.requirements:
+        opts = pycompat.byteskwargs(opts)
         repo_includes, repo_excludes = repo.narrowpats
         includes = set(opts.get('include', []))
         excludes = set(opts.get('exclude', []))
@@ -142,6 +143,7 @@
             opts['include'] = includes
         if excludes:
             opts['exclude'] = excludes
+        opts = pycompat.strkwargs(opts)
     return orig(ui, repo, *args, **opts)
 
 def pullbundle2extraprepare(orig, pullop, kwargs):



To: durin42, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list