# HG changeset patch # User Martin von Zweigbergk # Date 1600986781 25200 # Node ID 582e3be0a27767c83f8e6fcd8e9c56b6f1a7285b # Parent cbc886623dc1247e5befdd8bb36524ad92f7d831 evolvecmd: rename _solveunstable() to _solveorphan() "unstable" was renamed to "orphan" quite a while ago, so it's about time we update the function name. diff -r cbc886623dc1 -r 582e3be0a277 hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py Wed Oct 14 12:08:23 2020 +0200 +++ b/hgext3rd/evolve/evolvecmd.py Thu Sep 24 15:33:01 2020 -0700 @@ -74,8 +74,8 @@ displayer = logcmdutil.changesetdisplayer(ui, repo, {b'template': template}) if b'orphan' == category: - result = _solveunstable(ui, repo, ctx, evolvestate, displayer, - dryrun, confirm, progresscb) + result = _solveorphan(ui, repo, ctx, evolvestate, displayer, + dryrun, confirm, progresscb) elif b'phasedivergent' == category: result = _solvephasedivergence(ui, repo, ctx, evolvestate, displayer, dryrun, confirm, @@ -87,8 +87,8 @@ assert False, b"unknown trouble category: %s" % (category) return result -def _solveunstable(ui, repo, orig, evolvestate, displayer, dryrun=False, - confirm=False, progresscb=None): +def _solveorphan(ui, repo, orig, evolvestate, displayer, dryrun=False, + confirm=False, progresscb=None): """ Tries to stabilize the changeset orig which is orphan. returns a tuple (bool, newnode) where,