Mercurial Mercurial > mercurial / 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 native strings as keys into **opts in chistedit stable
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 31 Oct 2019 15:03:12 -0700
branchstable
changeset 43373 de2c8722a787
parent 43372 66a0c5faed1e
child 43374 65c37b431e76
py3: use native strings as keys into **opts in chistedit 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. Differential Revision: https://phab.mercurial-scm.org/D7186
hgext/histedit.py file | annotate | diff | comparison | revisions 
--- a/hgext/histedit.py	Thu Oct 31 15:00:49 2019 -0700
+++ b/hgext/histedit.py	Thu Oct 31 15:03:12 2019 -0700
@@ -1687,7 +1687,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
mercurial