Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: use meaningful variable names for a return value
authorSushil khanchi <sushilkhanchi97@gmail.com>
Wed, 27 Nov 2019 19:50:33 +0530
changeset 5017 b302066725c3
parent 5016 64868b7dc112
child 5018 f1e90ce1d372
evolve: use meaningful variable names for a return value
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions 
--- 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
evolve