hgext/evolve.py
changeset 1341 e8e3dbddc198
parent 1336 10d2ef1f7ed4
parent 1340 f455ce2a3587
child 1344 376d3df9f47b
--- a/hgext/evolve.py	Thu May 14 11:23:40 2015 -0700
+++ b/hgext/evolve.py	Tue May 19 00:47:00 2015 -0500
@@ -88,7 +88,7 @@
     raise ImportError('evolve needs version %s or above' % min(testedwith.split()))
 
 aliases, entry = cmdutil.findcmd('commit', commands.table)
-hasinteractivemode = util.any(['interactive' in e for e in entry[1]])
+hasinteractivemode = any(['interactive' in e for e in entry[1]])
 if hasinteractivemode:
     interactiveopt = [['i', 'interactive', None, _('use interactive mode')]]
 else:
@@ -913,12 +913,8 @@
     """Return a callable update(newid) updating the current bookmark
     and bookmarks bound to oldid to newid.
     """
-    bm = bmactive(repo)
     def updatebookmarks(newid):
         dirty = False
-        if bm:
-            repo._bookmarks[bm] = newid
-            dirty = True
         oldbookmarks = repo.nodebookmarks(oldid)
         if oldbookmarks:
             for b in oldbookmarks: