D241: context: rename bumped into phasedivergent

[lothiraldan (Boris Feld)]

lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Rename bumped context method into phasedivergent and add a deprecation warning
  on bumped.
  
  Only update all callers to keep the patch straightforward.
  
  The renaming is done according to
  https://www.mercurial-scm.org/wiki/CEDVocabulary.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D241

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -214,6 +214,12 @@
         return self.rev() in obsmod.getrevs(self._repo, 'unstable')
 
     def bumped(self):
+        msg = ("'context.bumped' is deprecated, "
+               "use 'context.phasedivergent'")
+        self._repo.ui.deprecwarn(msg, '4.4')
+        return self.orphan()
+
+    def phasedivergent(self):
         """True if the changeset try to be a successor of a public changeset
 
         Only non-public and non-obsolete changesets may be bumped.
@@ -235,7 +241,7 @@
 
     def troubled(self):
         """True if the changeset is either unstable, bumped or divergent"""
-        return self.orphan() or self.bumped() or self.contentdivergent()
+        return self.orphan() or self.phasedivergent() or self.contentdivergent()
 
     def troubles(self):
         """Keep the old version around in order to avoid breaking extensions
@@ -248,7 +254,7 @@
         troubles = []
         if self.orphan():
             troubles.append('orphan')
-        if self.bumped():
+        if self.phasedivergent():
             troubles.append('bumped')
         if self.contentdivergent():
             troubles.append('divergent')
@@ -265,7 +271,7 @@
         instabilities = []
         if self.orphan():
             instabilities.append('orphan')
-        if self.bumped():
+        if self.phasedivergent():
             instabilities.append('phase-divergent')
         if self.contentdivergent():
             instabilities.append('content-divergent')



To: lothiraldan, #hg-reviewers
Cc: mercurial-devel