comparison hgext/histedit.py @ 43373:de2c8722a787 stable

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

43372:66a0c5faed1e

            ui.status(_(b"performing changes\n"))
            rules = makecommands(rc)
            with repo.vfs(b'chistedit', b'w+') as fp:
                for r in rules:
                    fp.write(r)
                opts[b'commands'] = fp.name
            return _texthistedit(ui, repo, *freeargs, **opts)
    except KeyboardInterrupt:
        pass
    return -1

43373:de2c8722a787

            ui.status(_(b"performing changes\n"))
            rules = makecommands(rc)
            with repo.vfs(b'chistedit', b'w+') as fp:
                for r in rules:
                    fp.write(r)
                opts['commands'] = fp.name
            return _texthistedit(ui, repo, *freeargs, **opts)
    except KeyboardInterrupt:
        pass
    return -1