This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6614

py3: don't run source transformer on hgext3rd (extensions)
ClosedPublic

Authored by martinvonz on Jul 8 2019, 12:52 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd28d91f9f35a: py3: don't run source transformer on hgext3rd (extensions)
Summary

It's unclear why the source transformer runs on hgext3rd. It's been
like that since it was introduced in 1c22400db72d (mercurial:
implement a source transforming module loader on Python 3,
2016-07-04), and that commit didn't say anything about it (but it says
that it doesn't have "support [...] for extensions").

I find that the current handling of hgext3rd just makes it harder to
convert extensions to Python 3. It makes you convert a bunch of
strings passed to getattr() and kwargs[] to r'' that could otherwise
have been left alone. It's also really confusing that the source
transformer runs when you import the extension as "extensions.foo=",
but not as "extension.foo=/some/path".

I suppose there is small number of (very simple) extensions that would
have worked without this patch that would now be broken. It seems okay
to me to break those.

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

martinvonz created this revision.Jul 8 2019, 12:52 PM
pulkit accepted this revision.Jul 8 2019, 5:37 PM
This revision is now accepted and ready to land.Jul 8 2019, 5:37 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/__init__.py (2 lines)
Mrelnotes/next (4 lines)

Diff 15823

mercurial/__init__.py

import io import io
import token import token
import tokenize import tokenize
class hgpathentryfinder(importlib.abc.MetaPathFinder): class hgpathentryfinder(importlib.abc.MetaPathFinder):
"""A sys.meta_path finder that uses a custom module loader.""" """A sys.meta_path finder that uses a custom module loader."""
def find_spec(self, fullname, path, target=None): def find_spec(self, fullname, path, target=None):
# Only handle Mercurial-related modules. # Only handle Mercurial-related modules.
if not fullname.startswith(('mercurial.', 'hgext.', 'hgext3rd.')): if not fullname.startswith(('mercurial.', 'hgext.')):
return None return None
# don't try to parse binary # don't try to parse binary
if fullname.startswith('mercurial.cext.'): if fullname.startswith('mercurial.cext.'):
return None return None
# third-party packages are expected to be dual-version clean # third-party packages are expected to be dual-version clean
if fullname.startswith('mercurial.thirdparty'): if fullname.startswith('mercurial.thirdparty'):
return None return None
# zstd is already dual-version clean, don't try and mangle it # zstd is already dual-version clean, don't try and mangle it

relnotes/next

that are `cmdutil.afterresolvestates`, `cmdutil.unfinishedstates` and that are `cmdutil.afterresolvestates`, `cmdutil.unfinishedstates` and
`cmdutil.STATES`. Now these have been unified to a single `cmdutil.STATES`. Now these have been unified to a single
API which handles the various states and their utilities. This API API which handles the various states and their utilities. This API
has been added to `state.py`. Now instead of adding to these 3 lists has been added to `state.py`. Now instead of adding to these 3 lists
independently a state for a new operation can be registered using independently a state for a new operation can be registered using
`addunfinished()` in `state` module. `addunfinished()` in `state` module.
* `cmdutil.checkunfinished()` now includes detection for merge too. * `cmdutil.checkunfinished()` now includes detection for merge too.
* We used to automatically attempt to make extensions compatible with
Python 3 (by translating their source code while loading it). We no
longer do that.