Patchwork D239: context: rename unstable into orphan

login
register
mail settings
Submitter phabricator
Date Aug. 7, 2017, 10:08 a.m.
Message ID <differential-rev-PHID-DREV-7dnwhwgd7llhvx7vuxox-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/22700/
State Superseded
Headers show

Comments

phabricator - Aug. 7, 2017, 10:08 a.m.
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Rename unstable context method into orphan and add a deprecation
  warning on unstable.
  
  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/D239

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS




To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
phabricator - Aug. 8, 2017, 4:37 a.m.
indygreg accepted this revision.
indygreg added inline comments.
This revision is now accepted and ready to land.

INLINE COMMENTS

> context.py:208
> +        msg = ("'context.unstable' is deprecated, "
> +               "use 'context.oprhan'")
> +        self._repo.ui.deprecwarn(msg, '4.4')

Typo. Can be fixed in flight if you don't submit a new series.

REPOSITORY
  rHG Mercurial

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

To: lothiraldan, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel
phabricator - Aug. 8, 2017, 9:47 a.m.
lothiraldan marked an inline comment as done.
lothiraldan added inline comments.

INLINE COMMENTS

> indygreg wrote in context.py:208
> Typo. Can be fixed in flight if you don't submit a new series.

I have made the fix as I sent another series

REPOSITORY
  rHG Mercurial

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

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

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -204,6 +204,12 @@ 
         return self.rev() in obsmod.getrevs(self._repo, 'extinct')
 
     def unstable(self):
+        msg = ("'context.unstable' is deprecated, "
+               "use 'context.oprhan'")
+        self._repo.ui.deprecwarn(msg, '4.4')
+        return self.orphan()
+
+    def orphan(self):
         """True if the changeset is not obsolete but it's ancestor are"""
         return self.rev() in obsmod.getrevs(self._repo, 'unstable')
 
@@ -223,7 +229,7 @@ 
 
     def troubled(self):
         """True if the changeset is either unstable, bumped or divergent"""
-        return self.unstable() or self.bumped() or self.divergent()
+        return self.orphan() or self.bumped() or self.divergent()
 
     def troubles(self):
         """Keep the old version around in order to avoid breaking extensions
@@ -234,7 +240,7 @@ 
         self._repo.ui.deprecwarn(msg, '4.4')
 
         troubles = []
-        if self.unstable():
+        if self.orphan():
             troubles.append('orphan')
         if self.bumped():
             troubles.append('bumped')
@@ -251,7 +257,7 @@ 
         - content-divergent.
         """
         instabilities = []
-        if self.unstable():
+        if self.orphan():
             instabilities.append('orphan')
         if self.bumped():
             instabilities.append('phase-divergent')