Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 6984:6c4a08270222
merge with crew-stable
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Wed, 03 Sep 2008 19:03:57 +0200 |
parents | 63b5f4c73c98 5ce625983208 |
children | 2365c6d4c330 |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Sep 03 15:46:46 2008 +0200 +++ b/mercurial/commands.py Wed Sep 03 19:03:57 2008 +0200 @@ -288,9 +288,6 @@ reset = True elif extra or good + bad + skip + reset > 1: raise util.Abort(_('incompatible arguments')) - elif not (good or bad or skip or reset): - ui.status(_('(no action selected)\n')) - return if reset: p = repo.join("bisect.state") @@ -329,7 +326,12 @@ del wlock if not state['good'] or not state['bad']: - return + if (good or bad or skip or reset): + return + if not state['good']: + raise util.Abort(_('cannot bisect (no known good revisions)')) + else: + raise util.Abort(_('cannot bisect (no known bad revisions)')) # actually bisect nodes, changesets, good = hbisect.bisect(repo.changelog, state)