Mercurial > evolve

changeset 4697:cba3db7d7e96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
oops: backed out changeset 7ac40b4ea24c Anton requested some changes on it.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 02 Jul 2019 10:17:42 +0200
parents 7ac40b4ea24c
children 6af77f89eac5
files hgext3rd/evolve/__init__.py
diffstat 1 files changed, 7 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py	Sun Jun 30 23:50:57 2019 +0530
+++ b/hgext3rd/evolve/__init__.py	Tue Jul 02 10:17:42 2019 +0200
@@ -280,7 +280,6 @@
     patch,
     revset,
     scmutil,
-    state as statemod,
 )
 
 from mercurial.i18n import _
@@ -1356,28 +1355,14 @@
 
 @eh.uisetup
 def setupevolveunfinished(ui):
-    if not util.safehasattr(cmdutil, 'unfinishedstates'):
-        _msg = _('To continue:    hg evolve --continue\n'
-                 'To abort:       hg evolve --abort\n'
-                 'To stop:        hg evolve --stop\n'
-                 '(also see `hg help evolve.interrupted`)')
-        statemod.addunfinished('evolve', fname='evolvestate',
-                               continueflag=True, stopflag=True,
-                               cmdmsg=_('evolve in progress'),
-                               cmdhint=_("use 'hg evolve --continue' or "
-                                         "'hg evolve --abort' to abort"),
-                               statushint=_msg)
-        statemod.addunfinished('pick', fname='pickstate', continueflag=True)
-    else:
-        # compat <= hg-5.0 (5f2f6912c9e6)
-        data = ('evolvestate', False, False, _('evolve in progress'),
-                _("use 'hg evolve --continue' or 'hg evolve --abort' to abort"))
-        cmdutil.unfinishedstates.append(data)
+    data = ('evolvestate', False, False, _('evolve in progress'),
+            _("use 'hg evolve --continue' or 'hg evolve --abort' to abort"))
+    cmdutil.unfinishedstates.append(data)
 
-        afterresolved = ('evolvestate', _('hg evolve --continue'))
-        pickresolved = ('pickstate', _('hg pick --continue'))
-        cmdutil.afterresolvedstates.append(afterresolved)
-        cmdutil.afterresolvedstates.append(pickresolved)
+    afterresolved = ('evolvestate', _('hg evolve --continue'))
+    pickresolved = ('pickstate', _('hg pick --continue'))
+    cmdutil.afterresolvedstates.append(afterresolved)
+    cmdutil.afterresolvedstates.append(pickresolved)
 
     if util.safehasattr(cmdutil, 'STATES'):
         statedata = ('evolve', cmdutil.fileexistspredicate('evolvestate'),