Mercurial > public > mercurial-scm > hg
comparison mercurial/state.py @ 49829:8ced4ca30ea1 stable
bisect: correct message about aborting an in-progress bisect (issue6527)
By using a custom cmdhint message here we're avoiding automatic hint generation
in _statecheck.hint(), which would suggest 'hg bisect --continue' and 'hg
bisect --abort' (neither of which is a valid option).
This patch is only fixing the message about in-progress bisect, it doesn't
modify the unfinished state checking logic.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 02 Jan 2023 15:27:55 +0400 |
| parents | 642e31cb55f0 |
| children | 9d3721552b6c |
comparison
equal
deleted
inserted
replaced
| 49792:4658f5e67e4e | 49829:8ced4ca30ea1 |
|---|---|
| 364 addunfinished( | 364 addunfinished( |
| 365 b'bisect', | 365 b'bisect', |
| 366 fname=b'bisect.state', | 366 fname=b'bisect.state', |
| 367 allowcommit=True, | 367 allowcommit=True, |
| 368 reportonly=True, | 368 reportonly=True, |
| 369 cmdhint=_(b"use 'hg bisect --reset'"), | |
| 369 statushint=_( | 370 statushint=_( |
| 370 b'To mark the changeset good: hg bisect --good\n' | 371 b'To mark the changeset good: hg bisect --good\n' |
| 371 b'To mark the changeset bad: hg bisect --bad\n' | 372 b'To mark the changeset bad: hg bisect --bad\n' |
| 372 b'To abort: hg bisect --reset\n' | 373 b'To abort: hg bisect --reset\n' |
| 373 ), | 374 ), |