This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11884

status: when extracting arguments from `opts`, use the same default values
ClosedPublic

Authored by spectral on Dec 7 2021, 6:57 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGeaad68294904: status: when extracting arguments from `opts`, use the same default values
Summary

Sometimes other code, such as commit when using commands.commit.post-status,
calls commands.status() without going through the normal dispatch mechanism
that would typically fill in the args to be something besides None. As a
"defense in depth" mechanism for a bug where Mercurial would crash if both
commands.commit.post-status and experimental.directaccess were enabled,
let's sanitize these values to be identical to the values they would have when
the user invoked this method from the commandline.

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

spectral created this revision.Dec 7 2021, 6:57 PM
Alphare accepted this revision.Dec 13 2021, 9:24 AM
This revision is now accepted and ready to land.Dec 13 2021, 9:24 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (6 lines)

Diff 31456

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
hg status -v -t mardu hg status -v -t mardu
Returns 0 on success. Returns 0 on success.
""" """
cmdutil.check_at_most_one_arg(opts, 'rev', 'change') cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
revs = opts.get(b'rev') revs = opts.get(b'rev', [])
change = opts.get(b'change') change = opts.get(b'change', b'')
terse = opts.get(b'terse') terse = opts.get(b'terse', _NOTTERSE)
if terse is _NOTTERSE: if terse is _NOTTERSE:
if revs: if revs:
terse = b'' terse = b''
else: else:
terse = ui.config(b'commands', b'status.terse') terse = ui.config(b'commands', b'status.terse')
if revs and terse: if revs and terse:
msg = _(b'cannot use --terse with --rev') msg = _(b'cannot use --terse with --rev')