[PATCH evolve-ext] evolve: remove _picknexttroubled
Laurent Charignon
lcharignon at fb.com
Mon Jun 22 19:45:58 UTC 2015
# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1434761268 25200
# Fri Jun 19 17:47:48 2015 -0700
# Node ID 70fec53eb3512c07a982de40519c1ae789ddf4c8
# Parent 8794a4680bdd78fe9e452611797f9b018fc031df
evolve: remove _picknexttroubled
This function was not used anymore after the recent refactoring.
diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1548,25 +1548,6 @@ def evolve(ui, repo, **opts):
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
More information about the Mercurial-devel
mailing list