# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1528643148 -19800
# Node ID cb060c408b414ed7e23772f7fe8207e46d1d6b69
# Parent  f67ac33c07d22eb43039c4205edf0c9f89c629c7
evolve: move logic to continue interrupted content-div resolution to new fn

Each of the other type has defined their own function to continue/complete the
interrupted resolution. We take out the logic for content-div resolution too in
a separate function to make the top level function looks clean.

diff -r f67ac33c07d2 -r cb060c408b41 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Mon Jun 11 01:12:12 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Sun Jun 10 20:35:48 2018 +0530
@@ -1547,22 +1547,7 @@
         elif evolvestate['category'] == 'phasedivergent':
             _completephasedivergent(ui, repo, evolvestate)
         elif evolvestate['category'] == 'contentdivergent':
-            tr = None
-            try:
-                tr = repo.transaction('evolve')
-                divergent = evolvestate['divergent']
-                other = evolvestate['other-divergent']
-                base = evolvestate['base']
-                repo = repo.unfiltered()
-                ret = _completecontentdivergent(ui, repo, progresscb,
-                                                repo[divergent],
-                                                repo[other],
-                                                repo[base],
-                                                evolvestate)
-                evolvestate['replacements'][divergent] = ret[1]
-                tr.close()
-            finally:
-                tr.release()
+            _continuecontentdivergent(ui, repo, evolvestate, progresscb)
         else:
             repo.ui.status(_("continuing interrupted '%s' resolution is not yet"
                              " supported\n") % evolvestate['category'])
@@ -1586,6 +1571,25 @@
                         evolvestate['skippedrevs'].append(curctx.node())
         return
 
+def _continuecontentdivergent(ui, repo, evolvestate, progresscb):
+    """function to continue the interrupted content-divergence resolution."""
+    tr = None
+    try:
+        tr = repo.transaction('evolve')
+        divergent = evolvestate['divergent']
+        other = evolvestate['other-divergent']
+        base = evolvestate['base']
+        repo = repo.unfiltered()
+        ret = _completecontentdivergent(ui, repo, progresscb,
+                                        repo[divergent],
+                                        repo[other],
+                                        repo[base],
+                                        evolvestate)
+        evolvestate['replacements'][divergent] = ret[1]
+        tr.close()
+    finally:
+        tr.release()
+
 def _completephasedivergent(ui, repo, evolvestate):
     """function to complete the interrupted phase-divergence resolution.