equal
deleted
inserted
replaced
283 elif cmd == "bad": |
283 elif cmd == "bad": |
284 bad = True |
284 bad = True |
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("Incompatible arguments") |
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") |
292 if os.path.exists(p): |
295 if os.path.exists(p): |
293 os.unlink(p) |
296 os.unlink(p) |