Mercurial > hg

changeset 35917:3d8b0020f470

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 Differential Revision: https://phab.mercurial-scm.org/D2043
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 05 Feb 2018 13:12:01 +0530
parents d41e41d11574
children e35616bb6ede
files hgext/rebase.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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,