Mercurial > evolve
changeset 5590:582e3be0a277
evolvecmd: rename _solveunstable() to _solveorphan()
"unstable" was renamed to "orphan" quite a while ago, so it's about
time we update the function name.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 24 Sep 2020 15:33:01 -0700 |
| parents | cbc886623dc1 |
| children | 18fa4797b5dd |
| files | hgext3rd/evolve/evolvecmd.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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,