Show More
@@ -237,7 +237,7 b' class basectx(object):' | |||
|
237 | 237 | |
|
238 | 238 | Only non-public and non-obsolete changesets may be divergent. |
|
239 | 239 | """ |
|
240 | return self.rev() in obsmod.getrevs(self._repo, 'divergent') | |
|
240 | return self.rev() in obsmod.getrevs(self._repo, 'contentdivergent') | |
|
241 | 241 | |
|
242 | 242 | def troubled(self): |
|
243 | 243 | msg = ("'context.troubled' is deprecated, " |
@@ -968,6 +968,14 b' def _computebumpedset(repo):' | |||
|
968 | 968 | |
|
969 | 969 | @cachefor('divergent') |
|
970 | 970 | def _computedivergentset(repo): |
|
971 | msg = ("'divergent' volatile set is deprecated, " | |
|
972 | "use 'contentdivergent'") | |
|
973 | repo.ui.deprecwarn(msg, '4.4') | |
|
974 | ||
|
975 | return _computecontentdivergentset(repo) | |
|
976 | ||
|
977 | @cachefor('contentdivergent') | |
|
978 | def _computecontentdivergentset(repo): | |
|
971 | 979 | """the set of rev that compete to be the final successors of some revision. |
|
972 | 980 | """ |
|
973 | 981 | divergent = set() |
@@ -732,8 +732,8 b' def contentdivergent(repo, subset, x):' | |||
|
732 | 732 | """ |
|
733 | 733 | # i18n: "contentdivergent" is a keyword |
|
734 | 734 | getargs(x, 0, 0, _("contentdivergent takes no arguments")) |
|
735 | divergent = obsmod.getrevs(repo, 'divergent') | |
|
736 | return subset & divergent | |
|
735 | contentdivergent = obsmod.getrevs(repo, 'contentdivergent') | |
|
736 | return subset & contentdivergent | |
|
737 | 737 | |
|
738 | 738 | @predicate('extinct()', safe=True) |
|
739 | 739 | def extinct(repo, subset, x): |
General Comments 0
You need to be logged in to leave comments.
Login now