This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4172

debugcommands: force import of fileset in debugfileset
ClosedPublic

Authored by durin42 on Aug 9 2018, 12:02 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4d992e3f10ba: debugcommands: force import of fileset in debugfileset
Summary

It looks like Python 3's lazy importer is better than Python 2's for
this command, and as a result we had no symbols in the filesetlang
symbol table, which resulted in some really mysterious test-fileset.t
failures around withstatus optimizations. Inserting this explicit
import and forcing its evaluation fixes the test failure.

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.Aug 9 2018, 12:02 PM
pulkit accepted this revision.Aug 9 2018, 2:04 PM
Closed by commit rHG4d992e3f10ba: debugcommands: force import of fileset in debugfileset (authored by durin42). · Explain WhyAug 9 2018, 2:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (2 lines)

Diff 10136

mercurial/debugcommands.py

_('test files from all revisions and working directory')), _('test files from all revisions and working directory')),
('s', 'show-matcher', None, ('s', 'show-matcher', None,
_('print internal representation of matcher')), _('print internal representation of matcher')),
('p', 'show-stage', [], ('p', 'show-stage', [],
_('print parsed tree at the given stage'), _('NAME'))], _('print parsed tree at the given stage'), _('NAME'))],
_('[-r REV] [--all-files] [OPTION]... FILESPEC')) _('[-r REV] [--all-files] [OPTION]... FILESPEC'))
def debugfileset(ui, repo, expr, **opts): def debugfileset(ui, repo, expr, **opts):
'''parse and apply a fileset specification''' '''parse and apply a fileset specification'''
from . import fileset
fileset.symbols # force import of fileset so we have predicates to optimize
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
ctx = scmutil.revsingle(repo, opts.get('rev'), None) ctx = scmutil.revsingle(repo, opts.get('rev'), None)
stages = [ stages = [
('parsed', pycompat.identity), ('parsed', pycompat.identity),
('analyzed', filesetlang.analyze), ('analyzed', filesetlang.analyze),
('optimized', filesetlang.optimize), ('optimized', filesetlang.optimize),
] ]