Show More
@@ -285,7 +285,10 b' def bisect(ui, repo, rev=None, extra=Non' | |||||
285 | else: |
|
285 | else: | |
286 | reset = True |
|
286 | reset = True | |
287 | elif extra or good + bad + skip + reset > 1: |
|
287 | elif extra or good + bad + skip + reset > 1: | |
288 |
raise util.Abort( |
|
288 | raise util.Abort(_('incompatible arguments')) | |
|
289 | elif not (good or bad or skip or reset): | |||
|
290 | ui.status(_('(no action selected)\n')) | |||
|
291 | return | |||
289 |
|
292 | |||
290 | if reset: |
|
293 | if reset: | |
291 | p = repo.join("bisect.state") |
|
294 | p = repo.join("bisect.state") |
@@ -55,6 +55,9 b' hg bisect -g null' | |||||
55 | hg bisect -bU tip |
|
55 | hg bisect -bU tip | |
56 | hg id |
|
56 | hg id | |
57 |
|
57 | |||
|
58 | echo % test no action message | |||
|
59 | hg bisect | |||
|
60 | ||||
58 | # reproduce AssertionError (issue1228 and issue1182) |
|
61 | # reproduce AssertionError (issue1228 and issue1182) | |
59 | hg bisect -r |
|
62 | hg bisect -r | |
60 | hg bisect -b 4 |
|
63 | hg bisect -b 4 |
@@ -241,6 +241,8 b' abort: Inconsistent state, 31:58c80a7c8a' | |||||
241 | error |
|
241 | error | |
242 | Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) |
|
242 | Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) | |
243 | 5cd978ea5149 |
|
243 | 5cd978ea5149 | |
|
244 | % test no action message | |||
|
245 | (no action selected) | |||
244 | Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests) |
|
246 | Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests) | |
245 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
247 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
246 | Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests) |
|
248 | Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests) |
General Comments 0
You need to be logged in to leave comments.
Login now