D2228: narrowcommands: use pycompat.{bytes,str}kwargs

[durin42 (Augie Fackler)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG4a7ba3ac9163: narrowcommands: use 
pycompat.{bytes,str}kwargs (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2228?vs=5634=5641

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

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
@@ -19,6 +19,7 @@
 hg,
 merge,
 node,
+pycompat,
 registrar,
 repair,
 repoview,
@@ -69,6 +70,7 @@
 
 def clonenarrowcmd(orig, ui, repo, *args, **opts):
 """Wraps clone command, so 'hg clone' first wraps localrepo.clone()."""
+opts = pycompat.byteskwargs(opts)
 wrappedextraprepare = util.nullcontextmanager()
 opts_narrow = opts['narrow']
 if opts_narrow:
@@ -111,7 +113,7 @@
 wrappedpull = extensions.wrappedfunction(exchange, 'pull', pullnarrow)
 
 with wrappedextraprepare, wrappedpull:
-return orig(ui, repo, *args, **opts)
+return orig(ui, repo, *args, **pycompat.strkwargs(opts))
 
 def pullnarrowcmd(orig, ui, repo, *args, **opts):
 """Wraps pull command to allow modifying narrow spec."""



To: durin42, #hg-reviewers, indygreg
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D2228: narrowcommands: use pycompat.{bytes,str}kwargs

[durin42 (Augie Fackler)]

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/D2228

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
@@ -19,6 +19,7 @@
 hg,
 merge,
 node,
+pycompat,
 registrar,
 repair,
 repoview,
@@ -69,6 +70,7 @@
 
 def clonenarrowcmd(orig, ui, repo, *args, **opts):
 """Wraps clone command, so 'hg clone' first wraps localrepo.clone()."""
+opts = pycompat.byteskwargs(opts)
 wrappedextraprepare = util.nullcontextmanager()
 opts_narrow = opts['narrow']
 if opts_narrow:
@@ -111,7 +113,7 @@
 wrappedpull = extensions.wrappedfunction(exchange, 'pull', pullnarrow)
 
 with wrappedextraprepare, wrappedpull:
-return orig(ui, repo, *args, **opts)
+return orig(ui, repo, *args, **pycompat.strkwargs(opts))
 
 def pullnarrowcmd(orig, ui, repo, *args, **opts):
 """Wraps pull command to allow modifying narrow spec."""



To: durin42, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel