629 STATES = ( |
629 STATES = ( |
630 # (state, predicate to detect states, helpful message function) |
630 # (state, predicate to detect states, helpful message function) |
631 ('histedit', fileexistspredicate('histedit-state'), _histeditmsg), |
631 ('histedit', fileexistspredicate('histedit-state'), _histeditmsg), |
632 ('bisect', fileexistspredicate('bisect.state'), _bisectmsg), |
632 ('bisect', fileexistspredicate('bisect.state'), _bisectmsg), |
633 ('graft', fileexistspredicate('graftstate'), _graftmsg), |
633 ('graft', fileexistspredicate('graftstate'), _graftmsg), |
634 ('unshelve', fileexistspredicate('unshelverebasestate'), _unshelvemsg), |
634 ('unshelve', fileexistspredicate('shelvedstate'), _unshelvemsg), |
635 ('rebase', fileexistspredicate('rebasestate'), _rebasemsg), |
635 ('rebase', fileexistspredicate('rebasestate'), _rebasemsg), |
636 # The merge state is part of a list that will be iterated over. |
636 # The merge state is part of a list that will be iterated over. |
637 # They need to be last because some of the other unfinished states may also |
637 # They need to be last because some of the other unfinished states may also |
638 # be in a merge or update state (eg. rebase, histedit, graft, etc). |
638 # be in a merge or update state (eg. rebase, histedit, graft, etc). |
639 # We want those to have priority. |
639 # We want those to have priority. |