mercurial/commands.py
changeset 6930 a58a611c320f
parent 6861 0b6f2fa5e03f
parent 6929 1b15d6e7cc3c
child 6932 d557749c627a
--- a/mercurial/commands.py	Thu Aug 21 10:20:44 2008 +0200
+++ b/mercurial/commands.py	Thu Aug 21 19:05:18 2008 +0200
@@ -268,10 +268,13 @@
     To use, mark the earliest changeset you know exhibits the problem
     as bad, then mark the latest changeset which is free from the
     problem as good. Bisect will update your working directory to a
-    revision for testing. Once you have performed tests, mark the
-    working directory as bad or good and bisect will either update to
-    another candidate changeset or announce that it has found the bad
-    revision.
+    revision for testing (unless the --noupdate option is specified).
+    Once you have performed tests, mark the working directory as bad
+    or good and bisect will either update to another candidate changeset
+    or announce that it has found the bad revision.
+    
+    As a shortcut, you can also use the revision argument to mark a
+    revision as good or bad without checking it out first.
     """
     # backward compatibility
     if rev in "good bad reset init".split():
@@ -284,7 +287,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")