comparison hgext3rd/evolve/obscache.py @ 6135:ce7da767c7f6 stable

evolve: make _computeobsoleteset() return a frozenset

Let's make sure that obsolete.getrevs(repo, b'obsolete') returns a frozenset to
be compatible with Mercurial 6.1. This shouldn't produce any issues on older
versions, because I doubt anything tries to modify a set of obsolete revisions
by calling .add() or .remove() directly on it.

See 27fe84a8dd60 and c7e675848027 in core.

6132:7da0f8128d90

            self._setdata(bytearray(data[headersize:]))
        self._ondiskkey = self._cachekey

def _computeobsoleteset(orig, repo):
    """the set of obsolete revisions"""
    obs = set()
    repo = repo.unfiltered()
    notpublic = repo._phasecache.getrevset(repo, (phases.draft, phases.secret))
    if notpublic:
        obscache = repo.obsstore.obscache
        # Since we warm the cache at the end of every transaction, the cache

                # If a transaction is open, it is worthwhile to update and use
                # the cache, the lock prevent race and it will be written on
                # disk when the transaction close.
                obscache.update(repo)
        isobs = obscache.get
    for r in notpublic:
        if isobs(r):
            obs.add(r)
    return obs

@eh.uisetup
def cachefuncs(ui):
    orig = obsolete.cachefuncs[b'obsolete']
    wrapped = lambda repo: _computeobsoleteset(orig, repo)

6135:ce7da767c7f6

            self._setdata(bytearray(data[headersize:]))
        self._ondiskkey = self._cachekey

def _computeobsoleteset(orig, repo):
    """the set of obsolete revisions"""
    repo = repo.unfiltered()
    notpublic = repo._phasecache.getrevset(repo, (phases.draft, phases.secret))
    if notpublic:
        obscache = repo.obsstore.obscache
        # Since we warm the cache at the end of every transaction, the cache

                # If a transaction is open, it is worthwhile to update and use
                # the cache, the lock prevent race and it will be written on
                # disk when the transaction close.
                obscache.update(repo)
        isobs = obscache.get
    return frozenset(r for r in notpublic if isobs(r))

@eh.uisetup
def cachefuncs(ui):
    orig = obsolete.cachefuncs[b'obsolete']
    wrapped = lambda repo: _computeobsoleteset(orig, repo)