# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1398723336 25200
# Node ID 1d7a2771aa36e00770dc6c13def7371b637b5736
# Parent  9f12d8665c7bb9f3aa731d02e3db7432e765c7ce
revset: inline spanset containment check (fix perf regression)

Calling a function is super expensive in python. We inline the trivial range
comparison to get back to more sensible performance on common revset operation.

Benchmark result below:

Revision mapping:
0) 3f83fc5cfe71 2.9.2 release
1) bcfd44abad93 current @
2) This revision


revset #0: public()
0) wall 0.010890 comb 0.010000 user 0.010000 sys 0.000000 (best of 201)
1) wall 0.012109 comb 0.010000 user 0.010000 sys 0.000000 (best of 199)
2) wall 0.012211 comb 0.020000 user 0.020000 sys 0.000000 (best of 197)

revset #1: :10000 and public()
0) wall 0.007141 comb 0.010000 user 0.010000 sys 0.000000 (best of 361)
1) wall 0.014139 comb 0.010000 user 0.010000 sys 0.000000 (best of 186)
2) wall 0.008334 comb 0.010000 user 0.010000 sys 0.000000 (best of 308)

revset #2: draft()
0) wall 0.009610 comb 0.010000 user 0.010000 sys 0.000000 (best of 279)
1) wall 0.010942 comb 0.010000 user 0.010000 sys 0.000000 (best of 243)
2) wall 0.011036 comb 0.010000 user 0.010000 sys 0.000000 (best of 239)

revset #3: :10000 and draft()
0) wall 0.006852 comb 0.010000 user 0.010000 sys 0.000000 (best of 383)
1) wall 0.014641 comb 0.010000 user 0.010000 sys 0.000000 (best of 183)
2) wall 0.008314 comb 0.010000 user 0.010000 sys 0.000000 (best of 299)

We can see this changeset gains back the regression for `and` operation on
spanset.  We are still a bit slowerfor the `public()` and `draft()`. Predicates
not touched by this changeset.

diff -r 9f12d8665c7b -r 1d7a2771aa36 contrib/revsetbenchmarks.txt
--- a/contrib/revsetbenchmarks.txt	Wed Apr 30 14:19:01 2014 -0500
+++ b/contrib/revsetbenchmarks.txt	Mon Apr 28 15:15:36 2014 -0700
@@ -14,3 +14,7 @@
 min(0::)
 roots((tip~100::) - (tip~100::tip))
 ::p1(p1(tip))::
+public()
+:10000 and public()
+draft()
+:10000 and draft()
diff -r 9f12d8665c7b -r 1d7a2771aa36 mercurial/revset.py
--- a/mercurial/revset.py	Wed Apr 30 14:19:01 2014 -0500
+++ b/mercurial/revset.py	Mon Apr 28 15:15:36 2014 -0700
@@ -2784,8 +2784,9 @@
                 yield r
 
     def __contains__(self, rev):
-        return self._contained(rev) and not (self._hiddenrevs and rev in
-                self._hiddenrevs)
+        return (((self._end < rev <= self._start)
+                  or (self._start <= rev < self._end))
+                and not (self._hiddenrevs and rev in self._hiddenrevs))
 
     def __nonzero__(self):
         for r in self: