_descendant: use filteredset instead of orderedlazyset
authorPierre-Yves David <pierre-yves.david@fb.com>
Thu, 02 Oct 2014 19:43:42 -0500
changeset 22750 66e2b648deef
parent 22749 672f15ee2a1d
child 22751 e76aec3eddc4
_descendant: use filteredset instead of orderedlazyset The orderedlazyset class is going away. Filteredset gives the same service.
mercurial/revset.py
--- a/mercurial/revset.py	Fri Oct 03 01:37:13 2014 -0500
+++ b/mercurial/revset.py	Thu Oct 02 19:43:42 2014 -0500
@@ -665,12 +665,12 @@
     # Both sets need to be ascending in order to lazily return the union
     # in the correct order.
     args.ascending()
-    result = (orderedlazyset(s, subset.__contains__, ascending=True) +
-              orderedlazyset(args, subset.__contains__, ascending=True))
+    result = (filteredset(s, subset.__contains__, ascending=True) +
+              filteredset(args, subset.__contains__, ascending=True))
 
     # Wrap result in a filteredset since it's an _addset, which doesn't
     # implement all the necessary functions to be consumed by callers.
-    return orderedlazyset(result, lambda r: True, ascending=True)
+    return filteredset(result, lambda r: True, ascending=True)
 
 def descendants(repo, subset, x):
     """``descendants(set)``