# HG changeset patch # User Pierre-Yves David # Date 1409153795 -7200 # Node ID 46048124c44bcae7ca5cc86b6cf0ea5e964b0403 # Parent 74bc8a0c2c025d55cd0d7e12eef596ed374d1804 evolve: drop a very old safe guard about bad marker The do not clean marker with nullrev successors. I assume none of them remains. diff -r 74bc8a0c2c02 -r 46048124c44b hgext/evolve.py --- 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 #####################################################################