This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2364

py3: use list comprehensions instead of filter where we need to eagerly filter
ClosedPublic

Authored by durin42 on Feb 21 2018, 12:41 PM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf62369667a7c: py3: use list comprehensions instead of filter where we need to eagerly filter
Summary

These two uses of filter() are then checked for truthiness, but on Python 3:

bool(filter(None, []))

True

So we need to stop depending on that. Fortunately it's easy to replace
the filter with an equivalent list comprehension.

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 21 2018, 12:41 PM
pulkit accepted this revision.Feb 21 2018, 12:51 PM
indygreg accepted this revision.Feb 21 2018, 10:07 PM
This revision is now accepted and ready to land.Feb 21 2018, 10:07 PM
Closed by commit rHGf62369667a7c: py3: use list comprehensions instead of filter where we need to eagerly filter (authored by durin42). · Explain WhyFeb 21 2018, 10:10 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)
Mmercurial/copies.py (4 lines)

Diff 5972

mercurial/cmdutil.py

def __contains__(self, value): def __contains__(self, value):
if value in self.set: if value in self.set:
return True return True
elif not value in self.revs: elif not value in self.revs:
return False return False
else: else:
self.revs.discard(value) self.revs.discard(value)
ctx = change(value) ctx = change(value)
matches = filter(match, ctx.files()) matches = [f for f in ctx.files() if match(f)]
if matches: if matches:
fncache[value] = matches fncache[value] = matches
self.set.add(value) self.set.add(value)
return True return True
return False return False
def discard(self, value): def discard(self, value):
self.revs.discard(value) self.revs.discard(value)

mercurial/copies.py

for dst, src in cp.iteritems(): for dst, src in cp.iteritems():
if src in m1: if src in m1:
copies[dst] = src copies[dst] = src
# file is missing if it isn't present in the destination, but is present in # file is missing if it isn't present in the destination, but is present in
# the base and present in the source. # the base and present in the source.
# Presence in the base is important to exclude added files, presence in the # Presence in the base is important to exclude added files, presence in the
# source is important to exclude removed files. # source is important to exclude removed files.
missingfiles = filter(lambda f: f not in m1 and f in base and f in c2, filt = lambda f: f not in m1 and f in base and f in c2
changedfiles) missingfiles = [f for f in changedfiles if filt(f)]
if missingfiles: if missingfiles:
basenametofilename = collections.defaultdict(list) basenametofilename = collections.defaultdict(list)
dirnametofilename = collections.defaultdict(list) dirnametofilename = collections.defaultdict(list)
for f in m1.filesnotin(base.manifest()): for f in m1.filesnotin(base.manifest()):
basename = os.path.basename(f) basename = os.path.basename(f)
dirname = os.path.dirname(f) dirname = os.path.dirname(f)