##// END OF EJS Templates
py3: use pycompat.{bytes|str}kwargs in transplant.py...
Pulkit Goyal -
r36208:7fda2a8e default
parent child Browse files
Show More
@@ -120,7 +120,8 b' class transplanter(object):'
120 opener=self.opener)
120 opener=self.opener)
121 def getcommiteditor():
121 def getcommiteditor():
122 editform = cmdutil.mergeeditform(repo[None], 'transplant')
122 editform = cmdutil.mergeeditform(repo[None], 'transplant')
123 return cmdutil.getcommiteditor(editform=editform, **opts)
123 return cmdutil.getcommiteditor(editform=editform,
124 **pycompat.strkwargs(opts))
124 self.getcommiteditor = getcommiteditor
125 self.getcommiteditor = getcommiteditor
125
126
126 def applied(self, repo, node, parent):
127 def applied(self, repo, node, parent):
@@ -647,6 +648,7 b' def _dotransplant(ui, repo, *revs, **opt'
647 raise error.Abort(_('--all is incompatible with a '
648 raise error.Abort(_('--all is incompatible with a '
648 'revision list'))
649 'revision list'))
649
650
651 opts = pycompat.byteskwargs(opts)
650 checkopts(opts, revs)
652 checkopts(opts, revs)
651
653
652 if not opts.get('log'):
654 if not opts.get('log'):
General Comments 0
You need to be logged in to leave comments. Login now