This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7289

branchmap: correctly set()-ify list argument
ClosedPublic

Authored by durin42 on Nov 6 2019, 5:59 PM.

Details

Reviewers
indygreg
dlax
Group Reviewers
hg-reviewers
Commits
rHG43f57b9620d2: branchmap: correctly set()-ify list argument
Summary

Caught with pytype. I'm more than a little curious how this never
caused problems.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Nov 6 2019, 5:59 PM
indygreg requested changes to this revision.Nov 8 2019, 11:43 AM
indygreg added a subscriber: indygreg.

Could you please add a comment or add an annotation? I really don't like having to recreate collection instances to satisfy a type checker. Am I wrong in thinking this shouldn't be necessary?

This revision now requires changes to proceed.Nov 8 2019, 11:43 AM
dlax accepted this revision.Nov 14 2019, 3:52 AM
dlax added a comment.Nov 14 2019, 4:39 AM

On second thought, it's not obvious why it'd be better than annotating __init__(). Is this because this would require many changes in callers?

durin42 retitled this revision from branchmap: always copy closednodes to a set to branchmap: correctly set()-ify list argument.Nov 14 2019, 4:05 PM
durin42 edited the summary of this revision. (Show Details)
durin42 updated this revision to Diff 18077.
indygreg accepted this revision.Nov 14 2019, 10:15 PM
This revision is now accepted and ready to land.Nov 14 2019, 10:15 PM
durin42 added a commit: rHG43f57b9620d2: branchmap: correctly set()-ify list argument.Nov 14 2019, 10:36 PM
Closed by commit rHG43f57b9620d2: branchmap: correctly set()-ify list argument (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/branchmap.py (4 lines)

Diff 18077

mercurial/branchmap.py

closed.append(h) closed.append(h)
if rbheads: if rbheads:
rtiprev = max((int(clrev(node)) for node in rbheads)) rtiprev = max((int(clrev(node)) for node in rbheads))
cache = branchcache( cache = branchcache(
remotebranchmap, remotebranchmap,
repo[rtiprev].node(), repo[rtiprev].node(),
rtiprev, rtiprev,
closednodes=closed, closednodes=set(closed),
) )
# Try to stick it as low as possible # Try to stick it as low as possible
# filter above served are unlikely to be fetch from a clone # filter above served are unlikely to be fetch from a clone
for candidate in (b'base', b'immutable', b'served'): for candidate in (b'base', b'immutable', b'served'):
rview = repo.filtered(candidate) rview = repo.filtered(candidate)
if cache.validfor(rview): if cache.validfor(rview):
self._per_filter[candidate] = cache self._per_filter[candidate] = cache
self.tiprev = tiprev self.tiprev = tiprev
self.filteredhash = filteredhash self.filteredhash = filteredhash
# closednodes is a set of nodes that close their branch. If the branch # closednodes is a set of nodes that close their branch. If the branch
# cache has been updated, it may contain nodes that are no longer # cache has been updated, it may contain nodes that are no longer
# heads. # heads.
if closednodes is None: if closednodes is None:
self._closednodes = set() self._closednodes = set()
else: else:
self._closednodes = closednodes self._closednodes = set(closednodes)
self._entries = dict(entries) self._entries = dict(entries)
# whether closed nodes are verified or not # whether closed nodes are verified or not
self._closedverified = False self._closedverified = False
# branches for which nodes are verified # branches for which nodes are verified
self._verifiedbranches = set() self._verifiedbranches = set()
self._hasnode = hasnode self._hasnode = hasnode
if self._hasnode is None: if self._hasnode is None:
self._hasnode = lambda x: True self._hasnode = lambda x: True