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.

Download Raw Diff

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

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 19 2022, 7:58 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

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

If this is evolve's fault, fair enough.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/scmutil.py (4 lines)

Commit	Parents	Author	Summary	Date
8e15413286c0	8eeca94ded70	Gregory Szorc		Feb 19 2022, 7:57 PM

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:

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	32267			Feb 19 2022, 7:58 PM	★	★