This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2229

narrowrepo: filter() is a generator on py3, wrap in list()
ClosedPublic

Authored by durin42 on Feb 13 2018, 11:13 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG0c104ee51918: narrowrepo: filter() is a generator on py3, wrap in list()
Summary

Was at the top of Python 3 exceptions.

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.Feb 13 2018, 11:13 AM
indygreg accepted this revision.Feb 13 2018, 12:13 PM
indygreg added a subscriber: indygreg.

I'm not sure if there are performance implications to this. But if there are, this will get addressed when this code moves to core.

This revision is now accepted and ready to land.Feb 13 2018, 12:13 PM
Closed by commit rHG0c104ee51918: narrowrepo: filter() is a generator on py3, wrap in list() (authored by durin42). · Explain WhyFeb 13 2018, 12:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowrepo.py (14 lines)

Diff 5642

hgext/narrow/narrowrepo.py

# I'm not sure this is the right place to do this filter. # I'm not sure this is the right place to do this filter.
# context._manifestmatches() would probably be better, or perhaps # context._manifestmatches() would probably be better, or perhaps
# move it to a later place, in case some of the callers do want to know # move it to a later place, in case some of the callers do want to know
# which directories changed. This seems to work for now, though. # which directories changed. This seems to work for now, though.
def status(self, *args, **kwargs): def status(self, *args, **kwargs):
s = super(narrowrepository, self).status(*args, **kwargs) s = super(narrowrepository, self).status(*args, **kwargs)
narrowmatch = self.narrowmatch() narrowmatch = self.narrowmatch()
modified = filter(narrowmatch, s.modified) modified = list(filter(narrowmatch, s.modified))
added = filter(narrowmatch, s.added) added = list(filter(narrowmatch, s.added))
removed = filter(narrowmatch, s.removed) removed = list(filter(narrowmatch, s.removed))
deleted = filter(narrowmatch, s.deleted) deleted = list(filter(narrowmatch, s.deleted))
unknown = filter(narrowmatch, s.unknown) unknown = list(filter(narrowmatch, s.unknown))
ignored = filter(narrowmatch, s.ignored) ignored = list(filter(narrowmatch, s.ignored))
clean = filter(narrowmatch, s.clean) clean = list(filter(narrowmatch, s.clean))
return scmutil.status(modified, added, removed, deleted, unknown, return scmutil.status(modified, added, removed, deleted, unknown,
ignored, clean) ignored, clean)
repo.__class__ = narrowrepository repo.__class__ = narrowrepository