Mercurial > hg-stable
changeset 39372:3fec8aa9b454
resolve: make condition clearer, and able to handle a new flag
Differential Revision: https://phab.mercurial-scm.org/D4377
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Sun, 26 Aug 2018 15:23:03 -0400 |
| parents | eecd68ca041d |
| children | d0dfdf263a20 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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"))