# HG changeset patch # User Martin von Zweigbergk # Date 2019-09-17 22:35:16 # Node ID 44be33cf7a5720f681fe902c83d8cc4aa1c26127 # Parent 04c6de38734dc0534da29c0e05d9498214583b91 py3: don't double-convert "opts" to bytes The "opts" are already converted to bytes at the beginning of the function. Doing it twice results in a crash, which makes test-uncommit.t fail. The extra call was added recently, in ff1ff2aae132 (uncommit: add support to modify the commit message and date, 2019-09-07). test-uncommit.t passes again after this patch. Differential Revision: https://phab.mercurial-scm.org/D6864 diff --git a/hgext/uncommit.py b/hgext/uncommit.py --- a/hgext/uncommit.py +++ b/hgext/uncommit.py @@ -177,7 +177,7 @@ def uncommit(ui, repo, *pats, **opts): with repo.transaction('uncommit'): if not (opts[b'message'] or opts[b'logfile']): opts[b'message'] = old.description() - message = cmdutil.logmessage(ui, pycompat.byteskwargs(opts)) + message = cmdutil.logmessage(ui, opts) keepcommit = pats if not keepcommit: