This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6864

py3: don't double-convert "opts" to bytes
ClosedPublic

Authored by martinvonz on Sep 17 2019, 6:38 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG44be33cf7a57: py3: don't double-convert "opts" to bytes
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Sep 17 2019, 6:38 PM
pulkit accepted this revision.Sep 18 2019, 7:48 AM
This revision is now accepted and ready to land.Sep 18 2019, 7:48 AM
martinvonz added a commit: rHG44be33cf7a57: py3: don't double-convert "opts" to bytes.Sep 18 2019, 9:24 AM
Closed by commit rHG44be33cf7a57: py3: don't double-convert "opts" to bytes (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/uncommit.py (2 lines)

Diff 16585

hgext/uncommit.py

hint = _(b"file does not exist") hint = _(b"file does not exist")
raise error.Abort(_(b'cannot uncommit "%s"') raise error.Abort(_(b'cannot uncommit "%s"')
% scmutil.getuipathfn(repo)(f), hint=hint) % scmutil.getuipathfn(repo)(f), hint=hint)
with repo.transaction('uncommit'): with repo.transaction('uncommit'):
if not (opts[b'message'] or opts[b'logfile']): if not (opts[b'message'] or opts[b'logfile']):
opts[b'message'] = old.description() opts[b'message'] = old.description()
message = cmdutil.logmessage(ui, pycompat.byteskwargs(opts)) message = cmdutil.logmessage(ui, opts)
keepcommit = pats keepcommit = pats
if not keepcommit: if not keepcommit:
if opts.get('keep') is not None: if opts.get('keep') is not None:
keepcommit = opts.get('keep') keepcommit = opts.get('keep')
else: else:
keepcommit = ui.configbool('experimental', 'uncommit.keep') keepcommit = ui.configbool('experimental', 'uncommit.keep')
newid = _commitfiltered(repo, old, match, keepcommit, newid = _commitfiltered(repo, old, match, keepcommit,