( )⚙ D7639 releasenotes: extract helper for checking for incompatible arguments

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7639

releasenotes: extract helper for checking for incompatible arguments
ClosedPublic

Authored by martinvonz on Dec 13 2019, 2:53 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG023ad45e2fd2: releasenotes: extract helper for checking for incompatible arguments
Summary

This patch extracts a new check_incompatible_arguments() function
similar to check_at_most_one_arg(). The difference is that the new
function is for checking for arguments that are disallowed together
with some other argument but not mutually exclusive among themselves.

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.Dec 13 2019, 2:53 AM
martinvonz retitled this revision from releasenotes: use cmdutil.check_unique_argument() to releasenotes: extract helper for checking for incompatible arguments.Dec 13 2019, 5:56 PM
martinvonz edited the summary of this revision. (Show Details)
martinvonz updated this revision to Diff 18708.
martinvonz edited the summary of this revision. (Show Details)Dec 16 2019, 6:18 PM
martinvonz updated this revision to Diff 18765.
pulkit accepted this revision.Dec 17 2019, 2:13 AM
This revision is now accepted and ready to land.Dec 17 2019, 2:13 AM
pulkit requested changes to this revision.Dec 17 2019, 2:27 AM
This revision now requires changes to proceed.Dec 17 2019, 2:27 AM
pulkit accepted this revision.Dec 17 2019, 2:27 AM
This revision is now accepted and ready to land.Dec 17 2019, 2:27 AM

Revision Contents
Changeset List

PathPackages
Mhgext/releasenotes.py (10 lines)
Mmercurial/cmdutil.py (10 lines)

Diff 18793

hgext/releasenotes.py

import difflib import difflib
import errno import errno
import re import re
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import open from mercurial.pycompat import open
from mercurial import ( from mercurial import (
cmdutil,
config, config,
error, error,
minirst, minirst,
node, node,
pycompat, pycompat,
registrar, registrar,
scmutil, scmutil,
util, util,
The -l/--list option, presents the user with a list of existing available The -l/--list option, presents the user with a list of existing available
admonitions along with their title. This also includes the custom admonitions along with their title. This also includes the custom
admonitions (if any). admonitions (if any).
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
sections = releasenotessections(ui, repo) sections = releasenotessections(ui, repo)
listflag = opts.get(b'list') cmdutil.check_incompatible_arguments(opts, b'list', b'rev', b'check')
if listflag and opts.get(b'rev'): if opts.get(b'list'):
raise error.Abort(_(b'cannot use both \'--list\' and \'--rev\''))
if listflag and opts.get(b'check'):
raise error.Abort(_(b'cannot use both \'--list\' and \'--check\''))
if listflag:
return _getadmonitionlist(ui, sections) return _getadmonitionlist(ui, sections)
rev = opts.get(b'rev') rev = opts.get(b'rev')
revs = scmutil.revrange(repo, [rev or b'not public()']) revs = scmutil.revrange(repo, [rev or b'not public()'])
if opts.get(b'check'): if opts.get(b'check'):
return checkadmonitions(ui, repo, sections.names(), revs) return checkadmonitions(ui, repo, sections.names(), revs)
incoming = parsenotesfromrevisions(repo, sections.names(), revs) incoming = parsenotesfromrevisions(repo, sections.names(), revs)

mercurial/cmdutil.py

if opts.get(x): if opts.get(x):
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') % (previous, x)
) )
previous = x previous = x
def check_incompatible_arguments(opts, first, *others):
"""abort if the first argument is given along with any of the others
Unlike check_at_most_one_arg(), `others` are not mutually exclusive
among themselves.
"""
for other in others:
check_at_most_one_arg(opts, first, other)
def resolvecommitoptions(ui, opts): def resolvecommitoptions(ui, opts):
"""modify commit options dict to handle related options """modify commit options dict to handle related options
The return value indicates that ``rewrite.update-timestamp`` is the reason The return value indicates that ``rewrite.update-timestamp`` is the reason
the ``date`` option is set. the ``date`` option is set.
""" """
check_at_most_one_arg(opts, b'date', b'currentdate') check_at_most_one_arg(opts, b'date', b'currentdate')
check_at_most_one_arg(opts, b'user', b'currentuser') check_at_most_one_arg(opts, b'user', b'currentuser')