Commit fe1cdfb0 authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

evolve: use meaningful variable names for a return value

parent 64868b7dc112
......@@ -2072,17 +2072,17 @@ def _continuecontentdivergent(ui, repo, evolvestate, progresscb):
divergent = evolvestate[b'divergent']
other = evolvestate[b'other-divergent']
ret = _completecontentdivergent(ui, repo, progresscb,
repo[divergent],
repo[other],
repo[base],
evolvestate)
res, newnode = _completecontentdivergent(ui, repo, progresscb,
repo[divergent],
repo[other],
repo[base],
evolvestate)
origdivergent = evolvestate[b'orig-divergent']
evolvestate[b'replacements'][origdivergent] = ret[1]
evolvestate[b'replacements'][origdivergent] = newnode
ret = (res, newnode)
# logic to continue the public content-divergent
publicnode = evolvestate.get(b'public-divergent')
if publicnode:
res, newnode = ret
if not res:
# no need to proceed for phase divergence resolution step
pass
......
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