Mercurial > evolve

changeset 5576:b4c2cbbde6bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: rename a func and some updates around it
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 21 Aug 2020 01:27:58 +0530
parents 5c62afe34c96
children 2f78cb38620f
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Thu Aug 20 23:54:27 2020 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Aug 21 01:27:58 2020 +0530
@@ -286,7 +286,7 @@
         repo.dirstate.setparents(newid, nodemod.nullid)
     return (True, replacementnode)
 
-def _prepcontentdivresolution(ui, repo, divergent, other, evolvestate):
+def _pickresolutionparent(ui, repo, divergent, other, evolvestate):
     """ if relocation required, decide which divergent cset will be relocated
     to the other side"""
 
@@ -477,11 +477,10 @@
     evolvestate[b'old-divergent'] = None
 
     # setup everything before merging two content-divergent csets
-    datatoproceed = _prepcontentdivresolution(ui, repo, divergent, other,
-                                              evolvestate)
-    if not datatoproceed[0]:
+    picked, resolutionparent = _pickresolutionparent(ui, repo, divergent,
+                                                     other, evolvestate)
+    if not picked:
         return (False, b".")
-    resolutionparent = datatoproceed[1]
 
     if divergent.p1().node() != resolutionparent:
         evolvestate[b'relocate-div'] = True