--- a/mercurial/commands.py Thu Aug 21 19:02:46 2008 +0200
+++ b/mercurial/commands.py Thu Aug 21 19:02:56 2008 +0200
@@ -285,7 +285,10 @@
else:
reset = True
elif extra or good + bad + skip + reset > 1:
- raise util.Abort("Incompatible arguments")
+ 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")
--- a/tests/test-bisect Thu Aug 21 19:02:46 2008 +0200
+++ b/tests/test-bisect Thu Aug 21 19:02:56 2008 +0200
@@ -55,6 +55,9 @@
hg bisect -bU tip
hg id
+echo % test no action message
+hg bisect
+
# reproduce AssertionError (issue1228 and issue1182)
hg bisect -r
hg bisect -b 4
--- a/tests/test-bisect.out Thu Aug 21 19:02:46 2008 +0200
+++ b/tests/test-bisect.out Thu Aug 21 19:02:56 2008 +0200
@@ -241,6 +241,8 @@
error
Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
5cd978ea5149
+% test no action message
+(no action selected)
Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests)