D4377: resolve: make condition clearer, and able to handle a new flag
valentin.gatienbaron (Valentin Gatien-Baron)
phabricator at mercurial-scm.org
Wed Aug 29 13:13:04 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3fec8aa9b454: resolve: make condition clearer, and able to handle a new flag (authored by valentin.gatienbaron, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4377?vs=10575&id=10644
REVISION DETAIL
https://phab.mercurial-scm.org/D4377
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4558,7 +4558,7 @@
all, mark, unmark, show, nostatus = \
[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"))
if pats and all:
raise error.Abort(_("can't specify --all and patterns"))
To: valentin.gatienbaron, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list