##// END OF EJS Templates
obsolete: rename unstable volatile set into orphan volatile set...
Boris Feld -
r33772:d4b7496f default
parent child Browse files
Show More
@@ -211,7 +211,7 b' class basectx(object):'
211
211
212 def orphan(self):
212 def orphan(self):
213 """True if the changeset is not obsolete but it's ancestor are"""
213 """True if the changeset is not obsolete but it's ancestor are"""
214 return self.rev() in obsmod.getrevs(self._repo, 'unstable')
214 return self.rev() in obsmod.getrevs(self._repo, 'orphan')
215
215
216 def bumped(self):
216 def bumped(self):
217 msg = ("'context.bumped' is deprecated, "
217 msg = ("'context.bumped' is deprecated, "
@@ -908,6 +908,14 b' def _computeobsoleteset(repo):'
908
908
909 @cachefor('unstable')
909 @cachefor('unstable')
910 def _computeunstableset(repo):
910 def _computeunstableset(repo):
911 msg = ("'unstable' volatile set is deprecated, "
912 "use 'orphan'")
913 repo.ui.deprecwarn(msg, '4.4')
914
915 return _computeorphanset(repo)
916
917 @cachefor('orphan')
918 def _computeorphanset(repo):
911 """the set of non obsolete revisions with obsolete parents"""
919 """the set of non obsolete revisions with obsolete parents"""
912 pfunc = repo.changelog.parentrevs
920 pfunc = repo.changelog.parentrevs
913 mutable = _mutablerevs(repo)
921 mutable = _mutablerevs(repo)
@@ -926,7 +934,7 b' def _computeunstableset(repo):'
926 @cachefor('suspended')
934 @cachefor('suspended')
927 def _computesuspendedset(repo):
935 def _computesuspendedset(repo):
928 """the set of obsolete parents with non obsolete descendants"""
936 """the set of obsolete parents with non obsolete descendants"""
929 suspended = repo.changelog.ancestors(getrevs(repo, 'unstable'))
937 suspended = repo.changelog.ancestors(getrevs(repo, 'orphan'))
930 return set(r for r in getrevs(repo, 'obsolete') if r in suspended)
938 return set(r for r in getrevs(repo, 'obsolete') if r in suspended)
931
939
932 @cachefor('extinct')
940 @cachefor('extinct')
@@ -1947,8 +1947,8 b' def orphan(repo, subset, x):'
1947 """
1947 """
1948 # i18n: "orphan" is a keyword
1948 # i18n: "orphan" is a keyword
1949 getargs(x, 0, 0, _("orphan takes no arguments"))
1949 getargs(x, 0, 0, _("orphan takes no arguments"))
1950 unstables = obsmod.getrevs(repo, 'unstable')
1950 orphan = obsmod.getrevs(repo, 'orphan')
1951 return subset & unstables
1951 return subset & orphan
1952
1952
1953
1953
1954 @predicate('user(string)', safe=True)
1954 @predicate('user(string)', safe=True)
General Comments 0
You need to be logged in to leave comments. Login now