# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1518610334 -19800 # Node ID 7fda2a8ed24ec360ef137f39bd20f55e9cc9fc0d # Parent 2f309b8846cf5bbdd1a79cd192c4563918dda0fc py3: use pycompat.{bytes|str}kwargs in transplant.py Differential Revision: https://phab.mercurial-scm.org/D2268 diff -r 2f309b8846cf -r 7fda2a8ed24e hgext/transplant.py --- a/hgext/transplant.py Wed Feb 14 17:41:27 2018 +0530 +++ b/hgext/transplant.py Wed Feb 14 17:42:14 2018 +0530 @@ -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'):