Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: make condition clearer, and able to handle a new flag
authorValentin Gatien-Baron <valentin.gatienbaron@gmail.com>
Sun, 26 Aug 2018 15:23:03 -0400
changeset 39345 3fec8aa9b454
parent 39344 eecd68ca041d
child 39346 d0dfdf263a20
resolve: make condition clearer, and able to handle a new flag Differential Revision: https://phab.mercurial-scm.org/D4377
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Wed Jun 06 00:48:24 2018 +0200
+++ b/mercurial/commands.py	Sun Aug 26 15:23:03 2018 -0400
@@ -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"))
Mercurial