evolve: remove duplicated code draft
authorSushil khanchi <sushilkhanchi97@gmail.com>
Mon, 30 Dec 2019 00:11:00 +0530
changeset 5238 4a9f9cd7a0ab
parent 5237 8b7da5df5c7f
child 5239 13152b2fe8f7
evolve: remove duplicated code See at line 500.
hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Mon Nov 25 02:41:16 2019 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Dec 30 00:11:00 2019 +0530
@@ -498,7 +498,7 @@
     divergent, other, resolutionparent, relocatereq = datatoproceed[1:]
 
     if relocatereq:
-        evolvestate['relocation-req'] = True
+        evolvestate[b'relocation-req'] = True
     evolvestate[b'resolutionparent'] = resolutionparent
 
     if not ui.quiet or confirm:
@@ -520,10 +520,6 @@
         ui.write((b'hg commit -m "`hg log -r %s --template={desc}`";\n'
                   % divergent))
         return (False, b".")
-
-    if relocatereq:
-        evolvestate[b'relocation-req'] = True
-    evolvestate[b'resolutionparent'] = resolutionparent
     try:
         succsdivp1 = utility._singlesuccessor(repo, divergent.p1())
     except utility.MultipleSuccessorsError: