# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 2014-10-04 03:23:02
# Node ID bafa371d7af31020d8081b218256bfb3df42d929
# Parent  586d7058ea480907fa0f8473ba070b9088ce21d6

addset: drop caching through generatorset

The utility of this cache is debatable (no visible benchmark impact) and using
generatorset for such purpose makes the code complicated.

We drop it for now. Someone can reintroduce a smart version of it in the future
if it is detected to be relevant.

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -2499,22 +2499,20 @@ class addset(abstractsmartset):
         If the ascending attribute is set, iterate over both collections at the
         same time, yielding only one value at a time in the given order.
         """
-        if not self._iter:
-            if self._ascending is None:
-                def gen():
-                    for r in self._r1:
+        if self._ascending is None:
+            def gen():
+                for r in self._r1:
+                    yield r
+                s = self._r1.set()
+                for r in self._r2:
+                    if r not in s:
                         yield r
-                    s = self._r1.set()
-                    for r in self._r2:
-                        if r not in s:
-                            yield r
-                gen = gen()
-            else:
-                iter1 = iter(self._r1)
-                iter2 = iter(self._r2)
-                gen = self._iterordered(self._ascending, iter1, iter2)
-            self._iter = generatorset(gen)
-        return self._iter
+            gen = gen()
+        else:
+            iter1 = iter(self._r1)
+            iter2 = iter(self._r2)
+            gen = self._iterordered(self._ascending, iter1, iter2)
+        return gen
 
     def __iter__(self):
         if self._genlist: