This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8222

commands: switch one call of check_at_most_one_arg to strings
ClosedPublic

Authored by durin42 on Mar 4 2020, 2:22 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG5a5aee8ba980: commands: switch one call of check_at_most_one_arg to strings
Summary

This opts hasn't been through the byteskwargs mulcher, so we can just use
strings here instead of bytes. Fixes the test changes from D8204 on Python 3,
which was the only place this was a problem.

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

durin42 created this revision.Mar 4 2020, 2:22 PM
marmoute accepted this revision.Mar 4 2020, 2:40 PM
marmoute added a subscriber: marmoute.

If the test are happy. I am happy with.

durin42 added a commit: rHG5a5aee8ba980: commands: switch one call of check_at_most_one_arg to strings.Mar 4 2020, 5:15 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5a5aee8ba980: commands: switch one call of check_at_most_one_arg to strings (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)

Diff 20491

mercurial/commands.py

If you want to revert just one file to an older revision, use If you want to revert just one file to an older revision, use
:hg:`revert [-r REV] NAME`. :hg:`revert [-r REV] NAME`.
See :hg:`help dates` for a list of formats valid for -d/--date. See :hg:`help dates` for a list of formats valid for -d/--date.
Returns 0 on success, 1 if there are unresolved files. Returns 0 on success, 1 if there are unresolved files.
""" """
cmdutil.check_at_most_one_arg(opts, b'clean', b'check', b'merge') cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
rev = opts.get('rev') rev = opts.get('rev')
date = opts.get('date') date = opts.get('date')
clean = opts.get('clean') clean = opts.get('clean')
check = opts.get('check') check = opts.get('check')
merge = opts.get('merge') merge = opts.get('merge')
if rev and node: if rev and node:
raise error.Abort(_(b"please specify just one revision")) raise error.Abort(_(b"please specify just one revision"))