# HG changeset patch # User Dirkjan Ochtman # Date 2008-08-21 17:02:56 # Node ID 1b15d6e7cc3cf6002800dc0e27fe3153d3c3652f # Parent 1a4c66d741a2fd8fd6d4328dc95d81ce55510613 bisect: status message when no action is specified diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -285,7 +285,10 @@ def bisect(ui, repo, rev=None, extra=Non 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") diff --git a/tests/test-bisect b/tests/test-bisect --- a/tests/test-bisect +++ b/tests/test-bisect @@ -55,6 +55,9 @@ hg bisect -g null 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 diff --git a/tests/test-bisect.out b/tests/test-bisect.out --- a/tests/test-bisect.out +++ b/tests/test-bisect.out @@ -241,6 +241,8 @@ abort: Inconsistent state, 31:58c80a7c8a 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)