Commit 85f3820b authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

evolvecmd: rename _solveunstable() to _solveorphan()

"unstable" was renamed to "orphan" quite a while ago, so it's about
time we update the function name.
parent cbc886623dc1
......@@ -74,8 +74,8 @@ def _solveone(ui, repo, ctx, evolvestate, dryrun, confirm,
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 @@ def _solveone(ui, repo, ctx, evolvestate, dryrun, confirm,
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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment