# HG changeset patch # User Pierre-Yves David # Date 1392862460 28800 # Node ID 2137f1c153d63675f4de20f6fc4de10101392d6f # Parent c479e24ebddf8bce0d892615a775bebd60de902f evolve: drop `latercomer` and `conflicting` compatibility. Those old alias are deprecated for a long time now. All computations related to troubles are in Mercurial core for multiple versions. diff -r c479e24ebddf -r 2137f1c153d6 README --- a/README Wed Feb 19 18:03:13 2014 -0800 +++ b/README Wed Feb 19 18:14:20 2014 -0800 @@ -44,6 +44,8 @@ 3.3.0 -- +- drop `latercomer` and `conflicting` compatibility. Those old alias are + deprecated for a long time now. - add verbose hint about how to handle corner case by hand. This should help people until evolve is able to to it itself. - removed the qsync extension. The only user I knew about (logilab) is not diff -r c479e24ebddf -r 2137f1c153d6 hgext/evolve.py --- a/hgext/evolve.py Wed Feb 19 18:03:13 2014 -0800 +++ b/hgext/evolve.py Wed Feb 19 18:14:20 2014 -0800 @@ -326,31 +326,6 @@ getrevs = obsolete.getrevs ##################################################################### -### Complete troubles computation logic ### -##################################################################### - - -### changectx method - -@eh.addattr(context.changectx, 'latecomer') -def latecomer(ctx): - """is the changeset bumped (Try to succeed to public change)""" - return ctx.bumped() - -@eh.addattr(context.changectx, 'conflicting') -def conflicting(ctx): - """is the changeset divergent (Try to succeed to public change)""" - return ctx.divergent() - -### revset symbol - -eh.revset('latecomer')(revset.symbols['bumped']) -eh.revset('conflicting')(revset.symbols['divergent']) - - - - -##################################################################### ### Additional Utilities ### #####################################################################