Mercurial > evolve

changeset 5574:e6241483ccec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: no need to return divergent and other Since we have removed the logic which could swap the values between `divergent` and `other`, we don't need to return those values as they won't change in this function.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 21 Aug 2020 01:04:08 +0530
parents 80e55fbda4a4
children 5c62afe34c96
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Fri Aug 21 00:56:24 2020 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Aug 21 01:04:08 2020 +0530
@@ -322,7 +322,7 @@
                 evolvestate[b'relocate-other'] = True
         resolutionparent = publicdiv.p1().node()
         evolvestate[b'public-divergent'] = publicdiv.node()
-        return (True, divergent, other, resolutionparent)
+        return (True, resolutionparent)
 
     otherp1 = succsotherp1 = other.p1().rev()
     divp1 = succsdivp1 = divergent.p1().rev()
@@ -414,7 +414,7 @@
         ui.write_err(hint)
         return (False, b".")
 
-    return (True, divergent, other, resolutionparent)
+    return (True, resolutionparent)
 
 def _relocatedivergent(repo, orig, dest, evolvestate):
     """relocates a divergent commit and saves the evolve state"""
@@ -481,7 +481,7 @@
                                               evolvestate)
     if not datatoproceed[0]:
         return (False, b".")
-    divergent, other, resolutionparent = datatoproceed[1:]
+    resolutionparent = datatoproceed[1]
 
     if divergent.p1().node() != resolutionparent:
         evolvestate[b'relocate-div'] = True