evolve: replace bumped in function name to phasedivergence
authorPulkit Goyal <7895pulkit@gmail.com>
Fri, 23 Mar 2018 12:39:00 +0530
changeset 3609 1c8dec54450a
parent 3608 d520df57d1c7
child 3610 145dab8c60c9
evolve: replace bumped in function name to phasedivergence bumped was the old name of phasedivergence. Lets replace with its new name so that we can forget the old one.
hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Fri Mar 23 12:35:37 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Mar 23 12:39:00 2018 +0530
@@ -66,8 +66,8 @@
             result = _solveunstable(ui, repo, ctx, evolvestate,
                                     dryrun, confirm, progresscb)
         elif 'phasedivergent' == category:
-            result = _solvebumped(ui, repo, ctx, evolvestate,
-                                  dryrun, confirm, progresscb)
+            result = _solvephasedivergence(ui, repo, ctx, evolvestate,
+                                           dryrun, confirm, progresscb)
         elif 'contentdivergent' == category:
             result = _solvedivergent(ui, repo, ctx, evolvestate,
                                      dryrun, confirm, progresscb)
@@ -180,9 +180,9 @@
                   " or use 'hg update -C .' to abort\n"))
             raise
 
-def _solvebumped(ui, repo, bumped, evolvestate, dryrun=False, confirm=False,
-                 progresscb=None):
-    """Stabilize a bumped changeset
+def _solvephasedivergence(ui, repo, bumped, evolvestate, dryrun=False,
+                          confirm=False, progresscb=None):
+    """Stabilize a phase divergent changeset
 
     returns a tuple (bool, newnode) where,
         bool: a boolean value indicating whether the instability was solved