Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.strkwargs() to convert kwargs' key to str
authorPulkit Goyal <7895pulkit@gmail.com>
Mon, 05 Feb 2018 13:12:01 +0530
changeset 35957 3d8b0020f470
parent 35956 d41e41d11574
child 35958 e35616bb6ede
py3: use pycompat.strkwargs() to convert kwargs' key to str Differential Revision: https://phab.mercurial-scm.org/D2043
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Mon Feb 05 13:10:33 2018 +0530
+++ b/hgext/rebase.py	Mon Feb 05 13:12:01 2018 +0530
@@ -499,7 +499,8 @@
                 if not self.collapsef:
                     merging = p2 != nullrev
                     editform = cmdutil.mergeeditform(merging, 'rebase')
-                    editor = cmdutil.getcommiteditor(editform=editform, **opts)
+                    editor = cmdutil.getcommiteditor(editform=editform,
+                                                     **pycompat.strkwargs(opts))
                     if self.wctx.isinmemory():
                         newnode = concludememorynode(repo, rev, p1, p2,
                             wctx=self.wctx,
hg-stable