# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1574864433 -19800
# Node ID b302066725c3ffce407afc54eea37715889a47e0
# Parent  64868b7dc112d89adf73723ad8f069990925d25f
evolve: use meaningful variable names for a return value

diff -r 64868b7dc112 -r b302066725c3 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Wed Nov 27 12:34:19 2019 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Wed Nov 27 19:50:33 2019 +0530
@@ -2072,17 +2072,17 @@
 
         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