Patchwork D3687: shelve: check the actual shelvestate in morestatus

login
register
mail settings
Submitter phabricator
Date June 5, 2018, 10:56 a.m.
Message ID <differential-rev-PHID-DREV-r6wsa5y6fcfdyzfhaykv-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/31972/
State New
Headers show

Comments

phabricator - June 5, 2018, 10:56 a.m.
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The rebasestate is a lower level implementation details that we are trying to
  remove.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3687

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS




To: lothiraldan, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -630,7 +630,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