<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Feb 14, 2014 at 9:57 PM, Lucas Moscovicz <span dir="ltr"><<a href="mailto:lmoscovicz@fb.com" target="_blank">lmoscovicz@fb.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"># HG changeset patch<br>
# User Lucas Moscovicz <<a href="mailto:lmoscovicz@fb.com">lmoscovicz@fb.com</a>><br>
# Date 1392082723 28800<br>
# Mon Feb 10 17:38:43 2014 -0800<br>
# Node ID 84f626df10a5df208b211d3ad907562034d33c1e<br>
# Parent 959d8a69a22ef664626abd997143f58babbdbedf<br>
revset: changed spanset implementation to take hidden revisions into account<br>
<br>
Hidden revisions are now excluded from the spanset.<br>
Now this doesn't break for people using changeset evolution.<br>
<br>
diff --git a/mercurial/revset.py b/mercurial/revset.py<br>
--- a/mercurial/revset.py<br>
+++ b/mercurial/revset.py<br>
@@ -2132,21 +2132,33 @@<br>
"""Duck type for baseset class which represents a range of revisions and<br>
can work lazily and without having all the range in memory<br>
"""<br>
- def __init__(self, start, end):<br>
+ def __init__(self, start, end, hiddenrevs=set()):<br>
self._start = start<br>
self._end = end<br>
+ self._hiddenrevs = hiddenrevs<br>
+<br>
+ def _contained(self, rev):<br>
+ return (rev <= self._start and rev > self._end) or (rev >= self._start<br>
+ and rev < self._end)<br></blockquote><div><br></div><div>This notation:</div><div>return (self._end < rev <= self._start) or ( self._start <= rev < self._end)</div><div><br></div><div>Is more readable IMHO.</div>
<div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<br>
def __iter__(self):<br>
if self._start <= self._end:<br>
- for r in xrange(self._start, self._end):<br>
- yield r<br>
+ iterrange = xrange(self._start, self._end)<br>
else:<br>
- for r in xrange(self._start, self._end, -1):<br>
+ iterrange = xrange(self._start, self._end, -1)<br>
+<br>
+ if self._hiddenrevs:<br>
+ s = self._hiddenrevs<br>
+ for r in iterrange:<br>
+ if r not in s:<br>
+ yield r<br>
+ else:<br>
+ for r in iterrange:<br>
yield r<br>
<br>
def __contains__(self, x):<br>
- return (x <= self._start and x > self._end) or (x >= self._start and x<<br>
- self._end)<br>
+ return self._contained(x) and not (self._hiddenrevs and rev in<br>
+ self._hiddenrevs)<br>
<br>
def __and__(self, x):<br>
return lazyset(self, lambda r: r in x)<br>
@@ -2159,7 +2171,14 @@<br>
return l + baseset(x)<br>
<br>
def __len__(self):<br>
- return abs(self._end - self._start)<br>
+ if not self._hiddenrevs:<br>
+ return abs(self._end - self._start)<br>
+ else:<br>
+ count = 0<br>
+ for rev in self._hiddenrevs:<br>
+ if self._contained(rev):<br>
+ count += 1<br>
+ return abs(self._end - self._start) - count<br>
<br>
def __getitem__(self, x):<br>
# Basic implementation to be changed in future patches.<br>
_______________________________________________<br>
Mercurial-devel mailing list<br>
<a href="mailto:Mercurial-devel@selenic.com">Mercurial-devel@selenic.com</a><br>
<a href="http://selenic.com/mailman/listinfo/mercurial-devel" target="_blank">http://selenic.com/mailman/listinfo/mercurial-devel</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Olle
</div></div>