--- a/hgext/shelve.py Mon Jun 24 16:01:22 2019 -0700
+++ b/hgext/shelve.py Sat Jun 08 23:43:53 2019 +0530
@@ -48,6 +48,7 @@
registrar,
repair,
scmutil,
+ state as statemod,
templatefilters,
util,
vfs as vfsmod,
@@ -1139,9 +1140,10 @@
return createcmd(ui, repo, pats, opts)
def extsetup(ui):
- cmdutil.unfinishedstates.append(
+ statemod.unfinishedstates.append(
[shelvedstate._filename, False, False,
_('unshelve already in progress'),
_("use 'hg unshelve --continue' or 'hg unshelve --abort'")])
cmdutil.afterresolvedstates.append(
[shelvedstate._filename, _('hg unshelve --continue')])
+