Mercurial > public > mercurial-scm > hg
comparison hgext/uncommit.py @ 42952:44be33cf7a57
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 17 Sep 2019 15:35:16 -0700 |
| parents | 2da754532dd3 |
| children | 576fd1c8b20b |
comparison
equal
deleted
inserted
replaced
| 42951:04c6de38734d | 42952:44be33cf7a57 |
|---|---|
| 175 % scmutil.getuipathfn(repo)(f), hint=hint) | 175 % scmutil.getuipathfn(repo)(f), hint=hint) |
| 176 | 176 |
| 177 with repo.transaction('uncommit'): | 177 with repo.transaction('uncommit'): |
| 178 if not (opts[b'message'] or opts[b'logfile']): | 178 if not (opts[b'message'] or opts[b'logfile']): |
| 179 opts[b'message'] = old.description() | 179 opts[b'message'] = old.description() |
| 180 message = cmdutil.logmessage(ui, pycompat.byteskwargs(opts)) | 180 message = cmdutil.logmessage(ui, opts) |
| 181 | 181 |
| 182 keepcommit = pats | 182 keepcommit = pats |
| 183 if not keepcommit: | 183 if not keepcommit: |
| 184 if opts.get('keep') is not None: | 184 if opts.get('keep') is not None: |
| 185 keepcommit = opts.get('keep') | 185 keepcommit = opts.get('keep') |