D12157: scmutil: obsrevs is already a frozenset

Submitter	phabricator
Date	Feb. 9, 2022, 3:44 p.m.
Message ID	<differential-rev-PHID-DREV-udbm5u56osfninyrnnl7-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/50492/
State	New
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Wed, 9 Feb 2022 15:44:46 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "av6 (Anton Shestakov)" <phabricator@mercurial-scm.org> Subject: D12157: scmutil: obsrevs is already a frozenset Message-ID: <differential-rev-PHID-DREV-udbm5u56osfninyrnnl7-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-udbm5u56osfninyrnnl7 Thread-Index: ZjI1MmFkNzA5NjZhMTE0NGRjMjI1MjM2Zjkx MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "av6 \(Anton Shestakov\)" <phabricator+D12157+public+2019a40ff4c6ef6f@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Feb. 9, 2022, 3:44 p.m.

av6 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D12157

AFFECTED FILES
  mercurial/scmutil.py

CHANGE DETAILS




To: av6, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -366,9 +366,7 @@ 
         obsrevs = obsolete.getrevs(repo, b'obsolete')
         if not cl.filteredrevs and not obsrevs:
             return None
-        # 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)))
+        key = (maxrev, hash(cl.filteredrevs), hash(obsrevs))
     else:
         if not cl.filteredrevs:
             return None

Patchwork D12157: scmutil: obsrevs is already a frozenset

Comments

Patch