Patchwork D2043: py3: use pycompat.strkwargs() to convert kwargs' key to str

login
register
mail settings
Submitter phabricator
Date Feb. 5, 2018, 2:27 p.m.
Message ID <fd088448887462fd3e7ba3c9366415e9@localhost.localdomain>
Download mbox | patch
Permalink /patch/27320/
State Not Applicable
Headers show

Comments

phabricator - Feb. 5, 2018, 2:27 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3d8b0020f470: py3: use pycompat.strkwargs() to convert kwargs&#039; key to str (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2043?vs=5201&id=5214

REVISION DETAIL
  https://phab.mercurial-scm.org/D2043

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: pulkit, #hg-reviewers, yuja
Cc: mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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,