Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 38461:8459e8d2f729

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: check the actual shelvestate in morestatus The rebasestate is a lower level implementation details that we are trying to remove. Differential Revision: https://phab.mercurial-scm.org/D3687
author Boris Feld <boris.feld@octobus.net>
date Mon, 28 May 2018 20:51:20 +0200
parents 32fba6fe893d
children da2a7d8354b2
comparison
equal deleted inserted replaced
38460:7f738edc4a27 38461:8459e8d2f729
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.