This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2363

narrow: use list comprehension instead of filter for filtering lists
ClosedPublic

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

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf85e32a5e5c8: narrow: use list comprehension instead of filter for filtering lists
Summary

filter() returns a generator on Python 3, which causes these filters
to break things.

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:48 PM
indygreg accepted this revision.Feb 21 2018, 10:06 PM
This revision is now accepted and ready to land.Feb 21 2018, 10:06 PM
Closed by commit rHGf85e32a5e5c8: narrow: use list comprehension instead of filter for filtering lists (authored by durin42). · Explain WhyFeb 21 2018, 10:10 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5971

hgext/narrow/narrowchangegroup.py

extensions.wrapfunction(changegroup.cg1packer, 'prune', prune) extensions.wrapfunction(changegroup.cg1packer, 'prune', prune)
def generatefiles(orig, self, changedfiles, linknodes, commonrevs, def generatefiles(orig, self, changedfiles, linknodes, commonrevs,
source): source):
matcher = getattr(self._repo, 'narrowmatch', matcher = getattr(self._repo, 'narrowmatch',
getattr(self, '_narrow_matcher', None)) getattr(self, '_narrow_matcher', None))
if matcher is not None: if matcher is not None:
narrowmatch = matcher() narrowmatch = matcher()
changedfiles = filter(narrowmatch, changedfiles) changedfiles = [f for f in changedfiles if narrowmatch(f)]
if getattr(self, 'is_shallow', False): if getattr(self, 'is_shallow', False):
# See comment in generate() for why this sadness is a thing. # See comment in generate() for why this sadness is a thing.
mfdicts = self._mfdicts mfdicts = self._mfdicts
del self._mfdicts del self._mfdicts
# In a shallow clone, the linknodes callback needs to also include # In a shallow clone, the linknodes callback needs to also include
# those file nodes that are in the manifests we sent but weren't # those file nodes that are in the manifests we sent but weren't
# introduced by those manifests. # introduced by those manifests.
commonctxs = [self._repo[c] for c in commonrevs] commonctxs = [self._repo[c] for c in commonrevs]

hgext/narrow/narrowcopies.py

util, util,
) )
def setup(repo): def setup(repo):
def _computeforwardmissing(orig, a, b, match=None): def _computeforwardmissing(orig, a, b, match=None):
missing = orig(a, b, match) missing = orig(a, b, match)
if util.safehasattr(repo, 'narrowmatch'): if util.safehasattr(repo, 'narrowmatch'):
narrowmatch = repo.narrowmatch() narrowmatch = repo.narrowmatch()
missing = filter(narrowmatch, missing) missing = [f for f in missing if narrowmatch(f)]
return missing return missing
def _checkcopies(orig, srcctx, dstctx, f, base, tca, remotebase, limit, def _checkcopies(orig, srcctx, dstctx, f, base, tca, remotebase, limit,
data): data):
if util.safehasattr(repo, 'narrowmatch'): if util.safehasattr(repo, 'narrowmatch'):
narrowmatch = repo.narrowmatch() narrowmatch = repo.narrowmatch()
if not narrowmatch(f): if not narrowmatch(f):
return return
orig(srcctx, dstctx, f, base, tca, remotebase, limit, data) orig(srcctx, dstctx, f, base, tca, remotebase, limit, data)
extensions.wrapfunction(copies, '_computeforwardmissing', extensions.wrapfunction(copies, '_computeforwardmissing',
_computeforwardmissing) _computeforwardmissing)
extensions.wrapfunction(copies, '_checkcopies', _checkcopies) extensions.wrapfunction(copies, '_checkcopies', _checkcopies)

hgext/narrow/narrowpatch.py

else: else:
for x in orig(*args): for x in orig(*args):
yield x yield x
def trydiff(orig, repo, revs, ctx1, ctx2, modified, added, removed, def trydiff(orig, repo, revs, ctx1, ctx2, modified, added, removed,
copy, getfilectx, *args, **kwargs): copy, getfilectx, *args, **kwargs):
if util.safehasattr(repo, 'narrowmatch'): if util.safehasattr(repo, 'narrowmatch'):
narrowmatch = repo.narrowmatch() narrowmatch = repo.narrowmatch()
modified = filter(narrowmatch, modified) modified = [f for f in modified if narrowmatch(f)]
added = filter(narrowmatch, added) added = [f for f in added if narrowmatch(f)]
removed = filter(narrowmatch, removed) removed = [f for f in removed if narrowmatch(f)]
copy = {k: v for k, v in copy.iteritems() if narrowmatch(k)} copy = {k: v for k, v in copy.iteritems() if narrowmatch(k)}
return orig(repo, revs, ctx1, ctx2, modified, added, removed, copy, return orig(repo, revs, ctx1, ctx2, modified, added, removed, copy,
getfilectx, *args, **kwargs) getfilectx, *args, **kwargs)
extensions.wrapfunction(patch, '_filepairs', _filepairs) extensions.wrapfunction(patch, '_filepairs', _filepairs)
extensions.wrapfunction(patch, 'trydiff', trydiff) extensions.wrapfunction(patch, 'trydiff', trydiff)