Mercurial > evolve
changeset 1413:cf043c659ae3
evolve: remove _picknexttroubled
It was not used anymore
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Fri, 19 Jun 2015 17:47:48 -0700 |
parents | 8794a4680bdd |
children | 4198e2fad6ba |
files | hgext/evolve.py |
diffstat | 1 files changed, 0 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Fri Jun 19 17:35:29 2015 -0700 +++ b/hgext/evolve.py Fri Jun 19 17:47:48 2015 -0700 @@ -1548,25 +1548,6 @@ progresscb() _cleanup(ui, repo, startnode, showprogress) -def _picknexttroubled(ui, repo, category, pickany=False, progresscb=None): - """Pick a the next trouble changeset to solve""" - if progresscb: progresscb() - tro = _stabilizableunstable(repo, repo['.']) - if tro is None: - wdp = repo['.'] - if 'divergent' in wdp.troubles(): - tro = wdp - if tro is None and pickany: - troubled = list(repo.set('unstable()')) - if not troubled: - troubled = list(repo.set('bumped()')) - if not troubled: - troubled = list(repo.set('divergent()')) - if troubled: - tro = troubled[0] - - return tro - def _stabilizableunstable(repo, pctx): """Return a changectx for an unstable changeset which can be stabilized on top of pctx or one of its descendants. None if none