This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12203

scmutil: revert c7e675848027 / scmutil: obsrevs is already a frozenset
AbandonedPublic

Authored by indygreg on Feb 19 2022, 7:58 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Summary

The reverted change breaks nearly every command for me when I'm using
obsolescence. Specifically, I get TypeError: unhashable type: 'set'
on the changed line. The deleted comment actual draws attention to this
issue.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Feb 19 2022, 7:58 PM
Alphare requested changes to this revision.Feb 20 2022, 5:42 AM
Alphare added a subscriber: Alphare.

This is just because we're missing a new evolve version compatible with 6.1rc0, no need to worry. :)

This revision now requires changes to proceed.Feb 20 2022, 5:42 AM
indygreg abandoned this revision.Feb 20 2022, 1:03 PM

If this is evolve's fault, fair enough.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (4 lines)

Diff 32267

mercurial/scmutil.py

This function hashes all the revs filtered from the view (and, optionally, This function hashes all the revs filtered from the view (and, optionally,
all obsolete revs) up to maxrev and returns that SHA-1 digest. all obsolete revs) up to maxrev and returns that SHA-1 digest.
""" """
cl = repo.changelog cl = repo.changelog
if needobsolete: if needobsolete:
obsrevs = obsolete.getrevs(repo, b'obsolete') obsrevs = obsolete.getrevs(repo, b'obsolete')
if not cl.filteredrevs and not obsrevs: if not cl.filteredrevs and not obsrevs:
return None return None
key = (maxrev, hash(cl.filteredrevs), hash(obsrevs)) # TODO: obsrevs should be a frozenset, but right now obsolete.getrevs()
# may return a set, which is not a hashable type.
key = (maxrev, hash(cl.filteredrevs), hash(frozenset(obsrevs)))
else: else:
if not cl.filteredrevs: if not cl.filteredrevs:
return None return None
key = maxrev key = maxrev
obsrevs = frozenset() obsrevs = frozenset()
result = cl._filteredrevs_hashcache.get(key) result = cl._filteredrevs_hashcache.get(key)
if not result: if not result: