This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7292

changegroup: avoid shadowing a set with an int
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGea0b44255a31: changegroup: avoid shadowing a set with an int
Summary

This confuses the heck out of pytype, and I basically agree with it
that this shadowing is confusing. There's a chance this causes some
memory to be freed later, but I think it's probably not worth worrying
about for now.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Nov 6 2019, 5:59 PM
indygreg accepted this revision.Nov 7 2019, 3:25 AM
This revision is now accepted and ready to land.Nov 7 2019, 3:25 AM
durin42 added a commit: rHGea0b44255a31: changegroup: avoid shadowing a set with an int.Nov 7 2019, 3:35 AM
Closed by commit rHGea0b44255a31: changegroup: avoid shadowing a set with an int (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (6 lines)

Diff 17703

mercurial/changegroup.py

# pull off the changeset group # pull off the changeset group
repo.ui.status(_(b"adding changesets\n")) repo.ui.status(_(b"adding changesets\n"))
clstart = len(cl) clstart = len(cl)
progress = repo.ui.makeprogress( progress = repo.ui.makeprogress(
_(b'changesets'), unit=_(b'chunks'), total=expectedtotal _(b'changesets'), unit=_(b'chunks'), total=expectedtotal
) )
self.callback = progress.increment self.callback = progress.increment
efiles = set() efilesset = set()
def onchangelog(cl, node): def onchangelog(cl, node):
efiles.update(cl.readfiles(node)) efilesset.update(cl.readfiles(node))
self.changelogheader() self.changelogheader()
deltas = self.deltaiter() deltas = self.deltaiter()
cgnodes = cl.addgroup(deltas, csmap, trp, addrevisioncb=onchangelog) cgnodes = cl.addgroup(deltas, csmap, trp, addrevisioncb=onchangelog)
efiles = len(efiles) efiles = len(efilesset)
if not cgnodes: if not cgnodes:
repo.ui.develwarn( repo.ui.develwarn(
b'applied empty changelog from changegroup', b'applied empty changelog from changegroup',
config=b'warn-empty-changegroup', config=b'warn-empty-changegroup',
) )
clend = len(cl) clend = len(cl)
changesets = clend - clstart changesets = clend - clstart