facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity

smartset: rename spansset to idset

Browse Source 
Summary: Match the Rust `IdSet` name and be more different from `spanset`.

Reviewed By: kulshrax

Differential Revision: D22519590

fbshipit-source-id: 5be7990c2157dc09a37067ea7402a49da2a3127c
This commit is contained in:
Jun Wu 2020-07-20 17:23:52 -07:00 committed by Facebook GitHub Bot
parent 0562c1220f
commit c6fc753ad7
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eden/scm/edenscm/mercurial/phases.py
View File

@ -228,7 +228,7 @@ class phasecache(object):
if draft in phases:
revs += self._draftrevs
# XXX: 'secret' is treated as an ampty set.
revs = smartset.spansset(revs)
revs = smartset.idset(revs)
if subset is not None:
revs = subset & revs
return revs

26
eden/scm/edenscm/mercurial/smartset.py
View File

@ -410,18 +410,18 @@ class baseset(abstractsmartset):
return "<%s%s %s>" % (type(self).__name__, d, s)
class spansset(abstractsmartset):
"""Wrapper around Rust's SpanSet that meets the smartset interface.
class idset(abstractsmartset):
"""Wrapper around Rust's IdSet that meets the smartset interface.
The Rust SpanSet does not keep order. This structure keeps orders.
>>> xs = spansset([1, 3, 2, 4, 11, 10])
>>> ys = spansset([2, 3, 4, 5, 20])
>>> xs = idset([1, 3, 2, 4, 11, 10])
>>> ys = idset([2, 3, 4, 5, 20])
>>> xs
<spansset- [1..=4 10 11]>
<idset- [1..=4 10 11]>
>>> ys
<spansset- [2..=5 20]>
<idset- [2..=5 20]>
Iteration
@ -464,11 +464,11 @@ class spansset(abstractsmartset):
Set operations
>>> xs & ys
<spansset+ [2 3 4]>
<idset+ [2 3 4]>
>>> xs - ys
<spansset+ [1 10 11]>
<idset+ [1 10 11]>
>>> xs + ys
<spansset+ [1..=5 10 11 20]>
<idset+ [1..=5 10 11 20]>
"""
def __init__(self, spans):
@ -556,11 +556,11 @@ class spansset(abstractsmartset):
def _fastsetop(self, other, op):
# try to use native set operations as fast paths
if type(other) is spansset:
s = spansset(getattr(self._spans, op)(other._spans))
if type(other) is idset:
s = idset(getattr(self._spans, op)(other._spans))
s._ascending = self._ascending
else:
s = getattr(super(spansset, self), op)(other)
s = getattr(super(idset, self), op)(other)
return s
def __and__(self, other):
@ -571,7 +571,7 @@ class spansset(abstractsmartset):
def __add__(self, other):
# XXX: This is an aggressive optimization. It does not respect orders
# if 'other' is also a spansset.
# if 'other' is also a idset.
return self._fastsetop(other, "__add__")
def __repr__(self):