This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7698

cmdutil: return underscore-separate name from check_at_most_one_arg()
ClosedPublic

Authored by martinvonz on Dec 18 2019, 2:38 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdfac25883dbf: cmdutil: return underscore-separate name from check_at_most_one_arg()
Summary

As noticed by Yuya, when I changed the function (during review) to
work with underscore-separated names as input, I forgot to make sure
the returned name was also underscore-separated. We don't have any
cases where it matters yet, but it should still clearly be fixed.

Instead of converting the hyphen-separated value we already have in
previous, I'm changing it so we convert to the underscore-separated
values to be hyphen-separated only when we need to display them. This
will also help a coming change where we allow the inputs to native
strings instead only bytes.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (8 lines)

Diff 18883

mercurial/cmdutil.py

_linebelow = b"^HG: ------------------------ >8 ------------------------$" _linebelow = b"^HG: ------------------------ >8 ------------------------$"
def check_at_most_one_arg(opts, *args): def check_at_most_one_arg(opts, *args):
"""abort if more than one of the arguments are in opts """abort if more than one of the arguments are in opts
Returns the unique argument or None if none of them were specified. Returns the unique argument or None if none of them were specified.
""" """
def to_display(name):
return name.replace(b'_', b'-')
previous = None previous = None
for x in args: for x in args:
if opts.get(x): if opts.get(x):
x = x.replace(b'_', b'-')
if previous: if previous:
raise error.Abort( raise error.Abort(
_(b'cannot specify both --%s and --%s') % (previous, x) _(b'cannot specify both --%s and --%s')
% (to_display(previous), to_display(x))
) )
previous = x previous = x
return previous return previous
def check_incompatible_arguments(opts, first, *others): def check_incompatible_arguments(opts, first, *others):
"""abort if the first argument is given along with any of the others """abort if the first argument is given along with any of the others