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
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'):
To: pulkit, #hg-reviewers
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
