Patchwork D2268: py3: use pycompat.{bytes|str}kwargs in transplant.py

login
register
mail settings
Submitter phabricator
Date Feb. 14, 2018, 1:43 p.m.
Message ID <f6e13e1a279cef0bdf91e140fb8c838d@localhost.localdomain>
Download mbox | patch
Permalink /patch/27922/
State Not Applicable
Headers show

Comments

phabricator - Feb. 14, 2018, 1:43 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7fda2a8ed24e: py3: use pycompat.{bytes|str}kwargs in transplant.py (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2268?vs=5708&id=5722

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

AFFECTED FILES
  hgext/transplant.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -120,7 +120,8 @@ 
                                        opener=self.opener)
         def getcommiteditor():
             editform = cmdutil.mergeeditform(repo[None], 'transplant')
-            return cmdutil.getcommiteditor(editform=editform, **opts)
+            return cmdutil.getcommiteditor(editform=editform,
+                                           **pycompat.strkwargs(opts))
         self.getcommiteditor = getcommiteditor
 
     def applied(self, repo, node, parent):
@@ -647,6 +648,7 @@ 
                 raise error.Abort(_('--all is incompatible with a '
                                    'revision list'))
 
+    opts = pycompat.byteskwargs(opts)
     checkopts(opts, revs)
 
     if not opts.get('log'):