This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3077

simplestorerepo: avoid shadowing dict in list comprehension over dict
ClosedPublic

Authored by durin42 on Apr 4 2018, 3:05 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd62d2e346acf: simplestorerepo: avoid shadowing dict in list comprehension over dict
rHGac88fdd8a19b: simplestorerepo: avoid shadowing dict in list comprehension over dict
Summary

Caught by pyflakes.

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.Apr 4 2018, 3:05 PM
indygreg accepted this revision.Apr 4 2018, 3:12 PM
This revision is now accepted and ready to land.Apr 4 2018, 3:12 PM
pulkit added a subscriber: pulkit.Apr 4 2018, 3:13 PM
pulkit added inline comments.
tests/simplestorerepo.py
488

Looks like the above two also occurrences of ishead also needs to be replaced by revishead?

Closed by commit rHGac88fdd8a19b: simplestorerepo: avoid shadowing dict in list comprehension over dict (authored by durin42). · Explain WhyApr 4 2018, 3:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/simplestorerepo.py (4 lines)

Diff 7642

tests/simplestorerepo.py

node1 = self.node(rev1) node1 = self.node(rev1)
node2 = self.node(rev2) node2 = self.node(rev2)
return mdiff.textdiff(self.revision(node1, raw=True), return mdiff.textdiff(self.revision(node1, raw=True),
self.revision(node2, raw=True)) self.revision(node2, raw=True))
def headrevs(self): def headrevs(self):
# Assume all revisions are heads by default. # Assume all revisions are heads by default.
ishead = {rev: True for rev in self._indexbyrev} revishead = {rev: True for rev in self._indexbyrev}
for rev, entry in self._indexbyrev.items(): for rev, entry in self._indexbyrev.items():
# Unset head flag for all seen parents. # Unset head flag for all seen parents.
ishead[self.rev(entry[b'p1'])] = False ishead[self.rev(entry[b'p1'])] = False
ishead[self.rev(entry[b'p2'])] = False ishead[self.rev(entry[b'p2'])] = False
pulkitUnsubmitted
Not Done

Looks like the above two also occurrences of ishead also needs to be replaced by revishead?

pulkit: Looks like the above two also occurrences of ishead also needs to be replaced by revishead?
return [rev for rev, ishead in sorted(ishead.items()) return [rev for rev, ishead in sorted(revishead.items())
if ishead] if ishead]
def heads(self, start=None, stop=None): def heads(self, start=None, stop=None):
# This is copied from revlog.py. # This is copied from revlog.py.
if start is None and stop is None: if start is None and stop is None:
if not len(self): if not len(self):
return [nullid] return [nullid]
return [self.node(r) for r in self.headrevs()] return [self.node(r) for r in self.headrevs()]