This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1910

obsutil: work around filter() being a generator in Python 3
ClosedPublic

Authored by durin42 on Jan 18 2018, 1:17 PM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc0a6733f7e7a: obsutil: work around filter() being a generator in Python 3
rHG4705dc1500e0: obsutil: work around filter() being a generator in Python 3
Summary

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.Jan 18 2018, 1:17 PM
pulkit accepted this revision.Jan 19 2018, 2:40 AM
indygreg accepted this revision.Feb 1 2018, 6:32 PM
indygreg added a subscriber: indygreg.

Writing this as a generator expression /might/ be a bit better. But I don't think perf is an issue here.

This revision is now accepted and ready to land.Feb 1 2018, 6:32 PM
Closed by commit rHG4705dc1500e0: obsutil: work around filter() being a generator in Python 3 (authored by durin42). · Explain WhyFeb 1 2018, 6:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/obsutil.py (4 lines)

Diff 5131

mercurial/obsutil.py

effects |= BRANCHCHANGED effects |= BRANCHCHANGED
# Check if at least one of the parent has changed # Check if at least one of the parent has changed
if changectx.parents() != source.parents(): if changectx.parents() != source.parents():
effects |= PARENTCHANGED effects |= PARENTCHANGED
# Check if other meta has changed # Check if other meta has changed
changeextra = changectx.extra().items() changeextra = changectx.extra().items()
ctxmeta = filter(metanotblacklisted, changeextra) ctxmeta = list(filter(metanotblacklisted, changeextra))
sourceextra = source.extra().items() sourceextra = source.extra().items()
srcmeta = filter(metanotblacklisted, sourceextra) srcmeta = list(filter(metanotblacklisted, sourceextra))
if ctxmeta != srcmeta: if ctxmeta != srcmeta:
effects |= METACHANGED effects |= METACHANGED
# Check if the diff has changed # Check if the diff has changed
if not _cmpdiff(source, changectx): if not _cmpdiff(source, changectx):
effects |= DIFFCHANGED effects |= DIFFCHANGED