changeset 1083:46048124c44b

evolve: drop a very old safe guard about bad marker The do not clean marker with nullrev successors. I assume none of them remains.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 27 Aug 2014 17:36:35 +0200
parents 74bc8a0c2c02
children 5459d9f48fea
files hgext/evolve.py
diffstat 1 files changed, 0 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Wed Aug 27 17:31:21 2014 +0200
+++ b/hgext/evolve.py	Wed Aug 27 17:36:35 2014 +0200
@@ -347,30 +347,6 @@
     if not opts.get('user') and opts.get('current_user'):
         opts['user'] = ui.username()
 
-
-#####################################################################
-### Critical fix                                                  ###
-#####################################################################
-
-@eh.wrapfunction(mercurial.obsolete, '_readmarkers')
-def safereadmarkers(orig, data):
-    """safe maker wrapper to remove nullid succesors
-
-    Nullid successors was created by older version of evolve.
-    """
-    nb = 0
-    for marker in orig(data):
-        if nullid in marker[1]:
-            marker = (marker[0],
-                      tuple(s for s in marker[1] if s != nullid),
-                      marker[2],
-                      marker[3])
-            nb += 1
-        yield marker
-    if nb:
-        e = sys.stderr
-        print >> e, 'repo contains %i invalid obsolescence markers' % nb
-
 getrevs = obsolete.getrevs
 
 #####################################################################