This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8142

setup: exclude the __index__ module from itself when generating
ClosedPublic

Authored by mharbison72 on Feb 24 2020, 12:35 AM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHGbb58931d0c4f: setup: exclude the __index__ module from itself when generating
Summary

This module is generated on Windows to hold all of the extension names and the
help summaries, so that they are discoverable inside the py2exe zipfile. The
problem is this file is generated by dumping the disabled list, and that list
comes from walking the filesystem. So once an install from source into a
virtualenv created this module, then next build from source from that virtualenv
would also see __index__.py in the filesystem, and include it. Clearly that's
wrong because this isn't a real extension, so just filter it from the list when
generating it.

The Mercurial installer was unaffected by this, but the TortoiseHg package was.
In the final package, hg help -v extensions and the panel of extensions both
showed it.

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

mharbison72 created this revision.Feb 24 2020, 12:35 AM
marmoute accepted this revision.Feb 24 2020, 10:40 AM
marmoute added a subscriber: marmoute.

This looks good to me.

pulkit accepted this revision.Feb 25 2020, 6:16 AM
This revision is now accepted and ready to land.Feb 25 2020, 6:16 AM

Revision Contents
Changeset List

PathPackages
Msetup.py (4 lines)

Diff 20299

setup.py

def run(self): def run(self):
if os.path.exists(self._indexfilename): if os.path.exists(self._indexfilename):
with open(self._indexfilename, 'w') as f: with open(self._indexfilename, 'w') as f:
f.write('# empty\n') f.write('# empty\n')
# here no extension enabled, disabled() lists up everything # here no extension enabled, disabled() lists up everything
code = ( code = (
'import pprint; from mercurial import extensions; ' 'import pprint; from mercurial import extensions; '
'pprint.pprint(extensions.disabled())' 'ext = extensions.disabled();'
'ext.pop("__index__", None);'
'pprint.pprint(ext)'
) )
returncode, out, err = runcmd( returncode, out, err = runcmd(
[sys.executable, '-c', code], localhgenv() [sys.executable, '-c', code], localhgenv()
) )
if err or returncode != 0: if err or returncode != 0:
raise DistutilsExecError(err) raise DistutilsExecError(err)
with open(self._indexfilename, 'wb') as f: with open(self._indexfilename, 'wb') as f: