D241: context: rename bumped into phasedivergent
lothiraldan (Boris Feld)
phabricator at mercurial-scm.org
Tue Aug 8 05:33:42 EDT 2017
lothiraldan updated this revision to Diff 622.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D241?vs=586&id=622
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.phasedivergent()
+
+ 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, indygreg
Cc: indygreg, mercurial-devel
More information about the Mercurial-devel
mailing list