# HG changeset patch # User Laurent Charignon # Date 1452801028 28800 # Node ID 2d294dada4f833d12ec0a7fbfde4c6d1c58cb800 # Parent 63116d47cc3fd179c90b117397cc26341a381edb rebase: small refactoring to allow better extensibility from extensions Inhibit, one of evolve's extension, would like to change the way rebase works with obsolete changesets. During a rebase with inhibit, the inhibition of the obsolescence markers should be lifted for the rebase. With this small refactoring, inhibit and can wrap the _filterobsoleterevs function to lift inhibition cleanly and at the same time this change makes rebases' code more legible. diff -r 63116d47cc3f -r 2d294dada4f8 hgext/rebase.py --- a/hgext/rebase.py Thu Jan 14 13:33:08 2016 -0800 +++ b/hgext/rebase.py Thu Jan 14 11:50:28 2016 -0800 @@ -343,8 +343,7 @@ obsoletenotrebased = {} if ui.configbool('experimental', 'rebaseskipobsolete'): rebasesetrevs = set(rebaseset) - rebaseobsrevs = set(r for r in rebasesetrevs - if repo[r].obsolete()) + rebaseobsrevs = _filterobsoleterevs(repo, rebasesetrevs) obsoletenotrebased = _computeobsoletenotrebased(repo, rebaseobsrevs, dest) @@ -1188,6 +1187,10 @@ blockers.update(getattr(repo, '_rebaseset', ())) return blockers +def _filterobsoleterevs(repo, revs): + """returns a set of the obsolete revisions in revs""" + return set(r for r in revs if repo[r].obsolete()) + def _computeobsoletenotrebased(repo, rebaseobsrevs, dest): """return a mapping obsolete => successor for all obsolete nodes to be rebased that have a successors in the destination