This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4377

resolve: make condition clearer, and able to handle a new flag
ClosedPublic

Authored by valentin.gatienbaron on Aug 26 2018, 7:01 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3fec8aa9b454: resolve: make condition clearer, and able to handle a new flag

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/commands.py (2 lines)

Diff 10644

mercurial/commands.py

""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
confirm = ui.configbool('commands', 'resolve.confirm') confirm = ui.configbool('commands', 'resolve.confirm')
flaglist = 'all mark unmark list no_status'.split() flaglist = 'all mark unmark list no_status'.split()
all, mark, unmark, show, nostatus = \ all, mark, unmark, show, nostatus = \
[opts.get(o) for o in flaglist] [opts.get(o) for o in flaglist]
if (show and (mark or unmark)) or (mark and unmark): if len(list(filter(None, [show, mark, unmark]))) > 1:
raise error.Abort(_("too many options specified")) raise error.Abort(_("too many options specified"))
if pats and all: if pats and all:
raise error.Abort(_("can't specify --all and patterns")) raise error.Abort(_("can't specify --all and patterns"))
if not (all or pats or show or mark or unmark): if not (all or pats or show or mark or unmark):
raise error.Abort(_('no files or directories specified'), raise error.Abort(_('no files or directories specified'),
hint=('use --all to re-merge all unresolved files')) hint=('use --all to re-merge all unresolved files'))
if confirm: if confirm: