Show More
@@ -268,10 +268,13 b' def bisect(ui, repo, rev=None, extra=Non' | |||||
268 | To use, mark the earliest changeset you know exhibits the problem |
|
268 | To use, mark the earliest changeset you know exhibits the problem | |
269 | as bad, then mark the latest changeset which is free from the |
|
269 | as bad, then mark the latest changeset which is free from the | |
270 | problem as good. Bisect will update your working directory to a |
|
270 | problem as good. Bisect will update your working directory to a | |
271 | revision for testing. Once you have performed tests, mark the |
|
271 | revision for testing (unless the --noupdate option is specified). | |
272 | working directory as bad or good and bisect will either update to |
|
272 | Once you have performed tests, mark the working directory as bad | |
273 | another candidate changeset or announce that it has found the bad |
|
273 | or good and bisect will either update to another candidate changeset | |
274 | revision. |
|
274 | or announce that it has found the bad revision. | |
|
275 | ||||
|
276 | As a shortcut, you can also use the revision argument to mark a | |||
|
277 | revision as good or bad without checking it out first. | |||
275 | """ |
|
278 | """ | |
276 | # backward compatibility |
|
279 | # backward compatibility | |
277 | if rev in "good bad reset init".split(): |
|
280 | if rev in "good bad reset init".split(): | |
@@ -284,7 +287,10 b' def bisect(ui, repo, rev=None, extra=Non' | |||||
284 | else: |
|
287 | else: | |
285 | reset = True |
|
288 | reset = True | |
286 | elif extra or good + bad + skip + reset > 1: |
|
289 | elif extra or good + bad + skip + reset > 1: | |
287 |
raise util.Abort( |
|
290 | raise util.Abort(_('incompatible arguments')) | |
|
291 | elif not (good or bad or skip or reset): | |||
|
292 | ui.status(_('(no action selected)\n')) | |||
|
293 | return | |||
288 |
|
294 | |||
289 | if reset: |
|
295 | if reset: | |
290 | p = repo.join("bisect.state") |
|
296 | 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