From patchwork Mon Jun 25 15:21:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D3687: shelve: check the actual shelvestate in morestatus From: phabricator X-Patchwork-Id: 32424 Message-Id: To: mercurial-devel@mercurial-scm.org Date: Mon, 25 Jun 2018 15:21:34 +0000 This revision was automatically updated to reflect the committed changes. Closed by commit rHG8459e8d2f729: shelve: check the actual shelvestate in morestatus (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3687?vs=8975&id=9288 REVISION DETAIL https://phab.mercurial-scm.org/D3687 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS To: lothiraldan, #hg-reviewers, durin42 Cc: mercurial-devel diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -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