bisect: status message when no action is specified
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 21 Aug 2008 19:02:56 +0200
changeset 6929 1b15d6e7cc3c
parent 6928 1a4c66d741a2
child 6930 a58a611c320f
child 6949 834f7e069cae
bisect: status message when no action is specified
mercurial/commands.py
tests/test-bisect
tests/test-bisect.out
--- 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)