Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 33114:1b6946f87c50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.strkwargs() to convert kwargs keys to str
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 27 Jun 2017 00:23:32 +0530
parents 05906b8e1d23
children 4ecc6047d45f
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Tue Jun 27 00:15:56 2017 +0530
+++ b/mercurial/cmdutil.py	Tue Jun 27 00:23:32 2017 +0530
@@ -2839,7 +2839,8 @@
                 user = opts.get('user') or old.user()
                 date = opts.get('date') or old.date()
             editform = mergeeditform(old, 'commit.amend')
-            editor = getcommiteditor(editform=editform, **opts)
+            editor = getcommiteditor(editform=editform,
+                                     **pycompat.strkwargs(opts))
             if not message:
                 editor = getcommiteditor(edit=True, editform=editform)
                 message = old.description()