Submitter | Augie Fackler |
---|---|
Date | Sept. 14, 2016, 3:11 a.m. |
Message ID | <5c886401f3ae369de5cc.1473822680@augie-macbookair2.roam.corp.google.com> |
Download | mbox | patch |
Permalink | /patch/16617/ |
State | Changes Requested |
Headers | show |
Comments
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -896,7 +896,8 @@ def bisect(ui, repo, rev=None, extra=Non bad = True else: reset = True - elif extra or good + bad + skip + reset + extend + bool(command) > 1: + elif extra or sum(1 for b in (good, bad, skip, + reset, extend, command) if b) > 1: raise error.Abort(_('incompatible arguments')) cmdutil.checkunfinished(repo)