Patchwork D7186: py3: use native strings as keys into **opts in chistedit

login
register
mail settings
Submitter phabricator
Date Oct. 31, 2019, 10:23 p.m.
Message ID <differential-rev-PHID-DREV-jx3zh2cexzbxsjomepn6-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/42630/
State Superseded
Headers show

Comments

phabricator - Oct. 31, 2019, 10:23 p.m.
martinvonz created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Now you should be able to successfully confirm your histedit plan (at
  least in the case I tried). Even continuing after conflicts and
  finishing the histedit worked.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/histedit.py

CHANGE DETAILS




To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -1678,7 +1678,7 @@ 
             with repo.vfs(b'chistedit', b'w+') as fp:
                 for r in rules:
                     fp.write(r)
-                opts[b'commands'] = fp.name
+                opts['commands'] = fp.name
             return _texthistedit(ui, repo, *freeargs, **opts)
     except KeyboardInterrupt:
         pass