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: make repo required for idset

Browse Source 
Reviewed By: DurhamG

Differential Revision: D24365406

fbshipit-source-id: 17cbe8e5fc1ea6025b5006737dedb6f744c009a4
This commit is contained in:
Jun Wu 2020-12-14 13:10:41 -08:00 committed by Facebook GitHub Bot
parent 1327b6ec3b
commit 01553ffe03
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eden/scm/edenscm/hgext/smartlog.py
View File

@ -326,7 +326,7 @@ def smartlogrevset(repo, subset, x):
heads = cl.tonodes(heads)
master = cl.tonodes(masterset)
nodes = smartlognodes(repo, heads, master)
return subset & smartset.idset(cl.torevs(nodes))
return subset & smartset.idset(cl.torevs(nodes), repo=repo)
# Explicitly disable revnum deprecation warnings.
with repo.ui.configoverride({("devel", "legacy.revnum:real"): ""}):

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

@ -239,7 +239,7 @@ class phasecache(object):
revs = smartset.addset(revs, self.draftrevs(repo))
if revs is None:
revs = smartset.idset(bindings.dag.spans([]))
revs = smartset.idset(bindings.dag.spans([]), repo=repo)
# XXX: 'secret' is treated as an ampty set.
if subset is not None:

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

@ -486,8 +486,9 @@ class idset(abstractsmartset):
The Rust SpanSet does not keep order. This structure keeps orders.
>>> xs = idset([1, 3, 2, 4, 11, 10])
>>> ys = idset([2, 3, 4, 5, 20])
>>> repo = util.refcell([])
>>> xs = idset([1, 3, 2, 4, 11, 10], repo=repo)
>>> ys = idset([2, 3, 4, 5, 20], repo=repo)
>>> xs
<idset- [1..=4 10 11]>
@ -542,12 +543,11 @@ class idset(abstractsmartset):
<idset+ [1..=5 10 11 20]>
"""
def __init__(self, spans, repo=None):
def __init__(self, spans, repo):
"""data: a dag.spans object, or an iterable of revs"""
self._spans = dagmod.spans(spans)
self._ascending = False
if repo is not None:
self._reporef = weakref.ref(repo)
self._reporef = weakref.ref(repo)
@staticmethod
def range(repo, start, end, ascending=False):
@ -658,7 +658,7 @@ class idset(abstractsmartset):
def _fastsetop(self, other, op):
# try to use native set operations as fast paths
if type(other) is idset:
s = idset(getattr(self._spans, op)(other._spans))
s = idset(getattr(self._spans, op)(other._spans), repo=self.repo())
s._ascending = self._ascending
elif type(other) is baseset and (
op != "__add__" or all(r not in other for r in (nullrev, wdirrev))
@ -666,7 +666,7 @@ class idset(abstractsmartset):
# baseset is cheap to convert. convert it on the fly, but do not
# convert if it has troublesome virtual revs and the operation is
# "__add__" (union).
s = idset(getattr(self._spans, op)(dagmod.spans(other)))
s = idset(getattr(self._spans, op)(dagmod.spans(other)), repo=self.repo())
s._ascending = self._ascending
else:
# slow path