This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11281

templater: swap `\` with `/` to allow the resource logic to kicks in
ClosedPublic

Authored by marmoute on Aug 17 2021, 2:59 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7ab7f73a7f0a: templater: swap `\` with `/` to allow the resource logic to kicks in
Summary

Without this change our wrapper to the resource logic will fails to details the
nesting and try to pass directory/file entry to the resource module, leading
to a crash.

Ideally, we should track down all caller passing \ instead of /, but that
is far more intrusive and we would like to have a working pyoxidized version
working for 5.9 It will be easy to add a warning to the above code to track
down "bad" caller during the 6.0 cycle.

This reduce the number of failing test with pyoxidizer from 52 to 23

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

marmoute created this revision.Aug 17 2021, 2:59 PM
marmoute added a commit: rHG7ab7f73a7f0a: templater: swap `\` with `/` to allow the resource logic to kicks in.Aug 18 2021, 12:44 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG7ab7f73a7f0a: templater: swap `\` with `/` to allow the resource logic to kicks in (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/templater.py (7 lines)

Diff 29900

mercurial/templater.py

# in mercurial/templates/ if no path was provided? # in mercurial/templates/ if no path was provided?
if templatepath is None: if templatepath is None:
templatepath = templatedir() templatepath = templatedir()
if templatepath is not None: if templatepath is not None:
f = os.path.join(templatepath, name) f = os.path.join(templatepath, name)
return f, open(f, mode='rb') return f, open(f, mode='rb')
# Otherwise try to read it using the resources API # Otherwise try to read it using the resources API
if pycompat.iswindows:
# quick hack to make sure we can process '/' in the code dealing with
# ressource. Ideally we would make sure we use `/` instead of `ossep`
# in the templater code, but that seems a bigger and less certain
# change that we better left for the default branch.
name_paths = name.split(pycompat.ossep)
name = b'/'.join(name_paths)
name_parts = name.split(b'/') name_parts = name.split(b'/')
package_name = b'.'.join([b'mercurial', b'templates'] + name_parts[:-1]) package_name = b'.'.join([b'mercurial', b'templates'] + name_parts[:-1])
return ( return (
name, name,
resourceutil.open_resource(package_name, name_parts[-1]), resourceutil.open_resource(package_name, name_parts[-1]),
) )
def try_open_template(name, templatepath=None): def try_open_template(name, templatepath=None):
try: try:
return open_template(name, templatepath) return open_template(name, templatepath)
except (EnvironmentError, ImportError): except (EnvironmentError, ImportError):
return None, None return None, None