# HG changeset patch # User Boris Feld # Date 1527533480 -7200 # Node ID 8459e8d2f72964026b7e1b5d0eec1d85cdd7edca # Parent 7f738edc4a27563dbcf765464de00cf7e1f42691 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 diff -r 7f738edc4a27 -r 8459e8d2f729 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Sat May 12 18:44:03 2018 -0700 +++ b/mercurial/cmdutil.py Mon May 28 20:51:20 2018 +0200 @@ -631,7 +631,7 @@ ('histedit', fileexistspredicate('histedit-state'), _histeditmsg), ('bisect', fileexistspredicate('bisect.state'), _bisectmsg), ('graft', fileexistspredicate('graftstate'), _graftmsg), - ('unshelve', fileexistspredicate('unshelverebasestate'), _unshelvemsg), + ('unshelve', fileexistspredicate('shelvedstate'), _unshelvemsg), ('rebase', fileexistspredicate('rebasestate'), _rebasemsg), # The merge state is part of a list that will be iterated over. # They need to be last because some of the other unfinished states may also